diff --git a/Manifest b/Manifest
index 5054202a8eaf..2d1115bcf21c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29258 BLAKE2B 3be2c1a82b066ad6f6b213e1974bdab71337d2e5f9534d0e41a3f37b62ec09556f4b74d9c4c0de83b74066bef7025801ba82d22ecdc4329d2e10fc57aaed03d3 SHA512 4f3eb5c6620e5a685a777bf4bb6f3e1e60540093f3631ad23e86e908aa34b94393a51381141e953ea85a5baf4024b64993db4cba1d13646623c65ca3e865fc25
-TIMESTAMP 2020-12-18T06:08:44Z
+MANIFEST Manifest.files.gz 29272 BLAKE2B 6c1fcc53f399bc373a31b0e17e1e7bff551fb837b5090489f6730b3b433328710ab63929c84a5c9640e4bd051be6c5a679aaefa9df2e5f200beee8fd0774b3db SHA512 3052cf995467d243a83f9e0beee649f76147fd2fcb47277c85b620f5c4ea28d9d064b8b665b1a33a23cfb1f85ce6cd8ed6ef31c40c3902565010f1e0916c5c8e
+TIMESTAMP 2020-12-21T11:38:29Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/cR2xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/giTVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB17RAAhxznBmLqfpBWoW4d25h+jS/FYk94pykqTLjVFNHPKTZ6Loc6wAXpT6R8
-Fb/t2NA36tyDU22L5n0umojdoZPsN7E9oMvQ+4CXE68DAlXliBEznP7a72TsnEBs
-rVdF4vdkGUO6X2vjNDpQrlJLhfmvO/EPTIfDKSWYqh5jk4XSx5qQs6GpQ+1eNqSp
-Wqa0dng1y60P44gqD8syJNY/rOJc5MbCp14sv0+h/95oSapETbs8ajY5UiezGk8R
-+uxBpHZSGwiBpCqN8C1ONE0Nvqj240qbV8celRGppEhMQolSnkUaUmjaXxC2N+jm
-y0IAhfZdvY88SOMeVbEdmhBHNWVfn3Fm2gB+i/ONp4mgGf7lMlYMW7m6pth++wEB
-ePgRnM5Eny6v3SS7OPIJ8UweBGYFZjJ7R9+eu+hcYU1eSGMG1p+aVzooyYhaRHL7
-aGAodlGcVZxTYH8Bx76Lp1h7/KmIvuiiX/Ea7VopKqPmdWexHusbR3jluZet62ou
-sZWxgcRM91kG7dbPHLjRYxvR1oeJ3AvQPp8mbxztCXQ7LlHufE2EeGy/NkLuP7Mt
-yi7EGL6UmF2eWJXec83rATUvl8okOHJCqxaESt0vlJI8MJ4DC2iRCSdOF28jZsiw
-3MIuK1g9xS0bb9cQacbPgHTcr6S8cuYktzC4JFGa3mQzUH3VQwE=
-=BAQv
+klC2JA/9F5inyknshsna1o9tUON3UOCAZPqYUX5xGNan+dgF7XKedWLOrBYRtaIC
+DTKfdjZIu7zQXZjoFPAc4J0czKntwZ5bZWcGV1vuOksRZn8KZjooyN3kO78cE4u+
+g69iefRwJ3b+CJVH8AOeVWd2hiQ0XBsOQxZAnSZVZoH6NgzDnEV4NjLlPYDHvt1C
+4MmMUUtmLzcf2YRIYc+pJSZNvaLsVRqe1KSeUVbTBiPJ1M/yxTcVEBAyP1Jtc3mb
+9cRwFnVINVD7z8mfBK2CVwGwLLanp4aDBIFqVbog7SCJpufHzupzlmzF/+Vz6zWV
+QLmVnejtTUqcKNoXzjrtIsDfcdEaL50yBj/hbeAtqe2RTSowI/YuuIvljxGXrrCr
+3S1ncGUf5rEXOLOYmoQaF/58Oy2LWD6LMuJRylutbUT2IrUWSG+BZ670cBA4f1Kl
+YLvrg7tT/9ztLhYpzXkLMK/2u4CjDNg2d3uop5/0jApARhZ+m1kEvhFVc0SH+3Ut
+DhgFf6CxxyIcjFtTOeSWJ1K5M87x4QWvRg2XRN9pom+AGHpg8AweEQd6L2quJpsU
+ex5yiCpiwDiha7SiFJ3Ur7xiueadwecgltPLPVTZZ3Dyqa9Y0wcfbESCU87+tbs5
+ofsRTuLYkbSvubEzmPasVEtlMNodFpPkjLyuT+D2I/IAWKHQf58=
+=jdfm
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 813c28304089..30e90a04bcdf 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index a333d92f8a09..283681ac7c27 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/postgrey/Manifest b/acct-group/postgrey/Manifest
new file mode 100644
index 000000000000..0b89e1355ea7
--- /dev/null
+++ b/acct-group/postgrey/Manifest
@@ -0,0 +1,2 @@
+EBUILD postgrey-0.ebuild 195 BLAKE2B 7c4891d6c23b7936a72cbfeed40599a3656ca66a3a7c5ad3682153cf43fe52ad9db9be4a4026b91f83c9741f78219c40b499df139917b9d30fa717cf36d22f44 SHA512 1ef8b03c9c7b38cb11f85ebb08bdbb5e749aea13258ee1d9d99c73685859a81f2167d02ccb5ab1f34eb2d50a9238ddb082f5f76996399a3ddd03be456e19b9b7
+MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
diff --git a/acct-group/postgrey/metadata.xml b/acct-group/postgrey/metadata.xml
new file mode 100644
index 000000000000..6356cbc03fb9
--- /dev/null
+++ b/acct-group/postgrey/metadata.xml
@@ -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>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/postgrey/postgrey-0.ebuild b/acct-group/postgrey/postgrey-0.ebuild
new file mode 100644
index 000000000000..333c0f29bfd2
--- /dev/null
+++ b/acct-group/postgrey/postgrey-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the postgrey mail daemon"
+ACCT_GROUP_ID=360
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 7df778f09920..d1da5719e674 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/postgrey/Manifest b/acct-user/postgrey/Manifest
new file mode 100644
index 000000000000..d94522e41854
--- /dev/null
+++ b/acct-user/postgrey/Manifest
@@ -0,0 +1,2 @@
+EBUILD postgrey-0.ebuild 242 BLAKE2B d6621d74ef9dc47df80efaeae96b6e3e4d16e0f4a74dbc9efc5487ed8fe8835ded74642d37042739b1b98a04166511fcc7686545803ed9821b0fe54a659ea32b SHA512 02ce303963411731740da262cfb0701480036b525568b2fa5127bd7dba822e1ac6b19cb38fd06d44f1b4521dabc656c5a7b386e2e4f63a41a52fc364d305af1f
+MISC metadata.xml 239 BLAKE2B b6b1bf74f7f8bfb011e7281aed3fdd6384559b2ca489081ec5f76e8e150d4864cf8ace9109e490dcff07235e4eb009f2f07a0f7f1ab8b59700d2365f1c89cb80 SHA512 bc4dcbc277db158ba204153e2ee8b7de6db5fe7fa2b7abaff141da65d8b04b773e04526c94d7c824b57be06359e226a0b48479cf6f208eacb239c1a2f893b4be
diff --git a/acct-user/postgrey/metadata.xml b/acct-user/postgrey/metadata.xml
new file mode 100644
index 000000000000..6356cbc03fb9
--- /dev/null
+++ b/acct-user/postgrey/metadata.xml
@@ -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>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/postgrey/postgrey-0.ebuild b/acct-user/postgrey/postgrey-0.ebuild
new file mode 100644
index 000000000000..635b6617c408
--- /dev/null
+++ b/acct-user/postgrey/postgrey-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the postgrey mail daemon"
+ACCT_USER_ID=360
+ACCT_USER_GROUPS=( postgrey )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 02a3377a900f..5edd49d07544 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index fc742bbd6dc4..bfe70c719184 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,3 +1,5 @@
 DIST orca-3.36.5.tar.xz 3578288 BLAKE2B d9711720b7a104bc86c97f1821566dd710f0bd318a5409fc5bd5624e7f35a81e9cd0a3d9fd1337c58b09d1ed8fe1c9eeb5b0822e45f7a711a44405bcb8f54db6 SHA512 87756ab5ea962c715f1a00ba80a30cf2e812bab87cf6f13b437b45b39bb763b684fe69b8847a3ed543c398f79a4d2d3ed33b61f88414f432b473c0892453a4f0
+DIST orca-3.36.6.tar.xz 3465112 BLAKE2B 227610b5a01027c292cf9a99ecc54f76ad6053d6923325825ed5f81183b39e1e38e70e7a7d88561f0b0c4d212f16465542d57bf4aeed2fa893b8893fa1d3dd49 SHA512 be2752267d46077310eccc4d76dc5e87ce8e1715cc33ff6f8f15b83c9891a2ba98a2d681f893c88df5b0c5ffd8a1ebadc3a4286debf0ff14ba17803d20f902db
 EBUILD orca-3.36.5.ebuild 1648 BLAKE2B 9f80152aa72444dcfe6343e75c77ef7ab9563123adcb336c340577e6948f862fca703b242d0998088ce517c1c57bea3e3886ecc119443d6e17d54b721124d838 SHA512 5b5964138479936516dd8d9f46a0972fb341c1e956c5483a5aa6f8a110f75995ce90aa05e50e3ed9f0a77851dfcb3c3deb2d6de5115730487a49e4c77f591efd
+EBUILD orca-3.36.6.ebuild 1650 BLAKE2B d61b4eaaa388fc1a6a6b915db0983773899354e387bf193d34b905a974a67217d37b2ee261d1e94c57edcfa8cd78e332e1f348ae15ff39de637a0de05a4df5bf SHA512 a614dad534582560dc6b44f370e63d6a439e0ee863d88edbcd925c5d0e815ea5db4b3de66ee744e9750857752f3d09de9d2c29e9cd20f6c3a7a8bc12c2fb5edc
 MISC metadata.xml 640 BLAKE2B 490290dba5378d6599afa55e56780f99333b32ce71d0ca17f241c9e87c9d7ae19f3e0656c059bb841dd707df66b330da7ff860f3c0b1eb221de552227ba4ca06 SHA512 6fd5af9a57c21a72a37740f458947dce9a54e378ce5b602c9443d954ed536792cfa74299a69d02a2b0d81905a892d5b2d43f93678367ce7e039aa350c882cbb8
diff --git a/app-accessibility/orca/orca-3.36.6.ebuild b/app-accessibility/orca/orca-3.36.6.ebuild
new file mode 100644
index 000000000000..7e5ba2f05844
--- /dev/null
+++ b/app-accessibility/orca/orca-3.36.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Extensible screen reader that provides access to the desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+braille"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-atk-2.34:2
+	>=app-accessibility/at-spi2-core-2.36:2[introspection]
+	>=dev-libs/atk-2.36
+	>=dev-libs/glib-2.28:2
+	media-libs/gstreamer:1.0[introspection]
+	>=x11-libs/gtk+-3.6.2:3[introspection]
+	$(python_gen_cond_dep '
+		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.18:3[${PYTHON_MULTI_USEDEP}]
+	')
+	braille? (
+		$(python_gen_cond_dep '
+			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_MULTI_USEDEP}]
+			dev-libs/liblouis[python,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/atk[introspection]
+	$(python_gen_cond_dep '
+		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyatspi-2.36[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+	')
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+#	app-text/yelp-tools
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with braille liblouis)
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize
+}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2ef96199f3bf..4690015cc5d6 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 7d4b14540d15..b2dc15a7fb88 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -4,6 +4,6 @@ DIST ansible-2.10.1.tar.gz 25851704 BLAKE2B f9f42ab9f7864a48f0d960b4e8149dfba3ec
 DIST ansible-2.10.4.tar.gz 28622006 BLAKE2B 94551986f5e8ef54dd4f806a264f8373b19564f74b32bfc6d852d49b7b9ff1030ad3c2fdda2f16bc78c0dae5e07cc750a3992bca23fd9bff0f2466716ac32374 SHA512 da9517ad1f478eb8ccab3bad15f3f6ca4d6151798b5aab6db261c4b19a0ac023db1e294745a06748788820ece8980bf1c2c6274314fa0a2943b76c0658383b72
 EBUILD ansible-2.10.0-r2.ebuild 1985 BLAKE2B 30885a55981450ae698183239f9659e770e5afafb774722dc4dfeb48789c3b4e8985f39e917ff497911f84363dceaf1bdf7c2d45537c8f6e3bf21e57fc88a67e SHA512 e48e28eaf5ee8bfa2e54e3245b448105e6687cca172ba1f3fba5b68b2c165a16045d94f5794b936426658bdc53883342aaf7fc7a4eb4bb7ef7b3bb8bc0e014b9
 EBUILD ansible-2.10.1.ebuild 1908 BLAKE2B 009631ae1683884cc6f0c7ee1de1849944e8ab6d967554fa19904a9d959dd6e63603a40ff2fb6b70b20c22211b03efb5ac65932d4aafb0e39aefff3017c4e8f3 SHA512 a53a5352f6f13e295bf93d27fba404b59ead3dfadd9d51472c22c9a6b2b3638c95961e262d55e8345de41f3ad76c2190c2bc852bbdfc57e4c1d614eaf33f7a2b
-EBUILD ansible-2.10.4.ebuild 1910 BLAKE2B 8cddbaa1cdb8e6065afcd660c67cc41ec8088dcc494743a4d2280abf4168dc8cb05b819f6cb86a40d239e48ba0d170484f6b6f5d29f88fd5f9637e74f1e594b5 SHA512 7aa0ada42be21117db9fd4eeeaaa6649935a2e046fa8849005a230b37c20fcd3e28a65feedc7846fe7950ba953fcdbb5c6ded018dbabd015c76f37ac905d77bc
-EBUILD ansible-9999.ebuild 1937 BLAKE2B 98ab62b10f1d118b9d491639800cf12c61d89c76d7c825bee3f944baec488d7de3ac699e8e4ee024ce80b97ecc5625fdffa04c32b1a6590c3c2dd73103b9ca60 SHA512 c067bbb92042d932316ee2a26f43f974586eff96b8f5f679a8b51e4a66f2e6a7c532edc0d0bf996bf665a875c7af61e29d6fb5ac1b4ac10896140e77004778c8
+EBUILD ansible-2.10.4.ebuild 1518 BLAKE2B 05cb37f3d8a2805d76d5f5cc64880babc20fa1db50207f3ba6d4ba56afe35c7792109991975c4b644294cb28ad8860e4a3ba7ec844acfa54f492942d3c3c5042 SHA512 54aebf31f5721dec424b4bc7153509dc690df0fb6730487d868226903a3241ed84fd0d7c3910ebc926f4d51a29d5af54e1c9bb173551740f4a0456822eb6a8f6
+EBUILD ansible-9999.ebuild 1545 BLAKE2B 6a08a6b254a318114889c4f56586ab71ed8af353c0b38bc99c2ff6363bf76673f04e044ec7c5f313337682a26fa1578395800da63d0caea7ac9173c3a4d9acc8 SHA512 15d4b6cf8a02d44197aca55ba941e5fc3b6168d37e47146da5023a0cf2f1a64a4788984d56fcce9439a6194f20e6810fe55aeb747fe0d93055b4a426501f40a9
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.10.4.ebuild b/app-admin/ansible/ansible-2.10.4.ebuild
index 86e5af4dd8f5..cfb7d42b3a3d 100644
--- a/app-admin/ansible/ansible-2.10.4.ebuild
+++ b/app-admin/ansible/ansible-2.10.4.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="doc test"
+IUSE="test"
 RESTRICT="test"
 
 RDEPEND="
@@ -41,11 +41,6 @@ RDEPEND="
 DEPEND="
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	app-admin/ansible-base
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	)
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
@@ -61,19 +56,6 @@ python_compile() {
 	distutils-r1_python_compile
 }
 
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
 python_test() {
 	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index d3bff29efe2f..04de5dc07690 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc test"
+IUSE="test"
 RESTRICT="test"
 
 RDEPEND="
@@ -43,11 +43,6 @@ RDEPEND="
 DEPEND="
 	!app-admin/ansible-base
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	)
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
@@ -63,19 +58,6 @@ python_compile() {
 	distutils-r1_python_compile
 }
 
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
 python_test() {
 	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index 2316fdd0f838..f98d0e523259 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -4,6 +4,6 @@ AUX clsync.initd 555 BLAKE2B 18b3f0e1e8e079eb306709d2b55b99100ce3efa852f285d7ac9
 DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322 SHA512 cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd
 DIST clsync-0.4.5.tar.gz 276096 BLAKE2B 4fa534b342a806ca691f8a65455cb800800f7a943fa3f0913a26c37d2cd0f9d762630ad01eeb80bdd0d90a0731bed5f2aa60444a654972da9479c116e0e937aa SHA512 6568f3c49ac4fe11e54593ba23eed392d0b7d9b5bf052983c4a5a2befbb807dbd3f9d13412264f8909998702f869d1cd6db77d89bd9491414b1f3213437c5212
 EBUILD clsync-0.4.4.ebuild 2832 BLAKE2B b741cb0c391ae3bf8599d7013cd1a9f0a3680e61474312701775c2a3ef9c998cf547c83311d2d47ea377279aefdec794def5fcdb0d29aac04442da772871fe97 SHA512 239f53bda723da6e72852ef46fba96a30d6c1bf71623df6248ec113ce202b981bd9980deadcc2833c9a3796d16dce2d3f02947d1f07b16d6386d453f2e5b6f34
-EBUILD clsync-0.4.5.ebuild 3789 BLAKE2B 1970640b5658cd7d04bdb158d72b048cd1d14270fbae0b3c9352e317d782c928bd3f75ed70cbcbad5caebe32e51e42b41a6828a206b92ba6141a0f0fcea9b32a SHA512 cc2a15f91a09e2c40a53ee84d4ea818132dfa3f16ff0329284d4bd5150fe738853803fa7da3af72c99ff8501760f26447aee0fced10b9a34496add02667e0ea9
+EBUILD clsync-0.4.5.ebuild 3794 BLAKE2B 5502b5762d47acae15ba682468ed51ce5fe74876af09dba4a141e2ac5990330bbfaea5b293b2aaac14540b25baa1e7047fcdbc847bc9f9d6c73f4ce950278363 SHA512 a69f2355c0d96bc1787bf769ad3bf2b8354d5986472d9bad67b656378ce0ebec1ea962689540a185264bce82e3b01ea3a89e91c94b145f7f965c60cccb3b0426
 EBUILD clsync-9999.ebuild 3787 BLAKE2B bdbe927f14f77f9ce3a456543226dd60ec5ee77fe995b215453f45efeec59a51a69632466c3fe2150884d1a1a13d4bd31ed3f28c77ae92a4c3c70d5297a29322 SHA512 4c8be692a96362156fbb863cb27ca8ea932bfd8a9a46db27c186b8cf5f178d11171718559d0e8719f1f300a87db11a62602db54652fbb4c6995d047e5d985ee3
 MISC metadata.xml 2138 BLAKE2B 95be20be2bd87c771de6f49269bfa7e54b2a10f6c0166648130198647fcc37b86dab3501c1df8f5ef211dd0ef04f60244fec80907c95e78efd9f7c6b148023bb SHA512 0a70059c2f24248056a5aade206eafb457b39f37ab559d61284941cfcd6b01ff40328049e2edacd9a8f1a8dbbb313aed4add7092629c6bdfca0c1151ab8d69ca
diff --git a/app-admin/clsync/clsync-0.4.5.ebuild b/app-admin/clsync/clsync-0.4.5.ebuild
index ba4c91c7f45d..2d61d65f2f08 100644
--- a/app-admin/clsync/clsync-0.4.5.ebuild
+++ b/app-admin/clsync/clsync-0.4.5.ebuild
@@ -6,10 +6,10 @@ EAPI=7
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/clsync/clsync.git"
 	inherit git-r3
-	KEYWORDS="x86"
+	KEYWORDS="amd64 x86"
 else
 	SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 inherit autotools linux-info systemd
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 8f60689f9c5c..b193912ae208 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -10,11 +10,12 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip 2508208 BLAKE2B d17c22f3d8e3f0b52b
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip 2721920 BLAKE2B f3fde8f5cc53496dc314bcae822a415cf00950da0a03b968de00685371e7a2e84ffa304fb176e791c85c930728859687e768ff785829f0751ae919546bd3326d SHA512 8981a08b1ba0226854567b0977d8a349abe2b58420421ab1dccdaf9c98e7657cb2140ad1a38767d25cb54249b61f162ecd51d401374a29f7368a550b19196595
+DIST consul-1.7.11.tar.gz 22803471 BLAKE2B 05f839d4ca025600d56833534872dc2207b561c0b44643d788baa791b02137cbd7146223145d53697fa20e5ff707a3cfcc01fed993b7d6558b82579919667e6b SHA512 82dab9baef3ff48dd83dd0fd3e7d5d989af8bdd142cf4e169e6de7610bd51d00cce5e76b60e6e6827ec606c2d6d2c1d46ac0502d493b13dd7fc4d42441fc1c79
 DIST consul-1.7.4.tar.gz 22787889 BLAKE2B cb7a813beac2fd752858046d5a92f898662ea986f09d660c65173eb68e7523e9f1c6a8fc267275b2170490dc1e897d9c8d0df57dd898e58f0197e835c759919a SHA512 50466c6ded9d46ade57df252cda3cfc24ff321c13455d789dc7ea300ba037386aca73c6a47be9c5817985ff9678e04daa3295aff5ae83c97afa297451456bc4b
-DIST consul-1.7.7.tar.gz 22797355 BLAKE2B 659fec61fa9933c19d49c406a13305f2e33c064d9ff1df3d2c3dc28ca7f2e98be02aabcc110f741a2819022c6199d42284c8002c12594798be544295d7a2a23b SHA512 9a97ee452bac2cdf4cf9dbdab3b7b769f38d0d8082b419dbcc5b11a6041945f62ec7bbbd15f11e49c117215ff2ea6b986d754dbb50806631d6a0771741965d4f
 DIST consul-1.7.8.tar.gz 22799862 BLAKE2B 94a091dab7eb4a2379b4c426fa47e0baeaa016066fb161fba540af2cf6811fdc225d18181d99d8d0e674c9503ae6d9facc15e0e35dccbad509ba143aa1b9f497 SHA512 2ca89bdcf576910697a4c52040cd0eebd5b0600a717e2170132c65c2f66696dcad23ab9923c43c8c9213263d8da1dc681ef2fc52f97d9f582643c036473fb10e
-DIST consul-1.8.3.tar.gz 24240809 BLAKE2B ac3740541e37dd0546e719a359b3943ddd5c330b2c7e35dead1a8c849a434e935566edb1898d15a95892b35509885e02ba406d0bbeb4969e96146386c8b7e760 SHA512 841c21319b8937d1bccfc49c254db4d040368e678884c12fa67e8918e36c030c855c2b10fa7e372125c86345f0c6623fe7de54a4e657334db4a305752b7fd369
 DIST consul-1.8.4.tar.gz 28576916 BLAKE2B b5d65831e569dc1e997617642f82d040f0d3a1490c8a31f10e94ba50ca1a0b3abb4a3bcf57e369c7afacf8c31949ab0f7e687d887bb1c51641d9ee266e333b87 SHA512 f8bf566cfcad21e26c39e88667c383dc07569376b00c326938b685b082fe79f4e312c37132018a65f37ee2a70d2260c6a2e5dffb81cc8aaae77b3318e82fd7cd
+DIST consul-1.8.7.tar.gz 28519088 BLAKE2B 998ed12f6eae674f02616cc5e3fbe076a0ee81d538abee8fc2abca2cbc35482c0e0ed08455a22650bea7563a8daafcac7edd1ecc78496ff9062dcefa93826289 SHA512 508dcb195c964e6145a8256c747bba11e46c53f137e72e4ec23e539938f6dfeb858f74da60529206b5f6f1cb8b68520ec331105bb52512b2d655c2832c848907
+DIST consul-1.9.1.tar.gz 31240160 BLAKE2B 22d4e76eea9a113b9798048d565d33df3fca88c6a289f6e5ba61d7e8cfbbd98b0ae1a77c74eedb0eb2c861fc2501b3d475c307c07deba71c5f739793570505ca SHA512 9b983fed98499f642ac1bd8d183c2d76cbe321b8d1f7d318257c392185654e4037f7d80d39935011c0d97eb45c6686bd7c34c08908d5ad23d2c99bcee5e1fa74
 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
@@ -66,6 +67,8 @@ DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod 37 BLAKE2B 9aad8d876b
 DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
 DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
 DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip 14852 BLAKE2B 33a7c997772bc0ab89312c06940938a0e447b81d5613c95585ec3cf395189edaa92a8e9801649f91ebf9e65dad30af94725436d5849ca1277ec4126989d3b023 SHA512 55765137bbfcb45b4c9962044502458f1e7944487946604fbc7604d48b9b576c522b9316a99cb14dacc3c613c99ddb9c51f1a9cd92f4a729bdf76b834d7d2fba
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
+DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip 14905 BLAKE2B 9aa626472e6bebbcb1d454f892ebf3c5f953ccf952e6ca7e60715211d418ab9c8d54832f9949824702278cd753758425dda72867e61ece209da688196d13d2ef SHA512 82818b2eb7e8f7265b814f202c420e5a187fd5e9a43536a062715e1a3d1d5717acc8d2daeb1f678dd13bf5703545309ad9d4b4e78fbb6e9befd9bb7370ddaa3b
 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
@@ -79,12 +82,16 @@ 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.0.mod 753 BLAKE2B 5d81e99f1c39cafd4dd39f7202f71ea5fa3eba3f1c970e9c51e674e9aba8ce527034679105ed92843c7c69caec3770ef6fad38cc172df670f1643270300fb821 SHA512 8a04b0f60d9393afdc4b106413a1022e213509cadc222d592b8a98cc06188eda9ab8b7fdc346e8e70e15f40294ed41fe5510205d64ff40c427a6fbbcbd16f530
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip 44812 BLAKE2B ba556ac48b565838fd1686825e0bf8417d0473cdd1d0c9f28ce88cbda83b9e61bdfc9cc8b86351d0ad1d57b2aeb978800200bb023d9cd1bdbd013237e1813d92 SHA512 6a71cedd6356d9e17ffa7af4e005a7d17f1c004b6b68f487ac75b13668d22f18c06ea0c0e4c9b62d5d60b27054a3afa0e73d4adbab6ad46ede4b4387500c27d4
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.5-0.20201104215618-6fd5a4ddf425.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.5-0.20201104215618-6fd5a4ddf425.zip 48822 BLAKE2B 9fadcb6b1b9d7d0acfea5724db7f50c7a1a201ecf0383d96d7ebb085412c2a4a4b3beb766edc610b9803812839f44a1a4429825967cc679ffe249ecd9e854b29 SHA512 fb565518e3c593f9453f1fef49924144084793ff215dbe18c06ffe372785444e3d916a23aef30b508e750ac5df7108206749d773813b0fdac9d77d3831c99386
 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
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip 7144 BLAKE2B d223f96d7bdb87d77573fde857a61d518336b60ab04e2a3cafbbfde23ecd65511553d9bd6360b1a9c17b394f77c7cd37e3c74df827a65b0e79580e1695723652 SHA512 c3d4056c34241f73d9f79801ea6a6d03697f2a6f151ceb5239458cf50c715dab693ccc0b5593f51cde8e2fff5f4959c72ab4e95197be3f65cae8185b6cbda06d
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip 13988218 BLAKE2B af9b087b7c9fdf75ef92dadbfa49ad427238a49426bb50269cf3ffc72dbb15e5bfd9975308b0260bc507bebedf683ba78428d33e03780fd2895224b929e680f6 SHA512 a019196698556d6877dda5757f8bd062d2f4320b0e81c7a4fb92140e85623d95ff7d52fa42ecc88a762db53d29068d63e654ac3affb0efbcc0d49a1800711955
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
@@ -162,21 +169,29 @@ DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
 DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod 32 BLAKE2B a73ae1e577fbb84fd72de422c367c1003355c117a9660cadbb5d6d52fcd0c102fa3b22c7c7dfb6e149dc14ddcb9b5fef847fb2a7b9379a35405c7bd9d83ff1b5 SHA512 2ef8ab60b4320b9358614a28a02b4207f3986c4a06798c3e253a79bfb63692dfb1765476e9d154e15f9d5e30983609c98b6ee39ae910c678a3773fddca208cee
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.mod 121 BLAKE2B 3b2b42800cf70cdfcc5a34ccde0b38f8bb16756e47fd83215563e653667a993416007880ac26a9f41f1f18318d9803b9ee90eaa98b2d4de16edcb7b74eb54760 SHA512 1a666d5599c4bbdfc3c174047e187af75d1a3e66e344ae76d714b387c39dda9632bb6c7ea1ead5a830a2aea1c5a5e2d051d552535cc7e0bc3dbf71383a1c4e5b
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip 49672 BLAKE2B 792273745cd9cdb2913387fc305cb0a5e9c444c5e97bd469fdd94f91f6bb0a6a2c9223a9a5fd8798db79922e6056c9b266df2a7091fba4e81d783339c1b78284 SHA512 04ab61faa2934ec2ff4dccc43e74a20457874cf091ed182d28c13db97072b953a4040a0109daa8d2ed740069e89e4e0076f1c0246d7c93ba3119ebda1d659f0e
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.mod 121 BLAKE2B 3b2b42800cf70cdfcc5a34ccde0b38f8bb16756e47fd83215563e653667a993416007880ac26a9f41f1f18318d9803b9ee90eaa98b2d4de16edcb7b74eb54760 SHA512 1a666d5599c4bbdfc3c174047e187af75d1a3e66e344ae76d714b387c39dda9632bb6c7ea1ead5a830a2aea1c5a5e2d051d552535cc7e0bc3dbf71383a1c4e5b
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.zip 49890 BLAKE2B 738ff71723727e7950bd225a765e5f6ff47eaea5942d2e437b015103f1a06405f6c050b6a7222c2b6ab41506adf6b6768c4c2e7345a9503bbd7d737bb355b2e4 SHA512 c4331256ead0f5ef5684e155cdcd053cacd01123bb049edcf2c1a6692ad3c2c3653da6420d0e625b96ffaad0e429980590778370075d4857fee5c7b60e33d2d3
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
+DIST github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod 48 BLAKE2B dc30053a3f292ba19e5dcf7d7f287a15a970703b98bc83525dad946a8719b42e5a12575baa4206ed4237a202f1c4d57874813badff88aa80723d743a61c5e86f SHA512 e129ba3d01fa1a966c010ec4b453dccdb191dd7f8cf4f8295294e0a69f1a03d9d8cbc738d3fd3347a28beaccb205e443a40786866953f1c4dd761ebd2c889bbc
 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-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod 91 BLAKE2B 4aa00d10dbc5cf003c458093f8a81e56c440ddfb3e060c40cebcbeea3f04b152c19a6c879460a164e07e7df2b9a6ed86e16cef70ca34396e8fcf384907d5c606 SHA512 7ef69b0fa12691253fc58e94d67162abb06b86a762aaec858611cd1885bab3b60f14ccdf9cf75eefd24c0018aded83408461d7d709580fc89c123ee5a2e64614
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
 DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod 31 BLAKE2B d141d98fd2673b422369b754fbd430a465f08bcdb07fbbf1ed626304ecd0843255fd2e909fc395b04c7adec18a15dea65ede0c64689be98b7491729d13363db7 SHA512 45bbb63ae2dda8c2ea63c9e38405b379708326c3f2e7963e3589ea53d06fd3bdce1613b5a0c1ef66f9c6ddc21374b1669218bd6b3210918df0a4b205116f3e14
 DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod 32 BLAKE2B 165b3724097f123b839b3f65d2e401caf6d8046fe822d3d9b9f15d74e1da21c45b77706f79716fc1b9c5322127bec754b2dd35442fe077dad4f3e301cd168ca2 SHA512 14e60a75a483ff4a1f6313a7a8a1dbfbc6ed4c223c7a9d18c0b355e84261084204a22ef1125a40e30acb1b43abfc97e60c045dd91a16d2b4068a78a54d854d28
 DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip 78166 BLAKE2B 1a7b655abbaad2d27ca38c60ebd39a1b186fc49c9ef7bbdcd2610603af1074f0df7777e480eb5d9b5deb09edee32ec959daccc0f5fd33a8f18c85e219367a144 SHA512 69395f0457365d57b43086d52ca9c77ead9d74c52bb66c9687fb4c26164eedbf4322c129d55408ba96c9985b081ea8335be1587a63f29d53183f542130a409ec
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod 41 BLAKE2B 62bb3af3f58b23321cc389ceca36d28e4f32cb1470b6c54c4af55ef927ba84284858765b5b333c3bbdb042826550fe4f0d22022078e2b34e340098465e21f3e8 SHA512 1e8d650a965637bd0974b8f42e207155dd1bac307e9ecf4d294cb4ee0f1c694276062d46318d113326b9c1bfdc379a7d8b8fa2c18e4a08ed9baefcae67db88d2
+DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip 79799 BLAKE2B 1677e3977fcf1499a1d6d3b0dda2f990b12a9f5464ff8a7aca6752951b395038ea2e3a38224d24eff0e6df6a2cc92f5da47daef9ceb237433bd2370d70eb7737 SHA512 9a67b0101fc1afba75179246e1498c41254d8379f78ef65877166bf9a5b7f7ac9e29f270e9186f13a26891389ab4e9ef309c4e90b2e79bffc3ade49e39fe2af1
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod 41 BLAKE2B f496cc326aeee2c6f1547b802fa1ea13a578144331451bb772a33e2934dcc655c9355f06f7845684130c6647d00decfa937c839909baa01a6d84f6e601a427e8 SHA512 56fe1d995f8f51197d68494fb2edc2d5c5cc863c881ed640a74ba80e292a54a0600f10c727b3dc8a209fc33c750d92ad658374d0dc3d083fa9750bb7174f5613
 DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod 43 BLAKE2B ab024fc86c325a82315f5a99c39e1fc08440ee35d81fe09959816a0fff09aa5d852431fcc370dde082963ccbd0d79d74d987f1bacdd4796d6d1d11eb80089d63 SHA512 b3548cd55d406b9148e992e276f7178d68116825198f359971f22a1d9e7e2548cdf9605a1b8b6f04b3b66d92faa906dae781a53624344733fc471452f16f4312
 DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod 34 BLAKE2B da7fc8b2c3dd4e49dc2efc50ae5d50571e906f68ebbaaeb863f4b3f6f03160a381d7b0e743863cb4253ba36afa2f5d7e518ac08fb4d6c08566d9931396d87fa9 SHA512 b75a0212825e9e0554f7654b1da4050ddda233853ddd86fcfeaac0202dcc4605f0608f3e5ea90056407ccef504330ac407493187a759a36fd716f508b20dc60c
@@ -207,6 +222,8 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e8
 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%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip 458317 BLAKE2B df49024ad50c301d81d451351fec1ce0e3706c602de5068deeda6a0614412e49c0d230b47cd630cdc90a6a5bd4761e66f4f38554fd4b60b8896aec768cb98e19 SHA512 bc1c7eeac13afd27ba62c1343b697480a61812ab15231efae740c716f0a6abe2b53c8a40787601624af9017cd36463cc7cb5e895f4fed0de6e52a3c248bd0a9e
 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
@@ -220,6 +237,8 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 99332 BLAKE2B d95e04036796b0
 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-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip 127156 BLAKE2B 1d06924d2e9fadaefa1a506c16830c88e983c3d14b3bb9a82c216879531ffb664dc90de8fbf3b6025ae8b5e7cee1a9ecb900a7eabb85f6144d304fab7cacf21f SHA512 365bb5271fded39749a69bdfaee6e29740b26b84e0a737fedab3e50cc0416a098f0ed0a14704dc1ec9bc1eb81b8827de4a151024f5ea3e6c75a9fb9abfc14d62
 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
@@ -229,12 +248,16 @@ DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.zip 16817 BLAKE2B a3592faa6456fa855094ab193d3d09d8729d8e9dc9c1dfee62698bfe1e20306860009106626e356a0582e5a8f29dad2dbe454b1d13fda38b9ad6f0f1489b8f44 SHA512 669d022eade451baf0504b024b88024571ece521d223a908b2369e1de0a6b71199789b909961838f4eb2aba4508f6cb983511d01c33e157828f44ccee2b1602c
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip 16584 BLAKE2B 91b7f51050c2ee0261447144d1f86c7952cdd5f3096d72040b069dd2737c008084bb456b57400d3fa5cd26ce3bb34265c0cfcee94c4dace3468ef13b62d73c74 SHA512 6e265617828739486750cb8c5a8337f3e17f83664821208778528d93e608bd142902aaefcd64d4e6fb8542e5b0938b12191ea070fb5deefbff946daa146e9278
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.zip 22166 BLAKE2B 32c6a771070fe4da18b8cffb964f6d983244c79e33f50fe0b2cfe47eab04a6bfa8cff977fe7c200b73af264ef347bc24aebd1f88c8a22d3a30b0aa9e0b5497be SHA512 883f2d065ef1834580284954c9df239f3db3b40de7fc925baf563be9d4da4f0d873e156814b3eb99b6a1fad7cd3257a574f271679f783301595a12bec5b62175
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
 DIST github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod 34 BLAKE2B 2ccba8347a642af8518a868d34286011a61a2f540151a9ee37cb20a821041af46d787f1e59e55f428a380d8a27d0beee4494ee7a514a7f90dab18d06f67b8ea8 SHA512 5cc997fe8abd3a4ebaea6f2a023f3b9aa7d31de3f57d1b2693efbef17a93b5a9937403c4c7ac06b78951f04d517ad59e41b171b3fefe0330db88a705d74e94c1
 DIST github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip 39658 BLAKE2B 16dd91d050b8e32594fc01e02ed1cfb23e4b33e922af6c94ba17ac18d419337217cb231b864eb5bd5cd0a6d9a19e73f8c5405cf283cb111cb9dfaa4a84f7ab1b SHA512 f74c5dbacf2e1c5899b66c9ce1aa0298be7e36a04e493cbb8ef65254013c6f00caddf203c20638a9ff229637144e26b892ea16bd546c8eff0bd2f101d3d9f4b1
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip 596836 BLAKE2B 09db31490155fba99fa74f0aa3198dc94c113a3c8478fb366426b61922d74eecda5648fbe5172a315d450238f8f3b92873eaddfdb05b4f6d391bc6fd8ca13374 SHA512 c27b14bc8afb6cba3d835aa91a011747849800a2716722f6f4b9a1fefd03aa34da2cd098fb9bac60901af9dfcb1d344db5bf066372afc2b5d07cdf40e3843ef3
@@ -256,11 +279,15 @@ DIST github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod 81 BLAKE2B 27c4787e73bf
 DIST github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip 53549 BLAKE2B fccfd0782faf862498508cc67dfc0ec6b0bd9edd7fdb07970b87fa3ba99b834a1ea8021f045a0cd64f7e27d7c838fd596bad3fddcb62935d266009c04d446130 SHA512 ce3431175bcfa657e79846e64bcdbe1fe82115f336d2d2cbf3af514997ae8b6dd1acb263d9ec83068554b4303f8b3c235107dfd8661c208b708cc17c1fc7502f
 DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod 42 BLAKE2B affc467ae757490be75fe62bd307b777b71b0a2af48143ef514c70ad2e85d44ecf2c75495d7cff038eb40c0b9822ad06707c6d34237073d0cbe477c82e767114 SHA512 aaafa6983405f30bc9318ec18f78aabea8c2d51935b7611ac3b4927e9648a4cd7225acab9868944170885caae02d84cd7be2e68e1d6068175514095683c43ebf
 DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip 12168 BLAKE2B b3865963c203d955b55c8762155630385b002d8bab7f3ca59a1dd6383ee47e712dd93112378231f030a69dc1cdf8efe04a80638c7ef544682692fb4afa388540 SHA512 516ecadd02b88d33b421912956ae1fb7d83b9fe476659c87223a2dbfda32b391483f498d7c42a7b9c9b55109b9cb8c7ede158ef77f0bb046bc604a014b4311b9
+DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod 134 BLAKE2B 484477f336780669d2467c673d49aba38a44868ae2e3535282c19631fc7767c36bf3bb46d3ce27aa8173e1167e7d56a206303f73b671b49e999839832b14ae17 SHA512 32745c37e703a050b2d475ba122956a1278450a852f1b101e5900f62f0d0fc2e499f2e156b3640e76b2c4c368e3eacb8bf215b4ece5c55b7f8db3fa941309bda
+DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip 15916 BLAKE2B f206df5f4f898d04fccc38e95a4d2d05cde33762f1585aa673b60fb7f4b7c1d5b9d103ac7b07ddf9aa34e3a79c90a51c6434a1a9542341f050f0422135786340 SHA512 25e6d14319a8b26bba1fae08123aea772246aabe9c7bc0bd401226bfbfff6662c28c694231d8ed9b7c0a1d41b7b6d50a889f09dfd58f09121bbc8715b2838f9d
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip 9560 BLAKE2B 2c8039854037c0f11590c80605cd30bce58baed3e8ba11840e98e8b450d0b2303704d1a55252589529021af473fe1f47f7bf6a3edab5ecab4de4888088843b2a SHA512 d439e95bfd858cf71659e8ce905748749e9e15cf577b98b66d7d8dd6adbff8262219d0c26bbbe9a24021ed5d683d7b81dc560eec4a97f09a1b44fb8983a4177b
 DIST github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod 146 BLAKE2B 22e9af8c710fd531f641b7dcca5341312623409b3e70ebde5c7ded86ba237cee14d1d1f6d645b1d96b874f7c2e274aec4aaab894d55bde45098a8e38987c71c4 SHA512 379b39171f176146f7020b2a871e9e66d77e26c417e6e81a92edb1ec609fb55e4d6417a6e12b17fe9a4e3be6551c4f28381232b20f9a9f0807f25cfbea1863e1
 DIST github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip 9823 BLAKE2B e5903b074df6b1b2d94ff628cb927ef3a718bc3fdcbb5172231ac490deb0be75243f9cd365886ac985f44deae884e3541d22e27b2b6826900c4199f70c50a20c SHA512 49f21614fd2d2bf704828d93003e8fbdd687dd18db7e4377b3571d7bf867e0bb94d67df08867fcb64857a9b2a7e570d5e2a74da981448856ce61c78b771e5339
+DIST github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.mod 146 BLAKE2B 22e9af8c710fd531f641b7dcca5341312623409b3e70ebde5c7ded86ba237cee14d1d1f6d645b1d96b874f7c2e274aec4aaab894d55bde45098a8e38987c71c4 SHA512 379b39171f176146f7020b2a871e9e66d77e26c417e6e81a92edb1ec609fb55e4d6417a6e12b17fe9a4e3be6551c4f28381232b20f9a9f0807f25cfbea1863e1
+DIST github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.zip 16296 BLAKE2B 8e6e588b2d0bcc8ef3b6def22a0e0b7d1474321cb4b48c716be5a8a52b3c0ade6a9bc062ec4bf8f65f0cc0b016ce2dcc8d42c1eefe2b2ef0dadab82cb980e0bc SHA512 b85d89cd3ff65d27933b81dde7c0c7ddfaca19a68dc7aa0835b709c9c0ba3059d15adaf9ad27ea06e078ed5e4f203bbbdd52f3f24ec3b23c93e08e5dcfa7e01a
 DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.mod 3970 BLAKE2B b88c72783696107ae26fa0b15d1b3df2b200a51e138a1f0a0aab739e7645bf9338e40c50a0d2a529f067f2c91cf77f1b2e7dbca3634fa82d251cce6f7d7b00fc SHA512 53e72b9d5ba2aa02af996c7f21a1c34ba25aa5421aaf9991e41ee8c39c4f2b25e55cba874c52355bfa173ed69d176e4ab3e7db411c5033afdb2d6fda26f26ddc
 DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.zip 91411 BLAKE2B 69926327b0e4dd7d82dfb50bde7962d46b16ca1b3664107ce2d9ed5255be72dda1f6dfd35ef4575d3e585cab51a96897facd840e0342e29f5cd2a1ffdd00a9e8 SHA512 83156da81791810d6471475f89af3f47a74eb3859be9d0a6c14d747baee746ef9130bda36471fe360a930368f8862ce5e748e4d359526bd8cb4c33a2b018bcb5
 DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod 2222 BLAKE2B 96cebe381605e123a48d1ab2733a9bfb351441178579caf6a31b6e1276b2fbdf956da85c563fcde295d9380abf49b5678677278af8ec5db648297da1d85a22d0 SHA512 fa31fb1ac7931846abfc67ce547135b6d76050054c26a67f8c81ffc829ca43585278e5a9906c1e9a95c440bb3701ff3b416cb1ad06f376eec2083c22a8cd7220
@@ -268,17 +295,25 @@ DIST github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod 37 BLAKE2B 3e6a6550c5fd7b237c484b2d7ff9d4fdcf02eeef8be89f18169d50c0ca7c58849c362d363428893035a5720d094cceb407c8565ed680ff248c305cd4acf886b2 SHA512 f2a0acca0b74daa85f1b49e2a56bf2d58c17570379d80c696428e31c028ace8436bd734b032996b2e3a52396d90cfaf3c0a99fd414c10fe1d67727a0da962ac0
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip 42172 BLAKE2B ff4b18df1f223c00368c8be01634c08d8433e3993ac90c7243ca1c32c7871ee2222f25346a2c234b4d8f47ea4d6f62dc34c3eec86438d2cf95c8315779ff8391 SHA512 7305cb1a2a729c091267b1d4f1d59634c8cdafc39ae3355230e205e9aac960f321f6b07fdc3f3cd67f7f64daeaf287e214115df480bb7a318dcf51241260f642
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.zip 30671 BLAKE2B 4e9d64059a74036d71a06344d4cc1d7593c9757c6bf364b05dfe3c990e4a6a01faff3700a9af31c8cfdd6ab6f90fc9f0e07bd4e05c2ca9cdc47079ece6d770b3 SHA512 1bcd649feb0ee9b1210b17b249eccad8ca175b16c9af8f8fa16dc034761f62bad27c6bbdbffeca83c2992ce6d49124a29cc302b9b3c94324d6fec9340d722a83
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip 34982 BLAKE2B 182c247773cc6c2ad4ae42f255fb4e1c7f2e9664b07141e36bd763e498afa315e34e24007b6a8e857422dae46a99c199666effa09d1935888d2c96fd2fcc5bd9 SHA512 98eb544687e67eecfca40a285133e306402cade215b9776f5276c16113c0da1484795195894b0b0eb6a965909c1658ce0acafd3d98864cf2d2fa246fe5b18d94
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
 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-immutable-radix%2F@v%2Fv1.3.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip 31729 BLAKE2B cc35c143559499bb19e8802039ee32f1ba2db84cd4b6e7209feb9b4a9a36f2a7b21e817c40c82d75abd94dc02f4e3e89b38692c93fbca987a1ac16f2a43676e4 SHA512 b7a8bde64b16c032ab4ed47c7ec11da6661293d231d7e100b4fdf9db88a1ed2fb9f48b95f7a6c44fd14e033a5a02244c894496cac57fcefe8bcddc73f4755508
+DIST github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod 61 BLAKE2B f43ec3c9c450f07eeb5c08107e6320e5d98cc68b0bd388df850fe5c61ddc18b871956a75df797984b3f63d24b4ac5612d322d577e5ea371d24cd05cb0b4eb91c SHA512 9d86ce1de4bd2d4b32f76f69d0ce1f01c7db8b1a2555ae8b789c24fa5391e9e477bdd1d82719003f37205b102a845bce0b65611fd10cf52df4d49b6471f7e39e
 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-memdb%2F@v%2Fv1.3.0.mod 159 BLAKE2B b8decf11dd5318f6752c4fbf259b036737c0bed14d6764fa95966b73b8d0becd7ebda90b6f504401eee6a78e2dea0f252bfea08ef0394183da6e5954265bcd29 SHA512 caa11c7fcae8cf29369b1276911a7ce1f18c86af25ff4bd5e0949fff63dbcb99f57322ea335dff159f00653d1eeaaeb9f130efa8967ca440dc1e8417520aca81
+DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.zip 45061 BLAKE2B c89e9877a6c93f5dd0bd88ba1caaa390cf645f5ad16e29feb364643f4ff35e152332b6c381caf93db0176bd7b32fb3b412d78e5746487964c9c8f786186f5e67 SHA512 9c6541984800816462813a6fec63e19aa01ccc7888c8551d357ad08a85f9d7debfb513384e28363932cbd9a2865f4b69831b76a47a6289db7b33169a97152e33
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip 63182 BLAKE2B 6f6ca7aef3a60232a715cecb6f2a4f642fc32388229890699371d7a901498726bace0e37c800db4096769c65cebef01dc4abff9a111daa3cae8fd8352ff18174 SHA512 a50702f312dc7b0a9dc95c3415980e51d082e0c36820917b7ff5bc0965e06d5ead6d7749cf8c87c7671456e9c07e9625e342b644aa6f49a10b4483a198f845b4
@@ -292,6 +327,10 @@ DIST github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip 20140 BLAKE2B 21
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip 17666 BLAKE2B 17ec61e27967762f6f2d29e8dc23f4fba5c4ba0ee5acf7dd342e7437956af4348096da9df87c47c24bdc5f0d11544a1e5638125e888a9f163c97086259cbd888 SHA512 62644e1aad01d8475a0fe8878492477f11c5ac26cb0142a69b0afaf46a74ef3e3658b199ee6f505941f19d9ede170d62237422758e2800d81b251f365ac8bbbd
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod 147 BLAKE2B a87a317948074210158c83c25aa1e287c613665f0008c6337a41cde6fb7e1a0758c38762d8467fa508e0178fee74781f1db49a05a388d46f8871700fa3c85c92 SHA512 7ff5a339ab0da7023d7548056aa96eaf1fa9a0a36f9deb098f99910a9a77fbab43137b6e305b35cfbc4ab9d50adabda10b53c279bc701ffdf97e928fd19c7888
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip 22283 BLAKE2B c4c50530c98e584d408da87abf3d41470211b02dd1fdbedc7f06671fd8bdb9176a286414c0530975b44651f2a263230d7c450e35ffd435aeca100795e895f0f5 SHA512 d3cc4de24a8fc43b1efffb2e18fa5879bf57f2220f4a890fa3e357a3c05111ac55a36aea22fcddec115d50b19d04a9d452d28d6c05a60c39be301b11d8391558
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod 147 BLAKE2B a87a317948074210158c83c25aa1e287c613665f0008c6337a41cde6fb7e1a0758c38762d8467fa508e0178fee74781f1db49a05a388d46f8871700fa3c85c92 SHA512 7ff5a339ab0da7023d7548056aa96eaf1fa9a0a36f9deb098f99910a9a77fbab43137b6e305b35cfbc4ab9d50adabda10b53c279bc701ffdf97e928fd19c7888
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip 24036 BLAKE2B 30e48b301ee1aabd326394047f39d4ee2208aac617b2c3435d24c10735862c1fbd021aaa62f22e10ac07834e30e329d80aa5aa75267658b26c7a64112d0eed63 SHA512 4e72d97d59cb97db89cc6457b443ec4be7294e678d0edfefa0f76ee545c3663bafb223d9f7b2dc2e67c19429816e084e9da65e542788abcadea13657272ec8be
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip 15463 BLAKE2B 88fb544a56eb6266a2ed75b3b6380f52d11d725e8711f2fbe321bd30494201d43db01398348fca95ef76ebb46ce26f3f523be67bc2d56f264f5c9fc3ac1cb8c1 SHA512 891f2adbadf938d7d070d80198f50a62e187a6aa6fa6b489e0055b98a9b2547b43cda11ee983815026b1e6f0f8864d695bf7e72d70290423ff53b4872d310735
@@ -309,6 +348,8 @@ DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod 39 BLAKE2B 65fa1ffbb1
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip 15533 BLAKE2B 68044230c48b4076c3d87d9c46cd96d3b0f293683129f72c6612f0091aac8e7d722945ade6e689c4174baabe37a9f9cd78d722d9a61bc304034525e8605522d9 SHA512 b0d8eb07cb45a5d0e048956fad5c1c822e15d4b5544f59eb2ce925d8e9cc14a8de072f3f4a1792706b293b1d9a0530391f2243234dbeead9bdd77f229ebfba8c
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip 15917 BLAKE2B 66bf9607834472667be4da679727ff2b004e95dc52e4c69d1470586244387b3cb2afb792b8f7d858c4edb3f73151771eed8d7509c7da91ad31655a945ac4d326 SHA512 b1267266cdb9895cfc0707dcfbb3dbcc8e3a53adb297811ee70d20f6a77d080f5cb0c4b8438e68d933a7ebf701c0c3e3f9a1b881916fbdf5b4832d5ae790ebe8
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip 16706 BLAKE2B 3077f81adf72f995a24e9e8e0fd90e0457d5c210cba7b820dfed7a2cddb06eef4ad4747ff0da2e663419ba891df9fa7ff374e1bc73f2326faddcde17bd3e6bae SHA512 c44bca4c63fc38ebd97c2abb7b5bfa2af635548723697d9533590242b936f1b55b119d0f4a327f1b02c546d571cd0d085f727c00057634d8c2316d1c7249fecd
 DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
 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
@@ -319,10 +360,14 @@ DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331
 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
 DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip 58035 BLAKE2B 7e29dde7d2d36e3d6854f56b4d253bfcce1dc78845cd60ea52c8d50a3a64d391667de99fd96ae94101650f850b834c72b3509a9f02594fb46c49daea2ec9342a SHA512 4975a066f8b65dda7f51516347889b666aa930d016270100d0ffb9dd46aa7656dabe8a4ff84751d77ee807e9ebc51fdd882bb6e873bf00b1fcfe88289b04aa46
+DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.mod 128 BLAKE2B 1eb83fbb14a562b773bab2b3a7935d400cfc3921c643e9854c593bef8b55a82e19d88f0bdcf5fb814536a85d52a8ba53a55295631dbd5d6aac9d51a547d1b966 SHA512 107d9cdeca3151466c4b6833d8b39808ac5f3e05308ce9d78bb8afa18623bb91248ebd156f78343c4af95ddb91bbeab33515d7e414f5244753970b8b9948b498
+DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.zip 76818 BLAKE2B cd424057541a171dfbb35273ed72f55d6a9aeeddb9c067da8712f85114e7a0ff9b9c20efcc8da77b5e26da09fd844c7e5137e18f7e15392dd68200381a830e69 SHA512 b68047c19a41e5293a7591d40f66421f1fd9755a2e58d53cddc055cdd377ea6cf313da8b3e53628ff6bed401e0d7c7deb865ca15ceec6abf828b6f71bc7cff59
 DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a69efe71d633601e076be84d2adbf5f69067118851ec76b6044728cfe23644a8fba03502e476bc40ee79ef3e0c3385ab8ee2c3103321753deb SHA512 ed46a1036f3f7a7c2c5d55440ac93f468b5b4282fb5bee31a0c1a746b00426922544acd55ca6ca539d9d6927a23888e81aa360d2140036e84dc895b5a97c9b43
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip 14557 BLAKE2B 7b306a1151cda04a778b2606fbd7e5257a80da359ee6f02374bcf7199f16e3513be56c706d8af2fe2e683c46b80f9680e6831f0e022f3c8dbc5e0c16020d7a72 SHA512 96125081b3fe8233d3c2885c52cbd46c7091f4dbe7ff3e542f934c21c75f498b6bbb89200f9ed27dcc572b16dcb31bd400bb4d74b4e75e171c565ce7c1ecb3cd
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.3.mod 138 BLAKE2B 2a2a4f66f7beaeebc4fd09c010c1070dffaa86c881b1341259841a883b95b10616af9495a6c53fe7a726fd6e62ef6cafa2ed15c24a5a1d9491bffc76938c69b5 SHA512 eed5b88b29d831010236dde8569d3eb79d0c21cddc92ba6db576eac4100eff994f65df9e0a55cd4c71b30150e88db90a8b4be4d243aef67b0fdf0abc84557336
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.3.zip 14927 BLAKE2B 4fbeb6d31ee733b7c3cff2a48af43b4799b3f210c8f69a7318c1f5bb0df9ae1b4118d246ebc2f0615e786ac67dff22f33317e77232e2256282c2f19eb538076e SHA512 537bc4fb3b398efed9878a4155d988a896c298cd08b74e6c9bc6418d01abb8163b98b6868feb2adb2d481b86e2dacbdd7c23ca0e6a08dd8a76ca62f7c8586f39
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541b55472ef94a8d2606e9cccc82fc52d189e48bd94aef69871455088915595bcc21224ef7728750ac1ba8e3caef7c303446671416f71b74d03de647a3f23 SHA512 13275b8246248b1c3001acba9ea6178a10263fb8ff3cc205d2cccb86682eccad96695bac455a32f2407f7fbd9a4bc3b68cacab722bcc242c606248753efba3d1
@@ -331,6 +376,10 @@ DIST github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a1
 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip 156422 BLAKE2B 18071e2808ed442be205365d206d4f36042953663db3b219b4a54e90e723e42d753d465ba86614732495f0d3d06c6ae577cfc0ae8d0f715ad4a88c8bb340ec73 SHA512 dc554594229ea4caebdc7dfe34ddd5fc054ee59f8717a6afe2d32197ccf9b357a7f66c30d019c6d7b89685869e0e04c0dbcecbdaaf79e47c766c7573dad54d4d
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.zip 157790 BLAKE2B 29623bc436d2a1f1057532b98858f3e3309a0ae1cb209ca9e242d56eba97b84ac2b2f3533a542df9cbc8dd5521c5a09747adee1e38d3f3ec2b6a5517a0713684 SHA512 c689267a27346d83ac054c5202746c69bf79e5accc69a07c833ab00fe4f2a780ccbf41ed62d50e411322e62ba6603031134662c9e0dca18cd1ec3a52179a062b
+DIST github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.1.mod 202 BLAKE2B ed53e26428c0b7de6d212cd66333f6dca4d0c27f5f64df696dc2cc4c174f0e65b4a31ff71ab747d0a7e48994840bd7b4c955f325e3cb819fb2dd8364df407695 SHA512 438c4d83a271735fcab4b4dc92eefb8690be9f4695aecd6f3c65f8eb6040603172acf89c888df73f47cf03b2a206b8fb9ba6fcfd9ce39ad7601c5194f7b926e9
+DIST github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.1.zip 53103 BLAKE2B fb87d523eb80bb560145d051ce2425b7655909820e95c05facf2fd77291c4b592be95cc44553fbb7ff26a1d09318f33b17ec87ad44e6bdbc8db2677fde8207e5 SHA512 464d65d2521316a766d5659570aa81a5cd25a1a03939bfbe856608d6a952fd1eb63391852f92b28b35d3283bd659efa7906f940eeca7fbe25e11f20b005baa9e
 DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod 40 BLAKE2B 77f35128903a84139dfc23055bf87c4fd8b4843953c764f0ec004a8a2b10599de19bd767a569080422179bd8ad66218d3639025cf1d83eb5cab22599b5da2c3a SHA512 76ce93f04caa8045ed49fccbbbfe76fc278bb7d94c973e408d0695e8c9c5e569b3dc9d4af8722f13c4718753aa72fea76a238dc8243aff34bbfd10d4b684e38a
 DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip 12245 BLAKE2B a83d39eea2c911303550703d23c6c6be3e71c47c008d9bfc947303b5efe87f60983ba00a5fa3d28359959940ccf299a82971cc4cea9ab0bc28e7214db83398df SHA512 6b88063dd61b36a5bce08e49fa630d2a59d9e3617c9f9b5b747993cc66029209597e296dcdb38c126559226139bacb57dacf451bda3e50d6e85c7b4953e4dc80
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
@@ -340,15 +389,23 @@ DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod 831 BLAKE2B dd6e545fc4ad948
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip 550154 BLAKE2B e085f5b4c23e656f548e9d92cc3ecddb47a2431569240977ff7d7c2786c090115d5e360d478c3faa30b16a31a99f05959777144b9225f32afef69d77d9a9ab57 SHA512 818dfed4d0813bcc28c4b383daf039515593039e9171e1d970809e4fc5688dbf053bdb5b8b068ea9159397e0c240efacf0138d464699451406178569f77b6148
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.zip 550550 BLAKE2B e871add76e92ff6d4f3a708ffe644e99f61126ee6008260249f1e76372a5449832e14583ee1b54109d52d6678f1267bff795fc5a7b0298cb63c8eb751433cab1 SHA512 487de808f4ee33a22ffe1b6c3c57e102e54c2162ad1016fdb243a16f2dd1555dc8d978d636b03d2ec5eff30fa436771ade7719c4a650472533b36c0868c418c6
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip 553094 BLAKE2B 87ad7b11fc8edf2edd2a619f1cc262f2caecab0ec3c626f30e809ad9c366476e49049e8f6adb7f55c9a719ec19505eebf2db55d93559ec134f42479e78cbe968 SHA512 0daaf5d99ee54e7ff0ea882e77a38ab344cb427a8833a5c7fa30936d401d4c9edd6ea603b48821c072b6dabb2d9f31d74ea38180e23cc0949756b8e828ea0070
 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%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod 639 BLAKE2B 3573ac4768f18bbb167c0d524d4a51b9cd31ace23ec4e9dd1c6980eb84dd3120b6a336fa164ec3983a7f4b32a5531819dd3d2e7b6c9829ca3714302ae1820e0d SHA512 44a1ac2d2408a9cf14670e9fe4f32fd0df797d60d0de05030f41a7887503f03c79fe06cd49755c9083a914c126d76c716d8c2bee70d1edd44d3a9bd38d3d1406
+DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip 103305 BLAKE2B d5c8a1952f46d435943fc9f40ea001699d2ec26df8405e89797994be0d5afe6603909dfef88a7f7899a17298a73652e90693f49eb660ff29504621fd034b9625 SHA512 7d3ee8537b3390db69a83a4fdca5a883705d81270bcadc3ce82b6396e7751af40da2e38ea3d2d7d2eab05ac0828b367d60e2892d7838a28d5cdd53400b5f5ef9
 DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod 1594 BLAKE2B c6b069c73847f3b115faacacc323ab407df86f81a9056347ebbd15eb12ac642d8e8a7b0410afbd076f18b704c18830144a4bed5a98e6f31d67c14fd1219fa7a0 SHA512 c4a38235e1b91838e6743f4bff89ba737e6427a65e9a2d34c750b63a75ea86b7ce13243b93d13d34f9f384dbf678fbae5c5b5e056eeece9d17511b9e197444e9
 DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip 317301 BLAKE2B b4763083e5d6e71330e880a5daa29192dc20db6217b869f9714a29967f8a606ea6e8e8190b26fdd553017045069123fec3bc2ab7884eaf0cde2f328fda16dc56 SHA512 93290fae6c7317919fbb85229e00ac7e56728aa1a226bf1cb57a6defde4491cb8032c4d0c022ef4e06056af47fc2b1a6944521069cf9336dfba4a57227343075
+DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod 1198 BLAKE2B 6c06f699d99ae4b389918fd96bf7df7e61c573cddfd261ded88aabc7535a79bb62feb2c1a9ef61ea81cbc3df979de97c87093d8e06fe5341f09cea49f6b08f63 SHA512 eb9a9bead036c59a35e051874d86749b1a17f08a6bcdbbc4bffdbecd403c49121335599fcd0b9bc4e932c0b55363eff5f95908c0208d5bc9d6ee2470486cfb0e
+DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip 357137 BLAKE2B 3e39351e122e878d3d18859f7bc5d5bc2991a5efb0b42c67e73626c46c2d16ceee8a1135e4129a4e12111dd18006a9ffe8307b8a015eb67dd7c913425ef12a1f SHA512 17fad4f469ecfa0a48ca4fc6e89373a595ba379902c243decbe4ab6819736e629f8499fc414429837f2b07361b3788ecdbdc8dbf29e380b397f58f196242e907
 DIST github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod 32 BLAKE2B 40839230d4a1fd6d28597a39b0d98ac4aace76a96dcf2d222f073554b8df6de4fab48c0613b7bc2da1b4912e338ede282043a3f615a87c246bfd71488a671337 SHA512 614955fd74641e34555d843e335d5e35cf79dcc6e3b4d43bb0ba4fd6fed7d332365eb874d6bdb7c3b5be576dc3d09356c8206d1aa4d70378581001342f4f7310
 DIST github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip 24656835 BLAKE2B e4c0912be7d396374a372afbebe32d279f7585ed598f3c5e0edcc68e08cb91ba4e0c18df99eda33a2dbf2684c497e3a9e33010eb93039c0dd651ee4d1bb842f0 SHA512 671654641a1ed413628c14b6406cf68c6b6f95d6db9aaf4510b08b9c30042d478718e48077c1414e13d0c66e6a592731872ea7e4249d7fdae2068cad6588e551
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip 28730 BLAKE2B dac64266297648a7f3519e13bae1dbfb4d46f818d02cb1da520a1888b085ce31028e274e5085ea58d8786e9f39144880ece626ba46b50b68d37dc17d730ecdc4 SHA512 1949e95d8f3d259b27e0152824e25aea2ada28f33b56282a62bed9a6076a25dbcf664a945c5fc3015247c6d3f470192fd22273d60bbeb155288574bdac6e2e8a
+DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
+DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.zip 28949 BLAKE2B 5b32b51af5020eb8e48a78bd2307952b576c91f1b7f4667ac9f8eb9ffcefda3e177db0d2139f5a6f388b048b49e10c64dd3bebc38d4fe42af0bf7ada96f0c56e SHA512 8004b328f3162fa52314dbfcaf6eb880e1ecd205960176ba54812e0b8632cfd1b1977abbb559086f4bba867b027357fd4776d7bb58b10138bc09f27af294e072
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
@@ -389,6 +446,8 @@ DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 B
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip 11508 BLAKE2B 609b34f41f3c1579ae15bbdd5f9632dd58e9082917acce355ffc5402c33ea45bb0bda32d009a0a58c6cd60327aa87008453e0c4c36ed2a1be41c4f5337de72d9 SHA512 0f792e6f960b0cb8f9a30c25d3a3f30e7c459a05d7f03f68c98cb581967fc48b377314cb83b990c9509cde5680389bee0ce2b0b1efedbceb5592f38a9ae6a3ec
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
@@ -421,6 +480,9 @@ DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 4437
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod 371 BLAKE2B 3ff3ff24a8fa567c715a8698c5a636f3eb2b1bf95263dc71a57d506a8fdf9e25cd741b8d0564ba95c04c696ba536ba44149da16572e13c1b5134c24dd0edddec SHA512 5a25ee9f24cf52fccb76de4ca0d1ee7bf309044e6700d48273bc1ceba948831320a51a7013584f60496df642284a4a282b2ed44e7d6290e96927927a220619d6
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip 214127 BLAKE2B 305af1bdb26a01095cb780a27be74f6a3d53c72b1af1b6388dc284290271c6a2cd39e06b6d8856d81584b35be6c2ff1ee38d79175502a9e2bab782f29cb855ae SHA512 2ac387028c1ffe54d5223a0325e2c36c827ad93e24c628ac353da6b4b97df9ccbb3f8d0440449d3b190f30ffcfd7fb865e3e030b882dcbdea116f20e3184fcf5
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.zip 224434 BLAKE2B 7719d75840f11f1c547a91228ea7472b1774560966f9b456aaa3c19095e9bfc51c4e8655aa0a0a02590a52f0b06c2ad6ce3c0994d23d64f5a324539d7a98eb0d SHA512 d60802ce85252ea35f932efa2c04e10ab19bb94d56e6e7c84b1c41b9a43124b9b9e082f0eaa1ac7c903f31d70da9b8bb1f537edc71c0dfb19626226860d52a4f
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod 425 BLAKE2B 8e9c5ee0d4795def5f031ec58ce255227d2d17c80e0ebe028218e3022bb7c5b2cb831981a3247279a5405f36a061e7f0ec717f7d71ae96f33b56d20d0dbea520 SHA512 743b2f950677b8d24423a2491cfd67edcfb45d032e6995a743ebb1f3d6ec6f407f2e4d1d56b2bd14cbe4c519523ee83470f3e594f2da6e0b3fe7c2dfbad9c961
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip 30608 BLAKE2B 68db36e6420be62aa1594d415cc95da064c3f80e220891bc747ab61d1bada168fa8c33875bb8f5a1b3cbfcae6b9f48cc28fd792b884f7378b797f5f7445c268a SHA512 41d05b304a7325dbb01dc2704407f5a7c7f7c1255c58cfde66b1d9668b15e1b5e83b5159b25a6ad7d6fed90e64446b32c1633135a018bbb4357c495e3efc8a83
@@ -446,6 +508,7 @@ 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.2.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
 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
@@ -489,6 +552,8 @@ DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B
 DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip 22487 BLAKE2B 93907f2e048ce0d8be7636d9ddbfb61f051c6142402f725609692a1644cfb4b504ebc36efeb36ef1e70463b54c809b7c71b9596705a0b0e1dc5f7a52252be5cb SHA512 1619cb9a2613384fa025772cba512f24c29947945bf1d85e476a52be8f5711d4bcb670750dae0554741de3c9190f70ea2a2c60e6b04e5e5fe4bb653269f5a849
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip 3703141 BLAKE2B 0c8b5a768e298b8bdf314459aeb938a4a05dfa22bdee1b0a2d65e7b02edbf2be6b73ee51a331f4b1d14caef6bd9a001b11a72b85f5de3efcc044501fc2e0d3ce SHA512 b5352137315ec28c2f40f201629a4e60ac26a218a3c75666cf56959cff953fbb6153123413fd1518a1a636d10edac9022ba9f38065274b9f88a89e937283eefd
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip 20573582 BLAKE2B 4c5dd3e4f8ff6edabbd14b78486d6213064a8ee351a45efae43bab610899148060dba9143998f37667d8170a90a70187558b9eba9db36ef6cec5e18df020c466 SHA512 fda30f0b48b9561870599645cb9dc0a788d0f1fb8217e813ecbcf9a36d29d2185a53670bf81e21709484b22b851c0b46ae99265327f4af4c78eb5e95821d8264
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
@@ -553,6 +618,10 @@ DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29
 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip 4415 BLAKE2B f50a9fd1f74506625ae9460c6071bbbd1dd3ad3d83264fb7def028c757e8ad8f865fc7255db6e9b5cdb7a1744ac1f741bc6184f064eee7108f6fc0facc81f639 SHA512 acd19ece301ac146ae50dd784e3dc1c2cbc0c00a562fc5d2759b7b8a4acf0b5bf83d5bcd54122130877a1568a13709c28ab7e1cc7ba269ec91aa1b1a86c2065a
 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.zip 205379 BLAKE2B 7e069cea8b9950e7302c3568f9793664cfe7c0c1264b552930c4876f4d0d5365744a5098eed1670fec1b8f595a22c593d4cfa6d67c1fb24dba57adba2245e778 SHA512 00afbae051f41af4efe229cf2851a923c7e9570e24e8b1a01d5e395f9abfaabce590e9998e185391c38970faaba6911a1a6139e2851a5bed2b4a20c27c352a2c
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
+DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.zip 237135 BLAKE2B 9e8ab4f0dc1539b578ad21a2b74bb5a64460912bdd1f8508a390d7c4790d4482a02993e31ab2c94572b9e68d86b8d50beea52e17c777301e2c1c7562afabacac SHA512 dde9012abcc21ee5ac43b962a0e55693d456171b4d0e71388efbc3376880dfc6973991cca66da28488f46ca5ee862b8b2c08472f26835ffa34b8c47dec5d428e
+DIST github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.mod 258 BLAKE2B 45e0afcb6b9fd29005ea523e2576e5c5e82f62095a8abb059e7a9b13de9e23d2cd743ae15ae8bea50a07d7c172b03836eea887ca5d381f947c50a655c2cecb7b SHA512 65f7f3695c82e7039187709df388db8049aff76aae334427e78cf224cce118835df370b4d59430fa87f652fb1f6980a92586a081e32c866159d42dd5ede26a70
+DIST github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.zip 232475 BLAKE2B 25d425cf72f811b9dc03c023e401dc78094366d223f48c5d751a006fb494d595e1c1014afc4292843368b9e93e4e2aecf5f6a77b19d7f4fd92bbe3b253d6f599 SHA512 46d27a762b8d27799904150ed77755a530be4e8eb47c61ab63c545915c682765b5adf885af9911004a7015a821eb86d7ba2b81188f3cc3031855e784d72b6964
 DIST github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod 29 BLAKE2B 5a64bc6a74e308dc780f55617c18661ee4a570f5c536a1d8470ae197f5bde87ba88412e360585c3e7191289a2c478ec7c96c18cdd7ab9e10fc92cb8b098281b0 SHA512 54b48a0f515bb99c21f86f0cc9dfe9e06dff5bf8de3a453b1d91816e28d04fe64a52d01c2c5a651b51cf21d328fba8f97a3cba92e23d66e229034f8aed23a545
 DIST github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip 54143 BLAKE2B b408a5d554b816351ce754904755e90525b4bf74b7e529d0dd378fa8eae70a64677cae34f1efa9477d865fa752fd88ee9d1e5d420608e03078ed0f7d1aaaab4b SHA512 b06876629d4ff5d9145a1608ea513baa72b04087dd8ef5e4ae1ea611480770bb041be9b84d19a66855fc57596cec861e70e53660bb63c9385b0e72462fe913da
 DIST github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod 37 BLAKE2B 9945435440e0d3be57cdb12cab697382fe91c56329289bbde332bbd1fd15928a5101d7fcadd89064ecbd103130514a1cad383db097d02d596138fad0348c15d0 SHA512 7f46d39bc8f24a5c5c1ff513c0f0018d5341a008526a49bf0b3694008c272b3080b0386a44ba6c27f2894bef19dfbec5095c9189ed222ed5a55797788668315e
@@ -591,6 +660,8 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0
 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%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
 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
@@ -603,6 +674,7 @@ DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod 33 BLAKE2B cd0b56c3105d5a3
 DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip 1438412 BLAKE2B 6f7e05eebdc4f364300d20eae130ed0fa9cc26ce2827bcd6d28b79329126b21dd1007401f05341f9c0d1139efe5d58aff826ad2e48176aeaf9ff18f7233d68f0 SHA512 f9bb8f16b0c4b19d4fbee534281dbcbf74782f9bdd3ea06f9be9b967c6f5e4629e42453394ea7fb58624f45db44dd80b19360c68074c763c00d73d52226726c3
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
 DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
 DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
@@ -610,6 +682,8 @@ DIST go.opencensus.io%2F@v%2Fv0.22.0.zip 291484 BLAKE2B ca3bfc9c9864a2218ec373d7
 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%2Fgoleak%2F@v%2Fv1.1.10.mod 312 BLAKE2B 16bf4900b2afadc331814e16a34fa8cae0cfdc78c7ea9704312f121e166c93b7811db3604f6c167fc526faefdd1eb0ffca1dd09581094bfea4847fe0f62ecd91 SHA512 8814a6b8138027c366f3ebeea9033a71019990faf1cb613d75a25498a3a74d61fa2ba662302254150370a49a2a6f56da5c54889d4465117cf8afed4ec6cd9f63
+DIST go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip 24823 BLAKE2B 25394ce97a80093bcc7113c651d95fc383863a5efbb47825d053890ee2946f04ba4b9c4bb708458183b91f195133d22fb4bde840a25b6150c1c6a756ef417fd5 SHA512 cad58d0a0f37a7ba9ce7fc5d4598d511eda4bc675689f968b1d02c4b2e95d15976b6aae9d4b8655d2aa85e255308414e474fa6d42e4f49b31092e2b943648b36
 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
@@ -617,13 +691,20 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BL
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip 1845086 BLAKE2B 967aa93280eeac0b9ce3e269d135ee547cbcf007d6411e94eb8b7a6b32dbec501fef102f908e977c670e57c60672b0fc91ea16d17d106cc526d91ddf4427897e SHA512 86b0caeffaa24b588f4439370b3b5b2bb087c9a76e409dfdef278d42a2f21d57aa8ee019353b75178f72441339eb796cacaec5706f9bc73e820743137ab531b8
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip 1867651 BLAKE2B 7e9654d95bf03c5462d4d6420e676bd4a0e8769c5cb7954797a66c89298ed16063581391294b7c3e7c1e735ba0cfe3b60e899fbd2821b98179b2669740271a68 SHA512 a0560b1c03857faee4e6f6d959d042258f30bea2bb86af07c701a21c7a6d7e44a8929acd3e42503daed070c3597abede768af32814e252441f85823f330e573f
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip 1876176 BLAKE2B 84ea067e58783d36780037272d669162fce90fac23d5bb6090898e14ed6753ebd4bafc001b3e3ec792a29a2a802d57763a365a3f89f1acfc37f18e320aee42e6 SHA512 1a94d4b9e787a0f322cf9ee223c3b01d8dbd34b59381330808d2682ae05de0cdad62c31e085c554033e852bc5fe49d789993a668a2d75bd7eb8b2389ac774e65
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.zip 1876107 BLAKE2B 26a90e5dcfe05fac82496bac10442319680f5ab9f7f8e0f48f3994b677d2187f9cf735bb7da92ec74ce280f5c4bbf24893aefe4c859137c198118a3ebfc5557e SHA512 fd50b978909b5b2259da0cc5d4db8fe582b003f4b9c2e387a9491f2648521475c640a21a80d375ba006f0892595cd14c4e1c130a31e7da5a2cbd8b8673feec87
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
@@ -632,6 +713,9 @@ DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAK
 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%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 126236 BLAKE2B 48caec10f6bf4b8da7028b0358645ab0414b5526004479ceececbd68380586bfbc5b4cfb9d43f8c608565f30521a0dbfe005669db7d5e245a1b63ddc8171d3e3 SHA512 2735c124a735b4cba606e4e3de5bb39c889aae2516525f778764d987b58677dd263cb286604fee63bc45636662c11e3dcc2c9726dcaf85a26e072ccd56597b93
 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
@@ -653,6 +737,13 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip 1423356 BLAKE2B 412d4c362e9d11899790082861e26002ed0fe500b4d5d0b9caa1a00ee9363337d1e47cdc6a232d858d00ff10da2b581c000d20208539098a8fe1f83d012fb00e SHA512 dbd74ce99432faf080dc0980624adfea31cd74d53949a4b747e14d6464632c48e78c40a1b862305bb5650cfb1b202f2c024f44f9ffdcc104555e9f42b4eae30f
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip 1422609 BLAKE2B 9d879e8be7102a414510c297e078d409982052dea09b5990d3c2618e8f0ec94ba220c972356b1dc7dcce4941b7d5ba6dfc2e0490a37bccdd34e63bd4f71810c7 SHA512 d0608d4fa986159af8c4977c62d99e9b98cef21cbab548246deef3e1b054941f1576b6243e65de6855740869907098721be140fcdbff6bae9e523af736979fb6
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.zip 1503269 BLAKE2B afc7425e8a2354a2ea7de4b9e007d7091796edc22fe2783f2ec1cac2d0554d87aafbcf49fb838b1ae4f0193f936fc4cbb87fad4ceb4e5cf4e2b020b73db7c648 SHA512 66fe99252beeb16a4a8b3e37da32343955f1727043bde2ab9e5797d1e6b65b85c97292b43ba0f19587e03e02d6bffa7b8cb0986ebb714e992b9d91571dfdfa6b
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip 1505530 BLAKE2B b26f3f943953ecb17996f44c0e8278b56c7d01648227cc0b73cbb17e9fc44b40bbbac34ac4996fb88115a6451178d3c94f4c17a43cedd30f9c147312fd7e04ce SHA512 7b36db6f767f03d0a14ee599c6d1bcc7cf5cb8df69b9dd46d7544aac59ff6aa1bdf38af0f3f31328f02b7643f7655b375f8116f829b22993ae49951ab28cbef9
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200930145003-4acb6c075d10.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200930145003-4acb6c075d10.zip 1504583 BLAKE2B 053f287d785b3bf1bb908bd2e43c1891e2947c28a705f441b50657d40ee2889d121c81704aa14a73a9af36b616b2b22a3e59f3ceb8ea3a1e73979d61cafd81cb SHA512 c20133e196db03e0cdd5d7f770cc011b8cf29d8ddcd39a27d44586f7fd080bb17224d1d0736792c51d9dc6f8f11b13cd8bc07cf95fbe1c8f11095653b9633585
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip 81780 BLAKE2B 48e9b7ec89ad3f9cec88fe6c62ce64348a9217a134aab7306a07fd8cb28eeff91b15cf6f59ffec36df23a086195322f28e76fc16c026f33d2f419dcd3f84de04 SHA512 c7656f3c10140a5cb08620ce0647d0b2026272ec41bcd9df346dd2b5de5bd2236835ea117091646151a991f8f3aeeebd0cdfc1f784015d140162db5dc49f7325
@@ -667,6 +758,8 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAK
 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%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip 27020 BLAKE2B 0ba91b5129426896f009357980019a5e1c4cd5568108e615346a2d65421a6a595035069e6366d98af40260a020f90f6b55214e273a7dc92a80d3faee540bc0d0 SHA512 a9408e27c31248e5e6b24c0f255512c97e73e0a972a94e0bf0b0181eae42c1213e02e6988a71178abb05c2624da2e6b7beb12f2a494b630753a083dc3133b58d
 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
@@ -699,18 +792,28 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod 33 BLAKE
 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
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.zip 1490646 BLAKE2B 5114099217e143e032f735ca97dec7aa76515d49d08fdc2058612f1d8aaa0d4500c077c9df6521e94b84edf50983fc146ff5363a0811d4b60aba5145ed8f036e SHA512 0e1627eaa50ccfada08460b02929f5c2c91945a4082b2f2a9c70060d40dfca25d87bc2b056380960158226ea892f5f885bb012e686ff9177d57426486df34def
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.zip 1496293 BLAKE2B 5e4cd198d7a461db0dff9b387afd229472214ab6d204c4d55c6bf36ee851a07cd73b61a249603d7f1e7d917097bd9e118ff78b94f45f9d15834ba5b6df897c58 SHA512 167e2b6faac57e06c420b9c7bb7d16db9c30811337176488893807e5ff88aa0b24e90e1ec10ab6e282f1b4fa2e91f2e3d72d12b276da8a85bcf29b7e2df4e25d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 11671 BLAKE2B 0a73cd55380594ca4bac71bee0207b51979e62407ec3c828f975e8091a20e2b9a6cc331dea88cf0ff44ff3a6c7d1cfd2844651acd1d957c0d725de525a58985f SHA512 ccd129fd4ce8e4067d0ad4b164cd8c4fb7ba65d5022bb656dfdb50dd2d467152bb83760f3d94c465b6d4c29c29931c8be6c697e1634ccbab4eb3a53edca7dc4a
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip 11992 BLAKE2B f5b83bee24babf643a85b1ad338c9cda760634c279e495f2faae96138854cf433abd98552ecf7e4fb815bce96f38a8cb2601dcca0966f244d6e55e9622a95542 SHA512 3b325af08ffac024bf39a06676e4daf051b82bc765803224fd14c3251b87c5d4376269eb4ad6f2a511b72e065b062bc41823400cde602013cc1d3e687509f85c
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip 12009 BLAKE2B 62af63a123635afd495a0e621ed365f31b284aba1f891d09f4334d63d46a5dc0387aa055901e6e74bf358e1757ae91ed8515d3e2c9b9388f7f356841eb6543ab SHA512 a1727535cbe56fd9c94619ef7821c06d1b2f2cc386a839451aec9b1d101118b0f1e64ee78e7aaa72660f9a780e1c74e0fed3f07bc8f8b4dae9f7bcab4323ea01
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -724,7 +827,12 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BL
 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%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.zip 3126124 BLAKE2B 9e774521f22e4aee369dd03497702dd04dc6a83fb2e94d49428281d99892e8b7cad13c840231d721b0f338fdcc930812b374b5e4eb9db96e5fd8d81239252826 SHA512 b009aa0668073fa9872f10bd5a6ae95d55ea2b9187b074d21bac30fbdf587e574e24b75e491124973185a62a8de725a742d0524c0509b237ff4b6a51f4f5bb23
 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-20191011141410-1b5146add898.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
@@ -732,6 +840,8 @@ DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip 10163
 DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
 DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
 DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.zip 12958909 BLAKE2B 9ffceb4fe3e735aac577decb8f9db46c431c76a121c9ff946d19ad36081c67119c3f35e7c0825b761f206edd906eb95cd33f83ac3af24aa1c08e46d58b276b87 SHA512 00e929de2fc5da89f64d434ac2a4ca0252f7ef24926dc0c8c43bdbc84348522801b98346739b387c0b17c88bdb822875301b32a5007b8ecd54a443e0c4ec3057
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip 13193468 BLAKE2B 26449251871cda35dedc488c3c8c8fc4dc14b1bf79dfa5160b44e6890d5b350111277b1791b18d91a42bd91b6f382baf3caf62584e41c4a928afe17d564e2e6a SHA512 85d4096a7d867d8f4bcc1b3cc582512d94c626023d8abd20ca343009e62b600150076f161f3582ec88c6263695fec0c11de69290a6c6cd04a177272740132be8
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 408151 BLAKE2B 9f815084675da034d639cf3e8648ee5dd2d1282d2bb6937ffc91956b5cfa46809499441a39636e4f0565c4307854977201ecc8cfaf38b46557c3e715cef0722e SHA512 1eeb760cf1057c306f2301ef4c7065cdd6dc18cdeefefd3a1cc8cc22efa312ee5ba7da6b79a4e7666bc09429d1ca73d7bc1db574f9cd33d271a72700a070a219
@@ -777,6 +887,8 @@ DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod 34 BLAKE2B 618a69c0e95948b
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip 343284 BLAKE2B a4f4f886636b920a987942524f504c0049ca3c9d9ca5be16101109235e77e9a8a14106fee9fb2d02d403a056dcf5f42b0a4e4f57d33dbc78a88e0df5682162f8 SHA512 0b212e847ef8972bbc9dc96685c9fafcef5552e96c622134cb1aac903aa3f6f5a1aa65a2f179e93396fcf32ea4139a34f46c4e6fb3558c9da8579282095d1baa
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.zip 348295 BLAKE2B 00276bc79832e003d0a5880fe6d24d1252d45d55170cdd29e1c380ed07e070a2320549c179fd905292b3c148e33d9222ba9f37ff6d09c187d1fa3ead8feebbb2 SHA512 267dfa1a02e23d3fe266a03936a11afb962ce091d6fc1f0416ba5f0af91ed32e013f540000e1b62fe9c41d70b10b65e91e7e783ed7dce6daded9dd6474bd462a
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip 353844 BLAKE2B e4d24ee5a99951c19c32328d6eef3fd6c886338bc7189eec9e60c99fe89e5728b3f00824d0f321bbc921738a40900d8d90ab4d9879e8efee529ed4273df0c2a1 SHA512 7ec385824affaaa72aca2b5af052dc7e941a24b1712e0e1945fe6276df3b02ca9eaaf79fdc0888e398aaf10ce3b261f0d23b2c6485184e6a6587e1d04f1c8742
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
@@ -786,6 +898,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 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 gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
@@ -815,9 +929,10 @@ DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip 94436 BLAKE2B
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
+EBUILD consul-1.7.11.ebuild 28791 BLAKE2B 05d17f48881776f366a78a449fbed18b736fdfab803c182c19a13d5e4e2c68398352c39f2d644c6768de5a8341991a67fc8822029562726a26b06aa19230fb93 SHA512 0448d5bcdbfb462785b317b519e8fd2c8fde799ae03094888589863875b66c7f460a1160890470e37d85890fbe88d8c6deda151ddf22c59eee5ad4719cdc8bdd
 EBUILD consul-1.7.4.ebuild 25708 BLAKE2B eb083e6c49e6c4d062bb15a475dc88fdbeaafd394d396d17c245bd14eeaa62c31dcd598b9baf7e2508dd78e0c1f0ba8b05415509b38caedb9e3ca759ed74822a SHA512 7791c5ec933ab4cae9f108c04506d0e57a0abffa4b3a0956cbf4cabef13af69decf000ae1ff2e273585b80ceb61849bb4ef8c31fa8c4dd35b0423fb794f87937
-EBUILD consul-1.7.7.ebuild 29316 BLAKE2B 401e2ec84a03556864bd3d30524df4aa3140695e8eea0295907d52b2a7f495f402fde0330c04ac49f4ce683078d43a3d3d2229d2fbf244462da351fb40351892 SHA512 4f1d667ef96b590b78074d33aed04a918bf5eda2fd608dc0aca845261247d3b64a8cb5c756660d9397283b4a6d146d1c2d886be2a21cd2984fa54b2518d6a563
 EBUILD consul-1.7.8.ebuild 29316 BLAKE2B de9965792339523296d5100929c79c0f25354f099e2eb6cb380e846c106aafa54022e2a0dc0112f5ffce6c0bb6d0c7ebfde5fc80315b3ea78df4f633171d653f SHA512 5c1cf184a171fecc567ba2d076904a7f38e03e0ea82058bd70f1abca644738e50f0d2a008b01d1dd898cab381c7c8b0822d30a3afc80ef9db27ac16400572e09
-EBUILD consul-1.8.3.ebuild 38943 BLAKE2B 148de37f39b0214b9e0604a15ff0fc14f612409ed2924743d4e091336c2807d216f6229f7beec88b1893a5af5a9fd28e650726b7c9b12d7badf8172ebe199b43 SHA512 c062dfbf9fa8eca1b4508794aed52054980c339c41a19b2b5a5e963e6d64eea1d4e8a00992cdf33e8f7db0d94116f625ee4e55d9c38fd7c4a67a3d0878678a80
 EBUILD consul-1.8.4.ebuild 39141 BLAKE2B 4ccb00d34160791f496f79f6a80e9d0913bd9bd8179eddd59f3dffa58e47e2c945e526220ffc9c2138d04c7eef93fd29befc9ae096572b42211211bee4c3977e SHA512 2ea7cfec7a649b5453d456f17ef6995dba4755556f62a0d32cd4abdc9f45cd5f60c842e0aca577180b96b33b896ad560fc7de0c4de1319560cacf10961941f47
+EBUILD consul-1.8.7.ebuild 40305 BLAKE2B c1b58d00020ebd3f105c18534a70c2a36eb76b9e5981fe41cc7c76ffc8c3d15be5dcb9fe5a54aa3253be646b5d5e1fb06bfce01dd4744fcd32d788cc1bff590e SHA512 3f674ac0d000870a8bbac5df4794042387ca2ed202b02cf4143d63331d86f3b4e2a604911f85f16cb2169327a2bb1a7866435ef6316efe6669411be2437cab12
+EBUILD consul-1.9.1.ebuild 39245 BLAKE2B 334db0bb67b904832d44d590a0f2f6255b4cbc55955d9494834debd5487755f8d301b313667870948c7e603854c18137c71b60d7666394a47d6f3e4cc32abba4 SHA512 dc3e8213db6398acf836b69c4e93fb87d84d1600ec38c115a6f199084c64d822ec143530fa15b8d79961e6131606cece176180a518ccc168b6c6d199deaca4b0
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.7.11.ebuild b/app-admin/consul/consul-1.7.11.ebuild
new file mode 100644
index 000000000000..f8f883f790eb
--- /dev/null
+++ b/app-admin/consul/consul-1.7.11.ebuild
@@ -0,0 +1,581 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=5ed69b69a
+
+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"
+"cloud.google.com/go v0.26.0/go.mod"
+"github.com/Azure/azure-sdk-for-go v16.0.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v16.0.0+incompatible/go.mod"
+"github.com/Azure/go-autorest v10.7.0+incompatible/go.mod"
+"github.com/Azure/go-autorest v10.15.3+incompatible"
+"github.com/Azure/go-autorest v10.15.3+incompatible/go.mod"
+"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 v1.0.1"
+"github.com/NYTimes/gziphandler v1.0.1/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/go-metrics v0.0.0-20180917152333-f0300d1749da"
+"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-radix v0.0.0-20180808171621-7fddfc383310"
+"github.com/armon/go-metrics v0.3.4"
+"github.com/armon/go-metrics v0.3.4/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"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"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/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/coredns/coredns v1.1.2"
+"github.com/coredns/coredns v1.1.2/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/digitalocean/godo v1.1.1"
+"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/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/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/fatih/color v1.7.0"
+"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"
+"github.com/fsnotify/fsnotify v1.4.7/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"
+"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-ole/go-ole v1.2.1"
+"github.com/go-ole/go-ole v1.2.1/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"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1"
+"github.com/gogo/protobuf v1.2.1/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/mock v1.1.1"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/protobuf v1.2.0"
+"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"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/go-cmp v0.2.0"
+"github.com/google/go-cmp v0.2.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"
+"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
+"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf"
+"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+"github.com/google/gofuzz v1.0.0"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/googleapis/gnostic v0.2.0"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca"
+"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c"
+"github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/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-20191202160150-7ec2cfbda7a2"
+"github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2/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"
+"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"
+"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-version v1.1.0"
+"github.com/hashicorp/go-version v1.1.0/go.mod"
+"github.com/hashicorp/go.net v0.0.1/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.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"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/imdario/mergo v0.3.6"
+"github.com/imdario/mergo v0.3.6/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/joyent/triton-go v0.0.0-20180628001255-830d2b111e62"
+"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+"github.com/json-iterator/go v1.1.5"
+"github.com/json-iterator/go v1.1.5/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.9"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/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/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
+"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
+"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
+"github.com/likexian/gokit v0.20.16/go.mod"
+"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
+"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
+"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
+"github.com/linode/linodego v0.7.1"
+"github.com/linode/linodego v0.7.1/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"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/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.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"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.3"
+"github.com/mitchellh/go-testing-interface v1.0.3/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/go.mod"
+"github.com/mitchellh/mapstructure v1.2.3"
+"github.com/mitchellh/mapstructure v1.2.3/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-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/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/onsi/ginkgo v1.6.0"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/gomega v1.4.1/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/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 v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"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/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"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"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"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-20181126121408-4724e9255275"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"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"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"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/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/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/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/sirupsen/logrus v1.0.6"
+"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/smartystreets/assertions v0.0.0-20180820201707-7c9eb446e3cf/go.mod"
+"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/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/spf13/pflag v1.0.2/go.mod"
+"github.com/spf13/pflag v1.0.3"
+"github.com/spf13/pflag v1.0.3/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 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/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/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"github.com/vmware/govmomi v0.18.0"
+"github.com/vmware/govmomi v0.18.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-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4"
+"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4/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-20190313153728-d0100b6bd8b3/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-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-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-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+"golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/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-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-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/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-20190523142557-0e01d883c5c5/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/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.3.0/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-20180412165947-fbb02b2291d2/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-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-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/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.0.0-20180829000535-087779f1d2c9"
+"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107"
+"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/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.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"
+"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-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2"
+"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/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/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-20190523083050-ea95bdfd59fc/go.mod"
+"k8s.io/api v0.0.0-20180806132203-61b11ee65332/go.mod"
+"k8s.io/api v0.0.0-20190325185214-7544f9db76f6"
+"k8s.io/api v0.0.0-20190325185214-7544f9db76f6/go.mod"
+"k8s.io/apimachinery v0.0.0-20180821005732-488889b0007f/go.mod"
+"k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841"
+"k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod"
+"k8s.io/client-go v8.0.0+incompatible"
+"k8s.io/client-go v8.0.0+incompatible/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/consul/consul-1.7.7.ebuild b/app-admin/consul/consul-1.7.7.ebuild
deleted file mode 100644
index 8fa970e6543a..000000000000
--- a/app-admin/consul/consul-1.7.7.ebuild
+++ /dev/null
@@ -1,581 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-GIT_COMMIT=fdba2d0f7
-
-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"
-	"cloud.google.com/go v0.26.0/go.mod"
-	"github.com/Azure/azure-sdk-for-go v16.0.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v16.0.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest v10.7.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest v10.15.3+incompatible"
-	"github.com/Azure/go-autorest v10.15.3+incompatible/go.mod"
-	"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 v1.0.1"
-	"github.com/NYTimes/gziphandler v1.0.1/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/go-metrics v0.0.0-20180917152333-f0300d1749da"
-	"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-radix v0.0.0-20180808171621-7fddfc383310"
-	"github.com/armon/go-metrics v0.3.4"
-	"github.com/armon/go-metrics v0.3.4/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"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"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/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/coredns/coredns v1.1.2"
-	"github.com/coredns/coredns v1.1.2/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/digitalocean/godo v1.1.1"
-	"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/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
-	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/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/fatih/color v1.7.0"
-	"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"
-	"github.com/fsnotify/fsnotify v1.4.7/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"
-	"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-ole/go-ole v1.2.1"
-	"github.com/go-ole/go-ole v1.2.1/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"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.1"
-	"github.com/gogo/protobuf v1.2.1/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/mock v1.1.1"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/protobuf v1.2.0"
-	"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"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/go-cmp v0.2.0"
-	"github.com/google/go-cmp v0.2.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"
-	"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
-	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf"
-	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/googleapis/gnostic v0.2.0"
-	"github.com/googleapis/gnostic v0.2.0/go.mod"
-	"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca"
-	"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c"
-	"github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
-	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/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-20191202160150-7ec2cfbda7a2"
-	"github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2/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"
-	"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"
-	"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-version v1.1.0"
-	"github.com/hashicorp/go-version v1.1.0/go.mod"
-	"github.com/hashicorp/go.net v0.0.1/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.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"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/imdario/mergo v0.3.6"
-	"github.com/imdario/mergo v0.3.6/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/joyent/triton-go v0.0.0-20180628001255-830d2b111e62"
-	"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
-	"github.com/json-iterator/go v1.1.5"
-	"github.com/json-iterator/go v1.1.5/go.mod"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/json-iterator/go v1.1.9"
-	"github.com/json-iterator/go v1.1.9/go.mod"
-	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/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/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
-	"github.com/likexian/gokit v0.20.16/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
-	"github.com/linode/linodego v0.7.1"
-	"github.com/linode/linodego v0.7.1/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"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/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.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"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.3"
-	"github.com/mitchellh/go-testing-interface v1.0.3/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/go.mod"
-	"github.com/mitchellh/mapstructure v1.2.3"
-	"github.com/mitchellh/mapstructure v1.2.3/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-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/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/onsi/ginkgo v1.6.0"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/gomega v1.4.1/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/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 v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"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/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.2"
-	"github.com/prometheus/client_golang v0.9.2/go.mod"
-	"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"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"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-20181126121408-4724e9255275"
-	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
-	"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"
-	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
-	"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/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/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/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/sirupsen/logrus v1.0.6"
-	"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/smartystreets/assertions v0.0.0-20180820201707-7c9eb446e3cf/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/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/spf13/pflag v1.0.2/go.mod"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/pflag v1.0.3/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 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/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/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
-	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-	"github.com/vmware/govmomi v0.18.0"
-	"github.com/vmware/govmomi v0.18.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-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
-	"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4"
-	"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4/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-20190313153728-d0100b6bd8b3/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-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-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-20190613194153-d28f0bde5980/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478"
-	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/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-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-20181026203630-95b1ffbd15a5/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/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-20190523142557-0e01d883c5c5/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/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.3.0/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-20180412165947-fbb02b2291d2/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-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-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/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.0.0-20180829000535-087779f1d2c9"
-	"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.4.0"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107"
-	"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/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.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"
-	"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-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2"
-	"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/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/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-20190523083050-ea95bdfd59fc/go.mod"
-	"k8s.io/api v0.0.0-20180806132203-61b11ee65332/go.mod"
-	"k8s.io/api v0.0.0-20190325185214-7544f9db76f6"
-	"k8s.io/api v0.0.0-20190325185214-7544f9db76f6/go.mod"
-	"k8s.io/apimachinery v0.0.0-20180821005732-488889b0007f/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841"
-	"k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod"
-	"k8s.io/client-go v8.0.0+incompatible"
-	"k8s.io/client-go v8.0.0+incompatible/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/consul/consul-1.8.3.ebuild b/app-admin/consul/consul-1.8.3.ebuild
deleted file mode 100644
index 6eb67f4883cc..000000000000
--- a/app-admin/consul/consul-1.8.3.ebuild
+++ /dev/null
@@ -1,756 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-GIT_COMMIT=a9322b9c7
-
-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.4"
-	"github.com/armon/go-metrics v0.3.4/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/consul/consul-1.8.7.ebuild b/app-admin/consul/consul-1.8.7.ebuild
new file mode 100644
index 000000000000..15562895507e
--- /dev/null
+++ b/app-admin/consul/consul-1.8.7.ebuild
@@ -0,0 +1,796 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=cbe8f01e9
+
+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.0/go.mod"
+"github.com/armon/go-metrics v0.3.4"
+"github.com/armon/go-metrics v0.3.4/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.37/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/frankban/quicktest v1.11.1"
+"github.com/frankban/quicktest v1.11.1/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-asn1-ber/asn1-ber v1.3.1/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 v3.1.3/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-cmp v0.5.2"
+"github.com/google/go-cmp v0.5.2/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/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/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.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.9.2/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-kms-wrapping/entropy v0.1.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.6.6"
+"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.7"
+"github.com/hashicorp/go-retryablehttp v0.6.7/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/serf v0.9.4"
+"github.com/hashicorp/serf v0.9.4/go.mod"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/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/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/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.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/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+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 v2.20.9+incompatible"
+"github.com/shirou/gopsutil v2.20.9+incompatible/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"
+"github.com/yuin/goldmark v1.1.27/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-20190418165655-df01cb2cc480/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-20191011191535-87dc89f01550/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/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
+"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/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/mod v0.2.0"
+"golang.org/x/mod v0.2.0/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/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200602114024-627f9648deb9"
+"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+"golang.org/x/net v0.0.0-20200904194848-62affa334b73"
+"golang.org/x/net v0.0.0-20200904194848-62affa334b73/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/sync v0.0.0-20200317015054-43a5402ce75a"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/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/sys v0.0.0-20200323222414-85ca7c5b95cd"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20201007082116-8445cc04cbdf"
+"golang.org/x/sys v0.0.0-20201007082116-8445cc04cbdf/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.2"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/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/time v0.0.0-20200416051211-89c76fbcd5d1"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/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/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275/go.mod"
+"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/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.9.0"
+"google.golang.org/api v0.9.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-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/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.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.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/consul/consul-1.9.1.ebuild b/app-admin/consul/consul-1.9.1.ebuild
new file mode 100644
index 000000000000..b54ce9d29cc7
--- /dev/null
+++ b/app-admin/consul/consul-1.9.1.ebuild
@@ -0,0 +1,775 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=ca5c38943
+
+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/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-20190523213315-cbe66965904d"
+"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/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/go.mod"
+"github.com/armon/go-metrics v0.3.0/go.mod"
+"github.com/armon/go-metrics v0.3.5-0.20201104215618-6fd5a4ddf425"
+"github.com/armon/go-metrics v0.3.5-0.20201104215618-6fd5a4ddf425/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.37/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/frankban/quicktest v1.11.0"
+"github.com/frankban/quicktest v1.11.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-asn1-ber/asn1-ber v1.3.1/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 v3.1.3/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.4"
+"github.com/go-ole/go-ole v1.2.4/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/go.mod"
+"github.com/golang/protobuf v1.3.5"
+"github.com/golang/protobuf v1.3.5/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-cmp v0.5.2"
+"github.com/google/go-cmp v0.5.2/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/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.2.0"
+"github.com/google/gofuzz v1.2.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/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/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/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.5.0"
+"github.com/hashicorp/go-checkpoint v0.5.0/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.3.0"
+"github.com/hashicorp/go-connlimit v0.3.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.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+"github.com/hashicorp/go-hclog v0.12.0"
+"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+"github.com/hashicorp/go-hclog v0.14.1"
+"github.com/hashicorp/go-hclog v0.14.1/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.3.0"
+"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod"
+"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
+"github.com/hashicorp/go-memdb v1.3.0"
+"github.com/hashicorp/go-memdb v1.3.0/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/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.6.6/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.7"
+"github.com/hashicorp/go-retryablehttp v0.6.7/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/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.1"
+"github.com/hashicorp/go-version v1.2.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"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-20200423225030-a18a1cd20038"
+"github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038/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/mdns v1.0.3"
+"github.com/hashicorp/mdns v1.0.3/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.2.0"
+"github.com/hashicorp/raft v1.2.0/go.mod"
+"github.com/hashicorp/raft-autopilot v0.1.1"
+"github.com/hashicorp/raft-autopilot v0.1.1/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.5"
+"github.com/hashicorp/serf v0.9.5/go.mod"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/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-20200609203250-aecfd211c9ce"
+"github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce/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/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/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/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/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/go.mod"
+"github.com/miekg/dns v1.1.27/go.mod"
+"github.com/miekg/dns v1.1.31"
+"github.com/miekg/dns v1.1.31/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/go.mod"
+"github.com/mitchellh/mapstructure v1.3.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/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+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/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/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/go.mod"
+"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/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/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/v3 v3.20.10"
+"github.com/shirou/gopsutil/v3 v3.20.10/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/go.mod"
+"github.com/stretchr/testify v1.6.1"
+"github.com/stretchr/testify v1.6.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"
+"github.com/yuin/goldmark v1.1.27/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.1.10"
+"go.uber.org/goleak v1.1.10/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-20190418165655-df01cb2cc480/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-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20200930160638-afb6bcd081ae"
+"golang.org/x/crypto v0.0.0-20200930160638-afb6bcd081ae/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/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+"golang.org/x/mod v0.2.0"
+"golang.org/x/mod v0.2.0/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/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+"golang.org/x/net v0.0.0-20200930145003-4acb6c075d10"
+"golang.org/x/net v0.0.0-20200930145003-4acb6c075d10/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/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/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/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5"
+"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/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.2/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/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/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275"
+"golang.org/x/tools v0.0.0-20200513154647-78b527d18275/go.mod"
+"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/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.9.0"
+"google.golang.org/api v0.9.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-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/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/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.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.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"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/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/cygwin-rebase/Manifest b/app-admin/cygwin-rebase/Manifest
index 26e28839acc1..b29cf449225f 100644
--- a/app-admin/cygwin-rebase/Manifest
+++ b/app-admin/cygwin-rebase/Manifest
@@ -1,5 +1,5 @@
 DIST cygwin-rebase-4.4.4.tar.gz 114445 BLAKE2B f0741513fb3b636876ce6e33b882e4075d41606118ec1c663939b2e9a9d8690360011352f27ebfeffc49a644b5de8c5026bcab0fb7fb9b41ff36ee6cd6c031c8 SHA512 d155b05f663fab971c70b6618755ac528d49b96e17017c0fcabf26332e4a50c46ee346705fc59490f741bf37625e94a2bba8cc36d41c23f5643d54d08eb1051b
 DIST cygwin-rebase-4.4.4_merge-files-flag-0.patch 15409 BLAKE2B 6f8061903439c9baa508eb130f43fe5e9fe8b71725ab5efe92d6d8a667b71c467f2f0fddd8b4ca22c68087e24bbafc2db6c288ef87d125b23c8f8d35bb1b5a37 SHA512 b067751218026867681c24003a4f224599b5fd6a29920c3662b7964a3447db8b6b680acfaab637de911ecea08c3196bf268eba3237b92830dcbf531e05842fb2
-EBUILD cygwin-rebase-4.4.4.ebuild 2178 BLAKE2B 40b94933cb27d87d3cd5802536a90f7a417354a5bee6e9996490dc335c03f81b49ab834fccdc219f4e8d4284e4c5fc0d1015f528433e786fb37957f05848ae7a SHA512 3eb82c9213a49f2049bfc5b31f30c5cb25db6328812b76785e4cdcd9c4abea69a2b27cb7779a87867a99b3bb8f4096cd42826b0bc6e8452e8087884cc027a65c
-EBUILD cygwin-rebase-9999.ebuild 2178 BLAKE2B 40b94933cb27d87d3cd5802536a90f7a417354a5bee6e9996490dc335c03f81b49ab834fccdc219f4e8d4284e4c5fc0d1015f528433e786fb37957f05848ae7a SHA512 3eb82c9213a49f2049bfc5b31f30c5cb25db6328812b76785e4cdcd9c4abea69a2b27cb7779a87867a99b3bb8f4096cd42826b0bc6e8452e8087884cc027a65c
+EBUILD cygwin-rebase-4.4.4.ebuild 2171 BLAKE2B 74f866256433d06ade9ba0c485de0c882db5e885b1bbb6d416990dc2627692a1069c4ef9b2d3ed6a4d46e8725ee82de5c714e190745ab652fe78891da9f1c88e SHA512 5c621bdc18cac4e81816b5ae89dde58ddb1229cceef0b3b40be2b1c39ca251b82d1b35bf59b425f1c5ab12305ea14260f6a4fec23cc377d8018b02f7bd559890
+EBUILD cygwin-rebase-9999.ebuild 2171 BLAKE2B 74f866256433d06ade9ba0c485de0c882db5e885b1bbb6d416990dc2627692a1069c4ef9b2d3ed6a4d46e8725ee82de5c714e190745ab652fe78891da9f1c88e SHA512 5c621bdc18cac4e81816b5ae89dde58ddb1229cceef0b3b40be2b1c39ca251b82d1b35bf59b425f1c5ab12305ea14260f6a4fec23cc377d8018b02f7bd559890
 MISC metadata.xml 782 BLAKE2B 4d7688c224e77a1d55ff300ebfeed95f8dc80152a0c99d99beea493c592b10cdc351e113045929fa3a322f782ef978c54d788f9af6807ae38a7793b7183789aa SHA512 09c64f2e195b53bb1c2fdd1b1ea1ff8591458d592f81536e9bf9e3097a7f4dc6347369c74afe9aaad7369aa65075d38c68eb4b803c8c79371945a51e91b10fe5
diff --git a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
index f80b7c07b4d1..43e174d3f559 100644
--- a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
+++ b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ else
 		https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch
 	"
 	PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" )
-	KEYWORDS="-* ~x64-cygwin ~x86-cygwin"
+	KEYWORDS="-* ~x64-cygwin"
 fi
 
 DEPEND=""
diff --git a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
index f80b7c07b4d1..43e174d3f559 100644
--- a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
+++ b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ else
 		https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch
 	"
 	PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" )
-	KEYWORDS="-* ~x64-cygwin ~x86-cygwin"
+	KEYWORDS="-* ~x64-cygwin"
 fi
 
 DEPEND=""
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 8858c29a05d5..93bb3f0a0013 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,5 +1,5 @@
 DIST entr-4.5.tar.gz 24674 BLAKE2B ee9ce841c5b3adb2bddb5742c73311b6924e914b896297d56ca3397812e8d528a25276b2b6882e2391f649106e4bf1ebc81bc1cec837b8ce1056e2575eae20da SHA512 db9499d78385df5056a30a4e3262fb436090acc5410ddfc529a7cfe4e10e304e13787abfc31dd38dbf8b9f01fa3369ef32d20c9fb903fa35763f41791bdda9c7
 DIST entr-4.6.tar.gz 24909 BLAKE2B e6c1eb5da1a3b94d593297f9975c36ea98d88c5b6ac17c34934c8d4678fb1c247699b8ff3d481a3972a67fd0abba75687b11489258be98990713e2041a12c2d0 SHA512 41e8c2311c7833a778193b13d1e0b1bb18ece54f5e20b8b5b0b4a2308ba1cc1a8b8378700dbac83ee68822b5f847a3fa9c47822d22a22d45da792d2408f48378
 EBUILD entr-4.5.ebuild 574 BLAKE2B 62e54855ee13304a42fc9c3008bba21b5958debbc3f6beeb4dd4444a6b21689baa52b68a4f3e0cfce3cd313c49dfedec4b7c37d103a28a7d2b6819cbbc2c1c45 SHA512 d01cf7128540b816837035b222713937d86da67592d5ae87ffe89a3990741e1c8be565570844f2978b21d287a487a323822b018ed57690afe50873654f9ab474
-EBUILD entr-4.6.ebuild 578 BLAKE2B fca2962c24f9694e63fd97a6456fe7c628205016df398c79ed1e8cdd03a9fa8e7701f240747c1602a3e2f7449434f12f135d1122064c32b462a52905e466fc7a SHA512 94290e46fc8b37b5b4673bb105bb5bcbe039b97d1049d4a12ba2b00b18db4fe9806bb3525af8c55e2ef79b19398a07717c5d262fd174379fd3a65803bb05aed2
+EBUILD entr-4.6.ebuild 576 BLAKE2B 29529c94e8ddc3561ecece15e021e1f3edd58ebd375b246dea341bf55f90d555b7a96fb7f1965eb24723a7b264d6b5fbc97133dc152a1d9b96432a3b05459df3 SHA512 139b6a5be4c126d2ddf529e6467ca43a2e09fbf1eae63e3626b18152c8c581f96114d0929f706c8c05853f677e88162554de35b90f889e40e60f3a8395ec8b2f
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-admin/entr/entr-4.6.ebuild b/app-admin/entr/entr-4.6.ebuild
index b86dea0ffd94..aafb265f6800 100644
--- a/app-admin/entr/entr-4.6.ebuild
+++ b/app-admin/entr/entr-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://entrproject.org/code/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index 7adac223e852..5c5ac0bac733 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1,7 +1,9 @@
 AUX graylog.confd 521 BLAKE2B b776c8c834358a426aab6e67b894ab3fc8e07b5d6d24f506312f41e76ea36bd39398d1eb424cf9f3fff633a26acb8af54dccd4a19642b55bf18d91fe92aff31c SHA512 3d8c3b6128f839809f14c7a1f2683ed5ac273efbabb1e0f50a2e9e90ef6c7cdc481bd84ef3372bf10f288b08f2b850a80d917838e057545851d3113c8f877512
 AUX graylog.initd 836 BLAKE2B 936e5e3c811fb01bc80dde2bf8bf67dd75b6a4a20fdc7fabd53789fca977dccd7aa2664225d848e4b63819d15666e6913058ce0a769413c58784e891366bdc36 SHA512 a6d63077aac5d35621f355811bd6380b34eee952f34446faa26250c0e83a6649673550e51169103a6735fb0002f808fed0e8764459e129027700c3849b3cb0e5
 DIST graylog-3.3.8.tgz 129314297 BLAKE2B 21eaf45b396b11ad5c42efad790390b643505ac7ecc24332813784443ba3b5aeed911fae07beb270f598341d577469f9a5fdbe92101e64939e6646884b7f7fc8 SHA512 feda3dafc3af249e54e8240ea20a8fd4e96c80901b45842cf8ec4ee7a5b33646a391a19a23a06b0e5fb4bf29c0d1c8d7cb87f2ee169ef17ac5b38fbd00682ead
+DIST graylog-3.3.9.tgz 129306340 BLAKE2B 91fd8195176b2e7d87b0bf29ffbe000b8cddac8efb238487a0e3cc1b1048e9ea9af36d1f5362c79ce0ba964886b336a43bbc7e64d52711bf00e3721d7253a3af SHA512 acbfd63974a700f7860e4acf706cc40f8c097546510ec7ed040bfbf50cb878fbd0a9f793eb88227e27205d5af40dbad3a4299354bf70bc2c26a6998b6c3bf0c6
 DIST graylog-4.0.1.tgz 163263748 BLAKE2B fdaf3055a76b49a637e2ce7a52af465195e8afb787f20632197a6839a0e6d134284ac3e5c5af76d7fe8bb9ec5de9ba47d5401e0392eb5c078728698fd1e208cd SHA512 a7fb3757cb9ac67a33b836634f73d08b06bc6c0ff50ae0e24da3616dbe8663740e64f07efeb8ac8578f283232df784c959b940f25dc6ab5a66483bc84cbab88e
 EBUILD graylog-3.3.8.ebuild 2235 BLAKE2B 3c5282354b4c1cd5281640baecbe4031ebc90e4abe2f2f6640964cb353bc19e4985d4f1657c1b1fc38cba18201de98120de1bda93c208e8bbad9e35a7375be0c SHA512 121c473f1039cc0010e0bda3624f366b49f7741424d57c983077b044fd2bf0895bb125cc97ee97fe4313dc1736a5c6714532705a5053e8e9c1bc5beb038e566a
+EBUILD graylog-3.3.9.ebuild 2235 BLAKE2B 3c5282354b4c1cd5281640baecbe4031ebc90e4abe2f2f6640964cb353bc19e4985d4f1657c1b1fc38cba18201de98120de1bda93c208e8bbad9e35a7375be0c SHA512 121c473f1039cc0010e0bda3624f366b49f7741424d57c983077b044fd2bf0895bb125cc97ee97fe4313dc1736a5c6714532705a5053e8e9c1bc5beb038e566a
 EBUILD graylog-4.0.1.ebuild 2088 BLAKE2B 2d49f39cce74b6afb1073f34d310687f8bca88f22fa09b9ff438f6cae5a14768f26ab725200c960407ad82972e3efc9ecf85ad1d2c896961cab4ed849ff7361c SHA512 8ac4ed61c0804ae112955ca94a9f32149b76872e9a736d8195db32384a4c21391fd28162240c69413702f7d06c36668e2d408a4e2a328d2e6806d3d0cd2e24df
 MISC metadata.xml 584 BLAKE2B d19e09582932c7986c85059766f2a845c0e85d214b9af6c61d9c26005e31c208a8ab59e6d82e5870162314c2cb4a9d3e852f12c02551d399c1eb3063449501bb SHA512 c32525442e20550c7e3b0ac8b74d896f35b2de1e87d57befb152047840bf4811c8df135f828b1c95505b4a348f25478cd7b2b186c36f93c6055086437f257505
diff --git a/app-admin/graylog/graylog-3.3.9.ebuild b/app-admin/graylog/graylog-3.3.9.ebuild
new file mode 100644
index 000000000000..d9a5d3883577
--- /dev/null
+++ b/app-admin/graylog/graylog-3.3.9.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://www.graylog.org"
+SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="!app-admin/graylog2
+	acct-group/graylog
+	acct-user/graylog
+	>=virtual/jdk-1.8:*"
+
+DOCS=(
+	COPYING README.markdown UPGRADING.rst
+)
+
+GRAYLOG_DATA_DIR="/var/lib/graylog"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog"
+QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
+
+src_prepare() {
+	default
+
+	# Stick to architecture of build host
+	if ! use amd64; then
+		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+	fi
+	if ! use ppc64; then
+		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+	fi
+	if ! use x86; then
+		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+	fi
+	# Currently unsupported platforms
+	# QA warning galore but testing/patches welcome
+	rm lib/sigar/libsigar-*freebsd*so \
+		lib/sigar/libsigar-*solaris*so \
+		lib/sigar/libsigar-*hpux*.sl \
+		lib/sigar/libsigar-*macosx*.dylib \
+		lib/sigar/libsigar-ia64-*.so \
+		lib/sigar/libsigar-ppc-*.so \
+		lib/sigar/libsigar-s390x*.so \
+		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
+
+	# gentoo specific paths
+	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
+		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
+		graylog.conf.example || die
+}
+
+src_install() {
+	default
+
+	insinto /etc/graylog
+	doins graylog.conf.example
+
+	insinto "${GRAYLOG_INSTALL_DIR}"
+	doins graylog.jar
+	doins -r lib plugin
+
+	keepdir "${GRAYLOG_DATA_DIR}"
+
+	newconfd "${FILESDIR}/graylog.confd" graylog
+	newinitd "${FILESDIR}/graylog.initd" graylog
+}
+
+pkg_postinst() {
+	ewarn "Graylog does not depend on need.net any more (#439092)."
+	ewarn
+	ewarn "Please configure rc_need according to your binding address in:"
+	ewarn "/etc/conf.d/graylog"
+	ewarn
+	ewarn "Graylog requires Java >= 8"
+	ewarn "Elasticsearch 5.x or 6.x (does NOT work with 7.x)"
+	ewarn "and MongoDB 3.6, 4.0 or 4.2"
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index e6f48a994278..7c275891ed2b 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -2,11 +2,10 @@ AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf454a5163bae5cfa2b7af1a212b2e5bfcb4693c7291d5306e47e574d3c937aaedd02625dc954a9e SHA512 df93f7dbcf61eee9f42f4a0c2fa0e2dfc806ac737ba98329cee158e04150c9bf346abd9364b2a6824df4bb862e676be7b2c23f5947ef5aa589df745ac5c5cd03
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
-DIST puppet-agent_6.15.0-1stretch_amd64.deb 22581842 BLAKE2B 19c45427e56a41f6030836129a7fb2824ea47f1000745a8c74b0968c61f719d3cef9a0e02f51009b8e91c4ad66445c074ccc203754bb13d82007316a3d053c60 SHA512 4ec7e04fb6bab697bfccd369740a57f735476a4614dbfa1f7c893901f5ffb9d6ce3d79886b6e035805b1a8f2c3de3e0b9b468b08909881df6022c9700c7a2768
-DIST puppet-agent_6.15.0-1stretch_i386.deb 22917002 BLAKE2B 5bab2b6cdde11a46e64996074e8db50d48d004b601c0d08ddfde9c8dec0c0f62da1176b9148d084f0250b582460606b7cd0a97291d157a186b7a97dee4184c51 SHA512 89e676491f7b7b44c9c747b129166db7b025adf76d9911d12d7d026aa8d04de293d3d1c638ca309ee8ed45a37c49b4ab0076ea0c711ac0e43f4297084446784f
 DIST puppet-agent_6.18.0-1focal_amd64.deb 22258752 BLAKE2B 547d06b16b2c95ec9be72bd82e1aa0a4a4b511075da73f29ebecdef32ca4ed9b965a38a7c071d9bcc8c444b6974159df97f020878c0e4a20d1f50ff23d4c1129 SHA512 00f0cfd96176f5311f0bab14016ab88da03ecc10fd9e2bf28fc2d9a399600c56a97e23095694be5382005fef0df1c4fe3ff0d1aec3a46d85f74c729a3c62476a
 DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
-EBUILD puppet-agent-6.15.0.ebuild 2016 BLAKE2B 4f4382314410a9401868382b65e5ce627e9c706120dc21a537b71b390bd56480988b36e51f000303542d8711f2aebd47860605e8f52087c895e9453d2992a84a SHA512 45a7eaf2fbd6c66b672943192a92826ee10da6f0ba3a4d8cdc6c9ad2103d2fa534587dc31f5505bc8c9a23474e604ac58af0b328723668cd772a1e75fe6d0d5f
+DIST puppet-agent_7.1.0-1focal_amd64.deb 20881084 BLAKE2B 1f16533e9f2da9971bfeaaab696bd0631d058928491c52e7cadba2c710af8373cfb89b4eaa4e293121857dfdad9bc694d562ebd9db8213198191c56fe94dd119 SHA512 3356810dd08baad373fd62669995cea17fed6baad3d3ae54dfd00c88a69602b5d4b8917b5e54aacc41fbd011a4e6877d1fd6c4a62d09648ddfaf26d898c3e7d6
 EBUILD puppet-agent-6.18.0.ebuild 2067 BLAKE2B fbaa5ddfc2c3085a877a0adb546a8ced6242fcfeffa180cee4588dd6ac0f35ef15b58869f1b22dbc4d92b2344780ad64ae9ef41fa6a46f71bc50fd2f89031ea5 SHA512 154315c97b9ec493d6923e066df73d58a33e6f0c7bc33162d8fcb5b5eb86df3ebd7af93d9cc8a0463d6d19f7650209610fe391a5b530b7b57e147738cc567d9e
 EBUILD puppet-agent-6.19.1-r1.ebuild 2063 BLAKE2B 046b9954bf6619f55a664eb77b6552fd23a8d6d8a0da3dc9f9f395d570bd852fc3222bfc92debce028b49919e2fce63115d8c84c4957c75e49ebf5857b33c1d5 SHA512 8d78af238e593ddd88498d4994afa6565c8d5e9dcbc4baf4e05238ed591847ad97b3eb452c1a4d688d8d9d64aad274826349c28797bad960f12ebe39be1c304b
+EBUILD puppet-agent-7.1.0.ebuild 1917 BLAKE2B 1dff33fb27bd351a53bbec487e8d5b0a94b25ddb0593f7edac54fac68093201eaddbb304019ced4ac49d5d01765229729c522321c8d5646c549d188d0d0f842c SHA512 53896e99a7c287f71e067a257b0548267c9201010eabbd61ddf6cbcee7a86b1b427fc534d112806223a14eb96bcef90e6ed568b78fb2b883da34e2cc1075cbd6
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-6.15.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.1.0.ebuild
similarity index 70%
rename from app-admin/puppet-agent/puppet-agent-6.15.0.ebuild
rename to app-admin/puppet-agent/puppet-agent-7.1.0.ebuild
index 9d360f3dc1b3..b8c6c3f40eaa 100644
--- a/app-admin/puppet-agent/puppet-agent-6.15.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.1.0.ebuild
@@ -6,21 +6,18 @@ inherit eutils systemd unpacker
 
 DESCRIPTION="general puppet client utils along with hiera and facter"
 HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )"
+SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
 CDEPEND="!app-admin/puppet
 	!dev-ruby/hiera
 	!dev-ruby/facter
-	!app-emulation/virt-what
+	app-emulation/virt-what
 	acct-user/puppet
 	acct-group/puppet"
 
@@ -32,7 +29,8 @@ RDEPEND="${CDEPEND}
 	sys-apps/dmidecode
 	sys-libs/libselinux
 	sys-libs/glibc
-	sys-libs/readline:0/7
+	sys-libs/readline:0/8
+	sys-libs/libxcrypt
 	sys-libs/ncurses:0[tinfo]
 	selinux? (
 		sys-libs/libselinux[ruby]
@@ -42,6 +40,8 @@ RDEPEND="${CDEPEND}
 
 S=${WORKDIR}
 
+QA_PREBUILT="*"
+
 src_install() {
 	# conf.d
 	doconfd etc/default/puppet
@@ -53,23 +53,22 @@ src_install() {
 	insinto /etc/puppetlabs
 	doins -r etc/puppetlabs/*
 	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
+	keepdir var/log/puppetlabs/puppet/
+	chmod 0750 var/log/puppetlabs/puppet/
 	# the rest
 	insinto /opt
 	dodir opt/puppetlabs/puppet/cache
 	doins -r opt/*
 	fperms 0750 /opt/puppetlabs/puppet/cache
 	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/puppet.initd2" puppet
 	systemd_dounit lib/systemd/system/puppet.service
 	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	systemd_newtmpfilesd usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
 	# symlinks
 	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
 	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
 	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
 	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
 }
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index f2d9abf39228..a5059b102fc8 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -9,9 +9,11 @@ DIST puppet-5.5.21.tar.gz 2997149 BLAKE2B b42fd79132ce0aab02724c7aa38fc39a216df3
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
 DIST puppet-6.18.0.tar.gz 2911742 BLAKE2B 75ecb14a0cf96c1c54d09f88f91984805834288a166e74c5b9648d5f9ad60a6c279100f32f148659772a22fc01d21345bf765ed47518bfa9bd81d06c17587efd SHA512 a14994aea502fbc78219967e2d711952b580df1e7befeab2d254a73f28036c6c7923d167a20bc61c9abe76000f93dcd3cba92b3353540e2a26fc27b10b06efe1
 DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f SHA512 4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01
+DIST puppet-7.1.0.tar.gz 2827602 BLAKE2B 5e15c7304c7b91e40b95096482d6a71a3e9e1686f769c4c0334a533cd8b6faf31d4e126585c9b48c15bb524930e0410bff32201dd01d7faeb7487c29075f7477 SHA512 7cb5f8c472d28012a0b93893792611dd03081c7100be57e2fab60a0dabe164081fc40195d562ef8cf5e2d67f9d32f26704ecedee9cc772e568a116e12af70cda
 EBUILD puppet-5.5.19-r1.ebuild 3692 BLAKE2B 7aa03944368b7395b4c587230a39536db28d0a46352bd5c6f7ec457ca29a3e6d9a3672a9b74591d3382909dc4f9ecf6ec73853ad5722b26becafb5c1a1264912 SHA512 6012739c4d92cf576ea482f99e9d560633103116b40be7df8cc3a9e89f9efeef3e02317dbbed1207a91c5372ef7702d723c37207488ecd6ececad5d0df6de9a2
 EBUILD puppet-5.5.21.ebuild 3757 BLAKE2B 84bc423625d9ec703ef345fd0bbc44241e5abcd4c964290778a84a636e30a7b87153bb5c450a7b9e61f488279f28553969eb777deebb6ef22c923929b28f3b2c SHA512 cd1be53da064ad5641de2d4566f36f9733201c92ea68b3d36b416a8f786075d148a9a7f48eb1a67eca3567016f381bbc86c2a4dd6f4e3919befed2ae0bb75196
 EBUILD puppet-5.5.22.ebuild 3753 BLAKE2B 2d11b58b85a6a4a5c0568bb1b016c28fbf9fbc4a1c1b79f49c42698e855a4b59953ce02547ba00e9f17758009eb46d47c1cca130ac24461ab9733b12d44629e0 SHA512 ae360fba14e816e4e1f3ce5900e83a0a488e04933565b87ad69b52d2f24f15d217f06e18e0f341e656044f8fd5bee7de0c55beae45f76962ac4095fd6ff19451
 EBUILD puppet-6.18.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
 EBUILD puppet-6.19.1.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
+EBUILD puppet-7.1.0.ebuild 3554 BLAKE2B a181c774112747fa06e9980081da602b0bc8a924c08b04802054738a1a9ffac08bf85d6d4fca1c0c734a04f8e1b2daaf410743488f3fddc5ebc46f9424ca65fe SHA512 0ceea9d4e1651ba4732c3cf37c63998113a0bb0f88fedb27f2f2bfb663ab1f558e537886b983a415bbf0259c4a36ca40a186f7a78b9bb48d3bdd8b396a1f4215
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-7.1.0.ebuild b/app-admin/puppet/puppet-7.1.0.ebuild
new file mode 100644
index 000000000000..7347beb79605
--- /dev/null
+++ b/app-admin/puppet/puppet-7.1.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils ruby-fakegem eapi7-ver
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/concurrent-ruby
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+	elog "not already done so."
+	elog
+}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index e3a7a9e87069..ad65a0c0b024 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -2,6 +2,8 @@ AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
 DIST puppetdb-6.12.0.tar.gz 46375914 BLAKE2B 7d1a884881e9aa324b0d2a8cd49bf47e4014ff6bc23e94c76c27b3736c75f3cdcead76aea159de17ce1255381e32bb126f9cbf55297f64454fcca6ffd7f28b46 SHA512 040f8653c422e312857f82a8f040a33128f49c7900978a22b9ae672172ec41d2037e323de5aad3c50a630058b6b95c025bae05b3ea923e2321e94f97390998dc
 DIST puppetdb-6.13.0.tar.gz 46400373 BLAKE2B 2e3cdd4e7a3e84e11f23031dba3aadf5be885e118938a0a52140e612b4006a0fd4e97f162322c80731b2bfb63dcff2d73d5b2cd0882f7aabcb69fe30aa05151b SHA512 4d16ce44666634e88c538b06f6b2e91cf9786646134a6302a80ea941e3f73168b0f4981cecdb125cac881c0233c835893e9385004461b67e7d8635865f14aee9
+DIST puppetdb-7.0.1.tar.gz 46449698 BLAKE2B 63538c2c61ca5f68643f95537d5096e08e46ffbd0b7d02e03fd6fb6ae5864fc234bd18bc9389d1f073c30ed4472415b6916672875250ae3a24cb348969f950d8 SHA512 0ae763b71d02c3afc55cf2f10829da75b07d89e57b75c713bc52492a7cc3693c3d22ecbbb36fed30f562f067f78fb0d1c80b073e0238a60eb144cc3555d7219d
 EBUILD puppetdb-6.12.0.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
 EBUILD puppetdb-6.13.0.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
+EBUILD puppetdb-7.0.1.ebuild 2649 BLAKE2B 61c2280603f62775d7e3c06142c0bad6d28795dfd396c45c73680e7d33b034e8f656994a21b304e438f89fc9d700e722bdbbc94dec544cda0f6abbe560c9d1e1 SHA512 1dbf062b0f95659020fcd4ec207aeb658a62e35e74f868d95c91ccabf1115b22536be505fb2de84427a6506c47ecd7cbb3ca0164f618e4d297b921a629065b6c
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-7.0.1.ebuild b/app-admin/puppetdb/puppetdb-7.0.1.ebuild
new file mode 100644
index 000000000000..5a7a32bcf49c
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-7.0.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+="acct-user/puppetdb
+	acct-group/puppetdb"
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 632305b17342..188b56afcb7b 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,7 +1,11 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
+DIST puppetserver-6.12.1.tar.gz 60422470 BLAKE2B fd3fa33262a5ae83fb6889079a85c262d74d55b0ffb9ed297d60399c442d7a1676cfc54afd3e25721d6e4a4ad926c43a1f8f1a9db206ee6145280601c501fe09 SHA512 9ad5d3e266f91b8a1ef09302a1f8889f139909fb20268f714fb894dcff2379a01c78baafdab1102a26c26903cefe92ac833c2b20e9ea6f8d379af2dd11c20407
 DIST puppetserver-6.13.0.tar.gz 61890579 BLAKE2B be514b3c41dcc018715e949f1f1c86317499baa22fa70e5f7e8df89211b566651ab4de469afadf14fcd1dbc9b1d0b0c21452c313f74052eb8d65bbd591231194 SHA512 ab67ebf94c37a50999a5597e1ceeadf606296c2b6e557bd6ee2bb99ac44b7c8fe8df892f4e3bccb9f0e3822fc480f61a27d6799b7dfc8df12e058c7074d589f9
 DIST puppetserver-6.14.0.tar.gz 61960111 BLAKE2B 760fb2114aef78f1d96d41023f43f162eccd14ee0fa50f8ce4c7954450087dc395d9a9347629a968d99193ba6964b11a2650513c229b48159df67e9f9d63f541 SHA512 5d66b57a0f3c64ff889c33ccf94077a0ab142b84ca17faffaf4b885ba4794a52afb1b227f101eced36655999ac402913363897a3823a387f3c48948d38471c43
-EBUILD puppetserver-6.13.0.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
-EBUILD puppetserver-6.14.0.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
+DIST puppetserver-7.0.1.tar.gz 62214010 BLAKE2B e0272e8dfc910f503cbd8aca8d4c689656d1356a6198766c5c82ab6658b2e7f5e956eb10022ca5336fd1bd0d655ca4c87e5c43290229cfd26c74c9943210cdef SHA512 67f3ba07d1f607eeee0f0520054711f36d0f6e59477930a6115c5f5127b9fc7e00075d6f863bfe9e9f92e4f45fe13f452c80759e3b496aebdca6fd97e50f3774
+EBUILD puppetserver-6.12.1.ebuild 5323 BLAKE2B 0db7db207a85592c34ea08e7f2943a84ba799191e4481603b3448be95f26195c5419f465ee205d4c218c7d59c872d59ce42228437e9a4008d773eaf89c8334bb SHA512 b2424e2661072d77a7ccd535dc319000e1e2b8510428c4932bbd578c3e0d5189f8681d409daf194c801382ac730b45a916fae6c950ce059b8d0bf83de58a0c0f
+EBUILD puppetserver-6.13.0.ebuild 5323 BLAKE2B 0db7db207a85592c34ea08e7f2943a84ba799191e4481603b3448be95f26195c5419f465ee205d4c218c7d59c872d59ce42228437e9a4008d773eaf89c8334bb SHA512 b2424e2661072d77a7ccd535dc319000e1e2b8510428c4932bbd578c3e0d5189f8681d409daf194c801382ac730b45a916fae6c950ce059b8d0bf83de58a0c0f
+EBUILD puppetserver-6.14.0.ebuild 5323 BLAKE2B 0db7db207a85592c34ea08e7f2943a84ba799191e4481603b3448be95f26195c5419f465ee205d4c218c7d59c872d59ce42228437e9a4008d773eaf89c8334bb SHA512 b2424e2661072d77a7ccd535dc319000e1e2b8510428c4932bbd578c3e0d5189f8681d409daf194c801382ac730b45a916fae6c950ce059b8d0bf83de58a0c0f
+EBUILD puppetserver-7.0.1.ebuild 5326 BLAKE2B 33112d222b68f04c96b806e68ed7042885d453efb887dee9d8b94da3b1e69242c3aa9bffd940a115ca545278290f479690ce2f7ebf523606258f210fd9a8420e SHA512 c4487fa107612ed0f1f639cf73413dd810dbc0316e25140441fe28325fc64e34cef4e3062fd0ca6affecd822d44524e5f3d83bcf4b39bbb96441175493cc2c87
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-6.12.1.ebuild b/app-admin/puppetserver/puppetserver-6.12.1.ebuild
new file mode 100644
index 000000000000..2b74472d2418
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-6.12.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="amd64"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+	acct-group/puppet"
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	dodir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	insopts -m 0644
+	insinto /usr/lib/tmpfiles.d
+	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/puppetserver/puppetserver-6.13.0.ebuild b/app-admin/puppetserver/puppetserver-6.13.0.ebuild
index 5385eacc0c94..2b74472d2418 100644
--- a/app-admin/puppetserver/puppetserver-6.13.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.13.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/puppetserver/puppetserver-6.14.0.ebuild b/app-admin/puppetserver/puppetserver-6.14.0.ebuild
index 5385eacc0c94..2b74472d2418 100644
--- a/app-admin/puppetserver/puppetserver-6.14.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.14.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/puppetserver/puppetserver-7.0.1.ebuild b/app-admin/puppetserver/puppetserver-7.0.1.ebuild
new file mode 100644
index 000000000000..4e99a7c7b7ee
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-7.0.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+	acct-group/puppet"
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	keepdir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	insopts -m 0644
+	insinto /usr/lib/tmpfiles.d
+	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/selint/Manifest b/app-admin/selint/Manifest
index aacb85723b5d..fd42b059f330 100644
--- a/app-admin/selint/Manifest
+++ b/app-admin/selint/Manifest
@@ -1,4 +1,4 @@
 DIST selint-1.1.0.tar.gz 283926 BLAKE2B 0908f8830ce4b569c54e8c025dd92c39af59172fee0b8061f5b8cdaf61222979a78c3726a5647af9161ce7e4a7ddd5bee64772afecd2024368afa76294b3d317 SHA512 3af358e0f42a285a0360ce2b4db9014ef1e4f0b792623007f88cf510799080975d9e44817e8911bbd32b141704a7fd11e1b4d8f91e124d0fa91c38f71a978c91
-EBUILD selint-1.1.0.ebuild 777 BLAKE2B 01aefb1c3a19bee5325c75b318000d99f159bf23edc1e399c769c3eda57c7361a6ac87e3837ae79573f588450710b72183ad1b51158817b068a4852eaac7420b SHA512 495108a5bd26315c85f092b0880e3703b1207e45770a59a0cbdeaa68d3c8fbdffd508b229776587d71d4841721c75af919967fa02e27df9af82a87ede9784cbb
+EBUILD selint-1.1.0.ebuild 775 BLAKE2B 7c358a6a1d05bf970dca2f2bcc0bfb0d7e81afcf280c639a21cc6e09deb524121f09e01e546ebfa4ce83b6304e717d7dc768b00d3ad24e452a8263a4b5b1f8c6 SHA512 c1e72456363af31d31e8513afafde25dbfb8d75c870a57901c5199e73e6764f56aede0ab65461e8cb6fd0d92c2a762bcaa8865245f9958cded22567e2a958398
 EBUILD selint-9999.ebuild 777 BLAKE2B 01aefb1c3a19bee5325c75b318000d99f159bf23edc1e399c769c3eda57c7361a6ac87e3837ae79573f588450710b72183ad1b51158817b068a4852eaac7420b SHA512 495108a5bd26315c85f092b0880e3703b1207e45770a59a0cbdeaa68d3c8fbdffd508b229776587d71d4841721c75af919967fa02e27df9af82a87ede9784cbb
 MISC metadata.xml 335 BLAKE2B ab88b7d7fedc27d0ba41b77fc133a0ad8b42aa295bb5b64c5bb4924d8081cb1ac3480b07d7c8a04ff8da1c49f47983e33a63cef3de08baac4cb448d656ec6cb9 SHA512 e94ae02402e90d9475fd328454223fa95714c3292877a9cc31e98c393f59dde7ddd9be34afe8b2f2d318105794ca3faa7617166d123259d147115619b14d7d12
diff --git a/app-admin/selint/selint-1.1.0.ebuild b/app-admin/selint/selint-1.1.0.ebuild
index 592cb7fbdf8f..76ff35921fcf 100644
--- a/app-admin/selint/selint-1.1.0.ebuild
+++ b/app-admin/selint/selint-1.1.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/TresysTechnology/selint.git"
 else
 	SRC_URI="https://github.com/TresysTechnology/selint/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index e720713c4cae..10077a62c4c3 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,7 +1,9 @@
 AUX sudo-1.9.4-without-sendmail_build_fix.patch 1470 BLAKE2B fbffefb687a42cfac19cc1ede970729e17c1771421ff93a9d9c4df96046688b92e838cf48891e67e0ee8ce40b84a19c707a844c83bba2af5eae52caeca334573 SHA512 18d8ef507ce7c4c2ee8d5aed08199d527675a7757e9b1aff819380d156e4427a8c632b8a5cc1eee0698e6d20f2ec569e14d6ba957bb8dec788e75a82b706063a
 DIST sudo-1.9.3p1.tar.gz 3958071 BLAKE2B b681c120faa5dc7f25e27c1be423d68cea70f63dcdfea2183fd386a34dec0376555453399d3f8886c66c6507343648d40b59a058710432154061b210df2a704c SHA512 3ad13fd03e5b371fd6bf7909731ffc11431d2182a744b654f7e5d4b810e47955d49bc78f551afe13ec56acbce694139c33a15bc022cea41b17af5496b8b7f89f
-DIST sudo-1.9.4.tar.gz 3992062 BLAKE2B 65eb8f78eb34ca7009ea0752a1acbfcb4e06ddd7083301736ac1bac7019c1a45cf2c34f69ac5b86fa4ac01310e209f236840712ad4998b692ddf774b9d1bf60d SHA512 682b4d303147193149509b734b64f8541e00ccc1c41468928dff307f9d52f2b1aae005deee1ef5ac389cd3dc506368dba8a78c0392ea1434dd78cf7ef8a08408
+DIST sudo-1.9.4p1.tar.gz 3993946 BLAKE2B 171af5befe05e393846886077d0c210664ff86191ae1a093148d85ca80d4a8c6cd8c41ef91451207831f574267d32d4c621e47ecfa1d3b37ee8c498af6729369 SHA512 5d247c9ad68cd2c3ea504dc0a49db041f68c1575775b4bb3a5fb62abadc23295a42658d33430d6391152c7b44f66d9f165f77a91abb355edc2d2d8787d41cd91
+DIST sudo-1.9.4p2.tar.gz 3994184 BLAKE2B 110562792fa3d6f3f30fb0f07eefca975f062d41743fb84a34c27bf4c72296aa5f581de1f74895deedd6b47cb235399c52b9d3d818d274c6cdc61c741a0a287e SHA512 5258531d3dca0e812df5f4f8f26665f643c036d42534e3b98f5dd463624e9df0bba2a92c15da0c9958bda7e68f6f10b7b34875792ac9c205d1e70a12bc4f98a4
 EBUILD sudo-1.9.3_p1.ebuild 6892 BLAKE2B 3ad32318e45533045e40e7d4ad282b5a218c9531d98dda7a6d92bc0568ee874e020f4497811e7e2dad677d8d14962d2e5aadb014d5d1e01a4559fda16867e39f SHA512 34803aae1dd4a8aaa696b7b4c72d69d9dbe08a25072aac9b8a2a3f9e47eed84a9273c2cc6f1c496477a88b8df74e5587cf8761906970d574ea140fd0a41ca639
-EBUILD sudo-1.9.4.ebuild 6975 BLAKE2B 9d5c62ddbf6011a9fa7578f7b57762f1aa94c275759a087e57f366add38c9385f7acc38d343c6e148c0c11ec0790a7ee3b080ff83ce75e35cf72ea50bdf257d6 SHA512 12737ac1922535b9ff0cf2aa0b4a67af191bb2baaa9f993cc26fb1ced11cf7aa67da76423703d6b8c92dbffe1c629e61cd1f4284cf2e72f241f376ea01f73919
+EBUILD sudo-1.9.4_p1.ebuild 6901 BLAKE2B 57b94080303df4d32651aab3cd4be8601f59ff13138eb6b8941854255942422d338e47047ff98b1ec9c86863e77f2e1b36901ed001daf715f23b15ae65264709 SHA512 ecb146a12fe3ea3d32ef237e0e67a99d3eadd6ad99997c327eb31027b0f45aa6dbed9dec03ed5c39c62ddd1131762fdc708899e76b2a867416dc0997c1f0727e
+EBUILD sudo-1.9.4_p2.ebuild 6901 BLAKE2B 57b94080303df4d32651aab3cd4be8601f59ff13138eb6b8941854255942422d338e47047ff98b1ec9c86863e77f2e1b36901ed001daf715f23b15ae65264709 SHA512 ecb146a12fe3ea3d32ef237e0e67a99d3eadd6ad99997c327eb31027b0f45aa6dbed9dec03ed5c39c62ddd1131762fdc708899e76b2a867416dc0997c1f0727e
 EBUILD sudo-9999.ebuild 6901 BLAKE2B 57b94080303df4d32651aab3cd4be8601f59ff13138eb6b8941854255942422d338e47047ff98b1ec9c86863e77f2e1b36901ed001daf715f23b15ae65264709 SHA512 ecb146a12fe3ea3d32ef237e0e67a99d3eadd6ad99997c327eb31027b0f45aa6dbed9dec03ed5c39c62ddd1131762fdc708899e76b2a867416dc0997c1f0727e
 MISC metadata.xml 1161 BLAKE2B 0c501bf06edca82993ece857f9f7565f99da15df36c916bc9dc57e78bccf2b247c382e97dd6c97cc7f5375e1a0513c1a30ecbf097516e96319fd1797257fb117 SHA512 d6bc9cf11ea1bd28c19bfe167580556af517d92c958d63cd7872ab5076840eca39a7ab3d1f56e84fc0fcfb675d7a89c23ccdd3629f665c45232be1140eb950ac
diff --git a/app-admin/sudo/sudo-1.9.4.ebuild b/app-admin/sudo/sudo-1.9.4_p1.ebuild
similarity index 98%
rename from app-admin/sudo/sudo-1.9.4.ebuild
rename to app-admin/sudo/sudo-1.9.4_p1.ebuild
index 74f99d722acf..84770ae1b432 100644
--- a/app-admin/sudo/sudo-1.9.4.ebuild
+++ b/app-admin/sudo/sudo-1.9.4_p1.ebuild
@@ -74,10 +74,6 @@ REQUIRED_USE="
 
 MAKEOPTS+=" SAMPLES="
 
-PATCHES=(
-	"${FILESDIR}/${P}-without-sendmail_build_fix.patch" #757819
-)
-
 src_prepare() {
 	default
 	elibtoolize
diff --git a/app-admin/sudo/sudo-1.9.4_p2.ebuild b/app-admin/sudo/sudo-1.9.4_p2.ebuild
new file mode 100644
index 000000000000..84770ae1b432
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.4_p2.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam multilib libtool systemd tmpfiles
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} == "9999" ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
+	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+	fi
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+
+DEPEND="
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		sasl? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap[sasl]
+		)
+	)
+	pam? ( sys-libs/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+	${DEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+BDEPEND="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	?? ( pam skey )
+	?? ( gcrypt ssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+set_secure_path() {
+	# FIXME: secure_path is a compile time setting. using PATH or
+	# ROOTPATH is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+		echo "${ROOTPATH}")
+		case "${SECURE_PATH}" in
+			*/usr/sbin*) ;;
+			*) SECURE_PATH=$(unset PATH;
+				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+				;;
+		esac
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:${thisp}
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
+			newpath+=:${thisp}
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local SECURE_PATH
+	set_secure_path
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	myeconfargs=(
+		# requires some python eclass
+		--disable-python
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/run/sudo
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable sasl)
+		$(use_enable ssl openssl)
+		$(use_with ldap)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with pam)
+		$(use_with pam pam-login)
+		$(use_with secure-path secure-path "${SECURE_PATH}")
+		$(use_with selinux)
+		$(use_with sendmail)
+		$(use_with skey)
+		$(use_with sssd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins doc/schema.OpenLDAP sudo.schema
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+	pamd_mimic system-auth sudo-i auth account session
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
+
+	# Don't install into /run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/run || die
+
+	find "${ED}" -type f -name "*.la" -delete || die #697812
+}
+
+pkg_postinst() {
+	tmpfiles_process sudo.conf
+
+	#652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 37473690414b..8f9f1d827a45 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 11dbcdae3275..6f93f9c099c0 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,8 +1,10 @@
-AUX 3.32-packages.match 645 BLAKE2B 7bb6ec28fb8150e1f1989a9db4514556d857b4dea8b8225b1515f3f53b70a1e81b6a0a1068a0d356a33086d0127993a394cb0500e2991384c404dce7faaf32a0 SHA512 3c837c18afa12c5e022a80f85ccc83e5f55fc8fdd5ee8f19f1b2222d08560ad1fd349ed8b1bb7255119f6d6101399fa0dcd79e6a1754c719c0409343c231f65b
-AUX 3.36-packages.match 664 BLAKE2B 5ff5f4066c1b085829321280d0f86d9a9eda071a23bfb01aba94594ad2815d6f68d67b8c0b6d053ee442a0b3e70d81c2bde3788b14c98ed3e1e37fb16b101959 SHA512 e4518a143a164b699aeeb4309bf41697f9aab12de401217126513018352163ed034f3e8ef30fb22db0cb966650f08fc9b68079d171a861bd6185c13fa6b4a4c9
+AUX 3.32-packages.match 645 BLAKE2B b3ebf8eab5fd5fd57a19af06d3728d09f77ebd1c76aebae2e2bebae13f8071a86e60f5534460239436befb3d43f59441bec42c2787d5c5ee3c4e439fac02ca32 SHA512 894aabfba489ddf5aaaccccc10d5b7198dc03577a36798e418ebc0aa2b12689e04c2ce97052e0e105eaf93799964ce8196a234ed69f50fa0cf572cc723232690
+AUX 3.36-packages.match 664 BLAKE2B dfe72c4eb0b44b8ab589fa81c0ceaa31bc3516dee78fabe2eb48f8131b25ed75a11630ae620e70646539ef42a7c4d7d283f71ffa0fa13f64ccf164d672acd95a SHA512 154438583492c571e4c8e1c926c3cb04972255cc4d1b74f186dfbe50c9756f25e11034fe64d893fdd8f2698c8eaaebba76682a818bb6523656c7c412f8e8b614
 AUX file-roller-3.32.4-fno-common.patch 693 BLAKE2B 2a2cd45f9bc5fd73d9bf1324944f70890bd52878d03c0197f0b4759f6a780fac5c964c240269bbcb89056591306fc87df4bb3403b18346079853541d9b81a644 SHA512 31c425704802c2d2095b8778177f7cfbd31fd1447a3e4b8fa3ffcc9c952231d400a11458d26a6db7e2595d6bae1ba9eec01fa6d925ed727660cba7af2589bbb5
 DIST file-roller-3.32.4.tar.xz 854444 BLAKE2B 04264e64af8ab4376fa6985683b16be7fef730a4e24044f726933b885aaaa6b630f347a256b09c2ce6183d0a0a392b33b4328715bf6d19cf7128c1980f9f4792 SHA512 16b5ddbdeacf4e9e61265ecff05e8f2e0034147c67ae7355d2442f9b26098ff253d24cb34c8e686c2ac031da6acac8e1e3c8a9f978e1eb2b446b1e045babafc7
 DIST file-roller-3.36.3.tar.xz 870608 BLAKE2B 4c57b99f2ca0eb4db3fac0216b63207d1664829ee54e21eb976a327bd65aec5abfd2a02b84bc80246fde131ede6ff63deaf8b63451db6a0fecc0121c8bce1a5b SHA512 41558ca8061276b1248fd3599e856051dcd69ca831fb4d8a33666dc373b4abed56e7ef204a6e041ceace05ea7234448d15bc7be8c48dc1809ac6d445de251370
+DIST file-roller-3.38.0.tar.xz 877960 BLAKE2B af1c4800e24adfb36a8f8f108740f9cad14bcd40f797b2430d00e428d723587de75be03848aca612536cee768b6b372534e0b6a322dc40d7ab1c41eef540916b SHA512 9c2e3c105397bceb08e30c9796b9242633fe49772aed2e7f67461c34a51be1493e922301b1fc29bdcb0fa50d220f4a7db2ee7642f629007ce2bef00334d7110e
 EBUILD file-roller-3.32.4.ebuild 2274 BLAKE2B 996cac999d6d1c1f4b4deba986f6001371d1b5f6c05c370e531679c6486a796c75a6e2679ef65c655cfed6af1dbde06840d1b6b916ec3cc5f89325cdc440d90b SHA512 a3e66c14e06a337a41591a55a1d8a6d273f57bacec3edb202bca83bbf952d980e2b4131c338a2ea71b31f76116195a772a4261a4b9caa634795de4f249ea632a
 EBUILD file-roller-3.36.3.ebuild 2176 BLAKE2B 6e5b451ec8ce8a4f43b59a5c51ddf2c7389489fe80549efede5ebb23463f699e9a27ee86932d1a43b011def4a7d0cb4327f3fd1959aca409df649fa08bd3d477 SHA512 b7de40066a28fb6761595db964f13d0b41710da2bb542a9a78740677b36ea4fcf3faff79a592090c11a1c3fb537718c667a2257b98f7109eb5b30d758da75a02
+EBUILD file-roller-3.38.0.ebuild 2119 BLAKE2B 10345b6fbc51320329ecba9c26333faab979a61e9c204a385cb0d3e209298fa93e687c52f8d11a6ca44dab19253b2b425c43d60d5596f14132015cfd32f293f1 SHA512 b93f320df766fafef3deadfffdac670ba8df2088417a5b8740578b16be2e060129872dd84824d3283689397f1aded23fa2631c27105064d0fd63cd85f3d3e50f
 MISC metadata.xml 627 BLAKE2B cc3f28d4405c3939f1a24dbc25d3ac5dfa46438b769d29f4891e860a40b67de074defa0beff9ed9f542610eb38d3593b3d9602f886c57178db4e344e996c52e4 SHA512 6becde35161e28b9b829c97c6c3a67c011b2509647f4a15672ea67560909fc05a4e1aaf43aa4f4f308ab5541316b4107dada8cbe7e73fc2c076afbaa0a807eaf
diff --git a/app-arch/file-roller/file-roller-3.38.0.ebuild b/app-arch/file-roller/file-roller-3.38.0.ebuild
new file mode 100644
index 000000000000..aee9ff433eab
--- /dev/null
+++ b/app-arch/file-roller/file-roller-3.38.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="Archive manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+IUSE="libnotify nautilus"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# gdk-pixbuf used extensively in the source
+# cairo used in eggtreemultidnd.c
+# pango used in fr-window
+RDEPEND="
+	>=app-arch/libarchive-3:=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/json-glib-0.14
+	>=x11-libs/gtk+-3.22.0:3
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${PN} is a frontend for several archiving utilities. If you want a
+particular archive format support, see ${HOMEPAGE}
+and install the relevant package. For example:
+7-zip   - app-arch/p7zip
+ace     - app-arch/unace
+arj     - app-arch/arj
+brotli  - app-arch/brotli
+cpio    - app-arch/cpio
+deb     - app-arch/dpkg
+iso     - app-cdr/cdrtools
+jar,zip - app-arch/zip and app-arch/unzip
+lha     - app-arch/lha
+lzop    - app-arch/lzop
+lz4     - app-arch/lz4
+rar     - app-arch/unrar or app-arch/unar
+rpm     - app-arch/rpm
+unstuff - app-arch/stuffit
+zstd    - app-arch/zstd
+zoo     - app-arch/zoo"
+
+src_prepare() {
+	# File providing Gentoo package names for various archivers
+	cp -v "${FILESDIR}"/3.36-packages.match data/packages.match || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Drun-in-place=false
+		$(meson_use nautilus nautilus-actions)
+		$(meson_use libnotify notification)
+		-Dpackagekit=false
+		-Dlibarchive=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-arch/file-roller/files/3.32-packages.match b/app-arch/file-roller/files/3.32-packages.match
index 09f1513968e3..b8f879c2d13d 100644
--- a/app-arch/file-roller/files/3.32-packages.match
+++ b/app-arch/file-roller/files/3.32-packages.match
@@ -5,7 +5,7 @@ brotli=app-arch/brotli
 bzip2=app-arch/bzip2
 cpio=app-arch/cpio
 dpkg=app-arch/dpkg
-genisoimage=virtual/cdrtools
+genisoimage=app-cdr/cdrtools
 gzip=app-arch/gzip
 lha=app-arch/lha
 lrzip=app-arch/lrzip
diff --git a/app-arch/file-roller/files/3.36-packages.match b/app-arch/file-roller/files/3.36-packages.match
index 0a26adebb250..b494f5430a00 100644
--- a/app-arch/file-roller/files/3.36-packages.match
+++ b/app-arch/file-roller/files/3.36-packages.match
@@ -5,7 +5,7 @@ brotli=app-arch/brotli
 bzip2=app-arch/bzip2
 cpio=app-arch/cpio
 dpkg=app-arch/dpkg
-genisoimage=virtual/cdrtools
+genisoimage=app-cdr/cdrtools
 gzip=app-arch/gzip
 lha=app-arch/lha
 lrzip=app-arch/lrzip
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 09ff56736b87..0c2dc30d8967 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,6 +1,7 @@
 AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe
+AUX libarchive-3.5.0-darwin-strnlen.patch 732 BLAKE2B d20ffd1d898acf1e69e2f275bec2beda0769569ac37e179604dc7d0a5eca8fda2a06aa5b3811e28f465fb34c2061d15aa8073110f703244aec02cfa35afd8087 SHA512 9f5b86b6dc483f17a1d909d88841e1f82f5835dbef0bdfc18ffb982cd5f649d87fdc22f490169eb827de654fbd469fda77a5ce1bc0748b48f3f46e77318e672c
 DIST libarchive-3.4.3.tar.gz 6990533 BLAKE2B 12f97e8e4032daf0fa8f9e1839f9c7ef80fda0b2a0ba703c67d860437fad6a293484a61417f72eff933179d544cfed45083e7886f462276bc6abbce1097e6256 SHA512 d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d
 DIST libarchive-3.5.0.tar.gz 7017726 BLAKE2B 651c9e28d1a1b0a6dd2dbd2aefa0a47ba23d5fb5e96c1bc8c059152952c284f089ce16626b9fbc2cbea70dac2d16ab949235bf4c28f38235f23aeb6da3d69f0d SHA512 9a3d4ce9d4bc856c8d85b846d9d0c9f30369393aa107941c202ba0100c6bac009952c92d809e6981276b3bf91e9f37d018e7f1446b17c0c1c316fe5aafe15440
 EBUILD libarchive-3.4.3.ebuild 3761 BLAKE2B 2d9bcb9f9e0d6ead67db818a64fb611ce6158b0a7b01f20aadbfcb73624db143b399c446e6b1797d25581f7fb89ffe3b9528377f72dfc96cf2f5db7a658e4570 SHA512 346b64cc503f74f0220d319f02fe8c8265c3468c54a5c09df23fd948be20262bd849a34648522f6774854afef004bfefef7fd3f0cc0ee52b1bd18ec99e978924
-EBUILD libarchive-3.5.0.ebuild 3770 BLAKE2B 4807869b7b89b14b1c97218ce92a316de81c806580049e134ebe39688d678462f0e8a4ee790c364ff0a3ec2879840990f6c337b5541e5db3e4f06ac91a133f1b SHA512 2aaa032adff8441721e42e6fe4de0787eaa9602f71f2e60735c6a0fbd388a0137f82e8058b1b635287d790774663575c673cfa5ba2a75a3f9940e81e903c2c00
+EBUILD libarchive-3.5.0.ebuild 3842 BLAKE2B d3ab821827e0769f33ba9d2a4e1b49293f9dfe31565a59c40817e13459904bbe040959ea5179c8a8eb47df6885359bb6f1c308adbeadaeffa2ac23f405cd630e SHA512 83aca2391ae164efa577756ffcad24164bb9714f64d08208c0396a893adb4bb9298ae7126b29a3edb2ba4f8b91048dbee8667c1417d4017aac58e1f228a64117
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch b/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch
new file mode 100644
index 000000000000..8f540e4aa07b
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch
@@ -0,0 +1,27 @@
+https://github.com/macports/macports-ports/blob/master/archivers/libarchive/files/patch-libarchive-3.5-strnlen.diff
+
+next release should have a fix for this
+
+--- a/libarchive/archive_read_support_format_mtree.c
++++ b/libarchive/archive_read_support_format_mtree.c
+@@ -65,6 +65,20 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_mtree.c 2011
+ #define O_CLOEXEC	0
+ #endif
+ 
++#ifdef __APPLE__
++#if  __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070
++static size_t strnlen(const char *s, size_t maxlen) {
++  size_t l = 0;
++  while (l < maxlen && *s) {
++    l++;
++    s++;
++  }
++  return l;
++}
++#endif
++#endif
++
++
+ #define	MTREE_HAS_DEVICE	0x0001
+ #define	MTREE_HAS_FFLAGS	0x0002
+ #define	MTREE_HAS_GID		0x0004
diff --git a/app-arch/libarchive/libarchive-3.5.0.ebuild b/app-arch/libarchive/libarchive-3.5.0.ebuild
index dde837017a82..d59eb05c046f 100644
--- a/app-arch/libarchive/libarchive-3.5.0.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.0.ebuild
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3.3-libressl.patch
+	"${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch  # drop on next release
 )
 
 src_prepare() {
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 1fd6d6ac29ad..104a198abb4e 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,5 +1,3 @@
-DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
 DIST lz4-1.9.3.tar.gz 320958 BLAKE2B 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c
-EBUILD lz4-1.9.2.ebuild 914 BLAKE2B eaf423bafb37abee6dc5424d551449c359ca6e70790bfe35c5b28975c66064e84981b8d238492ffa080a2674b2937aebe9bb5d87b020e40bf048b9ee4cf36beb SHA512 76279d4ea35b063ea239f0124d60a0abd94e818ddf7aedbb2f44b80e504fb502cb8dddfa49e35ac9058bc377f5d2aaa9fa4bd322f22ffaa269f940edb78602dd
-EBUILD lz4-1.9.3.ebuild 786 BLAKE2B a1a64359af76f08e3c4d680fa1335721ae1848f27b8c9e4c50bd377bd0ef1f7842548bbc1711468b8fefcb62f1fbfbbaca35d36ce2090e7bd18489ecc6091404 SHA512 e74609a8a8cb6228c84933a25dc43aa4679bf841936ed4b58df1dd7372f844874ac99ee829b0fca671077a4607ea720e056337a34c58218fcc897109fc4f7c7b
-MISC metadata.xml 596 BLAKE2B f79116c2ed40f870c688d9843c6d54da4fa6d33313d2a42d2d6162e1f2b5a6e93f119354a7ad97c67d66be6ba2437ffc0e91d6a9077fbc5b02b19420155375ca SHA512 bc5a6081ed4c2c6b7c7e4de5ef0ada5a4692e1e0833a01d8e596b7891cb2f612418350643ce6b764d8170b5632afc78143dd50bb4a34565384fd4b89ee34786b
+EBUILD lz4-1.9.3.ebuild 780 BLAKE2B c63913d2cd51de168093fb639c87d044dab88e693999d1c56ae50332c840366d42e84e301ae22ca4300a6ee8cec3fa266161ff2da162d3783c9ce95bea3bb43a SHA512 b82fe30f3afad2376b43ab7a498cd57625ea448daab7cf89301ac874549f509604ea83025ecbb85703a0cbcf249db5837aef4fc12f6a4d49be7e8c124205316f
+MISC metadata.xml 591 BLAKE2B 3f9ef90c2960812f5c52a94974f4d3f754f7e74b4f208760e0ae67f4ada77610e6f193c51305929115ea72c91f8ed9bccbf507e766bd1b10b86526aba8b1b58f SHA512 a70f2c2a1671f67612f8ccc7c58fde1aa1a1488c444477b212a4d368a70b2c260d3e123b221c850516c2f837aece2f10c8dc6d15acd26279dc4aad85cf5d9890
diff --git a/app-arch/lz4/lz4-1.9.2.ebuild b/app-arch/lz4/lz4-1.9.2.ebuild
deleted file mode 100644
index 6ac3dce5c2ff..000000000000
--- a/app-arch/lz4/lz4-1.9.2.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
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
-	EGIT_BRANCH=dev
-else
-	SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/lz4/lz4"
-
-LICENSE="BSD-2 GPL-2"
-# https://abi-laboratory.pro/tracker/timeline/lz4/
-SLOT="0/r132"
-IUSE="static-libs"
-
-CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-	)
-
-	cmake_src_configure
-}
diff --git a/app-arch/lz4/lz4-1.9.3.ebuild b/app-arch/lz4/lz4-1.9.3.ebuild
index 2e76852c156d..5435992739dc 100644
--- a/app-arch/lz4/lz4-1.9.3.ebuild
+++ b/app-arch/lz4/lz4-1.9.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2 GPL-2"
 # https://abi-laboratory.pro/tracker/timeline/lz4/
 SLOT="0/r132"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 CMAKE_USE_DIR=${S}/build/cmake
diff --git a/app-arch/lz4/metadata.xml b/app-arch/lz4/metadata.xml
index 694c0de63b6c..9ea2d62a4794 100644
--- a/app-arch/lz4/metadata.xml
+++ b/app-arch/lz4/metadata.xml
@@ -14,7 +14,7 @@
 		<name>Guilherme Amadio</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">Cyan4973/lz4</remote-id>
+		<remote-id type="github">lz4/lz4</remote-id>
 		<remote-id type="cpe">cpe:/a:lz4_project:lz4</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index a6957afb298e..51a6308e0ae8 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -2,6 +2,6 @@ AUX pixz-1.0.6-avoid-unaligned-accesses.patch 1253 BLAKE2B e852f1c991bc7ba282b47
 DIST pixz-1.0.6.tar.xz 119516 BLAKE2B 758a4985b946284587998ab2a653e51ded9838a7c77c7795c82c15c1693714468b07c2cbfd86a0c7ce7be34d9a5bd8fdc3285d503524ce299ba53179447e60ed SHA512 361a8d8b736c350e4e3fd19b5d36777129a087eb81439d05edc08f9378938583bef8fc70e440ffd22efb6dad1f6494c6c3e532d7dd1ab12c9350b6078aa993d7
 DIST pixz-1.0.7.tar.xz 120876 BLAKE2B 23563837169611d54dc4540715537b2e16c66bd9682097e4f37957e7422b487f221603b11aa30a39fd05c77dbeddc1697ac9ffe208d984c1da885a67f79a180f SHA512 7f343cb74958b9582b60a2e916243e72421fad1ebecc5867c9e046c881e8a318da9bb885edd71da8fe6953fd5d5c2f5119133cd0bbbf4d0f9b35f8aecd61120d
 EBUILD pixz-1.0.6-r1.ebuild 1181 BLAKE2B 46d6fdf0d1aaa4b1ed24aff66405fd92e0e40710f64a7d7afbe175e9d597ce4fbd56b63b264b5ab57f0640fb2bee0ae3ae3b33400635ddf9961c7aa33866782a SHA512 907db330a6197304585318a3dcee21e7f7a6656bffdc5cc0c6cf2824ecff29c20564bf680c77cfb196b9e3bd662b5471c2da272b57b0847da66a913c771415c5
-EBUILD pixz-1.0.7.ebuild 1161 BLAKE2B 0dfa4c22f5909ca72297c574b7418ba5e202763dfa09f4467f6ca89aed139b9765a578879cc92126922a4a230088c0f8db070b0ada0b34640293521ab1343fa9 SHA512 418e57b0aa7ce08351c0934e5d8c37cb2ce0e47077ccddcf1beca7830ca89b1cc27f2d1759d7bb0138923be789f61ac7dfb364b92383dbd2dc075f02621a5db7
+EBUILD pixz-1.0.7.ebuild 1156 BLAKE2B 5394a3a2b40a3aaef7269dbce0ca7c3f055de2ea76088c54c36faad45fa7c8ef91b437b611123ba0368369d5924a512c48054dd76579aaa59d3551db140bc243 SHA512 9a3064fac8e0f716292b3756e519f9cb0638d8daa8b1db88c28f7412b43815abede488d07917f57a62c4156c8d9b2e4d32cd6c0837a25863960356c43b4108f1
 EBUILD pixz-9999.ebuild 1161 BLAKE2B 0dfa4c22f5909ca72297c574b7418ba5e202763dfa09f4467f6ca89aed139b9765a578879cc92126922a4a230088c0f8db070b0ada0b34640293521ab1343fa9 SHA512 418e57b0aa7ce08351c0934e5d8c37cb2ce0e47077ccddcf1beca7830ca89b1cc27f2d1759d7bb0138923be789f61ac7dfb364b92383dbd2dc075f02621a5db7
 MISC metadata.xml 331 BLAKE2B 15bff5a59c7a5ff1dc23d59a9c9acda8ad40691a1b79d992ea05eaab0436e56cf0419f0e70b4e8dbeed37bee33735bb6700a85a2f26d50fd857cb38eb55f152c SHA512 54391cfef5b3719b7ad708cc7367740ba68f3223e0d92ae8ae5992ff127f41291fc1afa0d0bd7a1a02cf53b76c3817a57696a16ae535f8522e9d9249f4ddf401
diff --git a/app-arch/pixz/pixz-1.0.7.ebuild b/app-arch/pixz/pixz-1.0.7.ebuild
index c6564c5abe3d..3f982f690295 100644
--- a/app-arch/pixz/pixz-1.0.7.ebuild
+++ b/app-arch/pixz/pixz-1.0.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${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
 
 DESCRIPTION="Parallel Indexed XZ compressor"
diff --git a/app-arch/stormlib/Manifest b/app-arch/stormlib/Manifest
new file mode 100644
index 000000000000..064465930a50
--- /dev/null
+++ b/app-arch/stormlib/Manifest
@@ -0,0 +1,4 @@
+AUX stormlib-9.23-gnuinstalldirs.patch 1923 BLAKE2B ddc6edea1ba991b66a4a15625bdf08aeb0ab4ac356345551b0c35cfa69c2045ed68b3d27d0475cab728480a029df301048d2859652234602f63d32479c582daa SHA512 f266baabb6b5f92465139bfa14e9db83cf30831848f7d97e9ace96bded84768cea4bdf3dc1437b8b85fd86efaec13bc9f833a25854123310037ed80b514592fb
+DIST StormLib-9.23.tar.gz 605295 BLAKE2B 2489e309f218f3e5c5069b56856415cc5985efb2352f36a33530442d539c786262b7c55d134dd67db3098981b1ad98ce8bfa77a16f86d28f326831b09752b705 SHA512 c851159596e252b42facdbac9c52f7477c61de35b44054ab608a22b42e7dc3b4179f50ba9d8cbd30448ed7787cc74e7efd2e08faafdd91289136cd91399d4f09
+EBUILD stormlib-9.23-r1.ebuild 814 BLAKE2B 6a0e6369892809b7a0e5f50a1fdf645dd38a50d2889cefc9d37275cc6be57bad048ab75021b30857588b55a349e14af98d0956bd618cdfee6c21279eca1c67f3 SHA512 701b12cf8efb292390038ca5d80c04af5ecd8fb99b8eb462c9477a52073628313e8b570136c49b6964960d7f98b03edc00c12400f6d04422944f16874d9d297f
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/stormlib/files/stormlib-9.23-gnuinstalldirs.patch b/app-arch/stormlib/files/stormlib-9.23-gnuinstalldirs.patch
new file mode 100644
index 000000000000..66b8f91183f0
--- /dev/null
+++ b/app-arch/stormlib/files/stormlib-9.23-gnuinstalldirs.patch
@@ -0,0 +1,55 @@
+From f89f1341cf59f7098af985ecd683d5e0407d2dc7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 20 Dec 2020 10:52:34 +0100
+Subject: [PATCH] cmake: Use GNUInstallDirs for configurable install
+ directories
+
+Use the standard GNUInstallDirs CMake module to provide configurable
+install directories rather than hardcoding 'bin', 'lib', etc.  Most
+importantly, this fixes install on modern amd64 systems that use 'lib64'
+rather than 'lib'.
+---
+ CMakeLists.txt | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bd8d336..2b09191 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 2.8.12)
+ set(LIBRARY_NAME storm)
+ 
+ include(CMakeDependentOption)
++include(GNUInstallDirs)
+ 
+ option(BUILD_SHARED_LIBS "Compile shared libraries" OFF)
+ option(STORM_SKIP_INSTALL "Skip installing files" OFF)
+@@ -331,12 +332,12 @@ endif()
+ 
+ if (NOT STORM_SKIP_INSTALL)
+     install(TARGETS ${LIBRARY_NAME} 
+-	    RUNTIME DESTINATION bin 
+-	    LIBRARY DESTINATION lib 
+-	    ARCHIVE DESTINATION lib 
++	    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++	    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ 	    FRAMEWORK DESTINATION /Library/Frameworks
+-	    PUBLIC_HEADER DESTINATION include
+-	    INCLUDES DESTINATION include)
++	    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++	    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+         #CPack configurtion
+         SET(CPACK_GENERATOR "DEB" "RPM")
+@@ -369,6 +370,6 @@ endif()
+ if(STORM_BUILD_TESTS)
+     add_executable(StormLib_test ${TEST_SRC_FILES})
+     target_link_libraries(StormLib_test ${LIBRARY_NAME})
+-    install(TARGETS StormLib_test RUNTIME DESTINATION bin)
++    install(TARGETS StormLib_test RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+-- 
+2.29.2
+
diff --git a/sys-apps/hwsetup/metadata.xml b/app-arch/stormlib/metadata.xml
similarity index 54%
rename from sys-apps/hwsetup/metadata.xml
rename to app-arch/stormlib/metadata.xml
index 06ddf117247b..0319eec4c8be 100644
--- a/sys-apps/hwsetup/metadata.xml
+++ b/app-arch/stormlib/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>releng@gentoo.org</email>
-	<name>Gentoo Release Engineering</name>
-</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-arch/stormlib/stormlib-9.23-r1.ebuild b/app-arch/stormlib/stormlib-9.23-r1.ebuild
new file mode 100644
index 000000000000..484b8ef3e37f
--- /dev/null
+++ b/app-arch/stormlib/stormlib-9.23-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=StormLib-${PV}
+DESCRIPTION="Library to read and write MPQ archives (Diablo, StarCraft)"
+HOMEPAGE="
+	http://www.zezula.net/en/mpq/stormlib.html
+	https://github.com/ladislav-zezula/StormLib"
+SRC_URI="
+	https://github.com/ladislav-zezula/StormLib/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/libtomcrypt:=[libtommath]
+	sys-libs/zlib:="
+DEPEND=${RDEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/stormlib-9.23-gnuinstalldirs.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		# interactive test app
+		-DSTORM_BUILD_TESTS=OFF
+		-DWITH_LIBTOMCRYPT=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 76838ca079c6..9980440659c0 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -6,4 +6,5 @@ DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b0150
 DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
 EBUILD xar-1.8-r2.ebuild 1458 BLAKE2B 555288ffa046e123dd907ffc82149fcb8475d8e0523832843ada29a45e0a93e54c231d1ffc0fd0f34a11ca19456c38299a92c631ca07e521146c2408a625968a SHA512 56560c834837cc754a67b75a62e6a6d55e66e01e529013b418371dd241572b0cba263ed259750c2f4864eece26bb2d2de4d4925e575bceaf859b7f06b20890f7
 EBUILD xar-1.8-r3.ebuild 2008 BLAKE2B 8c75abf68299e7f82df130cff852346dbabd599b5fe65dcec09d57902cce9ce587d98a3731ca3011ae64d78d0c77919cbaaf84a8b50cafe52728fd04596d2ba1 SHA512 95fd1cefb6f5d117ce6abb5ca6c27d55a9c61186c570e8dbb7b9efe289f1c57a12e605153a235279c700b2a9d7c53393c80be86d5d9a72f97743264aba50f4df
+EBUILD xar-1.8-r4.ebuild 2460 BLAKE2B d1a502c4d69ed2fa1a63a056fb080122deac98861067e0712daac8e55c287bd3a1701c580a5b4acd1bf4ab52721a50bbba50d9a8aaed01687899d1161634bedf SHA512 39cdca2fe8601eaddd1a10e116216cbbb0cafa197058222ffb4b8d060b6cae34432b19f9f2723e5fdd7b4d2afb90e005767e461dcaef557e07a1e9363f50517c
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/xar-1.8-r4.ebuild b/app-arch/xar/xar-1.8-r4.ebuild
new file mode 100644
index 000000000000..6106c668f823
--- /dev/null
+++ b/app-arch/xar/xar-1.8-r4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic multilib-minimal multilib
+
+APPLE_PV=417.1
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://opensource.apple.com/source/xar/"
+SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libressl"
+
+DEPEND="
+	elibc_musl? ( sys-libs/fts-standalone )
+	kernel_linux? ( virtual/acl )
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
+	"${FILESDIR}"/${PN}-1.8-safe_dirname.patch
+	"${FILESDIR}"/${PN}-1.8-arm-ppc.patch
+	"${FILESDIR}"/${PN}-1.8-openssl-1.1.patch
+)
+
+S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
+
+src_prepare() {
+	default
+
+	# make lib headers available (without installing first?)
+	cd "${S}"/include || die
+	mv ../lib/*.h . || die
+
+	# strip RPATH pointing to ED
+	cd "${S}"/src || die
+	sed -i -e 's/@RPATH@//' Makefile.inc.in || die
+
+	# avoid GNU make (bug?) behaviour of removing xar.o as intermediate
+	# file, this doesn't happen outside portage, but it does from the
+	# ebuild env, causing the install phase to re-compile xar.o and link
+	# the executable
+	echo ".PRECIOUS: @objroot@src/%.o" >> Makefile.inc.in || die
+
+	# drop Darwin specific reliance on CommonCrypto Framework, for it
+	# depends on what version of Darwin we're on, and it is much simpler
+	# to just use open/libressl instead, which we maintain and control
+	cd "${S}" || die
+	sed -i -e 's/__APPLE__/__NO_APPLE__/' \
+		include/archive.h \
+		lib/hash.c \
+		|| die
+
+	# fix branding somewhat
+	sed -i -e "/XAR_VERSION/s|%s|%s (Gentoo ${PVR})|" src/xar.c || die
+}
+
+multilib_src_configure() {
+	append-libs $(pkg-config --libs openssl)
+	use elibc_musl && append-libs $(pkg-config --libs fts-standalone)
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static
+	# botched check, fix it up
+	if use kernel_SunOS ; then
+		sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die
+	fi
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 9e42efa94575..f16a652a82cb 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -3,8 +3,8 @@ AUX zstd-1.4.4-pkgconfig_libdir.patch 8322 BLAKE2B 2c7bcc57cbbf549919d0f7ce4538a
 AUX zstd-1.4.5-fix-uclibc-ng.patch 762 BLAKE2B 3ead6b2ca56a6109b984a7e4b73d80b8a92e10f8ff20547e27fe897d70dac7bff15f1acedf6cca3ab0ea9ded07c2cdb8ac2ee5665eeb7a095c742c5614c73604 SHA512 e4de6367b47b016d9a0179b57cc06c9e232d0a736e20ff0cf8132d36512a5a232d8583d91b1453f7a122d63b85df96688053f02552b2717ff2f22bf30a0c0002
 DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf
 DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
-DIST zstd-1.4.7.tar.gz 1817193 BLAKE2B 8a307fa7efca8baa45c61eb0e46c5b6eedff1459a9493d81ad7033b9050ccf96e39cfc0f5b913ea20fb64d5efa26063b70e36e6cc47077b17106f3b5135fd999 SHA512 720941fc484e36e2f2bd74f120966fc598781a7abb945ed2f553d4cb035fa007117d00b72979b037817fbaff60b0d72f698fc16561ccbd46b16ae2888b044548
+DIST zstd-1.4.8.tar.gz 1816546 BLAKE2B 950d03c408e9d3fc2081969553c46247a1b8c13a22542effbf70373625bbfeb2a810e0adf0e1c6180cef590e7a28487191b1a577982fddc7a00d1507b461efd5 SHA512 61ce5d61e24770e70c32680f32d58542d6a1b5cc65737256561d8e34c77a82c1d36c769c179da5ea8ed5ecb035b4a4af292b9717c65976172e282859a332137a
 EBUILD zstd-1.4.4-r4.ebuild 1840 BLAKE2B 09aa07c4d2a068cb60e83d9796c7fe636d9e97c72e1efe731a2a2dc1f559874e9fa68dd06684135d18fe9f6dc67dcbddb69e34dd6ef0a510dc9355221acdf2a8 SHA512 7c55534e5feffae25bc9d1cfc9475404fa2387dbc44b788084df219d3cd26dfde0e47ccc015d89ab13bef1c5d261d2942d5745862221685fe5b80eb6613a73f3
-EBUILD zstd-1.4.5.ebuild 1750 BLAKE2B 3718289304a862bc8a5cd78159409ea00847af3d11e8906a45061ad76ee3cda3cdbcc072da6f2a8e20e6594aed841533bedf1195d4d01b0e43530ddb176160bf SHA512 b745133038280fcd31de024704934bf72d619087ed7d48efedf64d47758ca4987c26b0b9bd0ffbaf31b0321dd08796ec8e2d6a70c1a5a9b136ccf33f08960fd0
-EBUILD zstd-1.4.7.ebuild 1757 BLAKE2B 0e35a47390e0040e064966609d324018db0683f911dee36b357d72cd52da8c250c55fa583a5d8468ce0eeb24589b78c85b049e1c7315303112d74f60c9addc7b SHA512 4186ed99f97c69a4434ffce087327fd32f7fb9455be786e82c83417bbfec018409dd1d3da8907c0112f2de6e5c466b5f46d93a1a5c51d6ac093d3c16cbcb0e67
+EBUILD zstd-1.4.5.ebuild 1747 BLAKE2B 7116dfad65c21cf1776300ddbaf2c929f0fda8527bae7c79089b0aafd78acf36a43c964bf60451e5260db79e3b9f356b2c19a94e5bb9f980cf9d3066d968fb8e SHA512 5e5b002084ee39c033d1a39d2d86589ed1f7951a9fef1347650b6c4e8b0a4b81e715d435bdcab920c08f6a5df2392b6e9df66e52d391def22438f4dc9c40152e
+EBUILD zstd-1.4.8.ebuild 1757 BLAKE2B 0e35a47390e0040e064966609d324018db0683f911dee36b357d72cd52da8c250c55fa583a5d8468ce0eeb24589b78c85b049e1c7315303112d74f60c9addc7b SHA512 4186ed99f97c69a4434ffce087327fd32f7fb9455be786e82c83417bbfec018409dd1d3da8907c0112f2de6e5c466b5f46d93a1a5c51d6ac093d3c16cbcb0e67
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/zstd-1.4.5.ebuild b/app-arch/zstd/zstd-1.4.5.ebuild
index 110b0378b776..4632ada403a0 100644
--- a/app-arch/zstd/zstd-1.4.5.ebuild
+++ b/app-arch/zstd/zstd-1.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs +threads"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-arch/zstd/zstd-1.4.7.ebuild b/app-arch/zstd/zstd-1.4.8.ebuild
similarity index 100%
rename from app-arch/zstd/zstd-1.4.7.ebuild
rename to app-arch/zstd/zstd-1.4.8.ebuild
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 206afa4ee726..6466b075b4e6 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/cdbkup/Manifest b/app-backup/cdbkup/Manifest
index 80b4b27cbf05..63c9566b2750 100644
--- a/app-backup/cdbkup/Manifest
+++ b/app-backup/cdbkup/Manifest
@@ -1,3 +1,3 @@
 DIST cdbkup-1.0.tar.gz 38252 BLAKE2B f16209fac8a4c64b628caf9770c67e944add326a7aeeec0b76a1018b8441fd7cfd92de1a657eb8efe0eb49f30fb3f0e135f090291d8c07da1fef313a81f4b0ab SHA512 f95a7540704c16a01e65397fb63b5b97011685c62d3c9a9b2e303470fed5a31f909cb700035466e89ccd181401fd3c19d427fa32c40ece1ba77c1dba9322969d
-EBUILD cdbkup-1.0-r2.ebuild 711 BLAKE2B f0242e29f54a329c823460e24a66d9c1f229cc76cd4104979c40b8451af0dbfcef96912b401bd9f12497108030b7ef0c31c1e39b59ae755d0de7968064070d3c SHA512 d7ba064e80eba0e7955b2de762350d1d87bfa00591f1a3da0c5105e205ea41bd9944cdf99b3d7918d14649afdaab960efcb4a5c533f07b1fa296a94aeda8d9f9
+EBUILD cdbkup-1.0-r2.ebuild 710 BLAKE2B 5621a7e85b63ed277e10586b6a99cbcc13d7ee500331c0b2b61cb770750ee6586202d27feb6eb7a9899b90955df3679177cd5206b92949d46763093d5c6ad934 SHA512 b33475e857a6d5081051fe24fb6e726de3cb940eadbb8bf0dfc0e0ca5e28ef7f9e3cfad53fb9a1398e8fa139ed367b9ec064bc42ac9ad6ff507cf5ceaa7d61e9
 MISC metadata.xml 392 BLAKE2B d840db592ea3cc9fe268652b9fe71d4fb5ce2637e4d0b97d1329d3e389678775677a530de9a31c76b0fd61667964d0a7899b899fa3d39d01b5ce39f2c4910c65 SHA512 12309a51f3fd6a5fe322a90d71cb554c07b1dcbe42aa5052f3b84f9e361dce74e90bf4915852b7d7d563488451f4e6148a9fc24bb7ef539178f4abc8f0805ff8
diff --git a/app-backup/cdbkup/cdbkup-1.0-r2.ebuild b/app-backup/cdbkup/cdbkup-1.0-r2.ebuild
index 3c748f2a7b6a..82f0538a7ffb 100644
--- a/app-backup/cdbkup/cdbkup-1.0-r2.ebuild
+++ b/app-backup/cdbkup/cdbkup-1.0-r2.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
@@ -12,8 +12,9 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="net-misc/openssh
-	virtual/cdrtools
+DEPEND="
+	app-cdr/cdrtools
+	net-misc/openssh
 	virtual/eject
 "
 RDEPEND="${DEPEND}
diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest
index 81ce58b4b27e..1d8937efb07f 100644
--- a/app-backup/rear/Manifest
+++ b/app-backup/rear/Manifest
@@ -1,6 +1,6 @@
 AUX rear-2.6-Makefile.patch 879 BLAKE2B 60db156e4ac420f6d370b65c4a32b503f0ad958f1f2d3e698fe24248ebfeb94ccada049f580b6099385ad39ce57d06a3d4fbf30fa4372d85b7df57281de8f15c SHA512 8d1e3329b768b153124ebbebd0d70ecac19fababaad92d7789474709f785f74adaea3665d8f1889c344e03f58552616a16b71f541a8077c7b41adcbd9fa54c75
 DIST rear-2.4.tar.gz 611731 BLAKE2B f7cb6955302e0be6178393a678f050729b827f822df91d28245655d414892f225e25125f7e3bfad080e139ddc9c728121894b4ebde48c4dff2a8071fb4a5d46e SHA512 8a20c0ffd913b1b4c27f6125c1ca31404daaceccb2bfff7932f1ea402806657252afc3f6719c75dcab2de18b7975f83544dac92f43a742654f90494454d7c088
 DIST rear-2.6.tar.gz 750866 BLAKE2B de803951c040bb85d4659fc81ffb9264b2771a45675aca4eb0a6318201802475014c2b760415ac61ab734286f5e1e84b0c858df166b9be356384a243a7badb78 SHA512 0b6deac8f1b4adc3bcfcd19e82b5e5719df1c1c2347e3dde9bb47b6086856ebf5d08e485b876633190bb6f92a0e1c567bb65a30554205a32eec4b929e5815a6c
-EBUILD rear-2.4.ebuild 848 BLAKE2B cb6d62e0984c11bbde7f61cea72f16b10119c98047341100b2c6e8dcdb25a02551f5f8683df2b4efc65727ba9777b057f388e28dd2a6df95bde3cc37606a960d SHA512 78a8fd39ea5df4f65362a33c5d18dc16e52cea47b0aeaaf10ada27eb0ed01679b0254c55bba318ff1464f9ca55c3dd606b99a4cb71c37956eb961e64dba099b7
-EBUILD rear-2.6.ebuild 1384 BLAKE2B 5f52d341548b80d46cd461a02c049c6c11947f2f6cd7d00b0ef9c8e7c8b27a2d1e0f836758cfa7bca670ff182af5553e2341d4eeec2f676b922b6d01dc96589c SHA512 f8feb2cec9b17a9726c693bbcf5c6cfcc2b685bc22abb2a22f053807b4f4e099da833cbfa3d54cc8a46ddd458ab0601877b926668add49206d95d4980e7290ff
+EBUILD rear-2.4.ebuild 845 BLAKE2B 4b0b46b7e0bac21849b77d41da8a442377a006fbebe868a53dcf2aaca4dde192ad5b95700112b800a3b55cb631901ffa32522be4dd094db87c8702f68ee4bbe3 SHA512 bd11af749e16c4c65ccf87a0f059c9c5b389b23b74ae6792b07b7667ad38198b3904357b4fa6597b18fce7405c43435b1c646e03111654fe7c474b7d32f5b68c
+EBUILD rear-2.6.ebuild 1384 BLAKE2B db9f7f3bebb2f3727bd0880432b8ae3735dfc94d310276e4ed1469869546f6d76f9c3aa1bd96140b6fd196497bdc7018a0dfcc6e4e3b1965ab53cad70997b88e SHA512 4f9d2114d74414b1679f3f3b01e2beb8fa7301935955f53ff41245415e23148311c7dd681811b136ff4d90d8cff651eb7f295e9a33fba70489eba92f4ff79769
 MISC metadata.xml 1014 BLAKE2B 8216e23c54712cf7b79858ef34b46a4f232aae0f9f3ccec5626059c07a0070445cc2db019badfb1129365d1d47de8b02d11107796f7e86d4889d39cc4e2b7a9c SHA512 b3b62cb4b708bf7fe291d5245eba04d53afca274e0e20f48f9291a7c76d64abcda07176bb9679b95b25e3246683157e5369f16535bc7b37f7a338f1b938e139d
diff --git a/app-backup/rear/rear-2.4.ebuild b/app-backup/rear/rear-2.4.ebuild
index 55b55d0c90cc..498e7a6f47ab 100644
--- a/app-backup/rear/rear-2.4.ebuild
+++ b/app-backup/rear/rear-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="libressl udev samba"
 
 RDEPEND="
+	app-cdr/cdrtools
 	net-dialup/mingetty
 	net-fs/nfs-utils
 	sys-apps/gawk
@@ -23,7 +24,6 @@ RDEPEND="
 	sys-apps/util-linux
 	sys-block/parted
 	sys-boot/syslinux
-	virtual/cdrtools
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	samba? ( net-fs/cifs-utils )
diff --git a/app-backup/rear/rear-2.6.ebuild b/app-backup/rear/rear-2.6.ebuild
index 6e4df5c99df6..79da6fa23dec 100644
--- a/app-backup/rear/rear-2.6.ebuild
+++ b/app-backup/rear/rear-2.6.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="amd64 x86"
 IUSE="udev"
 
 RDEPEND="
+	app-cdr/cdrtools
 	app-shells/bash
 	net-dialup/mingetty
 	net-fs/nfs-utils
@@ -25,7 +26,6 @@ RDEPEND="
 	sys-apps/util-linux
 	sys-block/parted
 	sys-boot/syslinux
-	virtual/cdrtools
 	udev? ( virtual/udev )
 "
 
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index fe37c601f3cf..be3ac5c1b224 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/bashburn/Manifest b/app-cdr/bashburn/Manifest
index 886033fb799b..db8b56e4cbe1 100644
--- a/app-cdr/bashburn/Manifest
+++ b/app-cdr/bashburn/Manifest
@@ -1,3 +1,3 @@
 DIST BashBurn-3.1.0.tar.gz 91295 BLAKE2B 98b813a78029becdd2b2167e9c0d318bb2d8aed6ed5d697047ba81cc4fb87795439c8f4182b53e5db0286a03028b489d0b6e73d5d4032d47eaaf2ea0b88894e9 SHA512 9bded7a67b762be89993a6a7564d6a32f4cac209f9d16a4a861a5a36db92eda6436c2b80b89d57c051bbdafb0549999e54ce6e26477f664481cf60092eef90e5
-EBUILD bashburn-3.1.0-r1.ebuild 1346 BLAKE2B 46502ddeae8726bba3b5512a89010443b72dfa0f9ac5380ff216a130d68a3bd5c05b202bc6db5bfc12e7b772fedebe28bc73ec7068f0c4f13352a0fa14d5a73d SHA512 70a48f14f109daff7b563a3f17ec6dec6a2af979c2aceabc1c66b47c211b4bbd2154aaa3abb49decefcbf800f5fc6b4498f78571475f3133ec482c34ae201a19
+EBUILD bashburn-3.1.0-r1.ebuild 1346 BLAKE2B 98ff776542708064808508680b348b24445e4711b03466876002c1b5ee2ca49af15907d243afcf08564f76aa9b7add11c797bac41630ccd46d65e51b96abbbd5 SHA512 79eb96a3166940ae61856e9fdd7117aa2c6417daf22b29878dbad613df99d697024439ca7d67d5c06ceef3743bbe0bac0d10df9a4d8240c0b4ee1d5cbda38af9
 MISC metadata.xml 570 BLAKE2B 29e9f0d65fb879b7abee7605a0627de25f37952bf81072fee9e9d4bf2772b82321d4f4750e812983bea4f77d718b908584af76582fbfd4574447e1ce7ead0b2e SHA512 4a4f80ae83dd1cdf986675bfe70800be286e9041933602739a44756d88a12ad129acea090d36d37460eacef32e375efcaa21d074f0e53b30529ee0987fa2d1e4
diff --git a/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild b/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
index d4b529bc22ec..d945b4ada648 100644
--- a/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
+++ b/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 
 BDEPEND="app-shells/bash"
 RDEPEND="
+	app-cdr/cdrtools
 	app-shells/bash
 	app-cdr/cdrdao
 	app-cdr/dvd+rw-tools
@@ -25,7 +26,6 @@ RDEPEND="
 	|| ( media-sound/mpg123 media-sound/mpg321 )
 	media-sound/normalize
 	media-sound/vorbis-tools
-	virtual/cdrtools
 	virtual/eject
 "
 
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index d469a3da8b1b..d571d975c4f6 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,3 +1,3 @@
 DIST brasero-3.12.2.tar.xz 3742120 BLAKE2B 42cc60d3f4e26e948321c34f2514172aeac5a1b2624e6b23f27cc9725efd5cf0844a54175161b4c94601bbd5c4a6f18ccdd62353e862eddaab17e0d164f4694c SHA512 14886e772123f179f79d3172b59e21ced990fd8834cd27e8717eb635a75163c44c1d5084818b53da559a0c2ef25e7c0da4a3a7d3781e2ea74b59cfe98987384f
-EBUILD brasero-3.12.2-r1.ebuild 1965 BLAKE2B 465d7dd1e994898970a10bcc7f98c352dc0902e6ada2712f85d5034a5397c56d38ad52c4b95559baf0a9317c3b63165a7ed8f3d77bac9208cdb894c3d7c5d852 SHA512 a06e610e8f9e5a76e1c13f105b07e72f1e8485805ade65c76b1edfabe6ad61c48e4e4e8f4372bdaf522658134a67ec238ca1eb3ea4e0127853fe09b751d5fd5a
+EBUILD brasero-3.12.2-r1.ebuild 1966 BLAKE2B 64356df46aec4079532b22f9e4a9f5ab68dc2d88e0d49c31acc4b776c87e51af1e99a9abe2bacea7267944097cfec49063afb44f294346bf5418d97ea66e5d93 SHA512 a9bdb3a140a76bfe07e795509d3e568297b18218a6dc80dc94b0097ba7f983964d8acbdda5fa6ff05466ee70abc4e1a55c212927985732476557e0d91c192d2f
 MISC metadata.xml 746 BLAKE2B cc74b666873593a356e42643f62e16a4919441f08ce9645e367ce5f52b6b3c3d0a2bd1a5bc64b49348239b04c7543a66993926d216a7ada19f2129417106e1dd SHA512 9824ae80fa067cedf46aa47f83d481b18704b94af6258657eb099bde328abae196b8f86ce7e92a800fea6b657b5a774afc37888fb92b560fda1403d8adf06c7d
diff --git a/app-cdr/brasero/brasero-3.12.2-r1.ebuild b/app-cdr/brasero/brasero-3.12.2-r1.ebuild
index 15af48340c06..917812f33104 100644
--- a/app-cdr/brasero/brasero-3.12.2-r1.ebuild
+++ b/app-cdr/brasero/brasero-3.12.2-r1.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
@@ -42,8 +42,9 @@ RDEPEND="${COMMON_DEPEND}
 	css? ( media-libs/libdvdcss:1.2 )
 	!libburn? (
 		app-cdr/cdrdao
+		app-cdr/cdrtools
 		app-cdr/dvd+rw-tools
-		virtual/cdrtools )
+	)
 	packagekit? ( app-admin/packagekit-base )
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/app-cdr/burncdda/Manifest b/app-cdr/burncdda/Manifest
index 98abe94e0f5e..98c815d25895 100644
--- a/app-cdr/burncdda/Manifest
+++ b/app-cdr/burncdda/Manifest
@@ -1,3 +1,3 @@
 DIST burncdda-1.8.3.tar.gz 23710 BLAKE2B 60e70eaa31d2c2eee2a3e3a874f28dde1fc1c4d221b9eb14119666f505f94275c78f4aa87b823ee7c926bb657492a0cbc9830635d2a3d781b9853ec8866c5caa SHA512 b0ddf9457ca9a1b8ad07b43aba4b5c6532ef09aae85b363802084bcf7bbb4d4bfadf980af98862dfbdd72e257d287f1e517323ebec7432be3514880e393e9f1d
-EBUILD burncdda-1.8.3.ebuild 713 BLAKE2B e420f819d332959355b55b3723c49bcab504c88fa923ef378fb8bca1f0d0642c31af6868d21fb04214e7965504175fca919d0dd7a36221c5163362075ea48074 SHA512 8f62740382d174173d5f31e048e3831a287d65a0025ccdbb4d4b546d84cf6872a2a4bde2f2322febe1349b8b669c01f8f9ed7ee54401b236f48132031b548a70
+EBUILD burncdda-1.8.3.ebuild 710 BLAKE2B a3635263c7054e6a305c68a8a68226094d04e96dd8729493a06e4f14c61ccfc3811ddefdd10e0367555c6a3c01c9fd7b1729d8d4bce78c2828672c4cb1bf031c SHA512 25e3f5322989e148592caf598134ad88db3258c67755b865dbe712c1f94b00b24d7460537fb3dcf681239402a5f3b1fff74343faf7148ca6b5e292f6242f0181
 MISC metadata.xml 527 BLAKE2B 9051fc1e5e9905f5e86eb2b8cc3cbfaeb1caa5e25ac730a45f63c99c7acdec20e49f004d3248efb7bbee886758b9ec350ffffc6c979c172cdb6898eebbb27da0 SHA512 7b37753fad3ed11f3afa59b31d51ae2a90336ebb16f22b20a8c1cbed06c4f430126708eb5ff63724204b6cb10489c966cae3d3cb6703b2d440c52c98ce987352
diff --git a/app-cdr/burncdda/burncdda-1.8.3.ebuild b/app-cdr/burncdda/burncdda-1.8.3.ebuild
index 0d02e2c31549..b782ab530772 100644
--- a/app-cdr/burncdda/burncdda-1.8.3.ebuild
+++ b/app-cdr/burncdda/burncdda-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,10 +14,10 @@ IUSE="flac mp3 vorbis"
 
 RDEPEND="
 	app-cdr/cdrdao
+	app-cdr/cdrtools
 	dev-util/dialog
 	media-sound/normalize
 	media-sound/sox
-	virtual/cdrtools
 	flac? ( media-libs/flac )
 	mp3? (
 		media-sound/mpg123
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index a91ac72b159f..b2e3878a02a2 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,5 +1,5 @@
 AUX cdrdao-1.2.4-ax_pthread.patch 16846 BLAKE2B a76c7c68c53a57731e652325d98f9f2ce434c9c9385e8583fb948fe2e1c120ad564a95bc247993493afbef1163206c30fc8a141d72ee723b3bcabb20a5f9f36a SHA512 83789963569dbaa599294bd79447e3351309675817eef683e2f90974d68fda00c705eca43c015128d6c6e9ec98f14bf7f205f8e3ab46f33c1bf0afaf0f055694
 AUX cdrdao-1.2.4-wformat-security.patch 4864 BLAKE2B fa300eefe5d714de0245a9e745d13f051dcbc14590efb33a367dd113474984618e62e347fc3cdc26a057169ff95bdde25b36d9b7bcb25aa9cdd5fd9b07a42ec1 SHA512 a40fd8c91fa207ad52f3cde9318fc4422f14aeea15bab4d2cd1e04d3f09a2fc2b666397cdbddc89245c97a6a98ac155c0ecf71c1e2993a366a21016bd337a33e
 DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09
-EBUILD cdrdao-1.2.4.ebuild 1276 BLAKE2B ab937b86d99dcf9f2e97a5f42bb88f54ecca1ebc30eaf2afa5e3bdd2becd4b219cae6dc04f1755d1e891d6d01ed94a42d3b6094e324ce2f4d24ddf7870a86c6e SHA512 2826430e12617ed865524ce4b70c21b250cd48b3d28d8c72f53758667082e9cbd8d2b484a8de7899b5b950323967f91de9e6157f137daf3f36b9e28f64975edb
+EBUILD cdrdao-1.2.4.ebuild 1276 BLAKE2B ae784b2cf7a87ff73009efdfb21adb805f292ac44fd9595429340faf82cb94f24f1019c4a552f81e2d085b8b8d2d963be541f8f15f5717dd4d6ca66003905788 SHA512 74b72d8c9979d868c49e4a25bfef8bb4555c76a183a8d6f040e4fca1b9e220d226964492767ef98cfbaf67093f4f386778cbd9cd4b8fc304ea38890117318fd5
 MISC metadata.xml 395 BLAKE2B 271ac8836e1bc4bd8b8405ab9fdfdaaa4046b47bb44b07bdb78d063853a82433117d69d4dd46e89b4f42008b55f10e69d8262340bd29fe396061add32ed9959a SHA512 66d6f12a07e09dd91c828d34941963b1a498e1be14f0cadcb145b47471e148559280fb237a68c1d99ba3c2360e0603a231f124b950b3debde76fe476a5491351
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
index 242e7767047c..89a6b02600a9 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="encode mad vorbis"
 
 COMMON_DEPEND="
-	virtual/cdrtools
+	app-cdr/cdrtools
 	encode? ( >=media-sound/lame-3.99 )
 	mad? (
 		media-libs/libmad
diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
index 14fe60c4a20d..57c70cee8925 100644
--- a/app-cdr/cdw/Manifest
+++ b/app-cdr/cdw/Manifest
@@ -1,6 +1,6 @@
 AUX cdw-0.8.1-fix-ar-call.patch 680 BLAKE2B a258766221e3be5eee1d8b1ed9670b09d6119f868caee45c2af72e6c83d44c9073b679162fe275d98e4aa5f8a0e1d558cee83b7eb114d6a7584cff6c88a90a54 SHA512 412da6962e86f263214e883935778cab987a0895cd633dda250a80155f5304350dd4c0682d0b3f262c8801b6bfd858349b44af08288237b5c0d53ef0cd4c0dc6
 DIST cdw-0.8.1.tar.gz 858791 BLAKE2B 971a5c69ef1452bb4fd02e74bb2a81492de5dc16c024d185c43bb19aa0e293b727e74f72ce73ef3aebcdb941500f95433dc6243f1171f68943b2dbe7bdc176f7 SHA512 08f6bac823f534987835f434190601d0a72df2246ff78bfe1af98fd30dda25edb8cf2e09161b3a0bc55e9efefbc453b409cc95fd3c117d447f07e49f79072e33
-EBUILD cdw-0.8.1-r1.ebuild 773 BLAKE2B be965818072076042539e98c73559d2f38034446019a24b1ca8e7a87727ceac103a7df491754165019979ffc47e970ecea816b71bb256c1e352c9b113f3e939f SHA512 7389a0b4a34041b1dfea66c984c94f4200f42b619cd356c849fc828813715e19f25caf1207b9fa1dead1b4dbf4f701511af0451e6968d641ce4b71c755fd3e3d
-EBUILD cdw-0.8.1.ebuild 683 BLAKE2B 6be4e48db38ceb81cb4c819552def61d7f96a8b35faa01d02bce8fde9e3915e2fe39cb6010dfd114c24836db2b2b34beed798203d7541022d6acef57a8271208 SHA512 e2f975ae1e5cba6b086d52fa104aa67d0acab99cf6b4cbc04a36880b12cde300d788fb41a7e65e37e2594ad009211d1106c377ed1fb0890052c63c9ed874b0d5
-EBUILD cdw-9999.ebuild 849 BLAKE2B 0323ea79202be7e1a0a90b614296e3542d5a9c906dafa65a52b346b62cd0760dedef8f35b09d4a458730b63417fcca8ad2bdd8720a35ec3efed4e9cd2ea6567d SHA512 d692d443175347a3719df1375897d4f94f99e6d3538521ea9465368646afa862c0531bce39f44d68a88fa761541a02326bbda0a9dd6b2eec0de2c5df22c8f5f7
+EBUILD cdw-0.8.1-r1.ebuild 773 BLAKE2B 21f23121e6a768553ba716406f5f6a85f2439ae89f72d3c544be6da81804966a2df259c22470608a50183afbff0dc3e612eda3915481eb7bf696806a1a2da9df SHA512 4a638e201cc290a51223f48eaf82a46b05e50ace89bf881952ab0e76e66fa38077d84dd8359e8a133bd53774110f83b2d6949f349629cd1b7ee774e37d7f1f1d
+EBUILD cdw-0.8.1.ebuild 683 BLAKE2B 7db6d921230dc4e4ef268c3d20399c428de148f5a1293593530f6f651736d3ecc9b6ae203d209a490890d4379e54e34f06e9857901e809bccf7108020bf79213 SHA512 4c0447b1797904aeb82b6137d1cb5be39a37510171dc5c7457ab796168ab6fa1a5560ad41fb3db5bde9420e415101e1b8eba12e2796f33e9c70f71f546a96bd6
+EBUILD cdw-9999.ebuild 849 BLAKE2B 90d2548a91d97e58118ab8d1bdd5ba50a36742c3ec35b8e163c3c35d46eff7d095c9a823a34c29cc1bff3447fe2c0234f6984da2ddaabbcbf55c1406ff81108d SHA512 a21229cfe723712d29c76746a3613c214ba6098ba13b3672096a2e756d203362fa4afb91c9a230d8e9f79328a3d59406159ed0713e9e3add5421f06ee6b2984f
 MISC metadata.xml 446 BLAKE2B 6313db12893912ba680ec7c27d939ba2fa7c81b6cb2d7132052b5a0eaf674ce7f71703a8ea8324c61fcad6101b6bbb1e07f9a857bdc1646d96c27e6110b6b495 SHA512 304f1a9a99962e295db23822a327cc5d1b8f2f049bcbbbe562a516a5bf5171b5d93a9886353d02dedc32d1d1220f519bff13c35a7c00d1463a6af4906ad63161
diff --git a/app-cdr/cdw/cdw-0.8.1-r1.ebuild b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
index c524d89d06de..317cc629ee9f 100644
--- a/app-cdr/cdw/cdw-0.8.1-r1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
@@ -13,11 +13,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
+	app-cdr/cdrtools
 	app-cdr/dvd+rw-tools
 	dev-libs/libburn
 	dev-libs/libcdio:=[-minimal]
 	sys-libs/ncurses:0=[unicode]
-	virtual/cdrtools
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/app-cdr/cdw/cdw-0.8.1.ebuild b/app-cdr/cdw/cdw-0.8.1.ebuild
index 3b50e3848a7f..b4597335f09b 100644
--- a/app-cdr/cdw/cdw-0.8.1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.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
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
-	virtual/cdrtools
+	app-cdr/cdrtools
 	app-cdr/dvd+rw-tools
 	dev-libs/libburn
 	dev-libs/libcdio[-minimal]
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index f23f85b84c76..1e52c861c848 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -15,11 +15,11 @@ LICENSE="GPL-2+"
 SLOT="0"
 
 RDEPEND="
+	app-cdr/cdrtools
 	app-cdr/dvd+rw-tools
 	dev-libs/libburn
 	dev-libs/libcdio:=[-minimal]
 	sys-libs/ncurses:0=[unicode]
-	virtual/cdrtools
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/app-cdr/dvd+rw-tools/Manifest b/app-cdr/dvd+rw-tools/Manifest
index 0e7ce70906c0..bd30ed42ad0a 100644
--- a/app-cdr/dvd+rw-tools/Manifest
+++ b/app-cdr/dvd+rw-tools/Manifest
@@ -9,5 +9,5 @@ AUX dvd+rw-tools-7.1-bluray_srm+pow.patch 427 BLAKE2B 5caea4e6afd1af9b0afd33e9cf
 AUX dvd+rw-tools-7.1-lastshort.patch 593 BLAKE2B e24b41b6eb39961568133f91a110afc87b26597ead0b623deb22bff11a40638bd5faca1de75b8289484889d2d2768077fd637dfe57fdb8bc9f61c1ddd6bed91d SHA512 554b1eb09a00e6bba38acc6ab983f3e0e810b919eb2205f9ee6473d83edd0fdd524e29b844f4c5a55f8044bb72457b2896a24488d691773a00aa355dd1be9975
 AUX dvd+rw-tools-7.1-noevent.patch 783 BLAKE2B 78f27d65759b98607ac6e3eb29ce44c2d88029f7fdaffd3a6d305166b82a069c8a8621b2c680bfbb3a9a2e6585370bc6c1503b4107e903f69099565bfdc0de8d SHA512 0df88a56b3b776934fea0caca1ac247b5b5416fa4985601ac7996633a833b4d264b334d6bb9c5d7587227529ee36a7f2087fad9f6851b4cde8918204d8718b47
 DIST dvd+rw-tools-7.1.tar.gz 140846 BLAKE2B e456be6ee8d1863e78abc6d494a1ce08a49e3aec9b45533408c33ff4620dfc450b968280ce0453b0c0d966f3afca0d23e1ed7e3497caee8216561ad85599b138 SHA512 938f9ec5597158af275c7bf63002696ba362f6f22a219108c6a1df28792f0485046a7af5ce57e41695aaaa0d69543bd66cbbeb4415df5c0e0a902a3f1d278a31
-EBUILD dvd+rw-tools-7.1-r3.ebuild 1535 BLAKE2B 87c7c1af66dffb6b9fe9d6c0bbc7264e6718d73b5ddf2bb6f5f780825cb79e96a49f4ced1cfcc2b200879786d73e27f7fdb4a6f1d80eed1827809305b57a4552 SHA512 6100514ba13ee7e65b7e41baf6da9bd98a3e46e78cbd0d48b4073852e237dcfa9e0ae73d0a27eb29f6a994e28185508c79b62d0d1dc7eb9973a5a909d284a921
+EBUILD dvd+rw-tools-7.1-r3.ebuild 1535 BLAKE2B 9266e418664e83e9420a0bb1dc367550c2b61f2422e224f5024ded0194c6933d79eb5781cb11391d6144e5af3f22aee8b49bea6e05f9f049256cbeb24121e5cd SHA512 c3d701aa8c6da697c6031d03532df6dec5f89f9adf1555f1a4708122b727ece5a4f0f5b8e8c6e07b35b5861c6714692f3c4e07861f4bea24a0721ee50a070d99
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
index aee2f063fd21..c797c1c67194 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="virtual/cdrtools"
+RDEPEND="app-cdr/cdrtools"
 DEPEND="${RDEPEND}
 	sys-devel/m4"
 
diff --git a/app-cdr/dvdshrink/Manifest b/app-cdr/dvdshrink/Manifest
index 9e0bf01a1b2c..3c62878d4d3c 100644
--- a/app-cdr/dvdshrink/Manifest
+++ b/app-cdr/dvdshrink/Manifest
@@ -1,4 +1,4 @@
 AUX dvdshrink-2.6.1_p10-fix-paths.patch 793 BLAKE2B 7bca779d2e17ed4388dfdf8e6798bf11111a3a25c3bac722f0a5e428b703ccaaad0cd83f8e906d5ed17d123745d073f12d83c130f03fbf38d8a13f981b85cf5f SHA512 8302a9e62b57346a107857c3c3b7095c5838771919b16d4f248c03582100fbb9ab3d55aafbe8b3a911dc1fa89c746a438a9da60ca77af7419068c5bafb9816a3
 DIST dvdshrink-2.6.1-10mdk.tar.gz 1087571 BLAKE2B a45427483b5519ee7abbc787e7afea2f9edcb49f8f6a15843184e7c62e51f7ebb18ad1db35ea695004eda9763dfc9b2a5522b7b4c279a2b63a71b96d091ffe37 SHA512 6766f95bd2bb29ef0877d9b22bc45eb2c508ad2d1a7bb99f84b3f858987fc098a696f15f953efe006bf9556a73f6aa0e6247afcdf8e4c5dad826ddba97f02c06
-EBUILD dvdshrink-2.6.1_p10.ebuild 1057 BLAKE2B f01d636320244c7ee4bf287a376bb8afa4e1d436501fd8ff590e0412fe6ae6e8d8155f94246bcd2c81c9f407eefb90214db7cbc8bd7f62a48e1a85d2eb438f04 SHA512 9b093d7c68411904176f8884c1aeb579a0b56f7c3d8ee8b2c93c032c446ac51f0d175a80c816a53d451918969c939eb2cf7832cfa4edb8aaf846e62097c5c0e6
+EBUILD dvdshrink-2.6.1_p10.ebuild 1057 BLAKE2B fb2aec0b5becdf5fb614772ea354e83b2f016ef7188738693f5f7989cda135c8829a420c9fac0eae4f0504f3028ee24e6d07565e1a4c079c6c7826dc993ec05e SHA512 8543b0872cd04663d1aa27bafb38c1fb7415ffe2bfdbc0c86295906a893f9eb06c6915b0881dca073619a55e00e8e12279763550349a931fd41eb07699a802e6
 MISC metadata.xml 427 BLAKE2B 0d25c5f4c9d81b6c2e3fefb76d87d1df9e975455fe0d55b241b43549cedde20ff538cff1472121c3a21f9e176a233b69890cd60e55e50018819467192aa4bb53 SHA512 c0a8f2ce1679df431c652810e91285db1f1602a281b432c0dfe5e013ff3d25c22ab23852991a0fdb9cbccbebc5d07d61cce10ffb235012cb0b0b064219d5391c
diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
index c7e5f5c4269e..e052a53b1fb1 100644
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.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
@@ -14,14 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gtk"
 
-RDEPEND=">=media-video/transcode-1.0.2-r2[dvd]
+RDEPEND="
+	app-cdr/cdrtools
+	>=app-cdr/dvd+rw-tools-6.1
+	>=app-text/gocr-0.40
+	>=media-video/dvdauthor-0.6.11
 	>=media-video/mjpegtools-1.8.0-r1
 	>=media-video/subtitleripper-0.3.4-r1
-	>=media-video/dvdauthor-0.6.11
-	>=app-cdr/dvd+rw-tools-6.1
+	>=media-video/transcode-1.0.2-r2[dvd]
 	gtk? ( >=dev-perl/Gtk2-1.104 )
-	>=app-text/gocr-0.40
-	virtual/cdrtools"
+"
 DEPEND=""
 
 S=${WORKDIR}/${PN}
diff --git a/app-cdr/graveman/Manifest b/app-cdr/graveman/Manifest
index 1625da4ae1be..605cea0dbc7a 100644
--- a/app-cdr/graveman/Manifest
+++ b/app-cdr/graveman/Manifest
@@ -3,5 +3,5 @@ AUX joliet-long.patch 796 BLAKE2B 308e8471cbbcd2767370c452417d64bad6839126f95a4e
 AUX rename.patch 505 BLAKE2B a7794bdc1a45b34fee773fb0482054b80506d7865c98e7c88f5995c3c4ee377086470d8288640f7e9686e208ba43e49ca2631348d709fa48357ceb815ec5218e SHA512 5ae9769ddd1c26a34d155d38ec2dede550e63be6fa7cb7f8a3cdd7b289aadce370c3f015bac91d0379b20f9f5a2265daff6f69b22350df9486b515c956d7abf5
 AUX sox.patch 1396 BLAKE2B c6f193498e8086111a90aa0811e4d3396c743722a8c31ac8286d37d3bf98d17bb12bd505574af2fc10633a796cdc5bf07924ebd7a2bf63e2fc8cb470feaa8ccb SHA512 545e3439a81e131a704c53e0c5a016d32a99e5bbda788ef5f3a6b1819cac7f4d5b98688e3738f3e6f1440eaba3a69efc1b2718edd578c9e4499166e4d527bd2d
 DIST graveman-0.3.12-5.tar.gz 962523 BLAKE2B b7650c79ccd379ede48d9b1a9abbb1504e88e787feaf7897f50509d92ff51171e366e99bba4c9f9d153d92b4bbc5970b9775064e7f482fb0b1ccf12e5e50c4e0 SHA512 c09ec1b5273411e61ee568260eb921bb10aafa90ccd0f4074228741c1f0470650368f96e595763d77b46c87fa4a038a1d5a3a022f8019afd5f772754f9636ee4
-EBUILD graveman-0.3.12_p5-r2.ebuild 1674 BLAKE2B 9de76d9cc919a3859e57e0eefb3b8310b370729ee22b73219f69aa0ba6ffe6de88f8988f376a9730b787229e21347f64fee77d9ded6c28e56a354c9643702cbb SHA512 5907963ae33523bb1eb1460ef9438d5240ba19a9f79f89f6d2c7ccda05e3112badb9881f3354ed43244990773622e91fa9462b31c5133ba75c468adea9c8d7a6
+EBUILD graveman-0.3.12_p5-r2.ebuild 1671 BLAKE2B dfd7db4044f5e0f72cd2561191cc7938d5c64e4ad7f60883d155ef0a32e02b85048c04c561b94998d220bfeaa8d98fc47b2553ec624067952967f326a8ea3d1a SHA512 db1f956b2c3d8588760d7bad8f651c0fadc925e3ef0faaa7860d25b7337195037809bc608d4d04af6e2b4b19920035bb8dc24c834c113649aac0f0360613a140
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
index f38d627c9490..bb2aeac49bd6 100644
--- a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
+++ b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,10 +15,10 @@ IUSE="debug dvdr flac mp3 nls vorbis"
 
 RDEPEND="
 	app-cdr/cdrdao
+	app-cdr/cdrtools
 	>=dev-libs/glib-2.4:2
 	>=gnome-base/libglade-2.4:2.0
 	media-libs/libmng:=
-	virtual/cdrtools
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-2.4:2
 	dvdr? ( app-cdr/dvd+rw-tools )
diff --git a/app-cdr/mp3burn/Manifest b/app-cdr/mp3burn/Manifest
index b6f2c5f00149..1b7c48df7b38 100644
--- a/app-cdr/mp3burn/Manifest
+++ b/app-cdr/mp3burn/Manifest
@@ -1,4 +1,4 @@
 AUX mp3burn-0.4.2-build.patch 450 BLAKE2B 495a56ba698a6e160583cdcdfff895f09cb478c9a7d03142aef5e4a038488a5127f0d8ad5a01f2ce2b4b351f5309339251c39582f49471b3865b182184ffc7a9 SHA512 0b3d88fb3d716da0ba97e4a041f7df3204c67b3033374f592a37d4cc9414ee6fb95fe7ab50b9e47036ba353c2382fe18cea5d8bc2993cfb374c93a31858f38f2
 DIST mp3burn-0.4.2.tar.gz 17166 BLAKE2B 099954b2bd5ba6ff2dcbdade63b7bd2ffeaf4c269eee9c856149b8a899ed995e131516446b80c905850733e385bb4f6cb52ad2cb15fe4306dce417cadbb359ec SHA512 96234f7e7a528b0073e3cb8130d5f606741532954e54de56757b4b0945d24fa72860e62ae1d78a13463ed8dca22848d99d49791957ba3c92cb60591d0f54f261
-EBUILD mp3burn-0.4.2.ebuild 705 BLAKE2B 63105038984bc944b75d49b76ec82b66e6102fef55cd01266964d9980e277cc72072394e820e97e7b377e7a80b4db94ea7eceec3df738268e3e73605180bcc3b SHA512 5ebe8e11aa4b933137dc69d9f3473b6d41dc81d2ebb158262bd549d3617c037fd048774b6831766b8356b25e323016b1b18ad959ae901cfb36b1909f9d78e079
+EBUILD mp3burn-0.4.2.ebuild 702 BLAKE2B e2a8ba047672e76cdf26c973a6f4c020abce25acde9bde05088ca87da109c495e42923da9de83e0fc328e87da59dcb83c4dec46d04fd05801eeb6d377ef4e54e SHA512 d75cfca9a5520d161a46ac749834fd6639f2b3f88a7e36acc6ed104d176eca593cedf4d8f7ca310ac37c80c3265d17228e30589ae620534996c80e1c60fb6f83
 MISC metadata.xml 244 BLAKE2B e3e13de16e966b5bf7cb78a5941c209f349ad3862e14028e8b48825b691269a8397f681ef076c017ef72c14d1adecc64f6a9582a20eaad8c002f5d254b4cdbd5 SHA512 5dadcff7ab9780843e5ff9b58fc515cfb20b2d19633112459a961e4fdceff3f6e17b3490ecb891d47d5f448500a826ff673b62709e91864e4f0d87c624d62445
diff --git a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
index c391931b7233..8c1183cd0515 100644
--- a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
+++ b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,10 +15,10 @@ IUSE=""
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
+	app-cdr/cdrtools
 	media-sound/mpg123
 	media-libs/flac
 	media-sound/vorbis-tools
-	virtual/cdrtools
 	dev-perl/MP3-Info
 	dev-perl/Ogg-Vorbis-Header
 	dev-perl/String-ShellQuote
diff --git a/app-cdr/multicd/Manifest b/app-cdr/multicd/Manifest
index dd4bb0070bae..0b3e4c5b99de 100644
--- a/app-cdr/multicd/Manifest
+++ b/app-cdr/multicd/Manifest
@@ -1,3 +1,3 @@
 DIST multicd-1.7.5.tar.gz 22437 BLAKE2B 7b355fb6a7a99322fa4c3502da7f3949ca372fdebff786ca239260129432596a8556c68d62184ec22ca1c4b1f31b1ab3940793f8656c88f6e1fadd75c96c18d0 SHA512 c17be38d36e0c81a5a230729bbf78c26bfc4e1288f959f6a176951b142772727b58e976e30d12beb05b835aa4126b5410f6f2f8a5aca4bbb89794d336c072b85
-EBUILD multicd-1.7.5-r1.ebuild 473 BLAKE2B d6079aebd43092ac316711947e140f55141a77729fae1234638bcf8b6da5e5baa61e213834b98f9931e11d217626178d134b194a519494dc8ff3a55aff1e6dd7 SHA512 ae46e61d90dff98ee5b3122dd64a88d6f7df04e04c7cb1f3ebfbdf3750c60fd0ad403d996bfbaeb10b3ae57309b712b09cbd706feabe05fb925939ea5048c407
+EBUILD multicd-1.7.5-r1.ebuild 473 BLAKE2B 1492453c3e9c37cafd7f06f778ecd9ea2001b5c2b2167351340e8b0ba57bdd367c0e048b35ee6a5dfbe0c6384717ac4e8d9c4148e479b7b782935ec71a03da90 SHA512 220e3680e807516c947484f8cd4794c8d20566e84eda0584f94d549dcee56f14351b7a8e86ad52d2c166910bf6ddcb4eabd2696f3cfd12680705f39c8148bc32
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/multicd/multicd-1.7.5-r1.ebuild b/app-cdr/multicd/multicd-1.7.5-r1.ebuild
index a0811c55ef76..aaba8ca308a8 100644
--- a/app-cdr/multicd/multicd-1.7.5-r1.ebuild
+++ b/app-cdr/multicd/multicd-1.7.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,8 +12,10 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/perl-5.8.6
-	virtual/cdrtools"
+RDEPEND="
+	app-cdr/cdrtools
+	>=dev-lang/perl-5.8.6
+"
 
 src_install() {
 	dobin multicd
diff --git a/app-cdr/tkdvd/Manifest b/app-cdr/tkdvd/Manifest
index 7dba05d7a58b..e05edbc4756b 100644
--- a/app-cdr/tkdvd/Manifest
+++ b/app-cdr/tkdvd/Manifest
@@ -1,3 +1,3 @@
 DIST tkdvd-4.0.9.tar.gz 71046 BLAKE2B 0253f9c891f6ee617ef392279a126b23e031025df96fdd261a440277724d910714db721cf0d92e8f20c6ce4df5a5ae5c7fac1776a5fd42bf73cb5ff31dbef628 SHA512 948cbbf98338aaf92e4e74e81fbd996d7646f6737a7adfad16063bd8747994e33e034b277942536423d9c099f85dec6649c2be6f1a0e1efba8da7537ea426820
-EBUILD tkdvd-4.0.9-r1.ebuild 803 BLAKE2B 72214a8c5f5aecf08cf62a894963cf9dd787930844ab00414991871483e3dc76ca1705b5c1532089ad2745815a00e8acc8749f2266ef64859d7f14b292437451 SHA512 2b8546dd82fbcf558ef752c8f3cc4e4b366ed28f392f06fae9a00acc2c8e596e8ceac9ca89613933a037c0af2821597c0a28d93c0eae2ff50e259539966e8fdd
+EBUILD tkdvd-4.0.9-r1.ebuild 800 BLAKE2B 4728e13410c05f400ad0c7769fb0f62bbfa6148e792f63638f69af9d4696638cef885a2388f3f0b1895e22411ef552c94ce8ef3092a3a09c405aa4cafbe1d3e1 SHA512 bceed84c447a61e86502eef8100d9edf0fa5484101fddcf6c0a16926560c32f796aa39ca18857e1cf0cfca85193dde1bc5aa44076fe03bb6ac26c14ed77c720c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
index 96e958e6843d..4370360dc7ad 100644
--- a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
+++ b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,10 +15,10 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="
+	app-cdr/cdrtools
 	app-cdr/dvd+rw-tools
 	dev-lang/tcl:0
 	dev-lang/tk:0
-	virtual/cdrtools
 "
 
 S=${WORKDIR}/tkdvd
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c0e8d2f7e134..291592d8739f 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 7cb402719a16..7172b8241671 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,7 +1,4 @@
-DIST libmd-1.0.0.tar.xz 254852 BLAKE2B af0d3c645a18262965e708d678cb30c7ed168af8055885b08084fafd7299e9aaea95efb8437ffa756e43c5bb75fac99af067c6a560f3bb2b8b93ee889d5e664b SHA512 54c3cae1308f7686a1f642d25ae5d8cfb0fce2b98b33cf5e2891682893715c7de7e9700c70a6bd7e4ab4cf7f54c87643b259319e09e03f529b70d273477fc8be
 DIST libmd-1.0.1.tar.xz 257372 BLAKE2B e954ab6b1247952abcf6964d8d714c2a47a644e206a455db547a0159a97ebbc323cf1258a24c744cea3106f267f1a319a689fe545b672580f4e134d96cc7cb3d SHA512 6f343101f9ad8f927d862e6bae948d35ba596ecfd375c255fefb86efc621cf6e9de3597770ad66e0a48e8f4ea018df78debb571ea6746a7457d8900fec87069b
-EBUILD libmd-1.0.0-r1.ebuild 614 BLAKE2B 9d33178bd6faa47c60573c9f1b067cb4243074b42b5d7bc644f6cbfd47fd492081b0a7bcb169db21f0fab0edf3d3f8caf5e500a634ac0292a479f9ee9d766730 SHA512 aa0fdde5ba65459296370927e0c179f55a8aa9abb67ee3ee03eb803dd7760b8c695b826f5a876d89e460c0157bf0cf4f8d2fd5b81ed4ca89cce2d97b1c91aa99
-EBUILD libmd-1.0.0.ebuild 386 BLAKE2B 03798470d2403edab2cb52c6dd7f36abf86ae1590642b7a46c5166adac60e272fae28f72f0384a2bf80763f2d814211b0aa4d562a43829a9236b1a47f4637107 SHA512 6a7cdfc8a8a1a271e328d03f60634b94e3901684af86659996b082a3ecdc858c7b8345d66edfcd0667863bb964f61d116ceb5e9850599409d362906692762b74
-EBUILD libmd-1.0.1.ebuild 656 BLAKE2B 53eae921ad0b8584cffc07c2d9ba30c2bff72a75de3e7d0df255bfbccfe5e7a8da392a93a5b2c66034cf3334899a94e5d1d4d288c1c637934a0e8b21a1e354db SHA512 486ef1462fbfdad1b2327ccf922d8d1cc910a67ecb5b82270f59da6fd6275c781ceb3ac72de440aa7a47e72921a98bfc7f653e6bdb7dee903093c28a66ccde5a
+EBUILD libmd-1.0.1.ebuild 655 BLAKE2B 277dab7e12e30f7d570cdad5f044efddb604d718d60bfddebdeb2da857b518cafaff7a3174e924ea073e666cad7ffdf6346a9a23caa73e2ddcb188810f8037a7 SHA512 c40343fc729bd8f3f2a4f793f627d970e2b5859bbb74fe9d59cd93982c886a0342fc4142f8f213173ee422f302b9c95670a6b25c5ced1698c2bd62c4b098a2bf
 EBUILD libmd-99999.ebuild 568 BLAKE2B f3e942f902160f0fbf840e0c082a3dd07f57c2fe1a9d785a5d7b26c429f2baf6be48e4420b65d3c6b9b15684d6043576e989b15d188a167b016f8d404669d59f SHA512 d8479e0df2f68c33deece78037021a2dd26d75ed623b3fc486837b6bb53bd33fb49d4401e9dc5f938f161a296adeb2e7da8ca6294aaed56b8f9e8adf2fb2f759
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/libmd/libmd-1.0.0-r1.ebuild b/app-crypt/libmd/libmd-1.0.0-r1.ebuild
deleted file mode 100644
index d27a6c00ff63..000000000000
--- a/app-crypt/libmd/libmd-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Message Digest functions from BSD systems"
-HOMEPAGE="https://www.hadrons.org/software/libmd/"
-SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
-
-LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/libmd.la || die
-	fi
-}
diff --git a/app-crypt/libmd/libmd-1.0.0.ebuild b/app-crypt/libmd/libmd-1.0.0.ebuild
deleted file mode 100644
index aed0b60e74e8..000000000000
--- a/app-crypt/libmd/libmd-1.0.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Message Digest functions from BSD systems"
-HOMEPAGE="https://www.hadrons.org/software/libmd/"
-SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
-
-LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
diff --git a/app-crypt/libmd/libmd-1.0.1.ebuild b/app-crypt/libmd/libmd-1.0.1.ebuild
index aa6fb0663b15..0966fdfe7510 100644
--- a/app-crypt/libmd/libmd-1.0.1.ebuild
+++ b/app-crypt/libmd/libmd-1.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 31663e50eda2..10b833c7a727 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -5,5 +5,5 @@ AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
 DIST rhash-1.4.0-src.tar.gz 406433 BLAKE2B 2af437cd3a049bb9473825026f8a6476c81b4400a47638c62ee3ecb3d3984f7f9fe97def91488094a2919e5baad967d3f49ec7d95363896e270251ad085bacac SHA512 2f02487fffe8d1bc70c4454829bbd250a15fbd09db5ef85c54d3e8ad1008e84616ea54483292deae45047a27964e27b26d9b3da8447e7c37dac1e2ce18a63a07
 EBUILD rhash-1.3.6-r1.ebuild 1906 BLAKE2B 2b42abc2249717d46bf80a29ec189ce359dd414226ad895711fb91fcd11f30d8adfd695b0a58150ed810da03c5b859fec103691038b94d8f3c785ad63d1fcf4d SHA512 372d233a7507b52c8dd1a919afda5d4d61ba3bf6049f744d98e417570739491d8f6079723d7c86bc763cc31fe4dc408304148297bf079f34f02439c66b2851ab
-EBUILD rhash-1.4.0.ebuild 1770 BLAKE2B a215201bcb73d09e8c4c7196680128d66fe00bf5a84a232474cb7fb2c562906205234b480fe5b5040f19cb7739856e6d10c88624cc8e5246edfed3eb16dec302 SHA512 e7ab20e9d6e52cdaba729694d71ff05e00f59bf5755dcf9403139b309673a0239aa84427615b9d4967466278e983cb91d7b100c2621acd15773be9b6fd7a25d1
+EBUILD rhash-1.4.0.ebuild 1945 BLAKE2B e83ac65e2b39812c7788c2f4ce4808f0643a856ad4fbbf5c6e5c738ab375316441db36978eaac7a202631dc450c40f9394c4a3a2ee034ce02b317a7256e54d9f SHA512 c5b69afb6517a2a4ab5d036b86815332e532dc5e74b67ddc9957ce0596a77aa9c564161ba95613f6ead781f416704c8eb626e0bf043fca2d53508f7982657518
 MISC metadata.xml 816 BLAKE2B bb6057383b42281881b70331deed4070724bf10bdd00eb8329d3f3133329aa47d8d64ea66c70500dbeb8f92995f527b012dfeadd96d5c2a1eb73ff0ceb20f43a SHA512 ef3d1b671c08f7f1e1394675f626fc399a7a07dbefaa1a4ef1201052db524f2063efca3470b0d4f58a03cb8a49bb086e37b0bb8357cfc761107b1d6563e79263
diff --git a/app-crypt/rhash/rhash-1.4.0.ebuild b/app-crypt/rhash/rhash-1.4.0.ebuild
index e777c4b21ffd..88a8e3ebfe3f 100644
--- a/app-crypt/rhash/rhash-1.4.0.ebuild
+++ b/app-crypt/rhash/rhash-1.4.0.ebuild
@@ -32,6 +32,13 @@ S="${WORKDIR}/RHash-${PV}"
 
 src_prepare() {
 	default
+
+	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
+		# we lack posix_memalign
+		sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \
+			librhash/util.h || die
+	fi
+
 	multilib_copy_sources
 }
 
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index 8216e037ca9c..9d02ea2ba710 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -6,5 +6,5 @@ DIST signify-30.tar.gz 94593 BLAKE2B 2d432cef9990a8ce23d0f05449ef02dcf7a00f4328a
 EBUILD signify-23.ebuild 543 BLAKE2B 4af7771a8feba476774c635481a7458ff74066d60dc1d51d034892e574ffec1349791d51e028e3b7d4bcccc58c7f067eeaa0a238822a9d7c727618826ee928bd SHA512 081dc53f0b48bd58f4b59101e59ec9f64fe641824142f056820e61107937c39283a5e33f2ce32d711fc46c802557f142f627f754d5b6823f2d0e16fd4ba1c5e2
 EBUILD signify-24.ebuild 540 BLAKE2B c9ad33a60f4d8e2d5ef7a3f8945e722eb06d1c29f9947d24a93433ad54249860ff8a1f960eef2e31c618c1af9d6f7dd92ea6bf8099694ccc7c92aafa097ca46b SHA512 3792038e4d522c6ef7d30d3c6569f57902524f04e5c8cfa5f3868f491eff6094d163294f0fccbc5338acf1e398dabac3140f6ebd68395f142ff172a649a9eca6
 EBUILD signify-29.ebuild 551 BLAKE2B b91d56242ee6a5f33993e236bc405dd1ca92cf3cef64367aa4fe6d15de963c5dd6a71f6155777d0f1b7a50d2d243f46e54d876decfae931d51514d3e020e22b0 SHA512 f446097bcfd19cfb28450c98aa46b850d036e9ef68518912193f0cdedd08e0c5647232740f464c4f51bb13c712ea1814bddf393575712cbddb905cb079188825
-EBUILD signify-30.ebuild 611 BLAKE2B 2c42ca588c3dc61c633d8aa790af8fa7e16cdefc383ef97ce200e5f31e0f9b890d3fc83f8c80df126c78f0a9a88f768f083cc4026f4cf466e2d3e7f567c0b8be SHA512 da4b922eab992f4d9425ad40e08364a8334786a40c8cbb3ef11f48c4d35200c834700a3a1277ba0e3b138be1ab0691e48eb25fb8cc7c6dddcc8b9b990b12b6ff
+EBUILD signify-30.ebuild 616 BLAKE2B 970eeb3f56883853c77608f81af3f712d8057bb71cd5c99565a551a5e1a267358cf21e52c9e020461c8cfff09b18170cb3fb26645e8c811f9694e3169494de89 SHA512 3973c9115bf57c8582575a3791dae541bd3125241b0bfee2c046c795e627d818db8910fba83acb997fc8c27525df172908c136435006bc3fd4da571d5611f0b1
 MISC metadata.xml 328 BLAKE2B 48c8809b13673350e0ed718437f90815703eb6977ad40b8ca9a2f17b3b51e4d412450a31e58369f49c14e3a3d20a704840ec3efd6e03b9b377c8378598150dcf SHA512 4958752eab2ed703ddab429c46274a605a4954a4da92131979fd988ece5a5a68d944feb60cd4a21e2b6cfdd320fcc00ea631c8befe4cf620cb6b4794e6107560
diff --git a/app-crypt/signify/signify-30.ebuild b/app-crypt/signify/signify-30.ebuild
index 474220e8fa16..01339391bfa5 100644
--- a/app-crypt/signify/signify-30.ebuild
+++ b/app-crypt/signify/signify-30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/aperezdc/signify/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=dev-libs/libbsd-0.7"
 DEPEND="${RDEPEND}"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2f855104bb3d..972cfd210d88 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 8a827f323225..47701b827549 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -13,8 +13,8 @@ AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2
 DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb
 DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7
 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
-EBUILD libguestfs-1.36.13.ebuild 4169 BLAKE2B 653bd435a28ae1fb1d31d5b41441f1b397795392a7e5ffc9bd3f6dc7c2b1092913a9d87e8eeb9d9aaed14c0790c336b3706c265b78c653c7acfebb69040d71df SHA512 eabf43897b781557e3dd9cacd95f6e1d219ff9c2c5190aa43b7744fb802c8f09e354c3c3e88d9753747996b31706df11cfcadcd73f17eb24b50795690d1642d0
-EBUILD libguestfs-1.36.15.ebuild 4373 BLAKE2B 568051405020f0e4f14364c13ad7d02c82f7b904652f5c85ed25fb285cffa03ee6a608cbfd4d2249c8b26639fdb6205e78e362c10fe6fd32ff27af5da3a1164a SHA512 5cc73e4bc948fccf00b19c3fc874aad22ca4e128dfb6d705bb0593d99de11f5060d34a194f1611ca029906d9c0034da60b8e3035faafb9c85e4c86bc4daa43b7
-EBUILD libguestfs-1.38.6-r100.ebuild 4346 BLAKE2B a55350a00df69723758b5e597ac5d5451d61bf07ce285c61464626dba64f7e7df82d617ed5c89e618a4c2d7d00ada45bdf7936032dda59b9be0ac5ace8a6c17a SHA512 fc61ec2a70964510ceb4b8f42750dc6ba8a10d5ae4ee6abb2537a18848d95855b1dcf30e114bb1723252abc091f094671d84ac4cd921f5cab46c9a641e79484c
-EBUILD libguestfs-1.38.6.ebuild 4108 BLAKE2B 3a771d3ad03b10698b9bec292aa90f079e046abd66555f35e59cce3cbb8619a3bca15d6250fb8d3782a171347fa6844f30001e2d474641993abbb0cf7948d9b4 SHA512 ce75e3702715d6a3deaa0cc561b9d5a65de5f77fb22c23ef43ab135d20007a0112681071b4de061423ba5098aa6c98479bbc8aefc0bd3a721ac90971dcce0fd1
+EBUILD libguestfs-1.36.13.ebuild 4169 BLAKE2B 9bff5ec22e19a3fdc6151a703ab59b983a6a9f2a92d9d4da486e6c44fbba77f4c2ea089f267c2d1f045ff74bbabe5c3c42e72844baaadc14fc7c8b0ac42ccb7e SHA512 3cc7013ca42c13e60039b6328d5ce0fef228f0ca400e4a6a72882512bda387117466a7d368d0980fd38c4c0288b3dc50fc6dd2af1bb26dbab5c566063fa90417
+EBUILD libguestfs-1.36.15.ebuild 4373 BLAKE2B 4266e0cf2c4755879e78127c28b7442ffb7b12ccd3da62437661c7242f2e7bf0abaac0b2e62d30f23043b275451bfb6cdc5e55e1fc909cf31a51d0ee9e48239f SHA512 908a69ae90c178884fca7a9932ff790b721d932ed348fa874356f9f710bb0dffd6b155d76cb1d5e57839c48ab0d87e4903ec9ebe9a6c278f9df18129c655a1c5
+EBUILD libguestfs-1.38.6-r100.ebuild 4346 BLAKE2B 42199953bfc61d8022161dbb24f0dac352a32013edf574211e215e35e8823d9778e724b152ca81c0053aca08e60b6c13e9ce308e974385c7d29f9d1a83a4e0f1 SHA512 a334bde422c984357077acfada734809135e638f33fe716d705738526e2e07877a4983ed184e96a975f951b76537568bec543c1a635a85618f7033d21b9216f9
+EBUILD libguestfs-1.38.6.ebuild 4108 BLAKE2B 2e059e6e858b462653827a71da9ac263ff4cbef317df7d00cf9554c1409a249894652b7b8c0dcbf3f33d77a9ddfdb0b4061467cef537bdddbd4ac589966b5d21 SHA512 01edb567f0230ef1fc554a82c67b7a3ae54730f88d5f9894fa3493f9643d640ffc6b19a013dc8a80836a51b86760cd3e100a364b1fb809580f00a613a4999489
 MISC metadata.xml 845 BLAKE2B 002345b189789a28d74b674c9f32cd5b6793cd84e50fa3f54212c0d05ba6463ffcf75629f2459979dd20a85312018054325660b16d4df04e87222b5ce9ac95c9 SHA512 c32515f853783a1935a2285305e1b54e7309be52b6ac3cd4084a26b28f2b53c4378faa95ae3e24e6b0349ed1e84c46df0a5337c258e3726870aa7d45e3ed5366
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
index 7d1a1bbe48bb..a9896d1ca1ad 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	dev-libs/libpcre:3
 	app-arch/cpio
 	dev-lang/perl:=
-	virtual/cdrtools
+	app-cdr/cdrtools
 	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
 	sys-apps/fakeroot
 	sys-apps/file
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
index 8ec3e24990bf..7ec4be7a95e1 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 	dev-libs/libpcre:3
 	app-arch/cpio
 	dev-lang/perl:=
-	virtual/cdrtools
+	app-cdr/cdrtools
 	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
 	sys-apps/fakeroot
 	sys-apps/file
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild
index 833f7102526c..5c28a6fd58bb 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	dev-libs/libpcre:3
 	app-arch/cpio
 	dev-lang/perl:=
-	virtual/cdrtools
+	app-cdr/cdrtools
 	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
 	sys-apps/fakeroot
 	sys-apps/file
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
index 15cebc77a632..9828f1232d0b 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 	dev-libs/libpcre:3
 	app-arch/cpio
 	dev-lang/perl:=
-	virtual/cdrtools
+	app-cdr/cdrtools
 	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
 	sys-apps/fakeroot
 	sys-apps/file
diff --git a/app-emulation/qemu-riscv64-bin/Manifest b/app-emulation/qemu-riscv64-bin/Manifest
index 3cbc9573b27b..292bbc95ff51 100644
--- a/app-emulation/qemu-riscv64-bin/Manifest
+++ b/app-emulation/qemu-riscv64-bin/Manifest
@@ -1,5 +1,3 @@
-DIST qemu-riscv64-bin-3.1.0-r4.tar.xz 889764 BLAKE2B 888fef2f27f44be098e9b834b083558ce18d98337612b4de2278ffe5d6599248d9ed4e99153ad9b2c1a5b773131c420bb23ce6d080943af744df34464660bc42 SHA512 bc92110f6730c61bd39056d0bf3f84b35ed340a47af51b28b27554f9f2f72409221d2c81826b718742475d0fc48040c81e8f051e29b4f13412c3a39e282471e0
 DIST qemu-riscv64-bin-5.0.0.tar.xz 922240 BLAKE2B d4ff41c8e45ca99bc1b9e795d9e218b05be283b32d179e8ab88d07bd333a52fce7893739e6572219083d5d56a7abb7cc1870df7c585ca41af15b56a5dc30369d SHA512 1ba28679ce4bf1f11b77059dae8cb76f0095cc4427159d769947b8a1b1212c9de0a25a236c69ff9780dd111a22fa6e01519a3017b0b0a5d29069575501552f40
-EBUILD qemu-riscv64-bin-3.1.0-r4.ebuild 489 BLAKE2B c8c05afb49827fc776fc4569f51fbcc18a43519241dc580afc58b6e8cac09e31e3a82224fc6ebce7beef913a3794da1a9f9ddb86b2b01c4c5a8254f2e07e9ecb SHA512 a93aadc16237a744e0edd22ba11787b3867a25a402b560ea5ed5ec6e5104d9e1f88c66ce3b562fb936f416bd4088e4e74d687b418e40377cc8485a341e09dba1
 EBUILD qemu-riscv64-bin-5.0.0.ebuild 489 BLAKE2B c8c05afb49827fc776fc4569f51fbcc18a43519241dc580afc58b6e8cac09e31e3a82224fc6ebce7beef913a3794da1a9f9ddb86b2b01c4c5a8254f2e07e9ecb SHA512 a93aadc16237a744e0edd22ba11787b3867a25a402b560ea5ed5ec6e5104d9e1f88c66ce3b562fb936f416bd4088e4e74d687b418e40377cc8485a341e09dba1
 MISC metadata.xml 479 BLAKE2B 9073a68b14d921d5557835e3f3518f3e35688452310d8d9c89233abca25277588a67eee0641e0cfb8afb7951fd29281ca7add9a20ff45acae1f3532ad051e862 SHA512 78d7fa09208d0cb1c6bad33a92d059858d94939821147fa2f095b961bee64ea29db6dedba6e68dac9db6ae2b985e3c8462d56bbe079fbe074c623257a830b6ff
diff --git a/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild b/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild
deleted file mode 100644
index 650e2af57e19..000000000000
--- a/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Statically linked x86-64 binary of app-emulation/qemu, riscv64 emulator"
-
-HOMEPAGE="http://www.qemu.org"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}.tar.xz"
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="!app-emulation/qemu[qemu_user_targets_riscv64]"
-
-QA_PREBUILT="*"
-
-S=${WORKDIR}
-
-src_install() {
-	dobin qemu-riscv64
-}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 09f7a5741702..1533f7283cfd 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -21,13 +21,15 @@ DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b9
 DIST seabios-1.12.1.tar.gz 613450 BLAKE2B cb926b650c41a9962db407945cb5b6558079b061bd61f32ea56aedf0d37a00d10ad4434acbe717ffbc0dd1d1c0767304af8e640a53b0fc3784969dfa1590f681 SHA512 58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0
 DIST seabios-1.13.0.tar.gz 620952 BLAKE2B 460a7dd2b2775b981bbd890ed0a50fe905794c68b0b895799667dd1378bb84125712330c2f6945112709d42cfb7b01196c7fff99051e44b6211d47d19531cfae SHA512 7f158badf7deecc2998eab2a08f3615dfe5a7c0a51323f7b4568a4d1280935bc32bb466c8226d87d2ca7e13f9f117ff0092befcc0699bc31c5018e84754e8393
 DIST xen-4.13.2-upstream-patches-0.tar.xz 15404 BLAKE2B e4f679e4281e4edfe4f1e7722c19a973461b9a6423828f17719dfd766a73ef61a74b1cd87f375e2b0c2ec9cbed7b6a0f12c4a9982bbc325cdbba4c70a7145248 SHA512 122fe404f9c19567016e43208ddd08bdac56e7f264853d6cbe0929650fc4ada7175cc24c0e4fbf088acab77127eb76454948b98cbc731e35a12e1b068a5fd793
+DIST xen-4.13.2-upstream-patches-2.tar.xz 58992 BLAKE2B 535d67ae6a30e23feb975172a9e4abd6d7feb6c8c969aa243fdf672ed6580fe46bf57ea5530eab70457e22af9163f95061fdf97d10faa3be9f4c92033187c950 SHA512 6b6cdf72d13c0e595be65e3107c0f68299e932b74d4a1c4d59bfe3be8b76840c47f6adeaddd0efac71d5158cee8d778a0be863eea8f032cb9acf4191f629d8ae
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
-DIST xen-4.14.0-upstream-patches-4.tar.xz 79204 BLAKE2B 54d3ba5eac263d78c052cdf2b7958662dc29f689f03d03692c20c881a6b520bf08c86cf830a2727c2a2249c256aa0d06dea75496c8ee6699361c86c3f91bbd83 SHA512 c18b43a16e225cd1c50fe975fa1daf414e8e5fd47e4d3c9e2c655001ae59ab6fed5d332e5f34acc4f01b3c9d42bd425a86e084a4eb22c360257689aab3fe6825
+DIST xen-4.14.0-upstream-patches-6.tar.xz 119116 BLAKE2B e3a0f807182d32754c6ae2000324237117cfa66c4a43c27b583b6aef69a3889949779751b71a87b2538f679fb481e8a723433950c689f28a8c2e96278c1b0ddb SHA512 03b1fdc08e74756001fbb0de4e21297456f63615e6f63b8f360f8270ef85b0d50c3872be41cc26529ed0d91d82ffda2af53882b7c5233113f223a4ec813a0d5b
 DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0
 DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d
 DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B e0da49b39fbc6b689db47e40a4fbb4f6568644fe192b114cce01b0406cba4bf23339ad1bf39b972f895df004916827b6e774f97fc079aeb8ac436763efda5fc3 SHA512 5b7959af4ed30edd2526698ab60a86353e35d9dc48dc941b6df7659a7c4904260461e0decbd8d788542bd69384736f2175861d4943c3738618d20788b19ea9b1
 DIST xen-security-patches-28.tar.xz 1580 BLAKE2B c304894801b37259508582fc6947e26c0b8665e982d91de86c16efd5eaecd6c9bb19570534642d39e81175fe58baccf576990a481f40f8848692d3465ad17a85 SHA512 b442b5568e76e0f2a5cfc91063515b96347f8b30f6101a81536b78edecc400861fd99281e1994bc6626bff28ece3df8f8306575c8abbb2cddaf3a6d3542c0b2f
 DIST xen-security-patches-29.tar.xz 1536 BLAKE2B 7723e9d971a2385f7a4a85dd63412afc41ba20991d15732423f03d0c5455c504ecccec08102edbec0db47ed019c88cc86f4146e080075d829aff03ccded362bc SHA512 eff572fed812c38bc3c014d47b951d3614bfb1255d41a2d35ddcbe9228cf9550aaf867adde0f2365f49d0d4e5229c19a78aa538eb64de7cd3d1ef5f7f0c4a079
 EBUILD xen-tools-4.13.2-r1.ebuild 16589 BLAKE2B f0eec5093c3a0e10d66370c97704475aa6c0f4801e56bd9c49c54a31e9c9408c051601df53ecbdd9d63e15a4e8efa57a7d48571bd098a486b4e45f703d476900 SHA512 d99e8fc4579808d316292bc684752c7b6222dc82780af234c3b4d8dd86ac7ff91b4d6617dd4fb5b8ce9f19d17b1c8ebae0e1175d30602f62026325d2b91c0a90
-EBUILD xen-tools-4.14.0-r4.ebuild 16590 BLAKE2B 444fe6d4360cd30f0d96ef17cd57726d8115997d066f6d9f5a6cbf51ed374524c9c7b85b81eb420dda8a04c6a96e9befd862e9daffd3cda2912fa7f1e2ee8c35 SHA512 e0a78f8389bb4a7b68de6d4dfab4ed43bd924afe74be8233fc8df2c69e4259056019be26e10946e2538a93a5542f5eee3a70c443ac5aecbea455c5f1833127c4
+EBUILD xen-tools-4.13.2-r2.ebuild 16591 BLAKE2B be3645238a8a270a12019e758bfd1f257b4bb56aad484c26cf9dd38f3947fde3d2f241ef746ae00c4139df79ebacda556f14b3608b63bad7e886ef73651cb98b SHA512 68abbab521ce02abd5a52dbc01a6c8c230b7822f1215e593adad73547872c7a90aad9b8245c7918d8e1a588c1ce5cb022945ec29a6d7a228066f0bad647a0714
+EBUILD xen-tools-4.14.0-r5.ebuild 16590 BLAKE2B fc2fa05500f728bbba1e5606b96232c8e12ae0fc3a68aa030d0abbdf0646eb6706f9d66b2b6e509babbcb5da0f863bfe59ffcbb2e6712627e5116a867dcd710e SHA512 b37fad5e2705091f3309a23878d28b5a741d81cb4dac91b1979e4516b8379ddd1c513a044d79ebbb787318bc78569a03a5059d552e190da41438d4baf3dc2b52
 MISC metadata.xml 1662 BLAKE2B 1b243436df5eb36e30f73b36db45d859aa03f7e9d3360fcdb91c35e3a1c00f1217e5e7cd1461b65d9da2883f5e8ca969b958f9b2160def4c1f15347c1887b2cd SHA512 d6cdf124c7767727f7c8d16a2dc0f85a7213db21f8d1595f7d8899c7cb81d47849fd05759ccfc460630c32917e64ea31ef6384dc050ab0eb392f571b12db68ed
diff --git a/app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild
new file mode 100644
index 000000000000..9ed77248190a
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild
@@ -0,0 +1,512 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=2
+	SECURITY_VER=29
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=21
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=1
+	# xen-tools ovmf's patches
+	OVMF_VER=
+
+	SEABIOS_VER="1.12.1"
+	EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
+	EDK2_OPENSSL_VERSION="1_1_1g"
+	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+	IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6"
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ipxe? ( rombios )
+	ovmf? ( hvm )
+	pygrub? ( python )
+	rombios? ( hvm )
+	system-ipxe? ( rombios )
+	?? ( ipxe system-ipxe )
+	?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.11
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
+	x86? ( sys-devel/dev86
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		sys-power/iasl )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-power/iasl
+		system-seabios? ( sys-firmware/seabios )
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		x11-libs/pixman
+		sdl? (
+			media-libs/libsdl[X]
+			media-libs/libsdl2[X]
+		)
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )
+	python? ( >=dev-lang/swig-4.0.0 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/elf2dmp
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-edid
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/edk2-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+	fi
+
+	# ipxe
+	if use ipxe; then
+		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+
+		# gcc 10
+		cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die
+		echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		-i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable api xenapi) \
+		$(use_enable ipxe) \
+		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
+		$(use_enable ocaml ocamltools) \
+		$(use_enable ovmf) \
+		$(use_enable pam) \
+		$(use_enable rombios) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	tc-ld-disable-gold # Bug 669570
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"/tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+
+	if use python; then
+		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
+		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
+	fi
+
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config system at boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.14.0-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.14.0-r5.ebuild
similarity index 99%
rename from app-emulation/xen-tools/xen-tools-4.14.0-r4.ebuild
rename to app-emulation/xen-tools/xen-tools-4.14.0-r5.ebuild
index 55976ee7f22f..c23e528f38a5 100644
--- a/app-emulation/xen-tools/xen-tools-4.14.0-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.14.0-r5.ebuild
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=4
+	UPSTREAM_VER=6
 	SECURITY_VER=28
 	# xen-tools's gentoo patches tarball
 	GENTOO_VER=22
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index cfab886db06f..b49a0cd69e74 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,9 +1,11 @@
 AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3f1c0d4bf9733189808f5e1c47f1d90d1784f17fa52ca1626972c81d20c5e1ee3d42d082cdefcf67eb8dc SHA512 17208dc107f4ae4c5ec226c2ac05126817134fb6084cd8923204dc1b014e645e12c34cd11296319127e595ccbf17747931e9df78218bf49814f66e3cc6a789fd
 AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0
 DIST xen-4.13.2-upstream-patches-1.tar.xz 15832 BLAKE2B 4e20a1e2d575ed7e1d21f3b34ed0d8bf6e1405cb39cc5c6ffc099614ea833ac9794bfcfcdea0893fdf81b318f536017ac3a023ad096bc8a8c7390c01f1d513ed SHA512 48dda9dadec1e87fb7b6952636e73057f6e0a5501f9727d05ac636fd47747194501db709c8ffa7154e79b6b612a98b658a03bc083c5065ff851ac57f454b599e
+DIST xen-4.13.2-upstream-patches-2.tar.xz 58992 BLAKE2B 535d67ae6a30e23feb975172a9e4abd6d7feb6c8c969aa243fdf672ed6580fe46bf57ea5530eab70457e22af9163f95061fdf97d10faa3be9f4c92033187c950 SHA512 6b6cdf72d13c0e595be65e3107c0f68299e932b74d4a1c4d59bfe3be8b76840c47f6adeaddd0efac71d5158cee8d778a0be863eea8f032cb9acf4191f629d8ae
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
-DIST xen-4.14.0-upstream-patches-5.tar.xz 79424 BLAKE2B d2c6ec53e02fb306a7d7f7e8e6711f3e0523919d8dfb3e4e4b7ea66b618511c035e88e015e1028e6684bc6486e8e71b52e280c2f52c34357441870cd866b2672 SHA512 218657053c24330b0c9072fa32b9cc9619b6ceed0592114445651977c335fef0748160e89da2194456d4e0761b6314aed7a5f1992fa996c62eb191431b678e40
+DIST xen-4.14.0-upstream-patches-6.tar.xz 119116 BLAKE2B e3a0f807182d32754c6ae2000324237117cfa66c4a43c27b583b6aef69a3889949779751b71a87b2538f679fb481e8a723433950c689f28a8c2e96278c1b0ddb SHA512 03b1fdc08e74756001fbb0de4e21297456f63615e6f63b8f360f8270ef85b0d50c3872be41cc26529ed0d91d82ffda2af53882b7c5233113f223a4ec813a0d5b
 DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0
 EBUILD xen-4.13.2-r2.ebuild 4443 BLAKE2B a3e56e60f36b284d0241df597669cb2bbec7b4046986e29c2c5ce9d11096e0cc93ed5e4457f40f292b422a14366d71cae8544c99facc96bb240238d5a919e8b8 SHA512 b1913fed2768b75dbb6320a984d13b3821bd6348ad2b31b128ebbb692f504cb836c5a9d57928e799d771bee04e2c1502c487c3c7faacb1869f71748288cc39df
-EBUILD xen-4.14.0-r6.ebuild 4444 BLAKE2B 48f126d1d211c6a1b7d325ea3d6f894ae4d149dd6afe946ef1b64f1a05312ff9f205a026d4eb7f9bd0d197f1a727ee1c2fdcf22d6d4b833a58a7db79c316e304 SHA512 abbc18e928d616ea721d7ffc490db7fc7e04387cdf5771752bd991a165d249b6e8a5ae2946a6f0aea554e4a3639ddb10205f1fd4d32e17ac51fff5a427524fce
+EBUILD xen-4.13.2-r3.ebuild 4444 BLAKE2B f0b58e049bfd9833c62608c34c0ef53f2b20cb05552baf59fc8f9a0a9ecff9afcffbeaa1239c9519a94a2d36183e73e77425451dcd9077e5d9eb69339374172f SHA512 dccb9801de4ea572373e5b849351f8cfcfbcef511cd2e64c9dc1171716560563cfbc2fb30a36c8e8107658e84a4d4b8c313e9b30f689b184427689a0e16a8d18
+EBUILD xen-4.14.0-r7.ebuild 4444 BLAKE2B a2b1bfec72819b7e5dedc766657f61c5998d166794e5b28234cd74b6aed1aa1bf9f8f175dbb135b3f77b2bd2c1087cb5e72f02eefc4f03c65f04e306ba7cf777 SHA512 0c2a33aceceaef7cfc65901fcc56a1b6ee212fc01e6aac38946e54528eef058218329f5bfb138dc0f44db4d4a633ea288f933d5302b900cc2ba5a82af7ebb58f
 MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
diff --git a/app-emulation/xen/xen-4.13.2-r3.ebuild b/app-emulation/xen/xen-4.13.2-r3.ebuild
new file mode 100644
index 000000000000..79234b62328b
--- /dev/null
+++ b/app-emulation/xen/xen-4.13.2-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=2
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.11-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	# remove flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+	ewarn
+	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+	ewarn "to work fine."
+	ewarn
+	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+	ewarn
+	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-emulation/xen/xen-4.14.0-r6.ebuild b/app-emulation/xen/xen-4.14.0-r7.ebuild
similarity index 99%
rename from app-emulation/xen/xen-4.14.0-r6.ebuild
rename to app-emulation/xen/xen-4.14.0-r7.ebuild
index 3a4fdc8209c9..7febeaacb942 100644
--- a/app-emulation/xen/xen-4.14.0-r6.ebuild
+++ b/app-emulation/xen/xen-4.14.0-r7.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=5
+	UPSTREAM_VER=6
 	SECURITY_VER=
 	GENTOO_VER=
 
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 42ff9241cabb..e5c160f6be58 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 6cce6fe40ac0..95339ce057c0 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-typing-booster-2.10.1.tar.gz 9449495 BLAKE2B 36e52d3e6349a89a1202429f7068221dc75dc0072d9e49424cf410ab12c2e732b9ea9fc54a2bbbfe386f2687535b9e0d46e5567f1572c42cf7fe98243c234a38 SHA512 d4262d7bec0b65919f5d25c97b319a48808d1257ea0697163bcaae238870d57640ed8fb44d423abb844416e1c99c130b1d6d5813a0edfa849afc762929e61f66
-DIST ibus-typing-booster-2.9.7.tar.gz 8833452 BLAKE2B 4c4f33bcff2fa9e20afeccf242bec1a6e11fca0b5cb515b2c2dce7ef2401c092a7197a6637e2ca72d4c1bacd694860c07ae645a313e41cd879d6bde8c1736d12 SHA512 984beacdd6b853e074127372a912442ba1dbc536ecf194a34d03025277b9d6277e967e63a9bdcd1620f5094965a191297ccae9adbff2d54d1cd474437a1ec16b
-EBUILD ibus-typing-booster-2.10.1.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53
-EBUILD ibus-typing-booster-2.9.7.ebuild 1099 BLAKE2B 7bb5ca273bd6e5a4f6c4e2913fc0a7c2cd42fdc68a9003fec646164b24950ed17b49dab5bccb0c1bc3ccf029b6fc1791d39d975ad890e59a9c7ccb05e69850d4 SHA512 ce95b1ec4505e8e367d27ecd2808675efbb19e3ebec672bee3fd5c1cbe9b7d0d328e5dd3b354ca2a5be18f82732d8e46031704fb9eb05c8cabffe7b03071abb1
+DIST ibus-typing-booster-2.10.2.tar.gz 9433317 BLAKE2B 883639c6f6551b0e27e9ae45ba38320b465aeab9e43c6d848acff42fe74c670a6c0ea119256503267e5da7d94de2fbb8710b2d5c5de3a169aff095e0aa3570de SHA512 168ff2528e9b57120936dc69b6d8f32d495508de7e5a0cec9782b1b108b4acca9ba42c9a2f680f2b56c4ec01eae805b22cc5ba34e1a59c449715f589be51c542
+EBUILD ibus-typing-booster-2.10.1.ebuild 1099 BLAKE2B 7bb5ca273bd6e5a4f6c4e2913fc0a7c2cd42fdc68a9003fec646164b24950ed17b49dab5bccb0c1bc3ccf029b6fc1791d39d975ad890e59a9c7ccb05e69850d4 SHA512 ce95b1ec4505e8e367d27ecd2808675efbb19e3ebec672bee3fd5c1cbe9b7d0d328e5dd3b354ca2a5be18f82732d8e46031704fb9eb05c8cabffe7b03071abb1
+EBUILD ibus-typing-booster-2.10.2.ebuild 1103 BLAKE2B 82a57649f6c3f7eff747dafa49a13499917b37ed2f6583e7788a4521e22cd247cc59a6812bb4bd37e20fb2c09e52b8f4fbf2063a3bef7636661db2c25491594d SHA512 0919c3ecafffd77dededf740ba22f762be88f5561303389db14909f3af6bcfa4b859b443169734e3ccd69868e938c26136d6a04dad14105ee3874fc82d3fa548
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild
index ed1abe745449..69c81149e145 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.2.ebuild
similarity index 94%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.2.ebuild
index 69c81149e145..decf9c7acdb5 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit gnome2-utils python-single-r1 xdg
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 338e78fc04f6..b4cad080b84d 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/cdcat/Manifest b/app-misc/cdcat/Manifest
index 4e6c9ce9ee88..5cf429aee6ab 100644
--- a/app-misc/cdcat/Manifest
+++ b/app-misc/cdcat/Manifest
@@ -1,3 +1,3 @@
 DIST cdcat-0.3.tar.gz 7464 BLAKE2B 24d0acce5bca9f84d24944e74a463ec64fee19a989ef89c187dc283d5c87dbdffb76e9471159903603c07924e0affef6f1b48dc7ab5e7292e5ae427510f7a259 SHA512 6d30a22c29a1846a3899f384bcc395444af77b62024cb9f45da877819614c3f1ff495e03f7d7b498716fe4725c569c88a14480a37fc4e4fef5cfd9a640e4cfa3
-EBUILD cdcat-0.3-r1.ebuild 1239 BLAKE2B ac07365db2ca0d52437ea84268db936669044fa2d97502bcd79b1f86a9cade70b426c788430267609b4e7e28abaa84092e918a2142484ee1b923e4c1e521404c SHA512 c2e0c151bd9b306fdf6a10fa3c760fdbec1be83e83c92f8f54e67d811be0a396b4ed86d6daebf99640374e6d811c3c00744e5fab681f947fa5b085d81f1c4423
+EBUILD cdcat-0.3-r1.ebuild 1239 BLAKE2B 8bb864e99030a4ae67a4dd12314e3b713aa585c51b377fb3ec084707f9620b66b97274d8b3a391433224c2e9dd82fb49c4042b1d18fc8899f3b75760195ab129 SHA512 9778292d93b1d62d98521317161e60b603074cd45acdff6633f5ad4d686ff4a6e288e098ebcf4aa731388fd5151f6e9992e6522f934b8e34f939a2f6d99e3348
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdcat/cdcat-0.3-r1.ebuild b/app-misc/cdcat/cdcat-0.3-r1.ebuild
index 8ad49a3e87e9..ae81f769f031 100644
--- a/app-misc/cdcat/cdcat-0.3-r1.ebuild
+++ b/app-misc/cdcat/cdcat-0.3-r1.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=7
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-RDEPEND="virtual/cdrtools
+RDEPEND="app-cdr/cdrtools
 	!app-backup/cdbkup"
 
 src_prepare() {
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index a027a8303890..459e9c1aea05 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,10 +1,4 @@
-AUX golly-3.3-allow-py23-exec.patch 688 BLAKE2B d72ba8e9264f2b677818f46e94efac0b185cfb72fdac045b124a931ed8c727d644df8e76cc8d237bdb09a8adcc4a085a780c7f443a9c5c5df510efc3e3f028e2 SHA512 af7a7e132464594726d71d056105f88661e0e585f6833ea222977c5f659d3b02f4c12f2231e645955a3fea1de31cf9481cdf0949bc71adec12876550ee190393
-AUX golly-3.3-allow-py3.patch 3018 BLAKE2B ca05bc615f2bce230bb80bddcfca5d017181fba11c3117c438ec8cbff16fbd645a49b0f8f1cb3f52efb6a5c6548e2398b95167b738dfa3df36336ff43fc59d4f SHA512 409f765d7107b1f9d7df8389a57a06c7be37c050eed26f5724f24bed36fa5d93ff074d6ded991faf1c02341c726c4c8ceca268f89b64fef38f98c5c331a51f23
-AUX golly-3.3-glife-py23.patch 1087 BLAKE2B bc00e95ac7f07bae2c778f1faf93fee7e1ccd92947e12bb1fbc97c0a074c5a347c6ff084a47085c656a94bd2add2fe14c313aff39f60174c983670be006ad9b3 SHA512 814c8a9ac2e96bf4ff61bd46b86a5ef7cfd5a4ba027fd5af78029cfbfb2b8334c76bede82770912509b0c858a2e3ff3af8258aec6e8ee328710d805d527a2863
-AUX golly-3.3-nondynamic-python.patch 1830 BLAKE2B b202aebb3975f55de4748a925d3e4ef87e2033fa6dca7773327e5ca272872bdd817000a02a9bf5a6630eb1716ffa220844bfc324271d9b9a889a4f3cb25257e4 SHA512 5e12d9e6800cf4f3a495964d9320dae1a8a9ad4350d374c9ffa0ec61316d48d4d545d95e200a4b04a700fdb923a841214788da05d0d05bb8768018f83e5bf9a4
 AUX golly-4.0-CFLAGS.patch 686 BLAKE2B 1d82b951bee9f336931ad2589bae03bd8e52ac2f982294f18abd5297bc0d5cbd877ece2716736ce8dfcf044c823cb707d6ce8923177b3ab2bbf09a3d0e247b92 SHA512 b883702ed44bd8469255bbc43191bbf91da64ff0048d4cc3c7cc0c5103e01fe49f9017ad1723d041ab080dfa46b68f4bab0b9abd850b74b1803d5bcebb04c36a
-DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 6bd0c71083d021adb660ed8fd333399865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48 SHA512 bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47
 DIST golly-4.0-src.tar.gz 5579026 BLAKE2B fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32 SHA512 3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
-EBUILD golly-3.4.ebuild 1364 BLAKE2B 4e3ec9e4fd7a5746b30dca2a01d4e3b77eb0728a56aaf7936c5ff58372461e13076bbff0755ad2e375b35f65e3d3f0abe68743a55c45da48970e33548e108cfb SHA512 88bede339f2178bcdf8f83c33813495d45e51a301abd8796c93da7a7b39a97a049079efeaddf13b61f84229efd6384ce9387b882f1bdf112153c3c67e56b34a0
 EBUILD golly-4.0.ebuild 1381 BLAKE2B 182a9f197db7e0634c1baf06eb38b1bc923ab6bd39b90f529badfd3c3072b3f8597df57eb6ae5273545875b58f88fa2e6695f668cfcc869ca7e45341344cefb2 SHA512 394c3b8217a3fcc4be09391ffb504289fbbda991f9c7682defdacdc4a4570d6516d5c106690b9643912b5fcfce7f61725f5d963f3ac60e49fda86b480835082f
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/files/golly-3.3-allow-py23-exec.patch b/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
deleted file mode 100644
index e46b608ed6c5..000000000000
--- a/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-'execfile' is python-2-only. 'exec/open' works for both python2 and python3.
---- a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -3356,7 +3388,7 @@ void RunPythonScript(const wxString& filepath)
-     // for the global namespace so that this script cannot change the
-     // globals of a caller script (which is possible now that RunScript
-     // is re-entrant)
--    wxString command = wxT("execfile('") + fpath + wxT("',{})");
-+    wxString command = wxT("exec(open('") + fpath + wxT("').read(),{})");
-     PyRun_SimpleString(command.mb_str(wxConvLocal));
-     // don't use wxConvUTF8 in above line because caller has already converted
-     // filepath to decomposed UTF8 if on a Mac
diff --git a/app-misc/golly/files/golly-3.3-allow-py3.patch b/app-misc/golly/files/golly-3.3-allow-py3.patch
deleted file mode 100644
index 54a047830818..000000000000
--- a/app-misc/golly/files/golly-3.3-allow-py3.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-The patch allows python3 as a python implementation.
-Ports module loading to conditional python3 support.
---- a/gui-wx/configure/configure.ac
-+++ b/gui-wx/configure/configure.ac
-@@ -19,7 +19,7 @@ AC_ARG_WITH([python-shlib], [AS_HELP_STRING([--with-python-shlib=ARG],
- 	, [with_python_shlib=check])
- AC_ARG_VAR([GOLLYDIR], [golly data directory [default=DATADIR/golly]])
- AC_ARG_VAR([PERL], [Perl 5 interpreter])
--AC_ARG_VAR([PYTHON], [Python 2 interpreter])
-+AC_ARG_VAR([PYTHON], [Python interpreter])
- 
- # Check for build tools:
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-@@ -76,7 +76,7 @@ AS_IF([test "x$enable_perl" = xyes], [
- ])
- 
- # Find Python
--AC_PATH_PROGS(PYTHON, [python2 python])
-+AC_CHECK_PROGS(PYTHON, [python python3 python2])
- AS_IF([test "x$PYTHON" = x], [AC_MSG_ERROR([missing Python])])
- AC_SUBST([PYTHON_INCLUDE], [-I"'`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())"`'"])
- AS_IF([test "x$with_python_shlib" = xcheck],
---- a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -90,6 +90,12 @@
-     #include <Python.h>
- #endif
- 
-+#if PY_MAJOR_VERSION >= 3
-+    // python-3 got rid of int/log distinction
-+    #define PyInt_AsLong PyLong_AsLong
-+    #define PyInt_FromLong PyLong_FromLong
-+#endif
-+
- #ifdef USE_PYTHON_DYNAMIC
- 
- #ifndef __WXMAC__
-@@ -3268,6 +3274,22 @@ static PyMethodDef py_methods[] = {
-     { NULL, NULL, 0, NULL }
- };
- 
-+#if PY_MAJOR_VERSION >= 3
-+static PyModuleDef golly_module = {
-+    PyModuleDef_HEAD_INIT,
-+    "golly", /* name */
-+    NULL,    /* doc */
-+    -1,      /* size */
-+    py_methods, /* methoods */
-+};
-+
-+PyMODINIT_FUNC
-+PyInit_golly(void)
-+{
-+    return PyModule_Create(&golly_module);
-+}
-+#endif
-+
- // =============================================================================
- 
- bool pyinited = false;     // InitPython has been successfully called?
-@@ -3280,6 +3302,13 @@ bool InitPython()
-             if (!LoadPythonLib()) return false;
-         #endif
-         
-+        #if PY_MAJOR_VERSION >= 3
-+            // Autoload 'golly' builtin module at interpreter start.
-+            if (PyImport_AppendInittab("golly", PyInit_golly) == -1) {
-+                Warning(_("Error: could not extend in-built modules table\n"));
-+            }
-+        #endif
-+
-         // only initialize the Python interpreter once, mainly because multiple
-         // Py_Initialize/Py_Finalize calls cause leaks of about 12K each time!
-         Py_Initialize();
-@@ -3287,9 +3316,12 @@ bool InitPython()
-         #ifdef USE_PYTHON_DYNAMIC
-             GetPythonExceptions();
-         #endif
--        
--        // allow Python to call the above py_* routines
--        Py_InitModule((char*)"golly", py_methods);
-+
-+        // Python-3 uses module constructor
-+        #if PY_MAJOR_VERSION < 3
-+            // allow Python to call the above py_* routines
-+            Py_InitModule((char*)"golly", py_methods);
-+        #endif
-         
-         // catch Python messages sent to stderr and pass them to py_stderr
-         if (PyRun_SimpleString(
diff --git a/app-misc/golly/files/golly-3.3-glife-py23.patch b/app-misc/golly/files/golly-3.3-glife-py23.patch
deleted file mode 100644
index 8b1599712508..000000000000
--- a/app-misc/golly/files/golly-3.3-glife-py23.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Use python-3 compatible syntax.
---- a/Scripts/Python/glife/__init__.py
-+++ b/Scripts/Python/glife/__init__.py
-@@ -90,7 +90,7 @@ def rule(s = "B3/S23"):
- def description(s):
-     """Supply a textual description to the whole pattern."""
-     for line in s.split("\n"):
--        print "#D", line
-+        print("#D", line)
- 
- # --------------------------------------------------------------------
- 
-@@ -161,7 +161,7 @@ class pattern(list):
-   It is also the base for computing generations subsequent to N-th."""
-         if N < 0:
-             raise ValueError("backward evolving requested")
--        if self.__phases.has_key(N):
-+        if N in self.__phases:
-             return self.__phases[N]
-         M = 0
-         for k in self.__phases.keys():
---- a/Scripts/Python/glife/text.py
-+++ b/Scripts/Python/glife/text.py
-@@ -173,7 +173,7 @@ def make_text (string, font='Snakial'):
-         unknown = '-'
- 
-     for c in string:
--        if not f.has_key (c): c = unknown
-+        if not (c in f): c = unknown
-         symbol = f[c]
-         p += symbol (x, 0)
-         x += symbol.width
diff --git a/app-misc/golly/files/golly-3.3-nondynamic-python.patch b/app-misc/golly/files/golly-3.3-nondynamic-python.patch
deleted file mode 100644
index bc1c81a61917..000000000000
--- a/app-misc/golly/files/golly-3.3-nondynamic-python.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Don't use runtime python loading via dlopen().
-
-Just link to libpython directly. That makes python dependency
-more explicit and allows catching more compile-time bugs.
---- a/gui-wx/configure/Makefile.am
-+++ b/gui-wx/configure/Makefile.am
-@@ -22,7 +22,7 @@ golly_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(PYTHON_INCLUDE) \
- 	$(PERL_CPPFLAGS) $(PERL_INCLUDE) \
- 	$(liblua_a_CPPFLAGS) -I$(top_srcdir)/../../lua
- golly_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS_ONLY)
--golly_LDADD = $(WX_LIBS) libgolly.a liblua.a
-+golly_LDADD = $(WX_LIBS) $(PYTHON_LIBS) libgolly.a liblua.a
- 
- if WINDOWS
- golly_LDADD += gollyres.o
---- a/gui-wx/configure/configure.ac
-+++ b/gui-wx/configure/configure.ac
-@@ -86,6 +86,16 @@ AS_IF([test "x$with_python_shlib" = xcheck],
- AS_IF([test "x$shlib" = x], AC_MSG_ERROR([could not determine Python shared library name]))
- AC_DEFINE_UNQUOTED([PYTHON_SHLIB], [$shlib])
- 
-+# Find python interpreter
-+# 1. --embed is needed for python>=3.8
-+# 2. statuc check is needed because python-3.7-config outputs error to stdout, not stderr
-+if ${PYTHON}-config --libs --embed; then
-+    PYTHON_LIBS=`${PYTHON}-config --libs --embed`
-+elif ${PYTHON}-config --libs; then
-+    PYTHON_LIBS=`${PYTHON}-config --libs`
-+fi
-+AC_SUBST(PYTHON_LIBS)
-+
- # Find zlib (unless explicitly disabled)
- AS_IF([test "x$with_zlib" != xno],
- 	[	AC_CHECK_HEADER([zlib.h], , [AC_MSG_ERROR([missing zlib])])
---- a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -59,8 +59,12 @@
-     #undef SIZEOF_SIZE_T
-     #undef SIZEOF_VOID_P
- #else
--    // load Python lib at runtime
--    #define USE_PYTHON_DYNAMIC
-+    // On gentoo just link against python to make
-+    // python dependency more explicit.
-+    # if 0
-+      // load Python lib at runtime
-+      #define USE_PYTHON_DYNAMIC
-+    #endif
- 
-     #ifdef __UNIX__
-         // avoid warning on Linux
diff --git a/app-misc/golly/golly-3.4.ebuild b/app-misc/golly/golly-3.4.ebuild
deleted file mode 100644
index b1dcbb7f8201..000000000000
--- a/app-misc/golly/golly-3.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0-gtk3
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools desktop python-single-r1 wxwidgets xdg-utils
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="virtual/opengl
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff]
-	${PYTHON_DEPS}
-"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-nondynamic-python.patch
-	"${FILESDIR}"/${PN}-3.3-allow-py23-exec.patch
-	"${FILESDIR}"/${PN}-3.3-glife-py23.patch
-	"${FILESDIR}"/${PN}-3.3-allow-py3.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_prepare() {
-	default
-
-	# patches change configure.ac and Makefile.am
-	pushd gui-wx/configure
-		eautoreconf
-	popd
-}
-
-src_configure() {
-	ECONF_SOURCE=gui-wx/configure econf \
-		--with-wxshared
-}
-
-src_install() {
-	emake docdir= DESTDIR="${D}" install
-	dodoc docs/ReadMe.html
-	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 442578e614d0..32ccc7fefb90 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,8 +1,5 @@
-AUX mc-4.8.24-mc-lib-twice-4070.patch 1962 BLAKE2B db6f627507fd94443ea0fe13ebd026cd71fbf23d88d6c441d379ae15d19e509a5874bf894e88c3a91e608b34bf39f83bbfc6e4c4f7db2c46bdac80f1d8d688ee SHA512 35765acf211b9519958505e36c3aa30f87575ab904dcd59c7d0feae0afbdaaf83250f73a6e14fc4e9902dc9f4e5b216ffb4c365e1000e767759592048f48c48d
 AUX mc-4.8.25-alacritty-tmux.patch 429 BLAKE2B 2621145cb976e0f9c09abf1071752a2a89a7b143aedde63c7b0c447cb930f1647b0b8c63a96f5f69b6f7abf718ca3b7784e0fa5b30a507f2a8d32fa3923c738f SHA512 32e27a75c55b9044cb2d4c392974e5e9916f1e73755f578102c7826f97525c0410bcc16a1e8b9600d4facc8be7a90fbef4932ef622fb59dc7c1838ad448e5f59
-DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60 SHA512 ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc
 DIST mc-4.8.25.tar.xz 2488324 BLAKE2B 47047c85fbe3ce1c54b9a3477c35fb05d76b3688205bfd13db03844bb9d8b3e74498ef4d6b449cfcf79c0188687accd93602274b7e8c0cbffc5247d433e33272 SHA512 51913fd41df18b49498b97ad8e13aa4365cec24ab24169b1abe93209263e4cfea4b52e0faccaf934182c84e8eb5dc49336c885358b4b66c48d38900f890fde5e
-EBUILD mc-4.8.24.ebuild 2855 BLAKE2B 74fdf3aac3459a98b10520e036f3c752866b105c81c875245341960c28d77981cf6cdd3bfd7cc4b244689feb7008f9297f6028e394bfba60693f593c9021176e SHA512 457dd712e0ecc24c8a6d1ea180b49ff53b56ba8cbd27b74cf63041c47cf5671e6fa5b934ef37a3ad57fca74502c249100337a46b28d91956e755aae9405f3ea8
 EBUILD mc-4.8.25-r1.ebuild 2871 BLAKE2B 5d9fc7fcdf3d9d6c3a7f8d31799d82d471f9259098724bc0ab0298c4888faa121f852035e1b95c2a7bfcdaf1072e09b380fa99dce47d456ab5b0313553cec16f SHA512 77b2f606b468b292ee958159166436e067cb082a6a5302b5271fc034ca97ba2eb35365f900f47c51503c4fb642a9e502cba1d2b8f0c47447d843ed302e458c64
 EBUILD mc-4.8.25.ebuild 2801 BLAKE2B e7d9bf37ea23557b49bb7862175aae72ec932ef1f03e965db0cddd86c97507adb826ea49dfbb6ea12f102b5558abc39f8d729cb99c6d51a9779ac238094ba02f SHA512 7aa941058c2b8236123787e527c37311245122a61d2524a35c5905807fef45accc4227e2475adba5b2bc1e9a9e6010a84afa603a301f1ea5ca7b628f599adb79
 EBUILD mc-9999.ebuild 3050 BLAKE2B 101a2fa59995345bbca727af306f2dc367ebb30028137f52bcc618235914e80fc8c2c8411fa859092a1fd1d4014c1d20b675f25f4a2d744f11db304c14b95e1f SHA512 ad30cbbe132a4e3ab2477e03fd4a4eaa2a518d3b237b27b90a37178288278211ff90af7a6d111442990ea055586bd181641ef8147e4e56b83aed4ef3263c4dfd
diff --git a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch b/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
deleted file mode 100644
index 8db6fdfb2ea3..000000000000
--- a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://midnight-commander.org/ticket/4070
-
-From 30fd157a73f148dbc150c18b206b85e1a4a93e9c Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Tue, 3 Mar 2020 09:26:12 +0000
-Subject: [PATCH] misc/Makefile.am: install 'mc.lib' only once (#4070)
-
-Before the change `mc.lib` was installed twice due to being
-in two `_DATA` variables:
-
-```
-dist_pkgdata_DATA = \
-        mc.lib
-
-pkgdata_DATA = \
-        $(dist_pkgdata_DATA) \
-        $(PKGDATA_OUT)
-```
-
-This causes occasional install failures when two parallel
-`/usr/bin/install` calls race in installing the file:
-
-```
-$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install
-...
- /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
-    -c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
- /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
-    -c -m 644 mc.lib mc.charsets '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
-...
- /usr/bin/install: cannot create regular file
-   '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists
-```
-
-After the change `mc.lib` is present only in `dist_pkgdata_DATA`.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- misc/Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/misc/Makefile.am
-+++ b/misc/Makefile.am
-@@ -17,7 +17,7 @@ dist_pkgdata_DATA = \
- 	mc.lib
- 
- pkgdata_DATA = \
--	$(dist_pkgdata_DATA) \
-+	\
- 	$(PKGDATA_OUT)
- 
- SCRIPTS_IN = \
-@@ -54,7 +53,7 @@ EXTRA_DIST = \
- 	$(LIBFILES_SCRIPT) \
- 	$(SCRIPTS_IN) \
- 	$(noinst_DATA) \
--	$(dist_pkgdata_DATA) \
-+	\
- 	$(PKGDATA_IN)
- 
- install-data-hook:
---- a/misc/Makefile.in
-+++ b/misc/Makefile.in
-@@ -472,7 +473,7 @@ dist_pkgdata_DATA = \
- 	mc.lib
- 
- pkgdata_DATA = \
--	$(dist_pkgdata_DATA) \
-+	\
- 	$(PKGDATA_OUT)
- 
- SCRIPTS_IN = \
-@@ -508,7 +509,7 @@ EXTRA_DIST = \
- 	$(LIBFILES_SCRIPT) \
- 	$(SCRIPTS_IN) \
- 	$(noinst_DATA) \
--	$(dist_pkgdata_DATA) \
-+	\
- 	$(PKGDATA_IN)
- 
- all: all-recursive
--- 
-2.25.1
-
diff --git a/app-misc/mc/mc-4.8.24.ebuild b/app-misc/mc/mc-4.8.24.ebuild
deleted file mode 100644
index de7e49b86895..000000000000
--- a/app-misc/mc/mc-4.8.24.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0=[unicode?] )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=("${FILESDIR}"/${P}-mc-lib-twice-4070.patch)
-
-pkg_pretend() {
-	if use slang && use unicode ; then
-		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
-	fi
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local myeconfargs=(
-		--enable-charset
-		--enable-vfs
-		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
-		$(use_enable kernel_linux vfs-undelfs)
-		# Today mclib does not expose any headers and is linked to
-		# single 'mc' binary. Thus there is no advantage of having
-		# a library. Let's avoid shared library altogether
-		# as it also conflicts with sci-libs/mc: bug #685938
-		--disable-mclib
-		$(use_enable nls)
-		$(use_enable samba vfs-smb)
-		$(use_enable sftp vfs-sftp)
-		$(use_enable spell aspell)
-		$(use_enable test tests)
-		$(use_with gpm gpm-mouse)
-		$(use_with X x)
-		$(use_with edit internal-edit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# CK_FORK=no to avoid using fork() in check library
-	# as mc mocks fork() itself: bug #644462.
-	#
-	# VERBOSE=1 to make test failures contain detailed
-	# information.
-	CK_FORK=no emake check VERBOSE=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index bd07f9628bb6..7372ee11420c 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,3 +1,7 @@
 DIST pax-utils-1.2.6.tar.xz 680696 BLAKE2B b271e19ed5ec1024d7c6e5723c12464c6ab07646dfbfd4738bfe0250629205051642421425d7c7c5f540b1ac3d100c13d1beca398d9766f7f477830ab128eef2 SHA512 59fe16c5573414aa2952a99c5b85c16cf10dbbee76943f263d31d5b1aa8818a9b00fa78c8b6dadbe02216de54fc32b26d80303a17e2d854de6bb9dd8b431f617
+DIST pax-utils-1.2.7.tar.xz 689680 BLAKE2B 9d7dd0aeaecc10edf1dc70acef1561e3984b9d4f30f2ff54b27cdd91fb88d194e6f1bb9b2b01064a25a1842855dfe4f448f7267d69bbed0102a854635b5829aa SHA512 e3bbe7fe0cf7c1607218187f272edad3652a55317a620905b76bba5bc9617f31b8eced6760f353b4558e7b118664c3df5c6d97c78b653f8d4636f094b96307f8
+DIST pax-utils-1.2.8.tar.xz 704804 BLAKE2B b64b50f985320618e10528aaddbeee9a2c86b05724d8564342fc78fd8bd31a84f3cfe5e6051b3b8a1a882bb0b3da586ca351b6fdda0fd6168930e8e4a44806cb SHA512 c211defb72921a6dfa950173bef7ef6bc5ac059dbb394a82d2b2455d082843fc7722a6819f37aa39033bd37a5a77880f193f8be550020320e87ce5becfa6e5bf
 EBUILD pax-utils-1.2.6.ebuild 1903 BLAKE2B 308656bc3fbf8c597c984dd61c86ec4fcf5084b75c4a83e417ccdc49fae8c49b65b0195ad0156e009fe8e41d6ae6a5555df8781b55c4a8288b3abe01fa4f2d44 SHA512 b4a3b8872fc4e6f23ba6a22fb77bb0f73624bd76450ee8be8823bd9b7b487266b407cc7cbb5526a609fb8b0c8df5a8f9307ead8f0af741a49ea9f5997825a9dc
+EBUILD pax-utils-1.2.7.ebuild 1912 BLAKE2B 6b93612f1ce8aa8e109fc0ec667592d0b5eccfdf49db0be3aa84680187ad62b19ce5de2866d49bc7fdd9b21eaacf02359beea29aa14e59a4eaf8971cd0e228a4 SHA512 ba8f8de048d29b678ca5efb18ea9880781c26cbcdf799a7b3cbc406973f296311ca308520a3e947d461e9e4cb63d9160d75c68e0b2657f6c96a7e2b9294ff5de
+EBUILD pax-utils-1.2.8.ebuild 1912 BLAKE2B 6b93612f1ce8aa8e109fc0ec667592d0b5eccfdf49db0be3aa84680187ad62b19ce5de2866d49bc7fdd9b21eaacf02359beea29aa14e59a4eaf8971cd0e228a4 SHA512 ba8f8de048d29b678ca5efb18ea9880781c26cbcdf799a7b3cbc406973f296311ca308520a3e947d461e9e4cb63d9160d75c68e0b2657f6c96a7e2b9294ff5de
 MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.2.7.ebuild b/app-misc/pax-utils/pax-utils-1.2.7.ebuild
new file mode 100644
index 000000000000..97ad76dbc3c2
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.2.7.ebuild
@@ -0,0 +1,78 @@
+# 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} )
+
+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"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps debug kernel_linux python seccomp"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	seccomp? ( sys-libs/libseccomp )
+"
+# >=linux-headers-4.11 to pick linux headers with statx, bug #737094
+DEPEND="
+	${RDEPEND}
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.11 ) )
+"
+BDEPEND="
+	caps? ( virtual/pkgconfig )
+	seccomp? ( virtual/pkgconfig )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+_emake() {
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_DEBUG=$(usex debug) \
+		USE_PYTHON=$(usex python) \
+		USE_SECCOMP=$(usex seccomp) \
+		"$@"
+}
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux ||
+		has_version '<sys-libs/glibc-2.10'
+	then
+		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
+	else
+		tc-export CC PKG_CONFIG
+	fi
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
+
+	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/pax-utils/pax-utils-1.2.8.ebuild b/app-misc/pax-utils/pax-utils-1.2.8.ebuild
new file mode 100644
index 000000000000..97ad76dbc3c2
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.2.8.ebuild
@@ -0,0 +1,78 @@
+# 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} )
+
+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"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps debug kernel_linux python seccomp"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	seccomp? ( sys-libs/libseccomp )
+"
+# >=linux-headers-4.11 to pick linux headers with statx, bug #737094
+DEPEND="
+	${RDEPEND}
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.11 ) )
+"
+BDEPEND="
+	caps? ( virtual/pkgconfig )
+	seccomp? ( virtual/pkgconfig )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+_emake() {
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_DEBUG=$(usex debug) \
+		USE_PYTHON=$(usex python) \
+		USE_SECCOMP=$(usex seccomp) \
+		"$@"
+}
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux ||
+		has_version '<sys-libs/glibc-2.10'
+	then
+		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
+	else
+		tc-export CC PKG_CONFIG
+	fi
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
+
+	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 76c1c91074f1..a92a3c2257b3 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,3 +1,5 @@
 DIST tracker-miners-2.3.3.tar.xz 3144712 BLAKE2B a5789cce89dedd7cf35548b730acc80eb9b8bcbc8338c4ee55b07c97af4b9fbadc46bf0fdc552a3384e995d71aca0defe2d57dc21d99f775dee6f33f69e0aa9b SHA512 1e845aaa5412125df84298a05f29888b3872c0f4d9251f026dd51846831fcd4aa0c6965c85752d7b6ed6548268d21f0fd2a8427c922a5dc0afcd294286c607e2
+DIST tracker-miners-2.3.4.tar.xz 3128484 BLAKE2B f52c46123c95252f8f16df824ff7498a8f44698cea13fa78653d7733590bef0a502139fea686b4fd9012f7569a6f946e1dbf8e053a16c474230c733d37103a3f SHA512 ceddddfa6c3151b5caeb197a4ae4dbe24fa2674e807bf66a9cc72227b60ee295171b52c2edb35236a3fbf9d8803678f55f8b990864a7a3a32bf362b0739d03ba
 EBUILD tracker-miners-2.3.3.ebuild 4637 BLAKE2B 436138e7a33ec47ee1fe93c160de931830cd1b5c7a3294b8aa53b016a9b290621e8fdd4741930f65280c63d074570fd7210069824d138f3810222998a7e7f6ae SHA512 66c19d0ff11de4d249207f0227fabac984ef53f8aa82e4b4eef4d9c4f215f508b4f3f38d322ae0d34739c69bb93f0a5e75c00adcbcff400c181d49894a1c7f2a
+EBUILD tracker-miners-2.3.4.ebuild 4640 BLAKE2B 13b4176e6046e40f7fff1121272bfa60311e2ed164a4a5885c3fae9123b0790bc64fab07f4c3062e3374da6c041b325a4f7788d231e5c23b5a24217b270e0f45 SHA512 78c7ce8f2e884b10cbd8260e6f4c1c25fc93d3b49cbe30b4bfe9f69bf3218fcd5fe1e6bfb10474ea30b12b6cab645ce41061015319e0616c361bd63a6442a51b
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-2.3.4.ebuild b/app-misc/tracker-miners/tracker-miners-2.3.4.ebuild
new file mode 100644
index 000000000000..4bbd15f12ee0
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-2.3.4.ebuild
@@ -0,0 +1,154 @@
+# 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 gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+
+REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=app-misc/tracker-2.2.0:=
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-meta:1.0 )
+	!gstreamer? (
+		ffmpeg? ( media-video/ffmpeg:0= ) )
+
+	>=sys-apps/dbus-1.3.1
+	xmp? ( >=media-libs/exempi-2.1.0:= )
+	raw? ( media-libs/gexiv2 )
+	>=dev-libs/icu-4.8.1.2:=
+	cue? ( media-libs/libcue:= )
+	exif? ( >=media-libs/libexif-0.6 )
+	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+	xps? ( app-text/libgxps )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( virtual/jpeg:0 )
+	iso? ( >=sys-libs/libosinfo-0.2.10 )
+	>=media-libs/libpng-1.2:0=
+	seccomp? ( >=sys-libs/libseccomp-2.0 )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	pdf? ( >=app-text/poppler-0.16.0[cairo] )
+	playlist? ( >=dev-libs/totem-pl-parser-3:= )
+	upower? ( >=sys-power/upower-0.9.0 )
+	sys-libs/zlib:0
+	gif? ( media-libs/giflib:= )
+
+	rss? ( >=net-libs/libgrss-0.7:0 )
+	app-arch/gzip
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS}
+		gstreamer? (
+			media-libs/gstreamer:1.0[introspection]
+			|| ( media-plugins/gst-plugins-libav:1.0
+				media-plugins/gst-plugins-openh264:1.0 )
+	) )
+"
+# intltool-merge manually called in meson.build in 2.2.2; might be properly gone by 2.3
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+	if use gstreamer; then
+		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+	else
+		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+	fi
+	xdg_src_prepare
+	gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+	local media_extractor="none"
+	if use gstreamer ; then
+		media_extractor="gstreamer"
+	elif use ffmpeg ; then
+		media_extractor="libav"
+	fi
+
+	local emesonargs=(
+		-Dtracker_core=system
+
+		-Ddocs=true
+		-Dextract=true
+		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
+		#$(meson_use test functional_tests)
+		-Dminer_fs=true
+		$(meson_use rss miner_rss)
+		-Dwriteback=true
+		-Dabiword=true
+		-Ddvi=true
+		-Dicon=true
+		-Dmp3=true
+		-Dps=true
+		-Dtext=true
+		-Dunzip_ps_gz_files=true # spawns gunzip
+
+		$(meson_feature cue)
+		$(meson_feature exif)
+		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature gif)
+		$(meson_feature gsf)
+		$(meson_feature iptc)
+		$(meson_feature iso)
+		$(meson_feature jpeg)
+		$(meson_feature pdf)
+		$(meson_feature playlist)
+		-Dpng=enabled
+		$(meson_feature raw)
+		$(meson_feature tiff)
+		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature xml)
+		$(meson_feature xmp)
+		$(meson_feature xps)
+
+		-Dbattery_detection=$(usex upower upower none)
+		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
+		-Dgeneric_media_extractor=${media_extractor}
+		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index ff1399807173..b77593710cc2 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,3 +1,5 @@
 DIST tracker-2.3.4.tar.xz 1607928 BLAKE2B f0285480091fdac3aab1d258496643b7644f2d58383eb0d7cdd10f273a79e75a36507285db4737bb270dda8cb195482d6f8e2770b24fce13c72dd32325c3976e SHA512 8b8ffc33962a5dffbae83dfb8ea73b0d2ff6ee002fbd9e4b574ef5f8e562338e359caab290ab804f2801a14e04d2c76eb0a52cf06be4d236ea043de4fc39dadf
-EBUILD tracker-2.3.4.ebuild 2592 BLAKE2B 2a5c66824cf6405495f2facaf0d8c30eeee6b2d7993fc5ccaf69949fb9c5ff0a4070587932d52a94303707cd7d3d6ceb04196c1bc536a9f510f74204a408159e SHA512 8c23b0ad1c7b7aca2399a6fd84a25d6f03bf507e45253042c5e0958321cd876af3c8359d5f7dc48cc7503b39b31c867a6a182a5d9aba9e262318eac177e4b744
+DIST tracker-2.3.5.tar.xz 1604004 BLAKE2B ad79682cb703056fd927649021a5f37fddb2e978ecc710d020c23ef5dd076f88c7e0c2cd9d4385343e9d6c2c2ac7473af7508d86793c505e2361a8021bf27d50 SHA512 74cd3b2671b811f3267a516e6f6047594fffa7c8a4a23fa5be4f7d71f581c417a88f12f614757418a848077a9231c0c876617d4486f3bb5b103382b871913d34
+EBUILD tracker-2.3.4.ebuild 2620 BLAKE2B 8ccdf4ea140a4ede4a8324a87ef8b026591ebc25f658b24aff751ba4422da3e86e030bc55ecc92878e0d66db384daa5af43a142eee7f1df4aec72ef57f704366 SHA512 26b5717fcf43485257b4b2ad53ccd13585817c59046174325c658499bee412d5fb71e711368562433015f38a6a74cd549de0ac16293639b80977b3d013bbdaf4
+EBUILD tracker-2.3.5.ebuild 2595 BLAKE2B 4b241983c1284eefdc4c7c44749927389959d0b789a970b23d59adccc0ba315d2c0f2b460eb6ac761cdac70a7f0557867da1108605e978780e256c688a868c3e SHA512 11dec80a2cf4c148683ffc6dc6659354d367915d029c83992ef6a694751a24a9b0414ef3125f1369b15932dbc773891dc3b54e1e4bd99a0074035faab6ae391e
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/tracker-2.3.4.ebuild b/app-misc/tracker/tracker-2.3.4.ebuild
index cb4efce3cb78..fb616ad99c5d 100644
--- a/app-misc/tracker/tracker-2.3.4.ebuild
+++ b/app-misc/tracker/tracker-2.3.4.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 VALA_MIN_API_VERSION="0.40"
+VALA_MAX_API_VERSION="0.48"
 
 inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
 
diff --git a/app-misc/tracker/tracker-2.3.5.ebuild b/app-misc/tracker/tracker-2.3.5.ebuild
new file mode 100644
index 000000000000..c5a3577c1c9e
--- /dev/null
+++ b/app-misc/tracker/tracker-2.3.5.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/2.0"
+IUSE="gtk-doc +miners networkmanager stemmer"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+#RESTRICT="!test? ( test )"
+
+PV_SERIES=$(ver_cut 1-2)
+
+# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
+# But build still needs it - https://gitlab.gnome.org/GNOME/tracker/issues/131
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=sys-apps/dbus-1.3.2
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/icu-4.8.1.2:=
+	>=dev-libs/json-glib-1.0
+	>=net-libs/libsoup-2.40.1:2.4
+	>=dev-libs/libxml2-2.7
+	>=dev-db/sqlite-3.20.0
+	networkmanager? ( >=net-misc/networkmanager-0.8 )
+	stemmer? ( dev-libs/snowball-stemmer )
+	sys-apps/util-linux
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	$(vala_depend)
+	gtk-doc? ( >=dev-util/gtk-doc-1.8
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
+
+function inotify_enabled() {
+	if linux_config_exists; then
+		if ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "You should enable the INOTIFY support in your kernel."
+			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+			die 'missing CONFIG_INOTIFY'
+		fi
+	else
+		einfo "Could not check for INOTIFY support in your kernel."
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	inotify_enabled
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dfts=true
+		-Dfunctional_tests=false # many fail in 2.2; retry with 2.3
+		#$(meson_use test functional_tests)
+		-Dman=true
+		$(meson_feature networkmanager network_manager)
+		$(meson_feature stemmer)
+		-Dunicode_support=icu
+		-Dbash_completion="$(get_bashcompdir)"
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 05c160a9d94f..13aa9676167d 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 37051512d78a..1223796542dc 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -5,6 +5,6 @@ AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e
 DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
 DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
 EBUILD scribus-1.5.5_p20200626.ebuild 4078 BLAKE2B 28b48945c2f0cfbe409a1b390c42eeaed0db28a0592284c67c62855c11f52415ded2b0eeb2f65d359c6af6535ebc74928d7786a4abcde191ffdeb02b5870b661 SHA512 ff283fe98f0ce8929a7456316ced12d97d0e8df373af0fde09e49af37ccf5f29a0569ceb65ef21a03ea3444ccaa4c65d33d3753a5ba6390fa1f6f87d47ce273a
-EBUILD scribus-1.5.6.1.ebuild 4048 BLAKE2B 0346ecd36acbac7c2173eaf97624b4e6d06af9ee1821004731104bfbdfcfea4a5c65fa42e723a8004e8774775afe72f10fd9aa3ec98e56bd2564ebe383e96721 SHA512 b6022f80a91377f0735d592abf1c4724f6a27ddff18f65a059a7847703c498457e8abcfe621211644ee990cb044708e8291704810397addee863b24240fe55e2
+EBUILD scribus-1.5.6.1.ebuild 4047 BLAKE2B b9d81c8530d6bca1cc0663fbca6af1fdd490dcd50d085a1d8f5160abb3f363ce3566907f05ae5891129053f9c728c57d5fc978f5368222054d2aca5f118d5de8 SHA512 7c9f0254ee90f6595c535df75f8339e56e26af55aac45a0d5b53830c84a1b89ab14a35c73c2638bba094681efd0765e4b635dfb8cd4d476ab58c23ecd9a7c29b
 EBUILD scribus-9999.ebuild 3954 BLAKE2B b6907c836200ad7a775bf0e9866c2a324e61890923db880be545b3f142e63f102d2f52471a2c93da3b5825b36fa1abf9a1a7750746cd1c39b02511160c6fa65a SHA512 08b6477bd65533a70cae2f07e1e41f5ec713052dd1ccd164de489cc91b3f2a84644bd526e7c55357cca4833eedfa76016f7d7174521360361f49085bbcb0134e
 MISC metadata.xml 882 BLAKE2B 87f52990c93874472eeb73cbf7b46b4c1fa41d25e17d179f5cb9f5067d21aea18ac4ac323e5878c2bf49d075f67230353860cd6b45b9458435ca7b0fae9854b0 SHA512 403eb2874bccc2929284f1e44042e1fa84c2ad9d6abcb1b9600f327060e1b476366ab40cf6f8876aa18bf8195c21f82e2deaecfa7e1868b2fcfeba42c72e9d58
diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild b/app-office/scribus/scribus-1.5.6.1.ebuild
index f001fe5574c6..d68ada3ac042 100644
--- a/app-office/scribus/scribus-1.5.6.1.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 64404a069812..665f8add8781 100644
Binary files a/app-pda/Manifest.gz and b/app-pda/Manifest.gz differ
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 8dff3c074245..39bb9f8b722e 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,11 +1,4 @@
 AUX libimobiledevice-1.3.0-libressl.patch 862 BLAKE2B 48f05bd6fd4d460ee6d8f5174ce47dfd01b8cc2856b21893122be2d23676569de05712905d32e29783dc9b63b3fb047670e871fdb5c9b95cd2f33320d64ffbd1 SHA512 a583d0eb3be5a9b18abd3e3a810244345004bc0cd4c398b79311493b8da4f844691740c4d05f6377f122a74d928f8c723edf8ec14c932c5091ff765b5a4db108
-DIST libimobiledevice-1.2.0-git.patch 187304 BLAKE2B 7c184f823b831b913dbae16a58db1e4b7682fb42e573b1bab3983eb8150feb696795fd59c81ca7582fd56cd953e32489a8ddc502c4cb39a6ac88ff3d018ceace SHA512 cfc433a8eada9357ee5119ccfeb1e7444f10132637a43954174721905207b0e168f49a1728ee16ed6b0a9fd8b9617e8e35b04cf34f775abd1d12b8ecb7dbdbd2
-DIST libimobiledevice-1.2.0-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch 2272 BLAKE2B 2f435af75c6f7fe319c76b52feac32d8f1389806835658bae5713d82471d0b2edd01b062871bff5e757795c220e2cd4c77d404c1df0cf9616c2fc2d77364b686 SHA512 a31741cfaae53781a1491fd53514e614e64c676573dc9252adea2fb0d64005eb5fad6483f1848b0246f0fff76c8fb4535f56a6e97c13dd7aa48a29061cabb172
-DIST libimobiledevice-1.2.0-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch 2014 BLAKE2B 8a6e51af145cf9983aa92ad7febf8d48a64b81f4f4664079ee7df3d433626141e10af6700ad38aad81bbbf3be03d6b35bae4f10a595e97f6998a06b6b2a4fbd4 SHA512 1c6002f8da5524603b989613fc1b14e526bc6fcbf515890f8c4976fe5e1b3801f04f6b210264624990ff7dd7de01063ad53dbf9ec506a0645098692a948216b9
-DIST libimobiledevice-1.2.0.tar.bz2 631495 BLAKE2B b04d87906615710e9e143013d27f4a0735e444160cb9dad464cb63d568470397f504680b3faca3995932cc8a80970a5923128d356fad9c98372af4981373ed69 SHA512 0de5f768aeb5d62445892855d84ceaff776f6667733c351ed6c34bf9d500802762d1a06e5efdf57f33cafc9ee788041cd9b6748fb9bad6c2e4ae2f9b9aa93589
-DIST libimobiledevice-1.2.1_pre20200220.tar.bz2 193582 BLAKE2B 7fab2101ee96a5fcc5dc68bad1a6c9fef25d87f25660cbce9aef45f8830c0162179f07e3d8a0f1d7d60bb7a219b1c4ee2513d43f98e8e4ea0d891686600c370e SHA512 f9d04941685f1cb0e982d061a6ea92d88d1d90157a789460e09e6af72954ed7a7f0448efbef3fe3cbca380195ffa658f7d8119e812f8ba8003c1e8a242976865
 DIST libimobiledevice-1.3.0.tar.bz2 733949 BLAKE2B 40717280bb3424c7431aa93d06d10de817e6761acf2b19948d80b691cfb4dd4ef0e31b81c8458eed29a43c8c8aa256da7baa3648fb785cfbdb7316daaba119a3 SHA512 7b22040552a6561729c79c0846f571b0e608abb7c297567d2ecfdd1718ce86df08a5e34ba51f209bdee96a1917da15e7ba3aaef1d289a951d1d3470b1f89e6a8
-EBUILD libimobiledevice-1.2.0-r1.ebuild 3251 BLAKE2B 4250165b98dadb3c8c9c40205cfdc2751faa8a6865e58be8fb933b560d1001d9e4f41a81adea9099ed38cfc58f9a1fef61c1a61a1c84389f1436c713170acc30 SHA512 742efd5fdb8bcab38ac94af62e5a6c22f18128e43345d444cd96777a1fda4d46ca5bbb87b47a3fb3bcdb6011633e75ca876e372ce16969fe14394068b4f395d3
-EBUILD libimobiledevice-1.2.1_pre20200220.ebuild 2599 BLAKE2B 7378479cb0050d0c9ce2fbbe07b1aba1976e6c1d275753bf33d644230c49834865f721ad86aa84b86ce7247c8766363d2f03bd5aed1ecb5816d1d6431938bbde SHA512 ea49d0257645a50966102b5cd72950db1c84daf3a82327e3e2d2de3e9540a655999541dc628c59b4ebb7461dab593e2e3b3409a3120202453626d308006ba190
-EBUILD libimobiledevice-1.3.0-r1.ebuild 2551 BLAKE2B 45bcb4df69d85f6c378066011251d68b9e4122323ae8b321aa34872fee1e8bcf384d68436c47e0e68bc6b12db1d390681a084402a8074b1a4fe2cb8b43ece890 SHA512 c0c632e7ac24c800d6eb405a4d25583dab02cbc37f57eb79c5cd3648e38c5cdc153d4938564458b0a39ae2e68d87b5c6168cd9be3fa4cf0fb9b9dbff8336b869
+EBUILD libimobiledevice-1.3.0-r1.ebuild 2550 BLAKE2B 4c2bac64acd54e21ddcb03f38a53f7a31396d8fb110cb369ad7f61585d9f09301271d6b10e741122a97891b02182ddb99fa734ac13a6ead8b81c1cd50085be63 SHA512 d74b7c3c83bd0a3438095a0b44e07cd40557218d4bb4e95838de52b58a28d6f40e7ed540e4960af4da72ad39e16dee8db04a4e5023a72f5d75bbea8ce913dc32
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
deleted file mode 100644
index 6b1c60b021b4..000000000000
--- a/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools python-r1
-
-DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
-HOMEPAGE="http://www.libimobiledevice.org/"
-
-# Get patches from Fedora
-SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2
-	https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0001-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch -> ${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch
-	https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0002-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch -> ${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch
-	https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/344409e1d1ad917d377b256214c5411dda82e6b0...5a85432719fb3d18027d528f87d2a44b76fd3e12.patch -> ${P}-git.patch"
-
-# While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
-LICENSE="GPL-2+ LGPL-2.1+"
-
-SLOT="0/6" # based on SONAME of libimobiledevice.so
-
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="gnutls libressl python static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=app-pda/libplist-1.11:=
-	>=app-pda/libusbmuxd-1.0.9:=
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=dev-libs/libtasn1-1.1
-		>=net-libs/gnutls-2.2.0 )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= ) )
-	python? (
-		${PYTHON_DEPS}
-		app-pda/libplist[python(-),${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
-"
-
-BUILD_DIR="${S}_build"
-
-PATCHES=(
-	"${DISTDIR}"/${P}-git.patch
-	"${DISTDIR}"/${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch
-	"${DISTDIR}"/${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ECONF_SOURCE=${S}
-
-	local myeconfargs=( $(use_enable static-libs static) )
-	use gnutls && myeconfargs+=( --disable-openssl )
-
-	do_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		pushd "${BUILD_DIR}" >/dev/null || die
-		econf "${myeconfargs[@]}" "${@}"
-		popd >/dev/null || die
-	}
-
-	do_configure_python() {
-		# Bug 567916
-		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
-		do_configure "$@"
-	}
-
-	do_configure --without-cython
-	use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
-	python_compile() {
-		emake -C "${BUILD_DIR}"/cython -j1 \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			imobiledevice_la_LIBADD="${native_builddir}/src/libimobiledevice.la"
-	}
-
-	local native_builddir=${BUILD_DIR}
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake -j1
-	use python && python_foreach_impl python_compile
-	popd >/dev/null || die
-}
-
-src_install() {
-	python_install() {
-		emake -C "${BUILD_DIR}/cython" -j1 \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			DESTDIR="${D}" install
-	}
-
-	local native_builddir=${BUILD_DIR}
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake -j1 DESTDIR="${D}" install
-	use python && python_foreach_impl python_install
-	popd >/dev/null || die
-
-	dodoc docs/html/*
-	if use python; then
-		insinto /usr/include/${PN}/cython
-		doins cython/imobiledevice.pxd
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild
deleted file mode 100644
index 04ee38620ee7..000000000000
--- a/app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="3d8d13f0a70cefc1b12571b7f6aa2d1d4c58cffb"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/libimobiledevice.git/snapshot/libimobiledevice-${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-
-# While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
-LICENSE="GPL-2+ LGPL-2.1+"
-
-SLOT="0/6" # based on SONAME of libimobiledevice.so
-
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="doc gnutls libressl python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=app-pda/libplist-1.11:=
-	>=app-pda/libusbmuxd-1.1.0:=
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=dev-libs/libtasn1-1.1
-		>=net-libs/gnutls-2.2.0 )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= ) )
-	python? (
-		${PYTHON_DEPS}
-		app-pda/libplist[python(-),${PYTHON_USEDEP}] )
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-BUILD_DIR="${S}_build"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ECONF_SOURCE=${S}
-
-	local myeconfargs=( $(use_enable static-libs static) )
-	use gnutls && myeconfargs+=( --disable-openssl )
-
-	do_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		pushd "${BUILD_DIR}" >/dev/null || die
-		econf "${myeconfargs[@]}" "${@}"
-		popd >/dev/null || die
-	}
-
-	do_configure_python() {
-		# Bug 567916
-		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
-		do_configure "$@"
-	}
-
-	do_configure --without-cython
-	use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
-	python_compile() {
-		emake -C "${BUILD_DIR}"/cython \
-			VPATH="${S}/cython:$1/cython" \
-			imobiledevice_la_LIBADD="$1/src/libimobiledevice.la"
-	}
-
-	emake -C "${BUILD_DIR}"
-	use python && python_foreach_impl python_compile "${BUILD_DIR}"
-
-	if use doc; then
-		doxygen "${BUILD_DIR}"/doxygen.cfg || die
-	fi
-}
-
-src_install() {
-	python_install() {
-		emake -C "${BUILD_DIR}/cython" install \
-			DESTDIR="${D}" \
-			VPATH="${S}/cython:$1/cython"
-	}
-
-	emake -C "${BUILD_DIR}" install DESTDIR="${D}"
-	use python && python_foreach_impl python_install "${BUILD_DIR}"
-	use doc && dodoc docs/html/*
-
-	if use python; then
-		insinto /usr/include/${PN}/cython
-		doins cython/imobiledevice.pxd
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
index 9a8f598ddc00..7caaf0293e9a 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 
 SLOT="0/1.0-6" # based on SONAME of libimobiledevice-1.0.so
 
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="doc gnutls libressl python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index 93f597c98b54..c34923bdf1e2 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,8 +1,5 @@
 AUX libplist-2.2.0-fmin.patch 1102 BLAKE2B ce8c76a369ae1ddc54016bbc941efeafa96d093bce14c0cdaf1da17fe7d201673bd0565669dc12209ee1230b66f56750ba64e8431d72f0d118ea5880b0764a0e SHA512 683203116ffdae053c4da35704aaf2b707b804a19316286f890df4bb6a9ae8dd6b6a4ee0f6db6164f124887e8a602db709d985496b0734899826f04e19846d78
 AUX libplist-2.2.0-pkgconfig-lib.patch 305 BLAKE2B 67da57f080454e8b01408872ab76b66703e0339052f64c3738964b02e6a389b03aac65d7d6ca30bfd78b1366c4a7fec843b039b32269db0a4e7e95850638e34d SHA512 1c2c628f178ed64a8f7e1dd84657d7d365e980a2b2d8af9dd6bbe55d245997cf51974d9ed451eafb715299097029886f7ec0a863f199a72bf15f50281c9bfab7
-DIST libplist-2.1.0.tar.bz2 120602 BLAKE2B 8abfe3c295c4ebd242f2c4d49c80d1f214097df84f1d2fcf2696519bbbca4e8a5ce13c04690ac64fd981f84d585df25fc65c268a4e4f4092319053583e67736c SHA512 23156e882835bb0b894a05b57018b5e76f9f8f8f4b1d3fdad7b1970d2ef695033c98de74a1fa81bdf0829742a058fd65075cebc1512313d2be42e2f5367274be
 DIST libplist-2.2.0.tar.bz2 126808 BLAKE2B 7c3ec04aaa52eca33ae28851a6524c9ea531df939feef0f10827c8c2de78a6ccd856ea4d8a568b146ccb5de96f70dd5accec34aa2fdd61f9e6eba01256c0b518 SHA512 641bfd3ec0565f104d3a2d1ebdf6137bc9252b67ce90550e24ab0deeee4e820e119ba4f8f1ba04a0358d995d196fa61e35f2f0ee8ba37fc0270752ae842ab1f5
-EBUILD libplist-2.1.0.ebuild 2145 BLAKE2B 666212cfa479b9855390170df691006230daeebad437fa6599427fea3f7b6f25db4079cbd47d87453ad23eacfa8103f45e834d8c472db3b4cc6ce4a37c0fa9ed SHA512 f73c7808e738a970fd5edd8ef657558dcf97ac73cda3b2470ba3856edb0aa831e9338d349ce35330caa1c56a3713fd1d3d5046c965ecc8715f837479596a5a47
-EBUILD libplist-2.2.0-r1.ebuild 2150 BLAKE2B f4019c675f045e06bf35f4badf4738708b3afaf229087b7f0c3d8ef62a4051c7d9d6d40a44eb2a3b828c3fdabab40920af75890f08e6385a01ef561d6ecc3ef7 SHA512 8776a7558f87372514d6bdf21bbc4ef73f0c9dbac29c1bbd2b9b54f2fa66e9b40b91d309dc2cb8209c794696b2ea70972327abee5978dbf78848e54f55704c93
-EBUILD libplist-2.2.0-r2.ebuild 2713 BLAKE2B 93992011922de0a85274e93fe606eabd9e305340d8b2fadef724ff1f50a7290d6f5ccabb58ed19a676e1fb45c56d90740539bf7a83917bfb19953c222ab60787 SHA512 c940311a1af04035b8866954c7491157249b06d2180c4b36ce540a081d2c4012c201bc881c823cad4ac26eee89831355c649939121a2a496c234c19aee81c4eb
+EBUILD libplist-2.2.0-r2.ebuild 2712 BLAKE2B 8c06df42da66a930ff993ba8473dba9bd8e223ac0baddcd5f858e2eb17cefff84701804d5e8e5b796a46aaf5e258fab8b75da0d3a5e5b79276d535a1d2b7cbc8 SHA512 dca25126a8909615d21f16138c830fb6d9df94ce7cfde3b9e5fc0cfc2b6b59d3b51e7fc7d70f5892a0bf0a77b5a2c43bb18fbd41374d4588cbd34c35c6862e13
 MISC metadata.xml 329 BLAKE2B accbb4a0f223b37358e54635e61f1488abf2148d89e166e4a68e8ddfc90e0d4c3438c52d75c24aeced91c2246e537cb0b1d64e6e9c63425c6392148cbc3bcd58 SHA512 69d57118df488610f977fe8722d463bb858e8329855cf439ae3c1c7c52260dec96505535e9424041d71d000951db199312e382d24f66296c9c408113ead5219d
diff --git a/app-pda/libplist/libplist-2.1.0.ebuild b/app-pda/libplist/libplist-2.1.0.ebuild
deleted file mode 100644
index d4dfa2e6a791..000000000000
--- a/app-pda/libplist/libplist-2.1.0.ebuild
+++ /dev/null
@@ -1,98 +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 autotools python-r1 toolchain-funcs
-
-DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/3"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="python static-libs"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( AUTHORS NEWS README.md )
-
-BUILD_DIR="${S}_build"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ECONF_SOURCE=${S}
-	local myeconfargs=( $(use_enable static-libs static) )
-
-	do_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		pushd "${BUILD_DIR}" >/dev/null || die
-		econf "${myeconfargs[@]}" "${@}"
-		popd >/dev/null || die
-	}
-
-	do_configure_python() {
-		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
-		do_configure "$@"
-	}
-
-	# Don't prefer clang.
-	tc-export CC CXX
-
-	do_configure --without-cython
-	use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
-	python_compile() {
-		emake -C "${BUILD_DIR}"/cython \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			plist_la_LIBADD="${native_builddir}/src/libplist.la"
-	}
-
-	local native_builddir=${BUILD_DIR}
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake
-	use python && python_foreach_impl python_compile
-	popd >/dev/null || die
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	python_install() {
-		emake -C "${BUILD_DIR}/cython" \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			DESTDIR="${D}" install
-	}
-
-	local native_builddir=${BUILD_DIR}
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	use python && python_foreach_impl python_install
-	popd >/dev/null || die
-
-	einstalldocs
-
-	if use python ; then
-		insinto /usr/include/plist/cython
-		doins cython/plist.pxd
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-pda/libplist/libplist-2.2.0-r1.ebuild b/app-pda/libplist/libplist-2.2.0-r1.ebuild
deleted file mode 100644
index c5c2f5167b89..000000000000
--- a/app-pda/libplist/libplist-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,98 +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} )
-inherit autotools python-r1 toolchain-funcs
-
-DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/2.0-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="python static-libs"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( AUTHORS NEWS README.md )
-
-BUILD_DIR="${S}_build"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ECONF_SOURCE=${S}
-	local myeconfargs=( $(use_enable static-libs static) )
-
-	do_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		pushd "${BUILD_DIR}" >/dev/null || die
-		econf "${myeconfargs[@]}" "${@}"
-		popd >/dev/null || die
-	}
-
-	do_configure_python() {
-		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
-		do_configure "$@"
-	}
-
-	# Don't prefer clang.
-	tc-export CC CXX
-
-	do_configure --without-cython
-	use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
-	python_compile() {
-		emake -C "${BUILD_DIR}"/cython \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			plist_la_LIBADD="${native_builddir}/src/libplist.la"
-	}
-
-	local native_builddir=${BUILD_DIR}
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake
-	use python && python_foreach_impl python_compile
-	popd >/dev/null || die
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	python_install() {
-		emake -C "${BUILD_DIR}/cython" \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			DESTDIR="${D}" install
-	}
-
-	local native_builddir=${BUILD_DIR}
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	use python && python_foreach_impl python_install
-	popd >/dev/null || die
-
-	einstalldocs
-
-	if use python ; then
-		insinto /usr/include/plist/cython
-		doins cython/plist.pxd
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-pda/libplist/libplist-2.2.0-r2.ebuild b/app-pda/libplist/libplist-2.2.0-r2.ebuild
index 3956dce388f5..059c8ae313f3 100644
--- a/app-pda/libplist/libplist-2.2.0-r2.ebuild
+++ b/app-pda/libplist/libplist-2.2.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/2.0-3"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="python static-libs"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
index 95a2ea74c000..80f293f6b344 100644
--- a/app-pda/libusbmuxd/Manifest
+++ b/app-pda/libusbmuxd/Manifest
@@ -1,7 +1,3 @@
-DIST libusbmuxd-1.0.10.tar.bz2 292649 BLAKE2B 7ec9a576cb20f7e87cf1f31e57e66100c496e5809142d225df9b3cc295a71546bed2d90f41df3144f7316ce0aec5f08fad850c528e27f336bf96e9578bcffd04 SHA512 180cde2e9d0860d07d29813e68abf8ca807f75e98424b50acfc1ce941ba4260922959e1047a7d2bc754470c08ed55d0a15c9367487bd41c635a52b4fbf8ff535
-DIST libusbmuxd-2.0.1.tar.bz2 37373 BLAKE2B 3d7d8b4ccc5331f1f3868e67ac9726281dccb8eabc58cf78d4b8a921c403095adb18cd8ec4f156c06297abb8566daae04300709fd1afd35c57dbda155db03c0d SHA512 c2a977898ccd28d32f7754bac08829b57bc87ad958febded2c95087a06cb0b5a73daf087b3a00630701a7313fd3900f916846b77b4794321c90e6aa9f9246ed3
 DIST libusbmuxd-2.0.2.tar.bz2 43162 BLAKE2B e3559583e691a5f87a61ffece0ebf944d4aed48d37f83a504ee4d7a245e05511c6620c4a82d29bea2a10686910a14f7a730afec0f2cfc9435f748499e35df433 SHA512 3086ce1a05026afeabcdb5364ec30f4a6a5c84fe6f09e15ef6ff438bd3dfdb262ebdff94e5e0d0828b6d946bc8bdf01760271ba0d1fbf98d743dce149764a519
-EBUILD libusbmuxd-1.0.10-r1.ebuild 937 BLAKE2B a5c8eb29f27bc1a75a13c81e916eee108803a6a0827ba57edb76e2d06c89655852d021ef164efcd11e95c59ff95210b52bd417cb33404fff243d0b916553f44c SHA512 66a0254d202427c87f8188076a2602b200da3ba7e31b19e88c573269126ca075574e8d8b02da451c3f6bb348a74341365736b738271d8ab49d7d6060f8b9fc8b
-EBUILD libusbmuxd-2.0.1.ebuild 859 BLAKE2B fa38081bd37fe5f5f5d674623dd549e5456db0cd5586e29d2e1422e4b0e7d1507e6ea8cb6f87147204a44d6dcc097c0f536fa6304e01f05a64fbc67746ff24db SHA512 1ababb683971d59ddddc67fa34e3adf37af52a8ba805337e74f262175c7451307517a774911fb7f7a6cc4bfcb6d8008ba659e4ac209a23a64a0d6df4ee664746
-EBUILD libusbmuxd-2.0.2-r1.ebuild 840 BLAKE2B 5c8d95a21c51cc71b8a7029846f6aff86c4095439b5f0cb97f1eefed60361614a32e07e6100f3793b3695c3562b1ce571185f262de364ca6da83a3a64b2c4988 SHA512 0e345cc5353516f54b62e55bc8b924f51f89cab7b01991635f47874abdb290606fef58ee078293bbcdd56c16513d07c5cdcaea65130c760ad47f94458a7fc795
+EBUILD libusbmuxd-2.0.2-r1.ebuild 839 BLAKE2B c4d4bcea555332a7eb5c75204e7c30c22b6144fa8fa078fd2d7cd6789dde8e3cb595c56330aad82a241ecc606f2867a5dcddcd7174d85f334c73ab10fea13b9c SHA512 2c14a6036ca23f45ce2734e9938b5ff2623bf04bf75b1876560f1117a9a6fbf0af07f194b8f08b1723e566235839a2a4105b8841ca174aa01a68b24d5d5b36bc
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild b/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
deleted file mode 100644
index 484a681d6a9f..000000000000
--- a/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
-HOMEPAGE="http://www.libimobiledevice.org/"
-SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
-
-# tools/iproxy.c is GPL-2+, everything else is LGPL-2.1+
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/4" # based on SONAME of libusbmuxd.so
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="kernel_linux static-libs"
-
-RDEPEND="
-	>=app-pda/libplist-1.11:=
-	virtual/libusb:1
-	!<app-pda/usbmuxd-1.0.8_p1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/os-headers
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myeconfargs=( $(use_enable static-libs static) )
-	use kernel_linux || myeconfargs+=( --without-inotify )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -type f -delete || die
-	fi
-}
diff --git a/app-pda/libusbmuxd/libusbmuxd-2.0.1.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.0.1.ebuild
deleted file mode 100644
index 5464424c6842..000000000000
--- a/app-pda/libusbmuxd/libusbmuxd-2.0.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=7
-
-inherit autotools
-
-DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
-LICENSE="GPL-2+ LGPL-2.1+" # tools/*.c is GPL-2+, rest is LGPL-2.1+
-SLOT="0/6" # based on SONAME of libusbmuxd.so
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="static-libs"
-
-RDEPEND="
-	>=app-pda/libplist-2.1.0:=
-	!<app-pda/usbmuxd-1.0.8_p1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(usex kernel_linux '' --without-inotify)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
index e06910e1402d..66992dce2f80 100644
--- a/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
+++ b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.libimobiledevice.org/"
 SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
 LICENSE="GPL-2+ LGPL-2.1+" # tools/*.c is GPL-2+, rest is LGPL-2.1+
 SLOT="0/2.0-6" # based on SONAME of libusbmuxd-2.0.so
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index b3c683c54906..3f9feee41e0d 100644
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@@ -1,5 +1,5 @@
 DIST usbmuxd-1.1.1.tar.bz2 345290 BLAKE2B 580dd4e2fb05d6c4803d774f7d43c8399219d8f0ce4191428cb4fccffcc941894d0381d5f0746997570dd24e395af3dda340b1910827f9c5ace7e2d9cc176c6a SHA512 0e8829c93aac147a6b949fe95592d6ad9ea36e1c04676cb85accb4670a65b31065706fc438556def17b55850081d6c07deb325ca02b9853335b6e0b1049ba1da
 DIST usbmuxd-1.1.1_pre20200121.tar.bz2 51859 BLAKE2B 339d53904f7484bebb6d7524313ee065bf5a244efab16c77b30b8932071012105f21aa56083d82667b06088af83464ea8c86e3c28c5a45cb9abbe574a634533e SHA512 cc113b054e8e04d228af740ec43d2dbf29c015dc9d8e1cdd0eaf84bfcaa9838d5b1bf6db2efed30ffb84c35c88db5469983a115ffdbddbb6acd0df9fd2a5182f
-EBUILD usbmuxd-1.1.1.ebuild 893 BLAKE2B a9627bf8375b8017df7f70a99afb2d2cec8a5c1c5c2c64a46b78e5baa1559f27ce2cde88f5c873cb1d1ebcb59cb09b73f568cbfe5d38ff5872498e1b18283bfa SHA512 e29661b9abf03b94099246c841023e46fd349832ac5a0f58fd06c9322cf66201f76ce07232ffcdf2436b53e2b02f49f05abdf16a31bf85043028302dc9f1a725
+EBUILD usbmuxd-1.1.1.ebuild 892 BLAKE2B 97674b0eead116f41b38997b09da6786ad04f70287ceeee24d9b3c4330f44c8cd522da56b5647194fba7077de952184b501dfcbab3873f20a1f15a9761362c15 SHA512 a18e3c77ecc6a580984160b8c668cfc1d876c6a6cfdbb5bc32bfb705858eb3405327a420eecaddc878776b8b0118b4403c8e1419a66644e485553ab1844ddaef
 EBUILD usbmuxd-1.1.1_pre20200121.ebuild 999 BLAKE2B 2ee05606bfec58b686d5c9391b0374e2a525614bb94ba239b04517032da709c58f3eb51b5fd906db68d059c56f6604d8a91fed43aeda88984ff5d754ca2c7848 SHA512 d7149fa395b79a097eaeb8db5cd68cdbbb42a792b6be2e1ec513232aee7be2eac1ac426b9db10eaed66b6a7360c27c04f52e8d370474eb3279d8cc7c95f9c18f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
index b5000fe98b41..cde7b567939d 100644
--- a/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
+++ b/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libimobiledevice/usbmuxd/releases/download/${PV}/${P
 # src/utils.h is LGPL-2.1+, rest is found in COPYING*
 LICENSE="GPL-2 GPL-3 LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="systemd"
 
 DEPEND="
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 0e2fd672835b..6d0fc7e17ac9 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 0a995509e85c..5175c629b89b 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,7 +1,3 @@
-DIST eix-0.34.10.tar.xz 630356 BLAKE2B 6336652dbb3703295693dea40cb2d2a2d5c7fc17d28150faae07b566cccfddb8d103b83c5db34e839434b1fbbe0ff87a08c4af84d2f80c5e9b786d88d5743f96 SHA512 35270b7fafe6a13ebb33271b3baba07f61928d9c9c40aafabc47d8f7bd4a8d44e1013004361e9cf81e8517d5b1a8a3010d18c6fcac02dcc8b44dc443762f82a3
 DIST eix-0.34.11.tar.xz 629932 BLAKE2B 7b203a4763a880379e5bafe086f70aeca6ad508cd558cc53d53683d8ee4a85111ba9fdea9fa81cd9c3939dd01ea392876b2714257138fd40a2c6b124e0fdbc90 SHA512 518dee499ed27acd39ea4c26e7b94a1098408b1d8cf6bc593e5e4b06aa973ae664e155886681c1e90e4a89afe8b54e05f8bd08d6ace2a2e1559fa613e5a351e7
-DIST eix-0.34.9.tar.xz 629672 BLAKE2B ba9a5de98f74baa711e7483e284980c0fe5e956512de590954bf848f6cf6baad5db899256e927e7cb984d7276157fa9c42052cc8fb1ccc52e5e530cc31d39d84 SHA512 5cb00c813bc31971a0cfd77cae0c676040d33f24963cb241274918d2e381956ca949593e0637d81040a9751db0a925552913188cc25ada9a90c6007c31f72e43
-EBUILD eix-0.34.10.ebuild 2585 BLAKE2B 6749db82fc458fc9cf06ec50e3c1060dfd38c115d1215ff3ee550cb217583e01124bf8c898e89def83125531e5d020e217c19a23b921eed7f531a7fb10711b10 SHA512 46c33084b670cca3ff22602fc3f17da750ffca4f7503a51523f74edc89fd564cd7ed22f86a9065239bb49ed0e3a8e527fbab4e4b1f0f9074b6f6e02f49fc11b9
-EBUILD eix-0.34.11.ebuild 2581 BLAKE2B 8c4b96c586644179c7bae79e8fac6c46326f0256febc02e8047e7f7ba0176a4196e4fe5cdc0de32d9e994fe931ee99248b66e10daa4d581e55ef853e58978506 SHA512 d6925b8aa4f27597d23a96902e90cc13421171fa69332d58ac97beca903be8c1709ebe5667d96113b44fb92308c494aa7ddc3392d204d1aa2a881135959285b4
-EBUILD eix-0.34.9.ebuild 2576 BLAKE2B 746fd28cc0f30bb051721dd6b45868650af05fa624931a16999090da378033547b0ebfbd10c0704db68cae4df120540b2b2c63f361e3a3a44be6f08e27dbb802 SHA512 0fd779fc7effddc026db782ccbd5d891fdd954136ed7f1d9f10d7dde0d32b20042edcb1393698a79ae2b79d3fd7570c92009e7d76b29c66edae6efdf197b2020
+EBUILD eix-0.34.11.ebuild 2576 BLAKE2B 746fd28cc0f30bb051721dd6b45868650af05fa624931a16999090da378033547b0ebfbd10c0704db68cae4df120540b2b2c63f361e3a3a44be6f08e27dbb802 SHA512 0fd779fc7effddc026db782ccbd5d891fdd954136ed7f1d9f10d7dde0d32b20042edcb1393698a79ae2b79d3fd7570c92009e7d76b29c66edae6efdf197b2020
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.34.10.ebuild b/app-portage/eix/eix-0.34.10.ebuild
deleted file mode 100644
index f11bcd6edbb7..000000000000
--- a/app-portage/eix/eix-0.34.10.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-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"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.34.11.ebuild b/app-portage/eix/eix-0.34.11.ebuild
index 60c3f3a77291..27581250b045 100644
--- a/app-portage/eix/eix-0.34.11.ebuild
+++ b/app-portage/eix/eix-0.34.11.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/eix/eix-0.34.9.ebuild b/app-portage/eix/eix-0.34.9.ebuild
deleted file mode 100644
index 27581250b045..000000000000
--- a/app-portage/eix/eix-0.34.9.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-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"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index ad53f4ec6e61..b02d8b4ba1da 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -3,9 +3,9 @@ DIST elt-patches-20170422.tar.xz 27864 BLAKE2B 0b6a764a7030d78618139f2c2a51f33b2
 DIST elt-patches-20170815.tar.xz 27864 BLAKE2B ca699e3fc3f5903f660fba70aa424603d42ef3b3aaa5e8768cfad0561d423972b21e75e578faeaaa89d8b0932f5161079a57e5d0d4ab7b56d5a09b91fb0e8d46 SHA512 deba10767b6a8cb5e8139e6f47a30e6f8a4a9312adb1d3e0199df24321d89601915fc91003da2d14fda679e7cbd30a4d4cf39d94ba57bce06432eefc168650dd
 DIST elt-patches-20170826.1.tar.xz 27912 BLAKE2B 886644713651448784e040fbcde6ef11f98f12abffb347f2213b990c1f0ec2df3af6c729c18781235a393e6de907b4da6ec5d140f7fb856466de6e7cefd54b00 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3
 DIST elt-patches-20201205.tar.xz 39240 BLAKE2B aa2e2377f0d0cba14f38c59664174d066eff04c9d2a71346c998c4324987fbce25cfd91b79e8e40bde0d81bf7d3c43126bffd0a6b0b219aaad11f4f9f22abde4 SHA512 67e199f060e2c93e01b7a7809f52c0a18d82e86f1b1eb34b965c2acd24e5538a874b820028e363d3002cf58b43c2fe3376ae28d2bef0ca81feabb90c83ae47c2
-EBUILD elt-patches-20170317.ebuild 688 BLAKE2B dc82f16dd1eaaf61d7d2230077510a3632fc5b3d7c290befb05575d45dafc2cbe43d46b6188d3239d8a2672e82935a5a53d7ddb14f084d99adcefa8859da4fb5 SHA512 86c30f567058d4f34fcea513e3a298e6967c4ef45b52f633a869b87193f590081e5e3a370f696386af3940c78db80517626d173d38a587084fd52ad0dc4b10ed
-EBUILD elt-patches-20170422.ebuild 811 BLAKE2B 2ca9beead59be64373e7fb7247918df0571f730ae785b291169240d30ede0ee0bc167ea62f0b634b4cbad3b81dc4ca4826d2a6f72128b2e491a39f3b8d8c5572 SHA512 48968fc8561592271e1a6ce56f87b1eaef6d568e164ae30c9f3932918dba02b5322a9274e155acd41ec3077ab1da216ac1dbf27789d09ed93e72a636ce8ab789
-EBUILD elt-patches-20170815.ebuild 811 BLAKE2B 880f672a9d36dc7290afe0e35eb5da5b1eb5a2fd8fd304f0213a1e3f5e661c65e02a4a106f248d08adf782089f4addd2a2f739180c04517c1cdf6ad4a8077d1d SHA512 b0f128a7b20a8d9805dbee6dc9020d6f72051bdc747f8899f58a7e206fcf6fe22400490b739397ce6c790c9b3752254355d911cc6efc39bec4e657ac5b24e6e5
-EBUILD elt-patches-20170826.1.ebuild 827 BLAKE2B ec1bfaea05b583ac7cd3034936d1451a059213b392fd69a8c702bd528bd3031eac0f064874f3a335eb371a914c906858229f692dc5f4c409f791ad6f896eaaa2 SHA512 06c13a2651b68a7784797b7a26e95ac940c15a48dfada95cf42b35dbe332e335008dfec83be0c6fe3e5e79910cc8fc379618cadf4d5912c8a124caa1d6b452f4
-EBUILD elt-patches-20201205.ebuild 833 BLAKE2B 006c131972a8965407e7e0a797082225aa7b030e5303faf70f111db7b8338f665d9f5efba9fbe6b80b366a9aefc943d77d33b951bea28803ca074fe8ccfd3286 SHA512 4679aa383025c68edad50012092034a076831d677184dbe489bc030f4c8a63d2c5005340ccb77f0507771d41f04856b9d00e00b7a914e44543bbd11dbf84c668
+EBUILD elt-patches-20170317.ebuild 667 BLAKE2B 8607d6cf8ecdb333c88f3f697169c606f4357d0422c71b5464262e414773571d635e7b82ea563f553f1851423bcc6b332e10a6abaab51bc96a8d14ca987a3de8 SHA512 d5825ea53c621119db8f5879930ca53b5b2802abbcd2b0a51ff474fc820d2daf4026fe3c302da397950546d40a03dffe629a731bcc0eb11bb880820b5d7ef15c
+EBUILD elt-patches-20170422.ebuild 790 BLAKE2B 03c4e24c70bd8960ed0b3345dd3d9f0716818bcc71f1a44d383d036b911995c68b960aa93331310fab4402740ad80e3300e59a5d6691d026f0cdc25444533f5c SHA512 29a8b5774b02af4dbf32ad82c64955d7be4a33575a544f038c7a208899edb21a77df4a5f1d1500daf1566de3be93a6a8b6ae2c568ae1eba452163fdf90826d9d
+EBUILD elt-patches-20170815.ebuild 790 BLAKE2B 06e38b8a2cb139859d8d8c7d24d541401285d4cf5899f67b0cf3b40b11ad5c66d620c4eaebfd5f525375d74ebbf1c8f038f4712e5e033097418cc9a07d886823 SHA512 efcd3b775027140488cda3c70ad534d0ec658e85531aa6c9e8272374e0c5fb02f8c14aa9e71f0983c732e38c2439e369f10d07037e7614bff49d51d7b49c31a8
+EBUILD elt-patches-20170826.1.ebuild 806 BLAKE2B 4175008ef440a7d27a343de5efabecbdf110ff2094491e07e9841fcc36c70c576ffc1eab1b2f40db5bb13bb2b1cb417c9ae96061a3e8c23f279e661395934714 SHA512 6f0924a09df82ca73b3ef699df73fa87b7275011e422da1b5e8113d6c80322d11b829947136376b20135be01e6d119c732c60e4aaf3c42d0c4a1f0cf4000fc37
+EBUILD elt-patches-20201205.ebuild 812 BLAKE2B f8bcd4ddd1dfc85a43b01344b945f53b0c70a1b5d78cc32f05e28b6b7aba9e102380c190e009fde8eb65266b07c377334da59e2025d0ba435bdbe806f5addb4a SHA512 b544f58ca8e639fa0cb81c4059eb707df5a19cf6880b01aa860cd6b7d9420d75ce78080244cfeac5d252e11c1a184eb8bfc7a5e2e90312166606fd1cffb2fd31
 MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb
diff --git a/app-portage/elt-patches/elt-patches-20170317.ebuild b/app-portage/elt-patches/elt-patches-20170317.ebuild
index b3a68c92282e..bdc8efaf06f5 100644
--- a/app-portage/elt-patches/elt-patches-20170317.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170317.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${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 ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/app-portage/elt-patches/elt-patches-20170422.ebuild b/app-portage/elt-patches/elt-patches-20170422.ebuild
index 526135456625..e9790fd876ed 100644
--- a/app-portage/elt-patches/elt-patches-20170422.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170422.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${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 ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild
index 8836b8a3c500..cb0a74970111 100644
--- a/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170815.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${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 ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20170826.1.ebuild b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
index 98f318e07e43..865b12a91085 100644
--- a/app-portage/elt-patches/elt-patches-20170826.1.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${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 ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20201205.ebuild b/app-portage/elt-patches/elt-patches-20201205.ebuild
index e6ebc44e78a3..2f0742a48f46 100644
--- a/app-portage/elt-patches/elt-patches-20201205.ebuild
+++ b/app-portage/elt-patches/elt-patches-20201205.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${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 ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index fd49b224d4ce..e10f887d9255 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,12 +1,6 @@
 AUX gentoolkit-0.5.0-python3_9.patch 1425 BLAKE2B 51663e01d48f6f192cfe96972c584337e62495d553251ffe360c4e928e208d528b453faefeb3c2d1641c9e662151b8ba91ebb7f1ec6b3a2c67fcb18eaefe3495 SHA512 327ff6d6aa77293f7bff3be6e543e3bb1b4fcf226d3e913668c69fdb9de2d2e04a73d9e73526910ae4e2c3b0bce3f87249cb31d55928b58a9c4274b97525e9d3
 AUX gentoolkit-0.5.0-r1-python3_9.patch 1220 BLAKE2B ce01d9a8cdd214d585b0e4ee61ce21aba2880deb76c666f6a0fd5833d340a24b741be68e6923a942353d53ad0c4d66014290548d52fe76bad4cc0069b6322d29 SHA512 19ab5bd0bd76571106e12f361ef41a7eb4fb573afe5e5d61c547e4df1d2697c80db8307623edbdffcdaee9472ab56c1b61e133cfbf3845b174a10f4e7aec7d44
-DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
-DIST gentoolkit-0.4.7.tar.gz 3205669 BLAKE2B e5f64b85546bc10ad16e7fa42d288965539177375e8796b40df699859efa13fb98bb86aec58e60363c955b2d5e4b2e6379a7597252ee4fdbeec49559de67b328 SHA512 0fab600b4323d23e12009eeb4ade595950880a88b05bcfbfeada1a9b9af615b96d31c568285629bf6e5de7b45ed857bdf98b6261dc54974fbaf70c924e093c76
-DIST gentoolkit-0.4.8.tar.gz 3206070 BLAKE2B 7f689ae85136827b8af50401165ccd44bc824e12bec43dad786c7221ec78ee3c1f14d538d197e277a2fedc23f570440f4ec7c0cc707a146814315ff6de48c115 SHA512 689b4229c5d2b6f4440b7d3d57e4b9be5265eead53737890c17dbd0510df287f5c19f86b924735d4ad146d1a500c59a15869b718cbf805b894b0bf115b69f838
 DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861
-EBUILD gentoolkit-0.4.6.ebuild 2251 BLAKE2B a49d44a874cff3792b16e920592362d5e5475906fa8b001d9bddb8212637581be38c2efbe7e368cf4f9cb024a2759788eff7723b3ce2106f21ea970cb66835d3 SHA512 f993a289c799aff739735f7c857eb9fc8e2af6efef8d8222d0d89990f5017f488d8f4571d88f0b5d68a6a709cbd78067a68995c14c1046c9d95da0eb1387c4dd
-EBUILD gentoolkit-0.4.7.ebuild 2268 BLAKE2B 6c746dfdbedee69288ec6ed230aac924a3012eb4431012e25ee4bf0d79ab8ea007cc60c06618d4aaf985260c1fa326a4843cee0e090d235dfd93bc86621bdf57 SHA512 53616edc36e0e7412030a93e1de75bfe664553c28e7e14a37b9b521f3fcf74ee76d1e59f375e3b9a604b219af49ecaca4efa3d4b381122b7743aace6c655ced0
-EBUILD gentoolkit-0.4.8.ebuild 2259 BLAKE2B 821ed9f054defc80e3603324c17b1670d610d4d7b8cd95d089554af8b92a83419a7ac05025d3b1afab1770b861700b2887d142247c52b87415d5442065968aa0 SHA512 1ba6938d7121e2eeb62956299eca6d50a7643f42e3e6a3473d2e99152468b867ed51684f67921bfa29d62c0b19055e24ed3874053ebf57ee8ffea49f3865bf89
 EBUILD gentoolkit-0.5.0-r2.ebuild 2337 BLAKE2B e1cb23e6df8ac2ab3540c78cf9aab8327dac34a2c44f396d3c8b7b871866124a4be65bb0132534cd5d79fb963214d5e190e96512aa60b9bbd24f44ee7fdac949 SHA512 dec299d0f23c1722ddf03ab89bbff38459ad76af3fc47963c47785b3ae1c5ba6b8aa6ea0f0c37405335176289bbc3aeb93b8b23d06b45ce0870e70776e77bfc7
 EBUILD gentoolkit-9999.ebuild 2019 BLAKE2B a3893445cfcddfef221bca63821fe3df94c56486bee08457ac7e9fc12e99fc496423b5265eae4cb3e37f9781602d1d595ff31654a965a7e97680272eb7c602fb SHA512 33169445760fb68d32fd428f90a886fd407d5c203b62f561966f7a86f784611c110d7ffbeaae525b7f7b44e582a18ee89faa03dc1946ce37bb9a3237d4943b87
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
deleted file mode 100644
index 1db74e52a9a5..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-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"
-
-DEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
-		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
-	fi
-}
-
-pkg_postinst() {
-	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT}"/var/cache
-	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
-
-	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
-		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-		elog "part of the gentoolkit package."
-		elog "The gentoolkit-dev package is now deprecated in favor of a single"
-		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
-		elog "are now obsolete/unused with the git based tree."
-	fi
-
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "For further information on gentoolkit, please read the gentoolkit"
-		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
-		elog
-		elog "Another alternative to equery is app-portage/portage-utils"
-		elog
-		elog "Additional tools that may be of interest:"
-		elog
-		elog "    app-admin/eclean-kernel"
-		elog "    app-portage/diffmask"
-		elog "    app-portage/flaggie"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
deleted file mode 100644
index 318ac20f777c..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-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"
-
-DEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
-		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
-	fi
-}
-
-pkg_postinst() {
-	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT}"/var/cache
-	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
-
-	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
-		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-		elog "part of the gentoolkit package."
-		elog "The gentoolkit-dev package is now deprecated in favor of a single"
-		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
-		elog "are now obsolete/unused with the git based tree."
-	fi
-
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "For further information on gentoolkit, please read the gentoolkit"
-		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
-		elog
-		elog "Another alternative to equery is app-portage/portage-utils"
-		elog
-		elog "Additional tools that may be of interest:"
-		elog
-		elog "    app-admin/eclean-kernel"
-		elog "    app-portage/diffmask"
-		elog "    app-portage/flaggie"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
deleted file mode 100644
index 36cbf7459fc6..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-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"
-
-DEPEND="
-	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
-		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
-	fi
-}
-
-pkg_postinst() {
-	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT}"/var/cache
-	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
-
-	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
-		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-		elog "part of the gentoolkit package."
-		elog "The gentoolkit-dev package is now deprecated in favor of a single"
-		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
-		elog "are now obsolete/unused with the git based tree."
-	fi
-
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "For further information on gentoolkit, please read the gentoolkit"
-		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
-		elog
-		elog "Another alternative to equery is app-portage/portage-utils"
-		elog
-		elog "Additional tools that may be of interest:"
-		elog
-		elog "    app-admin/eclean-kernel"
-		elog "    app-portage/diffmask"
-		elog "    app-portage/flaggie"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index 3b2a88e9f866..b160e7708911 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -1,5 +1,5 @@
 DIST ISO-1.tar.gz 2887967 BLAKE2B 0ae9d9c4078974316d6865a8601705f7c69c8305d8401835bfa544d14a90b3688ea6b881a1c07bcb969fe2b15f210d05f114ebaf3af5ba6f1ae3705d395f1603 SHA512 50bd9bcaa3d1900763936beb4801fd9e5cb963e39d51c39c9cc9a8d160469db1b0c6fffae01bbb5d5d5c6d4e42d84a6c499c465bbdd964835c2d190785eed52d
 DIST grs-0.7.tar.gz 36330 BLAKE2B 9e835262656f8a51969810f92a1ae801bc058c4529c01fe1998227fa8b81939c1d7db9f335f5a18f18d9cbd53ec809d289efd80ba7543b3b61a8dee1296bd780 SHA512 b530d66e3402e34f1c4efdff0af0e1d0f0ccf311c440c8d5ee050f8a8ab178d663433f766d507c5b1280ef9056fd97d05915e65e07a1a59bb8a3c80fd4bab4c6
-EBUILD grs-0.7.ebuild 1331 BLAKE2B 3d240b30094732d53ae5d24751d43bacd75ad4434c1ec98963d89e1c26e09cca5e9d10d3bf69ed3b1a8d8a1356fcf671d2bcca2f7505639aa9e5cb2b8571531a SHA512 17e1e636d2664d42afe5dd4f7c57432ad0e31d0063b4b0caf3ce2a557c29995cc3650845168fb5811729f3bc2f17e4356a6e75e7c74b355d5c5429bb3d410a87
-EBUILD grs-9999.ebuild 1335 BLAKE2B 56a6ba0592ebcbe99a1ffd26782c91152117dfe7caba3fa1544e658aa8eb74ee33ae9277e30b9808b3d883fc8313836e939812c1f456447dd859bca7582761c5 SHA512 a1ea4639031316a2d6f125b1cd436118da04957624858e5bed825b838d8a0849939c40fa5152ddb72fb43a85303d0469fd710fdee9aa533a021ae3b484fb203d
+EBUILD grs-0.7.ebuild 1331 BLAKE2B ddac204bf60d9d5c52f0eef22104c4508ec04c0aa97aaabcd136062a333136bd34b82202a731c6c13504eddcd87d4a7fea7d12dbcc26133f7205f589f07d8a9d SHA512 84af3badafbf04212fdb95086cdc5cd3dfb7ff3ba166bb04cdf312fc436d3f8e8c44b90cbb0c415def64e3629db717a0a6ba057ca9a436efb096d43c0d7591a8
+EBUILD grs-9999.ebuild 1335 BLAKE2B 43d159bdf1b649fbeb2051e3f160bbf01a0dd431aee409e1f7398ae68a45edecbf41618b1eb09da6d95000b5281269b999de4004ae0763699fea3cbe66463d00 SHA512 0cf711b2f4457ff5f274f8a9bdec2845bfb9d3a9373f373058521dcdb93276feec916c45949a5d1b9cfedc4a98258ac335125fd8075becec79bce0922656f41b
 MISC metadata.xml 335 BLAKE2B 24dec8cf9113a9a1114ebac569e5f335f82bbd0e89efc87f4897fd79e7da509450e562aa825c01a20e3edfa82523bf443f0d24f8a0964b73f1074975eee821d8 SHA512 e753c37f63f2d42e2745076a5969ef57a87e71a9dc96b6f681d138c6d9c23d8903683208fa1519e91f08856f40e900812cba2b4d53c51c3827e18edd940b8d7b
diff --git a/app-portage/grs/grs-0.7.ebuild b/app-portage/grs/grs-0.7.ebuild
index c0dd4da74b1a..ab99785d4f64 100644
--- a/app-portage/grs/grs-0.7.ebuild
+++ b/app-portage/grs/grs-0.7.ebuild
@@ -30,12 +30,12 @@ RDEPEND="
 	sys-apps/portage
 	server? (
 		app-arch/tar[xattr]
+		app-cdr/cdrtools
 		app-crypt/md5deep
 		dev-libs/libcgroup
 		dev-vcs/git
 		net-misc/rsync
 		sys-fs/squashfs-tools
-		virtual/cdrtools
 		|| (
 			sys-kernel/genkernel
 			sys-kernel/genkernel-next
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index 04dfe2966f17..c98149f22b02 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -30,12 +30,12 @@ RDEPEND="
 	sys-apps/portage
 	server? (
 		app-arch/tar[xattr]
+		app-cdr/cdrtools
 		app-crypt/md5deep
 		dev-libs/libcgroup
 		dev-vcs/git
 		net-misc/rsync
 		sys-fs/squashfs-tools
-		virtual/cdrtools
 		|| (
 			sys-kernel/genkernel
 			sys-kernel/genkernel-next
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index f22302c612b1..57db9d65ebc2 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index aac77c284ca1..466d63b1a84f 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -394,6 +394,10 @@ DIST bash50-015 2565 BLAKE2B 7df76369726332299c089db156c1e9bc6619fe2e925732da46c
 DIST bash50-016 1534 BLAKE2B 8c9bb752a441b70b11655a9bd48e48ec9756a34d0513837faa94c64675c11d57ba1fb0bfc43a033040539f9c475a0efd00f375cf8ffe04a6d9d1d1c19575572e SHA512 dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
 DIST bash50-017 6517 BLAKE2B d8ec55e796fa2b17774fdf846c7b24ab1428a1dd94210e0d6b3174f99afe7f9c7f33448e1116c81f43407cb8d95390dd634cb8bd543046699898f471ffd68433 SHA512 d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65
 DIST bash50-018 1242 BLAKE2B e5f811ede6938e3b09d2ca658dc2ff2b30d6debed4334369ddf7755992cd1c591188595465552f4b5d0ab7d2d62759ff0b4f14a07466650cde0d25778b26df7c SHA512 cfbad36b1805ad76cb21d9136843171d794e57383318a014522e2d35905cf262d6721615f0a79972cacc45152de636977c957cbbad08ccb52f96de40b09bba5c
+DIST bash51-001 2894 BLAKE2B 7918eb48d4afe91a167eed666f0d15ca220e002d824cfc5ebb753430144a8bf884e8895e6d050158153e08c115fb0b90659608ed98b18aec737e75b5e61098f3 SHA512 1cd86805a2639614372aec29a710bc456e330abcbbaa0867820c94f714a1fa5fb5c1b18aa2c10263ae0bce9dad7579c7af2f732282315c1c34bfd6a90777bfd2
+DIST bash51-002 1575 BLAKE2B 70336d2ef04c63fa29a625a2719c0b36f7e34818cadbb4b09e1434d72d6695dd882c758a00f2ea48f38d3918abc15f494780825b7d2f7cfc6c747a3be89ac497 SHA512 923e7822a9629645347d3aea0058fb5e2d52223507159a62369309f264612df44a84931c19e0ccb3852e98ce672dfbd454477090b4041b5a0de477c94eb61088
+DIST bash51-003 1800 BLAKE2B 6dd284666273016d3b9007537502d75ad7c4e1347c3a13dcdab2325e4f191a149180ee86f9904fc96291ed8217e1d26dcd2b8b20c283ea616f322dbd293d1998 SHA512 01e952dcfdae58624723d64912ea3444eed2fdcd266ba1a929b95ec3abd70f914bf400607c3f7bb7a94ac2925f794f91f37c1929d5bb987de2ba7f60a19cb8bd
+DIST bash51-004 3745 BLAKE2B dbbe2713c1cc4aa6de99366c1d91e136d1a7a86ac11108e8dd1aea3823ba0f9e005f48f1507acd1f86ce2f3c2f4ac60ae04ff066e5587229e7f19aefbe4d6e39 SHA512 10ff24cd91a2cd88818bfa7218050843af6b409e43fcca89f5ec70d8266020c6c2a55132426271f165cd0f154f49eb0f8ec2761b80fc066c921b83120bb543ce
 EBUILD bash-2.05b_p13.ebuild 4548 BLAKE2B f5ac7b9f3fcef74d69143b4ed3e52a27f8cca8265bd86da9fcd00cb18dd14911e06c91bce9a0226656971a187cf570a7dcf16a564f5be42323fa18b98ecd1a21 SHA512 2229e0c4ac2bf9832827ab7658e44164eec90ae69111676f2bb58f0029560962f7e9f7e30429fa5e78c3258b1f220b163721ef2dd78dde516538a033c858f976
 EBUILD bash-3.0_p22.ebuild 4622 BLAKE2B 0a0513f83591b961ce99d5e68365c5b8e7ff518e8f6a2bd3fa21602e36bdedc254ebae6444dd3a1ddb89de7f4df53114d09ab8eddb26f8ebf0d0943f20fd2bd2 SHA512 a4968dd92901cd8a463847add32acbdcb7cc3e106d12b67b666e269d7c63033324a8aa5a391df367972849e9041f4ac12cb22e1dbebf948a08d8e8caf8065b0a
 EBUILD bash-3.1_p23.ebuild 4365 BLAKE2B a2332dc18bef4209dcd60c6810ffdb62b25e2ae88b45ebaa8c8ddd4e8ae15cee6064808170348dd91aa2a1a3a8d7cfe6b27f3bfe14e3377000040b6752b365a8 SHA512 254d2d624a13b2086029d4ef6a9fc5212befc9963c02558f6d49eefb115ea52b3686e3c3c59a8690f0c150f553d1bbd5ad7d20887d261cb28e7e953fa3d99ae7
@@ -405,4 +409,5 @@ EBUILD bash-4.3_p48-r2.ebuild 5596 BLAKE2B 89b41a1e0e072dcee85e09b50ce10e4a9b6fb
 EBUILD bash-4.4_p23-r2.ebuild 5706 BLAKE2B 7ab2b8715a769e1305bf8f0dc6f5218190cdd9e53f318391ba8f8acc51c4b207f36f2ccc7384c1c40ded840bcd555310270916b26cd663fad13a1b7e5224dc7d SHA512 0b318d5015a4e1a0a30a0c84405ab146730daa4a7d46a54223748fcb2a11edfc8150d39f28fc20a86c1cc791170fbf071749ed69ec4648748b3e124290bf4d80
 EBUILD bash-5.0_p18.ebuild 7315 BLAKE2B cefd5cc7c8cc55667911d3846b91bb8d0c76aee4fc719a5ed43f9619254847cee314b97c3cbcbc32fa34ec4012ebc79bb58c410164e6d7184a3ba35330d13465 SHA512 d9809be61511431777290dc2e95aa6dd736b403998514f9d9b88eefdaf3a73a5d4c0dc5626493d4eb847d00e21bc6899c74bcd3af304a1a81f0616b31cbdee08
 EBUILD bash-5.1.ebuild 7358 BLAKE2B b4ac6789ad3ca644f712797583fbe1c2d6374c8d275bd67e209aff8504dd11dde502052a7054a3cc638e33194ffb198e184b7e57d685e23f1945c302dd9be5eb SHA512 da8d2f4e79dcf675b8712136b315d019bc1b7088e9479315e4b2de4f3298a245ea28ef2707d74eb39ca22ff12cb94411aba9bc590668cd5da4fcc47e8bc1b310
+EBUILD bash-5.1_p4.ebuild 7306 BLAKE2B 3728d7fe34f6ac81f2cf84eb2d6b775ccb5863642a8c74f2a441404eeb9eab7957f5db12d696f74a2a448802071cd6baaf9cc2e2f7faca4b1697e68842174b6c SHA512 2ba0acbe653e36ace3e40d69df1d187a7cf8af9004115f7c50132513735e03c1d0d4605eb5bb745ac8680a726c3cdfad8888c07a88e4fd2b221a8061e9a5e5ab
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-5.1_p4.ebuild b/app-shells/bash/bash-5.1_p4.ebuild
new file mode 100644
index 000000000000..b99647b1aed7
--- /dev/null
+++ b/app-shells/bash/bash-5.1_p4.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multilib prefix
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+is_release() {
+	case ${PV} in
+	*_alpha*|*_beta*|*_rc*) return 1 ;;
+	*) return 0 ;;
+	esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="8.1"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+if is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ "${PV}" == *_rc* ]] || \
+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="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+"
+RDEPEND="
+	${DEPEND}
+"
+# we only need yacc when the .y files get patched (bash42-005)
+#BDEPEND="virtual/yacc"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Patches from Chet sent to bashbug ml
+	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+)
+
+pkg_setup() {
+	if is-flag -malign-double ; then #7332
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/* || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+		--with-curses
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading Bug 7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+	tc-export AR #444070
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+	keepdir /etc/bash/bashrc.d
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+	if ! use readline ; then
+		sed_args+=( #432338
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					dodoc ${f}
+				fi
+			done
+		done
+	fi
+
+	doman doc/*.1
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+
+	if [[ -L ${EROOT}/bin/sh ]] ; then
+		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
+		# missing even temporarily causes a fatal error with paludis.
+		local target=$(readlink "${EROOT}"/bin/sh)
+		local tmp="${T}"/sh
+		ln -sf "${target}" "${tmp}"
+		mv -f "${tmp}" "${EROOT}"/bin/sh
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index c494896b9eeb..16dbe62523cc 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,3 +1,3 @@
 DIST dash-0.5.11.2.tar.gz 244475 BLAKE2B 4edc85a70af62684b29fec7fd9c599aaade38ffcfb62b873dd149c4ada9e750f24cddf9a390c512313bc7dde67cab3d7b57776c92fe5f8e08bf8bdc164a4e5ec SHA512 2f846c26f3722ea3315aae73461f9c21a0a8a9ac712e1caf8dd9993e34729227c7648bf6f72fad8488247986e560298f95aa2411bd4e395410565c0b527b9db4
-EBUILD dash-0.5.11.2.ebuild 1573 BLAKE2B 0004a26ef789e1fc2dc84fd2acfa2b844a3c01f82edc4a2c8aaa26607a24636624df62a92d020efc17e7075958e6f8dbe6a66b09784743a2a3aef368aa787803 SHA512 02757904f79a36ef7f76f938533918aee250494d50690e19bd9769f3a4f75c11e4b4b0b80df115e8010df36e49c6570f89c71c5ed3ebfc69cf2f82cec00219b1
+EBUILD dash-0.5.11.2.ebuild 1731 BLAKE2B eac155331d9263670da1f690a57bd09e0fe32f8438e3add0f5f98ae5a0e0de569bd05fa61387579c5702dc7d74dd0fd82a5ec33793894919d9ed48a520adb894 SHA512 4a7cd38e1070817166ab9e8f113f62845717351107d3537224f5376c9ab2d55d185051f2b0570e276c58a44b200e4513205dafc47b78fa0dccee23915c3ce52a
 MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild
index ea4ee62b3c0a..1299af651db8 100644
--- a/app-shells/dash/dash-0.5.11.2.ebuild
+++ b/app-shells/dash/dash-0.5.11.2.ebuild
@@ -40,6 +40,10 @@ src_configure() {
 		# if your headers strictly adhere to POSIX, you'll need this too
 		[[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
 	fi
+	if [[ ${CHOST} == powerpc-*-darwin* ]] ; then
+		sed -i -e 's/= stpncpy(s, \([^,]\+\), \([0-9]\+\))/+= snprintf(s, \2, "%s", \1)/' \
+			src/jobs.c || die
+	fi
 	append-cppflags -DJOBS=$(usex libedit 1 0)
 	use static && append-ldflags -static
 	# Do not pass --enable-glob due to #443552.
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 486ed522e9b3..c6452834eced 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/an/Manifest b/app-text/an/Manifest
index 1456edd88eb4..fe0c28dbac7c 100644
--- a/app-text/an/Manifest
+++ b/app-text/an/Manifest
@@ -2,5 +2,5 @@ DIST an_1.2-6.debian.tar.xz 4432 BLAKE2B efec93daf46b30369aa5d6a6bc57b9e79db7aab
 DIST an_1.2.orig.tar.xz 13196 BLAKE2B bbb19eb16e558f8fc3d331e5ad308611b13a7a88a65fb310b678bd21d46c39761747fb6f60a7eba99a1c2e756a8c9467543d26e97bbf7f9c93d17f66a4d7698c SHA512 919c525aa1215e3c1b2200c6820a357c6406c19b7447147cc4243d339c554b9892bea11797769df0bf96dd72c89f61bf3d977769faf9bc7f9edf609a7daeac3d
 EBUILD an-1.2-r1.ebuild 770 BLAKE2B f6ac00e6faf8e128ed85f7256fba39e6582cb976640cdc460ed4dee8fb0038b543a3d29e48d6c926cb6c85136626c0adf19970bdef3b642e4c67b88f75462df5 SHA512 618ae33718d53a0702798933fe3ee2c14856f76aee53682ea60c2baddc7c28f4800753cdc1f61a21cc9097824716d1d2237291d306d6642fbdabd4755299b226
 EBUILD an-1.2.ebuild 719 BLAKE2B 89ea6d80bdb55f99dab24ed234bc86ada3ab44202285b5d382c737bc42db8529ee19da1fb5c4f4aa120b95d0829f7bf5d384a5ecb21ff2600d19a358c11c75be SHA512 774b56f85bc3d9812e5824551f83aebca3d08e34e0857030cca8b378f57ab5032d6a6f5f1f0bc6b766df0c2b825b0cf91e30d259e4f6fb772ad374cc4b447d1b
-EBUILD an-1.2_p6.ebuild 896 BLAKE2B 736c8b5f6c55d53ec9f0fdf6ec64811c4675c93c589a16f893316652601ce8a55d7d8a3ebd4758a3284802fe87c998c457f8dc49173b6f8a49f1bb73b81d7bbd SHA512 d8ad5c1efe19fdfd62af91cec771305e30da5babe1ce8f7a69914ec8a77c579ae66e71428d4057596e5bbd76d851f1b4b982d37e609ad63b454052ac00d1190f
+EBUILD an-1.2_p6.ebuild 895 BLAKE2B a41c2defb718dec2a9eb010fb44666ab0155f583ad440d8d972b6b1d74bb1853e79ff78009c5b3d4a8b5f8425470be1252f2f388a5424fa109a88cd2a0ab96aa SHA512 0c162481f05fff1ca7b3fb6814ca71b6d862e2bbf5162099ce1127cfbf3b7f6252e523d30af2a56cedbe091f3d1b2eb3a176f77594e6b945a3fd83bdd7743b57
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/an/an-1.2_p6.ebuild b/app-text/an/an-1.2_p6.ebuild
index ec08966bef24..3f1f44b3d2bd 100644
--- a/app-text/an/an-1.2_p6.ebuild
+++ b/app-text/an/an-1.2_p6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
 
 RDEPEND="
 	dev-libs/icu:=
diff --git a/app-text/diction/Manifest b/app-text/diction/Manifest
index c4816dbd3ff2..55e1669cd3b4 100644
--- a/app-text/diction/Manifest
+++ b/app-text/diction/Manifest
@@ -2,5 +2,5 @@ AUX diction-1.13-make.patch 367 BLAKE2B 1b29ff3455dc455210dd1277281b175292ead12e
 DIST diction-1.13.tar.gz 145971 BLAKE2B a70a198f356d9c92813d2b60b02e703a61dbefd5968314058a2538e77929f1fcdfb72d95a827ceb539770fdaf0f6d7a0f67e4318524463e24ae3eeeb31edf475 SHA512 f410f9992adcc362bc60f3e39e85cc07df5763623729c6d599538707aff0831e8cde59d80bcd384975d75229d6ce1cae9bebdf6eb3d4a7203b22d2a1773df039
 DIST diction-1.14.tar.gz 147268 BLAKE2B 12e4a56aa6429bb155dd08a0ba01438f79b69ab9d2a990a3d9c2d12e1eccd15ff7c09d634d399f82d09c97b24586e4586bd6521153ae071b3192dc7a3ea10102 SHA512 db704f3c01883b24ce01c5aaaae9a615418e2cfbf851b7f11a4357c853299caf666483e309d84217413732b7abd1abc44f0bcb3dc960b64adfdfa19121607ce3
 EBUILD diction-1.13.ebuild 560 BLAKE2B de58eee9a39d247850564a0699969c8ca6500338f2d047925d182dfb4b85f15c285f2782d3c0e1e497af333a3c314f707e0ef6a74c67d1df0d25b726d2f132e4 SHA512 62214b2d75940fd215871d7d3eefc0adc3198a178e1eb4e0376999f8dc484f5f9d3094495eb128140e3f7b333a5e39820ce665402f19fa25f4d9e884caf45f24
-EBUILD diction-1.14.ebuild 534 BLAKE2B 856fc77f1a7522509164b97e65fe1787265298f2fa52738cf4389f54936a44baba57b00062028d5de7792d6c8ecd5b9623880ef4000489ee9c653e69cab5a6d8 SHA512 d2209492c2a6ee191504bae3d2c98f4b1a2d3c8727eb9984e92e7361940d7c588538b06af7a0a3bf5a2380f9043f828c0ad04da2caf874a6025f9c1b251992e4
+EBUILD diction-1.14.ebuild 533 BLAKE2B be737206ad5f63b272c1cbb63c2c5a16c302425579fe99af07370c74334c6f657f0c404a977dd662430778724127556735dcf7ff68976edb86afacf0d5189e73 SHA512 5fa2258799fc31ccd0efb0a1ff7a19b5ea494985404ea85a0c1aa44f36c8f4430ea75cca0ec16d8548eceb37b395ca7ac4c38f0d0f655b324d706ce4af99c483
 MISC metadata.xml 901 BLAKE2B 5643435f17fdfe599f47305f23c4ccc9b6430a5b5dd8fb9344fed92b760e9715c3aa30adf4a99c02543dc173e07b8e6ba233f4a0389c5d006b3d22d955e6bf34 SHA512 7c48abbc5a289f52d53ea115427794db393fadf18d875edc2419efa2d1426e425adcb955ba3f19790928e21c071cd55327fbfe006f2f5bb571bfd5be12b79b57
diff --git a/app-text/diction/diction-1.14.ebuild b/app-text/diction/diction-1.14.ebuild
index 9f39fa67f731..10e5903d6fa5 100644
--- a/app-text/diction/diction-1.14.ebuild
+++ b/app-text/diction/diction-1.14.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.moria.de/~michael/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="
 	sys-devel/gettext
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index dabf4d762691..fa9913a29041 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -21,5 +21,5 @@ EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1242 BLAKE2B 17b909bc422758d17dacf948f31f6
 EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1253 BLAKE2B 48e913aabf0307702a1c1cca1be62f0e1fa35ea2902e9f06c584201cc69547cda776177bdd325041562e693e80a4ec94fd4310d0d1cf6a06a216607622776a67 SHA512 ff8d5fa3ba1a5497d29613af4fb905ab6c41fac7f6a6c8f23aa453bddd765899ce436c8c5e1c0b96c09295f456b00728d639d896fbf8f3b54cf165a07bce2377
 EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1238 BLAKE2B 9ef6216a5c8c038ede683f04caefee257a2b0504612d01da8183dcbd6559eabff7070365cd226c0f0624b33df543c7e6b272fa3371b50ef93426d87e519676b5 SHA512 d51d3d59c9dea06007e960b72e98b59648ea37f6186d87edeecba737c7a6f1adc8a8abe71b72d46d263c257cf774eacfd9dd052d50013d546ca9abd22eeedf4c
 EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1238 BLAKE2B e702894a034794674ead6467c9a4850f4b1dbbf532847dd4906e4c88ef5b7167d7858b9696cc59b82fd1c346b5640dcc713ee846d7618f5e076b02640ceb62b7 SHA512 572ef029ea213c84ffadbccfad022b457b2f5abf5f4cd70ee4f238f8a128e0e311bf02add6bd9f254a7a22dc5ed7b4bc596a93c652211a8db37ae9ccffd3d6df
-EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1234 BLAKE2B 1841bf91d8f12d2c1d8828b6e32661f5901013374af3ed6abb07ec910487be68aa7260c7667b49a05b2ba3b518c3c436d8760bdd8c9634019b9e8b44c4e8dfd0 SHA512 9b4c2d6c08f6e7a0e96af0641c965862d80dfb63553687e7ca90c7732cd978dde8ea1bdbe0d98b0fbf442942b0205ac36c8c55d03a062ff674496cd8da7ad3b9
+EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1241 BLAKE2B 63d92adcd75408b9f919cb45126d7a571a8b05c01b34624d26a94462282ac9bdf761dcf2114439689f28b69fcd77b82d90ef570055c6acc77fd61a39484ed1f9 SHA512 9bcd091519ac14f7e2e95b83c9fa2632ef6a1ba7d078f388156a9052e2825d4a9551f5006c3a484e3b05ec20eb6b8acc9558f772096ecf7e8f80f922d2c072f8
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
index f67b00a8c3e4..ba58a5e516b1 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index dd605010c312..d95d29c039ed 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -2,5 +2,5 @@ AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2db
 DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
 DIST dvipng-1.17.tar.gz 171049 BLAKE2B 7165135d818aa399d051977908bf7865774803127312fec515284bd72c4f9e88ffd7f1f7c3c8f1b5adf324fdbb9ac8d039582ede2398123db6ee7655500ac32a SHA512 b56faa6f2b24572233e1f0d9b74122b3bb7fed22cf47c9c05f5530691854dffc9a1953b51803f7d539f9a9de364160d557560c68c369820212837bdbacfb80c7
 EBUILD dvipng-1.15-r1.ebuild 1296 BLAKE2B 50bb4592f8ee749252bda8785b52834bdbd28d9c25e4455a919472310e57c4e3617d7f8b5a7db8df21dcde2a86b9452dfbadf38c165d482ad6020eed2af8547c SHA512 9e89d5e1773cb593936064fdb02b59edd917c74b54f9941a7d9ac3d698d35d27690dd6cd6956b07fafff27d6cdc18b88da4808c4517b811b2c7304d4ca466189
-EBUILD dvipng-1.17.ebuild 1121 BLAKE2B 12ffa5ba1f817099538fb278900def950b94d371c7ae058bc15d8bfc55852cbbec536901897ccdf9732da0c2190d932e45aad14febfebbe91c83a5f69e6a73be SHA512 5e01cb8cc0bfbff5a7cf08671ef72ce40731a136de7263c5428b5856e63c756cf36b9cd625fdb48cad9cbc744fe7a8c784c49e20190b6032938eb7fbbeaa5ae3
+EBUILD dvipng-1.17.ebuild 1118 BLAKE2B e5394bfc2c5fe0e52cc8aacfbe3d1e01978cd58fa4ed5d92687c4ed78326848b1d46166370aece5d6170dab6095a27a98db0898b8c9c0a131526a7b76fdccc67 SHA512 0e89c1e7313203cd3d90c33709f104768e0b39adc617de5bb92c704549c48b69b3de4406b2215ddd19314c98b3404990c68e74b02efe155cf849908136b714d4
 MISC metadata.xml 1122 BLAKE2B fcfe5bf7616dd40ccaa74751ba1c653012de0f263ae8c4764363c4a5b1ce9546a335b7e2c0917a9d2a0a30cde98bcc5b8e3184619b83f1d6267d7172584144d2 SHA512 c2f663c6ae8113fc462e16ce50ef44172c8d5cffaf34e9095701df7e3ae568126bb782c8a02e3d735239ea7263e6cd9778bf21f4d7166c24799a9090ecd8bc26
diff --git a/app-text/dvipng/dvipng-1.17.ebuild b/app-text/dvipng/dvipng-1.17.ebuild
index 8143ed496cef..74c622e5e726 100644
--- a/app-text/dvipng/dvipng-1.17.ebuild
+++ b/app-text/dvipng/dvipng-1.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+ Texinfo-manual"
 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 ~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 ~x86-solaris"
 IUSE="truetype test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index 1021f52aa535..e38b2afee139 100644
--- a/app-text/epspdf/Manifest
+++ b/app-text/epspdf/Manifest
@@ -1,5 +1,5 @@
 DIST epspdf.0.6.0.tgz 352989 BLAKE2B 633e2ed29d8ec28f679b00095d335cea4bd1996cf6fdf3950b97084a73044eca9371ac6964ad48e98ea8ddba38d91acad2137ee8d3122ea03df3ce25f08196ce SHA512 44a7015fa0b7298429567e998068864419fd396f6b0781bf7877c6599d3bb2f254b7a0f976500655851a95d727880d106d9e1df9086306eef74db0b109a63506
 DIST epspdf.0.6.3.tgz 335975 BLAKE2B aacd6e222bfe74636dba796fd6e878fa9970f469d096eb77acf4a336a0ab5620629de7ba1c763afa62b181887724db55be57d1929a041a945c7d74ea3028d6de SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea
 EBUILD epspdf-0.6.0-r1.ebuild 1258 BLAKE2B cb0329c1fa96eb8ea1c66a58fb6c0941abaf76a8f724ad86ad5813f98fa616591e4398ac36820fa8f83d8b11c13a161ae4289d7a5d192745edd78312208b7437 SHA512 cb07774f9cf78f5b3d81770b8bf26cbcdbe08d170d12700c2d28f7022d150bcd0d2a88d4cdc4089eb981a68fcfb4e4bad54763aa248e700a4e74ca9cb21cf52b
-EBUILD epspdf-0.6.3-r1.ebuild 1359 BLAKE2B 539b0a9e3510ecd09409580bd0a4b1b7766faafc0e2122f408da2c8cdce124f2bb3b0967abe535f6bb45382c38d3cfa847e8914a35f4e4801230e8f706930a01 SHA512 0606574b3eff46306e8a270d208f980dff22a07a150aa29dcf50f6ced43db9913f3bf6927189b6fb96ea6886a6233ad37560d9003d50d66f4147724aeefaf3a7
+EBUILD epspdf-0.6.3-r1.ebuild 1354 BLAKE2B b7b83c09148edd7f4ed57af4b02ff86366bc2d93e5fdff9f2c52ffc0373100c8de664a77de0dc7d80a44ff3938a6426a64b59f9ab16d298213799a1e2da926b8 SHA512 f0b75a6cb7af7848eacc57dd2624b348d657f3166d82732b2fc1c11e1a73ebf939ca1606d521bc702e037c9a91794b0abcc41953697f990d74c1fcfe3abbc435
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/epspdf/epspdf-0.6.3-r1.ebuild b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
index be2423a84ddc..3343af326070 100644
--- a/app-text/epspdf/epspdf-0.6.3-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc tk"
 
 DEPEND="sys-apps/texinfo"
diff --git a/app-text/epstool/Manifest b/app-text/epstool/Manifest
index 9137209c728a..e5889e245e3a 100644
--- a/app-text/epstool/Manifest
+++ b/app-text/epstool/Manifest
@@ -4,5 +4,5 @@ AUX gcc43.patch 632 BLAKE2B 3f4537c7b4e20e50aafa3d8e07379eb8db2e68c1abbe6e096b2e
 DIST epstool-3.08.tar.gz 191567 BLAKE2B 6ef2912e10e65809f60444d09facc1ea3800e492e55e87a4f00c95f7dbabd45c4d48b447fd92879e97e9dc2fe9698c1ff7d4cb06bdf3724f16ed89f76a829a8d SHA512 d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1
 DIST epstool-3.09.tar.gz 191023 BLAKE2B becb264bf93bdb1244550e0707eb2d513d8c4b8d9eee09356bd2ddaf25bc8b97e0c5e73a02839a0f66f18bd1949cb549525967ec430104c33067d9ca57984a6f SHA512 cb9519be0879ff791f0e243a541538254e24949683aa792f673334d2d1dbd3e449ec36890ccbb3852563cf8da997a035a80df605b395a1b84cbced7522dce291
 EBUILD epstool-3.08-r1.ebuild 904 BLAKE2B 50b366747cd1c79275a6a7c82dfd937ed5d052f81be2ce1c48c0d1f10cf8c59c7dead1ac8e1026fbd8566709ee5aff180c947c26f2b650469128f05a7053b570 SHA512 34323645e925827275dfd63f016a7578eb3d6c0a7bcfa71597afb7b010081caf0bb6e65b8c529dbd7ebb144c6242e71186f6187e76cb3daccdaad3c613016400
-EBUILD epstool-3.09.ebuild 887 BLAKE2B 779e634d9963d0d29956508ec24d915c89abc5ae87a80138d404d9f48642b7a6350a71cf58526a58a59c527c3888dbb77f82de6a27066c685afc1cf6a8bf3a90 SHA512 dfe52e2478b570ecdd6956331d3c0dcf009325bbf5561d73de15fca4a5942e8fa8a73e986b3a52388809007a84f741ed3c05da825f92aeb36e8b4611a1d5e002
+EBUILD epstool-3.09.ebuild 886 BLAKE2B cf67bedc4e49caa639a51cd322f6306e88304cad9182b6ab0845cb70c002758f791f479a14debdfa08b247531a52d0069270cce716b7d363ce77eff9423290e4 SHA512 1373af9421533ff9a01981cab253376da5d934161180a8a143ce9178ae7d9bb4fa520cafe704d33aa343ee90f9cafb63f96ce451512fc758a5024e467991f928
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild
index 7e62a5baddfd..135a57a851c7 100644
--- a/app-text/epstool/epstool-3.09.ebuild
+++ b/app-text/epstool/epstool-3.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ghostgum.com.au/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="app-text/ghostscript-gpl"
 RDEPEND="${DEPEND}"
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 043dde768686..39ff0f05206b 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -5,5 +5,5 @@ DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3
 DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
 DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5175 BLAKE2B 83b725c22dfae426de0735f8195e6e4477b47d3fff6fb0f3108d344ffee6eba03bdb875078c472a048c2be7ed1f3347cea7e22707bbc1c0c77629ad11a3c5106 SHA512 f242c79f3ac85c147ee9d6ea203b716ebf44170e5574db68fecb04940b2e7c6146631bb2e1a46cf06673d91fc6cad18bf4828ef97af91896815cceb5efba0e17
-EBUILD ghostscript-gpl-9.53.3-r4.ebuild 5243 BLAKE2B 6cf7dd80a4d958dd6986aef7fb68b4a07f9a43baa444dd3b6d02e3154f058ea2cb9bb20d71082e672dddf8ef9ae244bde460ac1f579c3f58f7dd3c5fc6bb9540 SHA512 16cb63b549ed02ab7be5551a0fcc03a6727823bfa65374e9edc57295008822855aba40faea15bf11c9770f6e98ff0dcf4200e88538efd6c1642e8b4d131a20d1
+EBUILD ghostscript-gpl-9.53.3-r4.ebuild 5239 BLAKE2B 3b91b8b5f38dfb9ce46fee9220cadf1be8fa48fb7b6e50382334cfd90b2489e7a7c3179ce1d538b9e17e0b21aeaeb37372b487508a1b0c6dd39ccd82ae3b60d1 SHA512 b3cb28c7950efa7d480b0784acac06cadcdc7e0ced0641e9eb55cfdb58a3b16c91934c18dc00db1cc2710a53188c1eb8f49ce7233a5a700f40611e43b5c50e05
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
index 9c8118074706..146d905ec865 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cups dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 8bf00b5ac5cd..a5def6d0c799 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,5 @@
-DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
 DIST gspell-1.8.3.tar.xz 421468 BLAKE2B 70a8c0649a9f1f0d5e1bbc170734c6ce7aeb4875ed1cca52c4c582688c56553ad2363b9fed732c504f3ff6bc33d994fc4ba12cd3754e4f3b602be2a2015144df SHA512 4116231fdfb416e70ee34c73e0ecf81f0071e81ad477135e3c1e270534dfe4be20c7f45e316e13d33c79944d282ed3223251122983a0f3199ea57c3431a24c1d
-EBUILD gspell-1.6.1.ebuild 1028 BLAKE2B 25d57e53d1d585b6ff94537ce7d65c079a66360fe11c5162c36d667ae1d59c03dbbb263b7a78a284a273513b43b6dadc90bbe8afa6dc47fafe9f1456a5d74b15 SHA512 25c33395a415b0b0207d6ed944729f424449ec45fbbf0eeda804778d3221bec6197e3f4d90181e46ac10ede0b3e5817d6cbf5134d60e8796c16b91a6fea5d2ce
+DIST gspell-1.8.4.tar.xz 424356 BLAKE2B 031787c4f5c3f3cfe21d5f74ec72117818da43313c5e6dffb79581ca07033aede2ecf236ffdf2197938d62727c5bd3913d1362e02be7109b0d498304949e1d44 SHA512 adb481590442d81040151746c7747791d76248b1b35af1702dc5389efbd2e0c6bdda070b8e84384d22f4922b5a382ac2c6519e425f417ec85c8efbe22dc38c82
 EBUILD gspell-1.8.3.ebuild 1477 BLAKE2B 6ad6e2c4522506edbd658ba763a3620fb5b7b7f7ea88d4268b0312b38bd6d6774cc208808953a9035b11e9d6dc5c8ca99f7adeb8f53e82255dfe53eac93bd752 SHA512 3b57665e5aadbe512253792b41b1f688b23653a56da2b90ef5370bc33781682937670e719b69c9eed89d7924abbc9d23ad4b3f4535a2cbac3baeb01ebee223fd
+EBUILD gspell-1.8.4.ebuild 1480 BLAKE2B 1033489ba41997af757377589f1922c7384c5b69048b52e0239cc2a3845b6bdcdc6f1b499cfe379346473d0399db810f3df47c7af6b5eaae6b1330ef5a40e8a0 SHA512 e29f3b1325a57bb9732adfde8fec6101f7e0a5ae4cfcbef710cbd2d7d41eca56a5831bdb732a5397ecfb5f6f62ff326b54a8fb6f3953019c19fc5c0ebd913d5b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.6.1.ebuild b/app-text/gspell/gspell-1.8.4.ebuild
similarity index 55%
rename from app-text/gspell/gspell-1.6.1.ebuild
rename to app-text/gspell/gspell-1.8.4.ebuild
index 108a5813d325..70eb544cba3a 100644
--- a/app-text/gspell/gspell-1.6.1.ebuild
+++ b/app-text/gspell/gspell-1.8.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"
@@ -10,15 +10,15 @@ DESCRIPTION="Spell check library for GTK+ applications"
 HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="LGPL-2.1+"
-SLOT="0/1" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
+SLOT="0/2" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
 	app-text/iso-codes
-	>=app-text/enchant-1.6.0:0/0
+	>=app-text/enchant-2.1.3:2
 	>=dev-libs/glib-2.44:2
 	>=x11-libs/gtk+-3.20:3[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
@@ -27,10 +27,16 @@ DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.4
+	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
+	test? ( app-text/enchant:2[hunspell]
+		|| (  app-dicts/myspell-en[l10n_en(+)] app-dicts/myspell-en[l10n_en-US(+)] ) )
 "
+# Tests require a en_US dictionary and fail with deprecated enchant aspell backend:
+# So enchant[hunspell] + myspell-en ensure they pass (hunspell is ordered before aspell),
+# however a different backend like hspell or nuspell + their en_US dict might be fine too,
+# but we don't support them at this time (2020-04-12) in enchant:2
 
 src_prepare() {
 	use vala && vala_src_prepare
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 6de7ef7dc43b..04d106e0290c 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,4 +1,4 @@
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
-EBUILD highlight-3.57-r1.ebuild 2801 BLAKE2B 4f968d4092fe5d9cb4d3be8c5547961cac075235fbc7f71bd0a5254a01d7bca3c8a64da7fce7fc9312ea24eef6436da616fcef07eeaceea3fb25841132c33e54 SHA512 99d672646125475deec028759ddb3b582d5b750500a5f055d89c22511b98b102acf76730e5e1cda4b8832053f7c7d931e2726d4d4b9dc724790dab4da9103edc
+EBUILD highlight-3.57-r1.ebuild 2796 BLAKE2B 5f381d9e9fe5b6268e61c54e9abb5b67bf83d58caab1261f2c904d65ddda3455a5e0b453bb2c3a7a46461e28b2dc656c71c293064af1a15368d4205edc44faa4 SHA512 69646dd692daa9c7b458c489d77b8d372e7603b5a2809e3cdf49a55e5eb512e3f274054512da668f0dfdcb1c908dbc9a9da376f827259854dfb0d27f5b9ac7ee
 EBUILD highlight-3.57.ebuild 2179 BLAKE2B 361a74f80a3b8d9ffca9528b15a644911712ea3da02acb6afaf354a2900302aa25d7c5484e75c8e9327d61df2a239e630cdb526ebd1a9f45a8a022852ac4ee7f SHA512 b5c3296235114c356d3abcd187a12ef00cc3ffb0f374a009da088a085b9af9e27b08b4eaa68692e37e8e34156901ba7a953cf693cf5c2a58c13ebdbead80810e
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/highlight-3.57-r1.ebuild b/app-text/highlight/highlight-3.57-r1.ebuild
index 1c4edc578e8c..971c9675c1b5 100644
--- a/app-text/highlight/highlight-3.57-r1.ebuild
+++ b/app-text/highlight/highlight-3.57-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 
 RDEPEND="
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index a55effec85b2..5d413b536796 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1,6 +1,6 @@
 AUX mandoc-1.14.5-r1-www-install.patch 637 BLAKE2B 2550351e29db19b43de500f039f0563af8a720ef3bf7efa60ac715ca956d7dd0d13d0e092ae2749e3a76fc456eacf0260ca6fc03d324e08bf287bd8d4ac56dbf SHA512 5ed589e1322a2bbd261eb56aee8376526b80cf72eb5eafbc6e2772018c924913db0fb27eb7a50ec2509640e03e41d11e88401f76293d1d4230e777e39056c9fe
 AUX mandoc.cron-r0 87 BLAKE2B 2fb4946dd2a9025f5bee78e61c11d77d6c6b9b32f9d17c11ea4f0d890e54b42817981e1cd4c568229927fd04bd0592e53ce18192f8359dded28be8c8690904f6 SHA512 74bdb16bc498d741128f1b6966afec8e21eb6899e26d20cf57cb0408ae6bdc63d75538dd355a21ae55593c359fbe707a56bbcdf6e78d557d4b53570db56fd6b3
 DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
-EBUILD mandoc-1.14.5-r1.ebuild 2785 BLAKE2B 5a18292e498215ecd218eab33b390055320d325ca26a0a661a2b8c30efed2bc611b774595f16565d9e312d08e1c3f96e347843bfdd87fcb960383f723ff16fbc SHA512 99635990cf6f06768b4345e462779c8606c5ac0f4bbd28d3c172f7bb2b8dc2bc873b8a4b62766d2b752d1777b73f65bb392c7b0b18252d4d59707381ba301731
+EBUILD mandoc-1.14.5-r1.ebuild 2792 BLAKE2B ef7c7d491b369dd2071f8dcb0a532d2968182db8f21911c63d45e4a39b39a52cb573770ebee587ea376f171ea2419db110034aaab032f510656db59bff79f38d SHA512 9972596dd9afb8910c6d5bf9ff87f8ee61761cbda119270d1f148a5c0ea126e69e9a500a6aba223638d1949efe1a2e273b66d0bf618b509c65abd85266dae917
 EBUILD mandoc-1.14.5.ebuild 1727 BLAKE2B fbdad7247703bcea768dd034b2169f5183cf7ca644dad09335428356d83935d3ab4db2449d18e9c44d23b76c2d5fcfbdda4f6c09ec4bb5b81e8ca2732fdc65f6 SHA512 92be1ad119597580062788095aafb9fc951f8c55d1c368cc412b7afcff32476b01aa103f6f067c326d8a459b97e6071c8c79af8ef51482d5205fa27a743b1f42
 MISC metadata.xml 375 BLAKE2B 6b3565c3419b306f33ce9ad867319cee386b20c92743fe1a6565a348aca03d13133906d07f5aa10ec145d84645fa11894ad8abd73a6f65d5d0680ce03ef339d5 SHA512 1814f8bf92ec3500aba2e6a194a8a1b0e7adf53de5ac5408ef22fa42845b9c7270a27eea0061d77b5b53ea7cf77e9bfc75c865dc1d6fb661a5bb8412fb9cda3e
diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
index e775602af4b0..c6058c164364 100644
--- a/app-text/mandoc/mandoc-1.14.5-r1.ebuild
+++ b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="cgi system-man"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index a0271ade2180..8287aac51ea6 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -3,5 +3,5 @@ DIST tree-1.7.0.tgz 47082 BLAKE2B 07449f50a44f857733679ae92a54a9dd61fe19b282f924
 DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
 EBUILD tree-1.7.0-r1.ebuild 1073 BLAKE2B e3560608b4163160461ad68b090f2c572f5cdc261064ce8316d9dcde7f26dcd54dad5ec9e49a7adb30cd76320e970c28c8cfc1da86a28fc544f34c0218f9e94f SHA512 0aa47789f61b067dc8191b3193dc402019df557693565bca63e6c3bc774d85c203ddf2a1ba430c7e23ed7164bf44a647261f9912df9b2596fa492f475d067067
 EBUILD tree-1.7.0.ebuild 1057 BLAKE2B c95e3fa8698e8630923688de312f104dbcee472ce6acd4b6c4f055e44d8c4942fbd43510b48d06e54db65ce550eb936bd2e61f3f3ae44e06df8716cb47acbb08 SHA512 7109d3b42d21f02b99bae7ad5cb5970907152a6b8a768a3a3016fed1f392d19b721c3b0ff3e54d8d877834543818ca1a139d21f4a34607b77c42c5f6e735f293
-EBUILD tree-1.8.0.ebuild 1041 BLAKE2B ece993680e9263a6c1e93c0ffcdd7a508c2a05ad3e3e7f407930efc84557f34f238c94c6ec64bb76b4180a889b507cd7ee7ac0e91481d9282bf851b739d71ce3 SHA512 491aa6dfd716f70796e18b8a01c1b63b69fee860c6aa6a005a9ec283603b7d848d68e76b34a1e51c6eabab968ca4218fdae5b6ac868e8a937eafd6fc21146154
+EBUILD tree-1.8.0.ebuild 1040 BLAKE2B d2ac723a3dbd635d82e8325c692f9de7855917cd1b09710a2d3477566e901eebdf54576bf90f5cf2d6b3a83ea6dfdb9abadbae0f57045bcae5acdaed4591217b SHA512 af03f5cb029977e47490976044e71b9866b2192682f0176557e2df0983672c922ab4cd674bdbf6bf1ccc1364e2e859767ce9e7f41f68d5333ee070d85f60ca05
 MISC metadata.xml 581 BLAKE2B c8ec671fdf6834012120004fc69b9957364d6c43d6b6dcdd78d1c0a850976d669c4044109c6c08d818a4167be2582cf6b0d20fd634843924a86e031d5d0a8f2c SHA512 ca6717181a7ad2535be2384b4abb986c4daf7d4defc2b4e7d7487fe62b5209c31e81f86843168681debda99dabb6d2c0165b0ca0b154464f5eada572bdc1fe42
diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild
index b862f8493c38..42842fb57b01 100644
--- a/app-text/tree/tree-1.8.0.ebuild
+++ b/app-text/tree/tree-1.8.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
index 0e2b196bd0e0..8e504c3343b3 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -3,5 +3,5 @@ DIST txt2man-1.7.0.tar.gz 17142 BLAKE2B 56dd6e09ed52cac0b203f68b6fe56550b13f4d2e
 DIST txt2man-1.7.1.tar.gz 15976 BLAKE2B 6d9d3947b3ed76e62c1295431f22a1eb00e9e9068623cae7a3ac853aa6fc4b5bda1db8969fbf2798b84daf84a46ad29e9bf9945cf62b51b90592300e255a3e2b SHA512 550b1d30a4435f35d03920d89f5f2adc2a937de7575c4ddc51ee9f4fe370975b45e51f5aec0eb865ead4b16d88ad31f3150cd3235362b1fc7e6d7b3c6233852a
 EBUILD txt2man-1.6.0.ebuild 609 BLAKE2B 5791269461f773391ba2080795d7689a9347d36bde85bd2152e62f7215368c47df1e82f2b31d7827c6bb2765976871e31dee9cd06efb3b4811cc657d72332f60 SHA512 312045664e536ae8147e641fda6a3726ad629682f1fe3ef1696a8cd8163fd115ee6082747612157e003cdc62269e108afff65d75c68d505d4865092923bf794f
 EBUILD txt2man-1.7.0.ebuild 615 BLAKE2B b48cb60e8d392a7b2fb1f17aa04a83da7cff32574027cd5fe02551225cf0c43c3405a470157cfd3ec6abb96a14d64e894354f2a4d0c032b90d5e1476b8a95baa SHA512 e619cb6677bf3da4f88993c8b0dbe0efa74ae3a986c9888297d09c741a0d313cef7c4133d8609a04eafd09dd23058b98d7bb498b4952f15d39b782a17c2d9380
-EBUILD txt2man-1.7.1.ebuild 600 BLAKE2B c7abe2de4d20f25d177333bd8efb939d89ca6ca395ab91e3db50d251e60077e553b9149709514ff5d65f3badd405aa108db9dd817f6f81bfd217bd726f6238fa SHA512 ba141dadf1d608c8e3e60afca3024d8b1acf254ea7f20cd2f443a1488ef36ff7e902f9ae98769c6bf48d9740de16a45cf2d4582a06683ab451294b20626368d3
+EBUILD txt2man-1.7.1.ebuild 597 BLAKE2B f67ac10cd49997f1e147d3e8392f7b704c214ed1e05964096a1b00460bbb7bdaa6edc5efc72c75d720a403837452e9d548588c1fa520d0c6edbf689c847f63be SHA512 b43ee581c855f367f507d26091da6746abf925869f6e5c9dd26d62b42ffc7fc78ba237ee888fb98b7620cd7656a8202e86e9601190fc6d740226cf089e8383e2
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/txt2man/txt2man-1.7.1.ebuild b/app-text/txt2man/txt2man-1.7.1.ebuild
index 8d30b3b96749..f06ad0f6aa3c 100644
--- a/app-text/txt2man/txt2man-1.7.1.ebuild
+++ b/app-text/txt2man/txt2man-1.7.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="app-shells/bash
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
index 6f0393f2871e..d1d7972fda96 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1,5 +1,3 @@
-DIST txt2tags-3.3.tar.gz 261417 BLAKE2B 6070c23faafc9283e48efdab165c9a0050703d5d04a5ce557afc693161af5e1105435ddb9c991c0e8ef5dbd1e6d25f77c915e8be3f349b790636c904df7553f3 SHA512 a52de3f5226d85af006304a9063b5dd01df2627a45670a91b954f758cb920648f86699acab5cd7822c0183e93eed110ddc7dd8d156b0eccbe1541e7fbc2bdb22
 DIST txt2tags-3.7.tar.gz 248392 BLAKE2B cad49f9815f2e8e466a0fa83715eee27c16cc67fac4c0c55324a3ebc22707857a4bb59176b62fbc1a922c465f60dbc6a057b326789f82a9a9b4babb7b8041486 SHA512 70f6b72b9555b881149e29581a200bf5195d740ca134fffb9faab3a8a04909173f40fe7758659bde44efa9aa50e9816e7164d8164f84b2046de500a49906072b
-EBUILD txt2tags-3.3.ebuild 542 BLAKE2B 2c4d3d8baf02068f7e616cff10f714cf9075620f876a3801db2f767cb2bc9a10565847607482e19cc19e918c3bdbd942004ba914f80e36356498fd808a4bb4d2 SHA512 4b5c17e1d3ca3ca848e7f87c28984c322f747291d5762aa865559c7b5be594a1b053d75fdb6999b7216b9f51330bd76f5a4cb67c41308daa0ce42279c0876a21
-EBUILD txt2tags-3.7.ebuild 540 BLAKE2B 2d2e8e2ed987320f473acf5e977f700bcd4cdd368b57425a868c0f9c285aa29c5792f1ada985c03aa3c327b623491dedace49fb45cd774517e24af72ef6f9c26 SHA512 e6f6cde7f386780363dacafcb4cee4b111d7edd873a52b4c337cbc76435a781e654708fdb402fd0bf56328b8c0a30d671180f32b9d1f88cd71fa6b4856617146
+EBUILD txt2tags-3.7.ebuild 538 BLAKE2B a9cea8e12a121aaf8e659826fa6221bf1ffc9146f71809a6e1481c8687862cce06dbaeb817f6a31817047b76852a1c8bbd7745335d898874fdf0bd1f48139355 SHA512 7a57e84b34121dc1169e6c34390111aac11348c904f04839eddf2e19c6dd6d6f0466098c706ed6d667a9527a0412cc2d7c627e59d3145e8040ec6360b49a5f1f
 MISC metadata.xml 245 BLAKE2B e2a831e97b1c75aa3e161109943ede73b2d686a83fbb11b84d3f201c8214b997d759c93298c2d7f14a6a8486443cc52ea9369fc12476747528509d9d8807b1c9 SHA512 4fa0282e97338eef99cd0be8c2cda4a5eb6d6c1393a41782a45ad172c9b99690d572598f3de81f5828ab568fe32d4b28890c22908f86c73ac8e399837f28fddb
diff --git a/app-text/txt2tags/txt2tags-3.3.ebuild b/app-text/txt2tags/txt2tags-3.3.ebuild
deleted file mode 100644
index 83374fa38499..000000000000
--- a/app-text/txt2tags/txt2tags-3.3.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=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup"
-HOMEPAGE="https://txt2tags.org"
-SRC_URI="https://github.com/jendrikseipp/txt2tags/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
diff --git a/app-text/txt2tags/txt2tags-3.7.ebuild b/app-text/txt2tags/txt2tags-3.7.ebuild
index 0ef8f7c72887..b29495dda13b 100644
--- a/app-text/txt2tags/txt2tags-3.7.ebuild
+++ b/app-text/txt2tags/txt2tags-3.7.ebuild
@@ -14,4 +14,4 @@ SRC_URI="https://codeload.github.com/txt2tags/txt2tags/tar.gz/${PV} -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index ef3e646a52b7..394d56196946 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,4 +1,4 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 880 BLAKE2B 4c386057db6fa83679b42c0314abe6336dda9bfcdfc2c5887037595f210b8eaa81509ecacf991ee77b90597ae5fe21c19d3cbb27b73854468840977bb2c391fd SHA512 ad0383422e8aa931adeeb787d47d2fc2c189fa2b65bf6f7cb70657b6846de9bd71a1a1541d3423434689c75ee133cb8af3f80603408c0933e2e95eb5485bcb5b
+EBUILD wdiff-1.2.2-r1.ebuild 879 BLAKE2B 0c93fc63215b814bfeb75a3274f3338ce4e7c38fc35797a7ad29167703fb0e24074ef7a290bb18a84abf43503b78b3058f5999c92cb28637521076fc45e786ac SHA512 4148216f54eda9939d84ac8d6839121ae0b79d53704dc8762e90df4d0f27f8747cd70b8d14a085b639c4a8fa6309286e2bde92c7bfe86f6ff64c310b560f4bbf
 EBUILD wdiff-1.2.2.ebuild 851 BLAKE2B 20168eee855349d4e7a5058b1b8e93ee39bc94231856598a6729db90b41e034c69f1b92ddce2f88d32b57d2da0e1068084ee82352d9924e68a4901901bf6f04b SHA512 2fe11c3f47e3a20ac3b265738182d607cbbbee88629257d288a2a77d97c9249abf5f3523fa19cb2a3799c290854c69f069d7e2efe9e6f99408fb00be3e8d9d57
 MISC metadata.xml 377 BLAKE2B ddada9afaa9d6031b4493ad27870959d71c7ad7852399b36468f41c0c11dbd591e0809101927d82a4f80520562b1fb8b65d577086218cc922a7b0e03b761005a SHA512 675191d217533506137aa85c390cbcf2c9683157b451c862701b5ab59d3ca437266243af0cb458f7ee5150fadb444a7eda648091eaa8b4f7e211e0bd98d92c7a
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index f8235bcf109d..e16047fa8605 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 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"
+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"
 IUSE="experimental test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index bf6eff8917c0..b071e5cfdb22 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-djvu-0.2.8.tar.xz 8860 BLAKE2B ea6eb70d7350ea388043c9ceb8ef8602030d17e4dabc353ac7346ba11c2d8f105bd235eee90823818fc1d4d5a9ca16755bb56a1e1b8aa633a79802ca2c3e92f2 SHA512 ec51d339a01e7f2d063d21ab0e32624770398a21727fe6714b8fa8f9a1ef46909d58fa26c4a50430234f04377cce076312ebefb8a6cbdc28ba5de1c205d944a9
 DIST zathura-djvu-0.2.9.tar.xz 8976 BLAKE2B f0a798e9473ad2d09bdf171f4689231d73fa1e1bbaa0faa750feb82db2e2b029a86bf759e642f92c0ba438ee88b9178969e5d2aec4f30d9cb049bd3bcd69639e SHA512 3c2815e7f1cdfb9fc594dc6ad65359245f322e5fa27f018fb9431747e4d474734f5efd134aaeb9dabde09b01de603b1d1dc7aede883b1ef81266e067b0490726
-EBUILD zathura-djvu-0.2.8.ebuild 790 BLAKE2B e1d46cea20f9449006092e2ff44263b0d9bb9e8a269801a850dc7182e014c17c12f1fa23dddab820b05a158e03e322a8e9fe3d99e82e6c2ca5ae8b8e3a0bc72e SHA512 4c9809b8a22db671ab492204a30493daa74aed5f86d2b3b7642057a73114c8fc9e556e8f22717e8b82f52a92c4d660c1e2831016dbecd810083d5f129a6d286e
-EBUILD zathura-djvu-0.2.9.ebuild 793 BLAKE2B ad18e511919ab77afc1e5c2de562171156aeef6bed4b3f5e1532138ce046f2454adabd620b3bc44fe787006bdc66875715c33a603e6d0969eef9fe1a384f1458 SHA512 05cb70dee85ed810bf50c968ba2b1e979f13861e34dece0506e3cffccbcf3d69c5f2c1225afee64664ea843e2ddd74731b63d7fea1581e7e2863e15b5c218ab7
+EBUILD zathura-djvu-0.2.9.ebuild 790 BLAKE2B 186206077ba1e1686d869ec7ee0f7c696db689ea580690ff349ca7209845fd2d875c3f7d89c6c9bfbc8826bf3f2af5f5de40cf2b72301c8d164c8ace286ca3f2 SHA512 0cb49628a301366421a53175837eabd9283d1d21f4c1a682ecf0b88bfa2ea6d49f26f1d544826e45fe2128eb4e8cad0d4241605b2bb627bc3a3326ee44d5e606
 EBUILD zathura-djvu-9999.ebuild 793 BLAKE2B ad18e511919ab77afc1e5c2de562171156aeef6bed4b3f5e1532138ce046f2454adabd620b3bc44fe787006bdc66875715c33a603e6d0969eef9fe1a384f1458 SHA512 05cb70dee85ed810bf50c968ba2b1e979f13861e34dece0506e3cffccbcf3d69c5f2c1225afee64664ea843e2ddd74731b63d7fea1581e7e2863e15b5c218ab7
 MISC metadata.xml 582 BLAKE2B ed94d37e43b59abd8bf8fbc1da8a6839aceddd5aae31109bf5d35f3996992d96dec619daba1d2c67a7d5c6182a06a413dc5e425ae786c3fe2cdbb68bb25796fb SHA512 88a39e758edddb852dd554a88035a74b0043d37009f97fb2ba45fe94169e17eef02b41ba8666d9f712469ae3af3258f14f7958b4dc70fc8eaea790d31b092fb8
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
deleted file mode 100644
index 2a891acd222b..000000000000
--- a/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils meson xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="DjVu plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-djvu/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-RDEPEND="app-text/djvu
-	>=app-text/zathura-0.3.9
-	dev-libs/girara
-	dev-libs/glib:2
-	x11-libs/cairo"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
index 7262f7ee1caf..b5a67f6e3010 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
 fi
 
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index ebe7bc681d8e..bf3152236884 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/cpp-hocon/Manifest b/dev-cpp/cpp-hocon/Manifest
index f0a331c579c3..d52e07de02b1 100644
--- a/dev-cpp/cpp-hocon/Manifest
+++ b/dev-cpp/cpp-hocon/Manifest
@@ -2,5 +2,5 @@ AUX cpp-hocon-0.2.1-cmake.patch 1792 BLAKE2B 2caf382ed29013b85d989f827a07430aa40
 DIST cpp-hocon-0.2.1.tar.gz 158108 BLAKE2B 4b7097768d4fcbc72df5c63fb036b12bb08108a0e1ef57ec182c64c2aa337b56197c8c10dea8f26f64a273b578d4c1b53a898024558d95e99d2ba1b3778c2414 SHA512 fcc377da7923b77436a6f2787d5b8b1b573f239de4f059c4a5949cbb1a755fd12024b9155f5e44cf60141181942f3e9a2a8fad07ee0b1d516fe2cd4a88d4ac8b
 DIST cpp-hocon-0.3.0.tar.gz 159032 BLAKE2B a5503d28d4740c78ad13836d5e7c60fc56b06d8f60f3d977a1db1008e0e90e159f2bef4d9737215684a4318b3c6d0a5efa20da1c14cd94ceacdb597bc5eaaab8 SHA512 de997e6d90330f901863b7da0d6f6e069a31e052b6f31c1e3009a9559c863f08879ecf4e202c763ec32567dd3a1e436ff5d3bf0b3009a085ef3ee95e5ca6c7e5
 EBUILD cpp-hocon-0.2.1.ebuild 588 BLAKE2B 3cb26d87e544bffdb3d77e51234f580b40ebe30a5d3c53ecab26b7224ff0657396833a1bd4c4d215c4ce3dad2cf87030eb62cfc6fc7ca84f5f9deee95a201157 SHA512 1cbfaf089c07c522c69dc3dc3c1de5af435d9baaa24ce6092fd61b403088f34c5c177fd957de5d75425ba9dfd300d93b294d12fd71de423e9fdb80a21caaf049
-EBUILD cpp-hocon-0.3.0.ebuild 584 BLAKE2B 8a740a334344a83933b076e2166bb4fd935abcadef5fac956d77c7d5c1a83dcb7f2d395712c74c82cc6b835a7a40c1aef12582631f4ed4bceeabcd23822867c8 SHA512 326f0cb3728284087115d0c6518ee0bf16462435bed19cd031718b4cb2fc698198d833bb58b1548db165574d674531dacd7aab575856f9279394013c332f1a94
+EBUILD cpp-hocon-0.3.0.ebuild 583 BLAKE2B 07e9241102d8402ca278e9c3bef86e961002e8cd66d142e2419bb0824bf7d7337bea4e34085c53ca1044a616c4fba19948a5a761b1fcb85ee82ad0d9e2104cfb SHA512 ae883347f8fe5ed11e1e62121efe7072bb354bffb830147ff47475fc305d4b168bafe617469128b1b1c5892179d95eb49e0b0af58b6a4d1865bf85373b7abbe2
 MISC metadata.xml 339 BLAKE2B 1318ce43b3d36322704fef45dfb7d54658e15394bb96120b9f0afe31099370d263fe033564aac1e113cd287e65900baea0add55fe81b7fe8e2ba31f627834302 SHA512 a7f1e55152a79c6a199de7f1264ecfe59f9e7135fcf650629b19655912d43371648c4b9efa75e6a4d6eafe30a7dc8c597c6936ba7b0ec59e38de2a2bcddd9d01
diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
index cdf3a111f176..015fa6c96c75 100644
--- a/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
+++ b/dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/dev-cpp/libmcpp/Manifest b/dev-cpp/libmcpp/Manifest
index 03692f0db14a..15e9e10579da 100644
--- a/dev-cpp/libmcpp/Manifest
+++ b/dev-cpp/libmcpp/Manifest
@@ -2,6 +2,5 @@ AUX libmcpp-2.7.2-fix-build-system.patch 1008 BLAKE2B d9a87af2faada430c9bd09bb6d
 AUX libmcpp-2.7.2-gniibe.patch 1039 BLAKE2B 2d69c087602432013c86cfe3a54f67e113842b0ae1cb9d293862f9ab1956c0b38a86a93c294936eb9e43c9fc6f7c8726bcfe198d0cdd9ede68bb05acec340e46 SHA512 a31a0f2e7430381e5e62ea4257a35891ce9d2f3beed60c6caad3b6d298a58557e9c850223840ef8c6f6c2e8139cf4a4edf29ac93b2532680feafba503fcfaf6d
 AUX libmcpp-2.7.2-zeroc.patch 2342 BLAKE2B d33a7539044a084ce42d5655db298c92b288574ae677621ccbde252abbc46ea7f5c071c500431e2e761c6158944beb2efd7fa95ec8cebd4e5ea1ce3a6ddf4af9 SHA512 86b2e851490e180dfe3028a5a37019ea423924c921ab053a642fb78d4533a87f913ede2928daf9da4daf60e67795a24521186b40c76961ae99ebeb75f8aa95ad
 DIST mcpp-2.7.2.tar.gz 1533457 BLAKE2B 4368fd1c667923ab3b60ce79f8421c549a9d9105957ca87b9ba49be513cb1be7f220a3ddbaf306e860014d5211af480d07170d912d3d4a80345d8eab45fd6c00 SHA512 1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235
-EBUILD libmcpp-2.7.2-r2.ebuild 716 BLAKE2B 8dae6fae2e6fddda5581b1adf3faea20d9b6132b034abd7932b009820d5e5553344c4c7f75b61b992f19fdd6a01ea5a24b6d55f2c0f6a28b1f69c4f2f6726237 SHA512 a4b00d7c475c7c1deb37576fd2c0e137635df1c9c8caf31c6dc3b0579d2b73b9e1794472a3f82d24636c901ff434b9a2d8a160057293cf0ad7165cdbdf227846
-EBUILD libmcpp-2.7.2-r3.ebuild 776 BLAKE2B 20b6e5e79784b777925e8ae927ce0a5dc08321bad61fd64836c7b99796c7a6e23f19fe10749fbb6b8d34f1a1c7653a1e471c5338fae1f352d1abdcd3e08ab6cc SHA512 d0ad25a3a72047b086dc840a094da909f40995098700580e78e1e7cc040b4e6dffb07b81e741062e62aa5e3bdbcdd1abcaa3a5c9a35fa84effd59965c8c6658f
+EBUILD libmcpp-2.7.2-r3.ebuild 771 BLAKE2B 306444121f6c963ae823a42ad8d1adc58e54f3d196385f0a6f95443421896779d5b821108bbdc4da0e4de6de332f73335a6f4c9e4727bc341f7d749fd60207c1 SHA512 2017ba16c121bc09393b7a1df4ff586d90034c8b568076fbfd824864f45a296306ad99ef66104caf9bf99264997469dca9579891db44b7ac873aab51c2100492
 MISC metadata.xml 241 BLAKE2B 243a081993d2297570d94667e0858f3a05bc5a214321a6d5a132f0b7a20a4cdfd9fdd1ccfd9e4753e6ea74e26907b167c484e504671e68458664d0fee31e1a2b SHA512 d242d2c5f6c5b13d0380745c59f6d4672fefcf85b888df7bc88f4501853f262eb1f615b25787ad4bce10fb8b5aad23de076feff3350f214be3d3793a3d249444
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild
deleted file mode 100644
index 0f8a8f23a825..000000000000
--- a/dev-cpp/libmcpp/libmcpp-2.7.2-r2.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
-
-inherit autotools
-
-MY_P=${P/lib/}
-
-DESCRIPTION="A portable C++ preprocessor"
-HOMEPAGE="http://mcpp.sourceforge.net"
-SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-mcpplib \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
index 69aa40621369..d22a2e028a4e 100644
--- a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
+++ b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
 IUSE="static-libs"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 207e71f8417d..1fcd9be7683d 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 3d85fb54a9cb..44feefc503c8 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -8,7 +8,7 @@ DIST mysql-5.7.31-patches-01.tar.xz 6664 BLAKE2B 8225f286f0090653f9714545daa95cc
 DIST mysql-5.7.32-patches-01.tar.xz 6660 BLAKE2B 5c63158615398bdcc4480a0e1b058f491b39ffc7ee33767b425f3b254555411031f64d865e1924afe8aa3926e4cba18049f1219a0a8acc702bc5e011c94fa947 SHA512 bf5e0d27af81e599005268ee243af4cd93f6df95c32cccb268a749322b4e5f73a2ce5d51f0ad1b0e1f2cf4702b8a05e4b2e0b73110fd4aac61f2a0f51bf4952e
 DIST mysql-8.0.20-patches-01.tar.xz 7176 BLAKE2B 2fc51986c0a4da60521d0e64b9f8705caf8ec3869af930c9729359c3710059fc78aae176523fdf17d10173b404431f31f9bb23ee5c82fba7cbbb4cb39881c005 SHA512 bf8211cf3873f8672b9d3d1dc42b68a1c635690ffdc2d3393eafa83f060ada9f2eaa63f859bf8eecc24976a733d8c7c3b9632ac70f28b5facf48eae921c7ceeb
 DIST mysql-8.0.21-patches-01.tar.xz 7212 BLAKE2B 2f1b38b3f84a124e3636cb726f3fcef82d71d933e90429dc78be44afeb4f456a37104359c5fd58ab50f0c03c1698e6c79f9b1e07640f0411c0024f558b4e9595 SHA512 3edcbb529b0623adaed30150d88c9b54d1a3e402faf5c7cff4ed626bbf4e5f50838d8f3c79bd2173439d748ded13412ff7fe37e3742c55879ff28907b9eb5660
-DIST mysql-8.0.22-patches-01.tar.xz 7176 BLAKE2B d793aefb0753bfdc04ae22f6f23e49755658c22bb749df3ba5cb5fad2296729600e209638be23e193aa0aaa114080be939e53e3e9aee45bde610eb17f0439211 SHA512 3606a5cd016a49bbbef008f5d0d0a98df44f523bfacf93cfd4e75f279b14329664241cc3cf63894fb24446a0eb1d51623b1267a5488dd3f7ea7990e9a18bf312
+DIST mysql-8.0.22-patches-02.tar.xz 7580 BLAKE2B a50704c3c58b1f67ca86edb233544137927b0ae5fdf302687b48f6fd30fbbd26798e8ef8282662586b25a7240b47278b44f944a8ca59f1a198bc228dd74459c9 SHA512 59f864452e9fdebe4d3990eff8b756e9bbfad58da216b74fa8b7e8391cb0d9d543ca2828591b9ed1ee276c1dec9e1851a8c2683507f0a326c85054e31cc3f950
 DIST mysql-boost-5.7.27.tar.gz 51436383 BLAKE2B 6db64ab5fa659aae9baa3725a0de9465e48c37618ffd69f34809880c06a00ce55dce77f507810c6fa52d86901facfa42d3d1bd8db1914a779fbc88a69be82497 SHA512 573f4555f3d62bcd3dc2228bcfba023518d462bb6689114a3505ccf7c7c3061d2775a8e7a37ec3c8b9dea6e8fbc56ba599610f237abc38cedff58e75799bdc52
 DIST mysql-boost-5.7.29.tar.gz 51417554 BLAKE2B 652ce9f99419387e9bcc37afeb1b46438784752e963c3aa1877f17650c31d8b058b4052da97c3a7e9454e758c259d6c311e0518f9a75909fce9741150b82164c SHA512 38acf7c2a10b20c59230ad05cd2cd6996c4c582233c1be573ead08e5c6684275790da07a036570363f89b4d61547b306589b0b98ed5fca70723a3f2cbc21fe11
 DIST mysql-boost-5.7.30.tar.gz 51363998 BLAKE2B 7897ad74b685c3b30e7ecdf132fdfa72f3416c05e8d0086cb8f7674b6c4f377fff9abc51ed258cc4dfeab50a2cb393af9076d9c1f9a83a26521facbaf223afa1 SHA512 b75d41d0c72d16c6f8d5393dab6e476b7993d296eb5683c12417ce2da3db2052fdab2a152f6e7c545315d21bfa35f26a247cb6cdab83d3418b5d34ed7f5f9560
@@ -29,5 +29,5 @@ EBUILD mysql-5.7.32.ebuild 37598 BLAKE2B 467bc83326192f67778dd41e25687ff0af4c821
 EBUILD mysql-8.0.19-r2.ebuild 37949 BLAKE2B c0ae41237387d4c58bac1f0f218fa467eba25a79e44605489f3835a1508c94423ea31c7d7d3f39e00f91a56a2320ffcca4fd968a425a3f898c9b7c2b9713f902 SHA512 434b40517a183a8bbb877ad79661ccc3ee1a89d40a374823c8778d87f75593f295c7a635496be1cb6376036da9c3acd5f82bfa2b62a88165b9c4b4b0ffd6469f
 EBUILD mysql-8.0.20-r1.ebuild 37217 BLAKE2B 2aef6bce1bd7f8e5e55b64caa304b427c84fcd365e265a6ce0d2458491349cd8c04c17a50644d1be7fca9218e17ad748b9307fe7b32270c6ba936077e2746d9b SHA512 ca65ad63a374696e4adc2d73176de71a0b27e267b91dfba20641303c4b9e8cfa1241375c7cd69af660b2d2632c629ab0658d1ed6e2454032a689f2995a2c505c
 EBUILD mysql-8.0.21-r1.ebuild 38168 BLAKE2B 7fd4dcb6e42c5d1dc4131c0de51e077fdd130012f9a25ef09731cdb15c6c72ae10063a431a8146934b1a19fdde4de21ea4b32b58190f88b03a4a91ace322acfe SHA512 2539cb667afe19ad476ef73fe30878fc98f04d63b6edac0b201cdd7b48ef48e5eb8125a87e1c021e7e53c0d2e6142abfe8743d26ed6f7c88ad7ae6565cd346f2
-EBUILD mysql-8.0.22.ebuild 37611 BLAKE2B 3d7f59692f1065cdbdce8b62ab47322f7a17cb19f8cf640b9f7c8076fcb8f021e4d5039149583a671d46a5033cbe2f092fc2aa2190039f50ddac036de42d17be SHA512 52563da07ab306b38e58666cb07140607ae41e767a444ba59fb044088383f4fd9d900345c6790bdbab16751aacccea94cbd886effb87e90f4ec03604685f30af
+EBUILD mysql-8.0.22.ebuild 37611 BLAKE2B 24451f3b5c9a2b434a8bd360277b2a4b79620ff0836fd06210caa8313b386c8fe2bcc6f5b78da6a2c52d73972ab19e9ab5eca0fad67bfb973e030b599348c507 SHA512 29f93d52a7a5b2a131245a9f12ea6b5f74e58ec0dd2917fa3ac64d9995b37a7d78186a924ae6c1af890342e6769f4a9769f93a95685b9bbfe8ae9b8187b99f2d
 MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
diff --git a/dev-db/mysql/mysql-8.0.22.ebuild b/dev-db/mysql/mysql-8.0.22.ebuild
index 721ce231c3a6..ccd6ddc59fa0 100644
--- a/dev-db/mysql/mysql-8.0.22.ebuild
+++ b/dev-db/mysql/mysql-8.0.22.ebuild
@@ -12,7 +12,7 @@ MY_PV="${PV//_pre*}"
 MY_P="${PN}-${MY_PV}"
 
 # Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${PN}-8.0.22-patches-01.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${PN}-8.0.22-patches-02.tar.xz"
 
 SRC_URI="https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-${MY_PV}.tar.gz
 	https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${MY_PV}.tar.gz
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index b7e49861fc10..e05266b9ca34 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,21 +1,13 @@
-AUX my.cnf-5.7 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e216d3f10034796de9aa618efb11482cef78b7c7e50393b5f665810d03321b5ca770ac8a6144 SHA512 1d7250689005c948f4a849959baf33f5f0fda099f230611651919ed053fb563daa19d996b7ca6714e224174172fb504f4d7d08e9d449a7e1203e32cf3fdec782
 AUX my.cnf-8.0.distro-client 749 BLAKE2B b01b39c85430714b5a4bfb9923c9ed1df99cdcef0583b25f28c2ebeee264732f4402198b1918e5ec5b4b1091dbda2d321baf31fe87eae00792b20042260969b3 SHA512 62aa589833126c2b78528e103f2de11ba0e339615cb00170a0f9f53bbb123a4bf99f2041819440297ab6cc34cf57333488e6ae12082fa5dcbe1b0ddef5f6108d
 AUX my.cnf-8.0.distro-server 1125 BLAKE2B f4d6941aad1fc29e81e6c805ac42f4c8d3c7bc250990a9c432800dbe25b5c31be08d8e3895666b57f21606ffb69e704c57ed2692fd94696b9d325a4442596587 SHA512 82d35b7bc944e5690e1f2670a3d5674845610c2d11d6d8b1c5784ccb3877c6298de70eced3d7c497c0bcaecfa9e339ac43ce0534a97e7d976e950bb1a7f5c75d
 AUX my.cnf.distro-client 637 BLAKE2B b0812e0e03aa9a3b2e55e08b933a0b41b6afd95ded61f4d9d7c34a2d3810ec38520abd0d89e1c6565f61d4cd8a36d653f9f3199b3dd6a91345cdb5ff962685d8 SHA512 74bd1d9a58075d0a6195be1f94db310bcbe8da532b03844e6fa1ff84676e84843fc9adf9aed06b7e4db53c9aa24ef0885d96de0ccfe4c6ad98afe4c145d43f4f
 AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650
-DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
-DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
-DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
-DIST percona-server-5.7.27-30.tar.gz 84672298 BLAKE2B 8431d231f602b704195868110e8eb73adb3db7c761906c15eff182e54634ef091a3ffa0d4f3498a93dbfbf65cd5cdd12102871abaaaa0f32378ba3068d083b2b SHA512 d62c66de3128df87dce52292ad1671e01fe2c923e668ef0faf9cb663c11c9cd0b976345aea1de6ea2bc458d0e1066b42c022849e422121d96cea082ed12c8f4b
-DIST percona-server-8.0.19-10.tar.gz 490703179 BLAKE2B 731e9498c4934eb53451c202e8b1de93618190d9b6334b761428ab223756d515d958db77515517e6b5db3ba6cd908c8b238c18b63f4c73b256ec251f8b161ff3 SHA512 39aa805474c6655980e70c97e0d2c0f21ae16e2c1e2e9c7e1d615f46320f1615620368fbdfc24f5d1784aae856090856c3ccda3d6f09ed86c6c9ffe3197be90e
-DIST percona-server-8.0.19.10-patches-01.tar.xz 8288 BLAKE2B 2f79c538ac1512b052210439a27b71491917cb9eab08ac3a3b21c188458c2989f0c998d973b8dd654a7d7606acd70ccf374f1e2f5e0088d0c6b96a794dc4c4a5 SHA512 43313797ec405be82f15745185bfab25fda093045f981a8caa8a019522e432415e4b3cca4ca5ffb735d102f98b3c2fccafccbd4695bd2d1f011707f709fcc2b3
-DIST percona-server-8.0.20-11.tar.gz 494288758 BLAKE2B 202f0cbd7395a6b8ae367ed96d1b6d2c6ae2a56ba6d85e8aad55a6b36a6966a0c3285836dc829e1583a46e28fd2903540e520f6347b1e8c18d99b08f58daef8b SHA512 cf8aa999bd0205bded526838246d023eae5dfadeec1aaf0be99565def5a1cdcc8041bcff90ba6a49f5e903e4f436d416181a9f134555d5c71b7cf44d2ba58a6d
-DIST percona-server-8.0.20.11-patches-02.tar.xz 8876 BLAKE2B 34cb3cd0c6d6fb8b2fca98efa53e6e163e4f6b251f629e40169018c328da5319a77ecceec92c925019d13a4ba2dba8c96a23dccf8ba8a3aa95452d4dc9278ffa SHA512 372885f22e7e37bcd63f382d4b064d99b6f826cd2d053148fcdfa1c7f062f51531d5366c198976797f9a3349539e59f5ba96187dc79fdf00365c618b0f83b7c2
+DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST percona-server-8.0.21-12.tar.gz 522004727 BLAKE2B bc6bf77d862a4827839d1942f58e4124f4692abfa9298eaa7cebdaaa7a6cff036247edda51d9cbb878b0e79858e54cbe5326bc30479b1d5977a655240df438fd SHA512 66076a6774cf18af1111b83aa8977a55e1a2d634c30e190d3bd8e82ba079fb772ac2a2402356be0b79677b54ca0b24c441d87444b68d1e66cd298ca6a0108d31
-DIST percona-server-8.0.21.12-patches-01.tar.xz 8916 BLAKE2B 3a40f63383ad0c63830056b15453a0e7429f2507e8205cca660aaf6787c9d6ed9e741df8d09fc887fe07b82f86e7aa53730b3aa97788421ed4dde3e83c992c01 SHA512 f7599293dced8ea2bc98d88e8dfc4f20288974fecfe481f446b071c1d393119c22317819fcc054bf9cdd4c557044332d450ffc99b3a14c91b51a4c0b6c1c0896
-EBUILD percona-server-5.7.27.30-r1.ebuild 37272 BLAKE2B 637049d8fcae905ad4cb4d41651e53fcc0980cf307602879e8d5f0d6bcf0505ff0a9c38a7450f539db0106f4ed406f96e1e212bd2f34eb2510bb137714cd69fd SHA512 feda2f9ccb3b58a03577126aabe0483c3217ce5e0618028d442c98aa2ace7ba527dd10aafde2f679ddabe9f86c65648ea445081d78eb360d02e42cb072733425
-EBUILD percona-server-8.0.19.10-r1.ebuild 39009 BLAKE2B d7ff1b52a7e04d3158461494503cf2af8f3bf7775fbeb9d91e58a3cd85094d093aef085522af221e3b6037ec958cf4ffafbbdaf808343b8a23f5b1be40e82750 SHA512 4ffb5d0e7611cd5b388cc5846d12d2eb020325d99a14c10e42c204425360f6d5109352ea8d6dad8926fadba84df810fb10a8f21179ebd79c0e1e0b18e4c3c3e4
-EBUILD percona-server-8.0.20.11-r2.ebuild 40249 BLAKE2B ae3233ecc31893529f5d59128e3f39bee9509a46d98a2ec8ca2766ed74af5e5625168e0095fc25852f7fa927fa9e36191d2be1d6ec975eebf3cc771dabf8ec62 SHA512 0831b745e259bcff131e1778f7fa25826198eed091238dfe1f3728a9c940b74582308fe787dd6bbef95568a1fbbb9e5ff7c641476763e3a2d71eee340224542c
-EBUILD percona-server-8.0.21.12.ebuild 40541 BLAKE2B ca55840b52ae781acf13de2917d524b9205b11d4f1703775b8368bef9b7fd256a8b4f360c5fc645a9e65752253336998f0ed602c85e9bf3963e5d9cc37149827 SHA512 34fa8092ad1ee78461e7824a5eb56b8582310fc216cef27fcddde3a2605145be308df28f74847cd343905fbfee6f4a3474193bea95caf30efb5366595b49ee96
-MISC metadata.xml 1476 BLAKE2B 45302733bbb03e6e999d60db72bed7382f664d9b46772904a35a1a8bfceccc89008e739fcead55bfb6a056523f0ff84fd22c638de859236f47a01eb8ac6c45eb SHA512 e53b29f9d78e895a26f228b7719a023dbd5957d1e10f384376b75b539a211425be143c229378af2ade5314f6b414d891bafc7e1fffde9bb88b59ff24de31a2c2
+DIST percona-server-8.0.21.12-patches-02.tar.xz 9276 BLAKE2B 97aa38dedcd1c09e88d2b17c462da8adbf1defbe1596abbc33eeca1ef1f14e3a2acddeca82da04e7c4d3a4c0dec70c53ee39d1011ba86c836492a2f8599a6732 SHA512 e7876088778a6190c0f0dbfbc44d5794c2d0903a2303bbb913fc1d4d7f462000108e33d3e764399c9fedbaa5b642004243316505f4a6f0566e1b250a9faded14
+DIST percona-server-8.0.22-13.tar.gz 530806570 BLAKE2B 256e5afa2e3908617c41ffcab591ccdbfd932a8ba3ce25fbf2a0be2cdfa80991b0c2d090c11ffae64e4bb3d8cf9f3011b70974ab22cbab023f6625ac422f3c73 SHA512 9b7a1d06885eb4412361bb3920adc9f050f8da95584eb910c97c8877a433ead04d02f2908e5e9648b1d79cdba677727fdb745377feac3c958339588d5f0cdf2b
+DIST percona-server-8.0.22.13-patches-01.tar.xz 9236 BLAKE2B d75d32782902d5d095389c8f79587b196e65508223503616d92304a2cb09520959adca04eac96fd4501cccf46ca684702b55c7a0327e6c3477b68245fe96e82b SHA512 e884d8bbd31f6df7f3a585feb970f82f78484a90404c40dc3e5daf46c3836a59c6bcef34fd8a3e9191a12820ba7ae441d53a7c010256dd0296e7eeb00313d6a0
+EBUILD percona-server-8.0.21.12.ebuild 40541 BLAKE2B 7bf262f6ca477aa55633083149b5552988bf59016433bfab08e92c5003b22ef11782f500544d76fcdd759e972ce280cdd113ac1a76d4687ff232f71497f68f46 SHA512 ad9ce5201ab82ffb12efc9480247a01b0064263fcf5b53af40716d1bc5f258e3f9f6991f170cfff5c1e6f636ff1ed0ead7bbe30716bf6ac40829aebeab3aa4dd
+EBUILD percona-server-8.0.22.13.ebuild 39969 BLAKE2B 4cf8dc803784c3b31c4b13558a7f480dae1309997066bf5ab949d66edb60d3c150649cd9aeea789dce4944308536a5dbd6b755a16ba9e222bb4b0f60ceaa6c0f SHA512 b42efe102fd5364eee539ff1ef50b0d0463196279e443666bb6e8653c5528911de57d7de7322ec25141f6a5e26650fb998cca855bc62fc4bbcdbeece406a6f9d
+MISC metadata.xml 1120 BLAKE2B fb5942ab65cb9572c5bf593833c274e82c6f99dda741638efbba4c00c667bda6a9aa290db772cc83a8afe4e5e0ef167b92b449ff54e5a0facdc3ca093e3dc72b SHA512 d603bb674b8458ac00de2fe9ecc8454407e8df44138f4ecb450ea6cd10265ab3aaba78fac6ba2e7b41e454adfd8ba5c0a2541729668170ab48031c352f30bbdd
diff --git a/dev-db/percona-server/files/my.cnf-5.7 b/dev-db/percona-server/files/my.cnf-5.7
deleted file mode 100644
index 571ebf07a76e..000000000000
--- a/dev-db/percona-server/files/my.cnf-5.7
+++ /dev/null
@@ -1,3 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-
-!includedir @GENTOO_PORTAGE_EPREFIX@/etc/mysql/mysql.d
diff --git a/dev-db/percona-server/metadata.xml b/dev-db/percona-server/metadata.xml
index f282af308762..4b72b897bda7 100644
--- a/dev-db/percona-server/metadata.xml
+++ b/dev-db/percona-server/metadata.xml
@@ -7,8 +7,6 @@
   </maintainer>
 <use>
   <flag name="cjk">Add CJK support for InnoDB fulltext search using <pkg>app-text/mecab</pkg></flag>
-  <flag name="client-libs">Build the libmysqlclient libraries</flag>
-  <flag name="experimental">Build experimental features aka "rapid" plugins</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
   <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
@@ -16,9 +14,7 @@
   <flag name="rocksdb">Add support for RocksDB; a key/value, LSM database optimized for flash storage</flag>
   <flag name="router">Build the MySQL router program</flag>
   <flag name="server">Build the server program</flag>
-  <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
   <flag name="tokudb">Add support for TokuDB storage engine</flag>
   <flag name="tokudb-backup-plugin">Builds the TokuDB backup plugin</flag>
-  <flag name="yassl">Enable SSL connections and crypto functions using the bundled yaSSL</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-db/percona-server/percona-server-5.7.27.30-r1.ebuild b/dev-db/percona-server/percona-server-5.7.27.30-r1.ebuild
deleted file mode 100644
index 86283b34ba4b..000000000000
--- a/dev-db/percona-server/percona-server-5.7.27.30-r1.ebuild
+++ /dev/null
@@ -1,1136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20190822-1908Z"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-# Python2 required for innodb_stress.innodb_stress{,_blob,_crash} test
-PYTHON_COMPAT=( python2_7 )
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eapi7-ver cmake-utils eutils flag-o-matic linux-info \
-	prefix python-any-r1 toolchain-funcs multilib-minimal
-
-MY_PV=$(ver_rs 3 '-')
-MY_PN="Percona-Server"
-MY_P="${PN}-${MY_PV}"
-MY_MAJOR_PV=$(ver_cut 1-2)
-MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/5.7/release-notes/release-notes_index.html"
-
-SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
-	mirror://sourceforge/boost/boost_1_59_0.tar.gz
-"
-
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]] ; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server"
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-LICENSE="GPL-2"
-SLOT="5.7/18"
-IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa pam +perl profiling rocksdb
-	selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin yassl"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/mysql-extras"
-	EGIT_CLONE_TYPE=shallow
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras"
-else
-	MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
-	"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.7.patch
-	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch
-	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch
-	"${MY_PATCH_DIR}"/20018_all_percona-server-5.7.26-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20018_all_percona-server-5.7.25-fix-libressl-support.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-add-missing-gcc-8-fix.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-round-off-test-values-for-same-output-on-all-architectures.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-mips-ASM.patch
-	"${MY_PATCH_DIR}"/20018_all_percona-server-5.7.23-rocksdb-use-system-libs.patch
-)
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-# MULTILIB_USEDEP only set for libraries used by the client library
-COMMON_DEPEND="net-misc/curl:=
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	sys-libs/ncurses:0=
-	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] )
-	!client-libs? (
-		dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
-		>=sys-libs/zlib-1.2.3:0=
-	)
-	jemalloc? ( dev-libs/jemalloc:0= )
-	kernel_linux? (
-		dev-libs/libaio:0=
-		sys-process/procps:0=
-	)
-	server? (
-		>=app-arch/lz4-0_p131:=
-		cjk? ( app-text/mecab:= )
-		experimental? (
-			dev-libs/libevent:=
-			dev-libs/protobuf:=
-			net-libs/libtirpc:=
-		)
-		numa? ( sys-process/numactl )
-		pam? ( sys-libs/pam:0= )
-		rocksdb? (
-			app-arch/zstd:=
-			dev-libs/protobuf:=
-		)
-		tokudb? (
-			app-arch/snappy:=
-			app-arch/xz-utils:=
-		)
-		tokudb-backup-plugin? ( dev-util/valgrind )
-	)
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	!yassl? (
-		client-libs? (
-			!libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
-		)
-		!client-libs? (
-			!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	dev-libs/protobuf
-	virtual/yacc
-	server? (
-		dev-libs/libevent
-		experimental? ( net-libs/rpcsvc-proto )
-	)
-	static? ( sys-libs/ncurses[static-libs] )
-	test? (
-		acct-group/mysql acct-user/mysql
-		dev-perl/JSON
-		|| (
-			$(python_gen_any_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]')
-			$(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]')
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster
-	!dev-db/percona-server:0
-	!dev-db/percona-server:8.0
-	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= )
-	selinux? ( sec-policy/selinux-mysql )
-	server? (
-		!prefix? (
-			acct-group/mysql acct-user/mysql
-			dev-db/mysql-init-scripts
-		)
-	)
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-python_check_deps() {
-	has_version "dev-python/mysqlclient[${PYTHON_USEDEP}]" \
-		|| has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
-}
-
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]] ; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]] ; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_pretend() {
-	if use numa ; then
-		local CONFIG_CHECK="~NUMA"
-
-		local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
-		WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		local GCC_MAJOR_SET=$(gcc-major-version)
-		local GCC_MINOR_SET=$(gcc-minor-version)
-		# Bug 565584: InnoDB now requires atomic functions introduced with gcc-4.7 on
-		# non x86{,_64} arches
-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-
-		use test && python-any-r1_pkg_setup
-	fi
-
-	if has test ${FEATURES} && \
-		use server && ! has userpriv ${FEATURES} ; then
-			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-}
-
-pkg_preinst() {
-	# Here we need to see if the implementation switched client libraries
-	# We check if this is a new instance of the package and a client library already exists
-	local SHOW_ABI_MESSAGE libpath
-	if use client-libs && [[ -z ${REPLACING_VERSIONS} && -e "${EROOT%/}/usr/$(get_libdir)/libperconaserverclient.so" ]] ; then
-		libpath=$(readlink "${EROOT%/}/usr/$(get_libdir)/libperconaserverclient.so")
-		elog "Due to ABI changes when switching between different client libraries,"
-		elog "revdep-rebuild must find and rebuild all packages linking to libperconaserverclient."
-		elog "Please run: revdep-rebuild --library ${libpath}"
-		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
-	fi
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	if use server ; then
-		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-			einfo
-			elog "You might want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
-			elog "if this is a new install."
-			elog
-			elog "If you are switching server implentations, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		else
-			einfo
-			elog "If you are upgrading major versions, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		fi
-	fi
-
-	# Note about configuration change
-	einfo
-	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/mysql.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
-	einfo
-}
-
-src_unpack() {
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
-
-	mv -f "${WORKDIR}/${MY_P}" "${S}" || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use jemalloc ; then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-
-	if use tcmalloc ; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-
-	# Don't build bundled xz-utils
-	if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
-		echo > "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
-		sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
-	elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
-		echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
-		sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
-		sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
-	fi
-
-	if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use tokudb-backup-plugin ; then
-		 rm -r "${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || die
-	fi
-
-	# Remove bundled libs so we cannot accidentally use them
-	# We keep extra/lz4 directory because we use extra/lz4/xxhash.c via sql/CMakeLists.txt:394
-	rm -rv \
-		"${S}"/extra/protobuf \
-		"${S}"/extra/libevent \
-		"${S}"/storage/rocksdb/third_party \
-		"${S}"/storage/tokudb/PerconaFT/third_party \
-		"${S}"/zlib \
-		|| die
-
-	# Don't clash with dev-db/mysql-connector-c
-	rm \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1 \
-		|| die
-
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-
-	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
-}
-
-src_configure() {
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	if use tokudb ; then
-		# https://jira.percona.com/browse/PS-4399
-		append-cxxflags -Wno-error=shadow
-	fi
-
-	if use client-libs ; then
-		multilib-minimal_src_configure
-	else
-		multilib_src_configure
-	fi
-}
-
-multilib_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if ! multilib_is_native_abi && ! use client-libs ; then
-		return
-	fi
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		### TODO: make this system but issues with UTF-8 prevent it
-		-DWITH_EDITLINE=bundled
-		-DWITH_ZLIB=system
-		-DWITH_LIBWRAP=0
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
-		# The build forces this to be defined when cross-compiling. We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DWITH_CURL=system
-		-DWITH_BOOST="${WORKDIR}/boost_1_59_0"
-		-DWITH_PROTOBUF=system
-	)
-
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	if ! use yassl ; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
-	if ! use client-libs ; then
-		mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
-	fi
-
-	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
-	# systemtap only works on native ABI, bug 530132
-	if multilib_is_native_abi ; then
-		mycmakeargs+=(
-			-DENABLE_DTRACE=$(usex systemtap)
-		)
-	else
-		mycmakeargs+=(
-			-DWITHOUT_TOOLS=1
-			-DWITH_READLINE=1
-			-DENABLE_DTRACE=0
-		)
-	fi
-
-	if multilib_is_native_abi && use server ; then
-		mycmakeargs+=(
-			-DWITH_LIBEVENT=system
-			-DWITH_LZ4=system
-			-DWITH_MECAB=$(usex cjk system OFF)
-			-DWITH_NUMA=$(usex numa ON OFF)
-			-DWITH_RAPID=$(usex experimental ON OFF)
-		)
-
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]] ; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8
-				-DDEFAULT_COLLATION=utf8_general_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-
-		mycmakeargs+=(
-			-DEXTRA_CHARSETS=all
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_EMBEDDED_SERVER=OFF
-		)
-
-		if use profiling ; then
-			# Setting to OFF doesn't work: Once set, profiling options will be added
-			# to `mysqld --help` output via sql/sys_vars.cc causing
-			# "main.mysqld--help-notwin" test to fail
-			mycmakeargs+=( -DENABLED_PROFILING=ON )
-		fi
-
-		if use static ; then
-			mycmakeargs+=( -DWITH_PIC=1 )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_EXAMPLE_STORAGE_ENGINE=0
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_FEDERATED_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_INNODB_MEMCACHED=0
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_PARTITION_STORAGE_ENGINE=1
-			-DWITH_ROCKSDB=$(usex rocksdb 1 0)
-			$(usex tokudb '' -DWITHOUT_TOKUDB=1)
-		)
-
-		if use tokudb ; then
-			# TokuDB Backup plugin requires valgrind unconditionally
-			mycmakeargs+=(
-				$(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1)
-			)
-		fi
-
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DEXTRA_CHARSETS=none
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	if use client-libs ; then
-		multilib-minimal_src_compile
-	else
-		multilib_src_compile
-	fi
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-
-# Official test instructions:
-# ulimit -n 16500 && \
-# USE='latin1 perl server' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild percona-server-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	_disable_test() {
-		local rawtestname reason
-		rawtestname="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}'"
-		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ $UID -eq 0 ]] ; then
-		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
-
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-	# Enable parallel testing, auto will try to detect number of cores
-	# You may set this by hand.
-	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" &>/dev/null || die
-
-	touch "${T}/disabled.def"
-	# These are failing in Percona-Server 5.7 for now and are believed to be
-	# false positives or are known to fail:
-	#
-	# group_replication.gr_communication_configuration: requires a valid local network address
-	#                                                   which clashes with FEATURES=network-sandbox
-	# innodb.xtradb_compressed_columns_consistency:     long running test which tends to timeout
-	#                                                   on a busy host
-	# keyring_vault.keyring_vault_timeout:              requires network access to vault.public-ci.percona.com
-	#                                                   which clashes with FEATURES=network-sandbox
-	# rocksdb.prefix_extractor_override:                https://jira.percona.com/browse/PS-5199
-	# rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch:   https://bugs.mysql.com/bug.php?id=89223
-	# rpl.rpl_multi_source_mts_reset_worker_info:       https://jira.percona.com/browse/PS-3786
-	# tokudb.bugs.5733_tokudb:                          https://jira.percona.com/browse/PS-4274
-	# x.crud_insert_cast:                               https://jira.percona.com/browse/PS-5032
-	# x.insert_table_bad_column:                        https://jira.percona.com/browse/PS-5032
-	# x.insert_table_bad_numcolumns:                    https://jira.percona.com/browse/PS-5032
-	# x.insert_table_bad_column_type:                   https://jira.percona.com/browse/PS-5032
-	# x.insert_table:                                   https://jira.percona.com/browse/PS-5032
-	# x.update_crud_arrayappend_o:                      https://jira.percona.com/browse/PS-5032
-	# x.update_crud_arrayinsert_o:                      https://jira.percona.com/browse/PS-5032
-	# x.mysqlxtest_help:                                https://jira.percona.com/browse/PS-5019
-	# x.admin_kill_client_mysqlx:                       https://jira.percona.com/browse/PS-5019
-	#
-	local t
-
-	for t in \
-		group_replication.gr_communication_configuration \
-		innodb.xtradb_compressed_columns_consistency \
-		keyring_vault.keyring_vault_timeout \
-		rocksdb.prefix_extractor_override \
-		rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch \
-		rpl.rpl_multi_source_mts_reset_worker_info \
-		tokudb.bugs.5733_tokudb \
-		x.crud_insert_cast \
-		x.insert_table_bad_column \
-		x.insert_table_bad_numcolumns \
-		x.insert_table_bad_column_type \
-		x.insert_table \
-		x.update_crud_arrayappend_o \
-		x.update_crud_arrayinsert_o \
-		x.mysqlxtest_help \
-		x.admin_kill_client_mysqlx \
-	; do
-			_disable_test "$t" "False positives in Gentoo / Known bug"
-	done
-
-	# Unstable tests
-	# - main.xa_prepared_binlog_off: https://bugs.mysql.com/bug.php?id=83340
-	# - rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch: https://bugs.mysql.com/bug.php?id=89223
-	# - rpl.rpl_non_direct_stm_mixing_engines: MDEV-14489
-	for t in \
-		main.xa_prepared_binlog_off \
-		rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch \
-		rpl.rpl_non_direct_stm_mixing_engines \
-	; do
-		_disable_test "$t" "Unstable test"
-	done
-
-	for t in \
-		gis.geometry_class_attri_prop \
-		gis.geometry_property_function_issimple \
-		gis.gis_bugs_crashes \
-		gis.spatial_op_testingfunc_mix \
-		gis.spatial_analysis_functions_buffer \
-		gis.spatial_analysis_functions_centroid \
-		gis.spatial_analysis_functions_distance \
-		gis.spatial_op_testingfunc_mix \
-		gis.spatial_utility_function_distance_sphere \
-		gis.spatial_utility_function_simplify \
-	; do
-		_disable_test "$t" "Known rounding error with latest AMD processors"
-	done
-
-	if has_version ">=dev-libs/openssl-1.1.1" ; then
-		for t in \
-			main.ssl_8k_key \
-			auth_sec.mysql_ssl_connection \
-			main.ssl_verify_identity \
-			main.ssl_crl \
-			main.grant_alter_user_qa \
-			auth_sec.ssl_auto_detect \
-			encryption.innodb_onlinealter_encryption \
-			main.ssl_ca \
-			main.ssl_cipher \
-			main.grant_user_lock_qa \
-			auth_sec.openssl_cert_generation \
-			main.ssl_bug75311 \
-			main.ssl_compress \
-			main.ssl \
-			main.plugin_auth_sha256_tls \
-			main.ssl_ecdh \
-			main.openssl_1 \
-			auth_sec.cert_verify \
-			main.mysql_ssl_default \
-			main.percona_tls \
-			auth_sec.tls \
-			auth_sec.ssl_mode \
-			binlog.binlog_grant_alter_user \
-			x.connection_tls_version \
-			x.connection_openssl \
-		; do
-			_disable_test "$t" "Known >=openssl-1.1.1 failures"
-		done
-	fi
-
-	if use numa && use kernel_linux ; then
-		# bug 584880
-		if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then
-			for t in sys_vars.innodb_numa_interleave_basic ; do
-				_disable_test "$t" "Test $t requires system with NUMA support"
-			done
-		fi
-	fi
-
-	if use tokudb ; then
-		if [[ -f "/sys/kernel/mm/transparent_hugepage/enabled" ]] ; then
-			if grep -q -E "\[always\]" /sys/kernel/mm/transparent_hugepage/enabled &>/dev/null ; then
-				# TokuDB refuses to start when transparent hugepages are enabled
-				for t in \
-					tokudb.rows-32m-rand-insert \
-					tokudb.savepoint-2 \
-					tokudb.savepoint-3 \
-					tokudb.savepoint-4 \
-					tokudb.savepoint-1078 \
-					tokudb.savepoint-1078-2 \
-					tokudb.savepoint-1078-3 \
-					tokudb.savepoint-1078-4 \
-				; do
-						_disable_test "$t" "TokuDB will not work with transparent hugepages enabled"
-				done
-			fi
-		else
-			einfo "Cannot determine transparent hugepage status."
-			einfo "Please note that TokuDB refuses to start when transparent hugepages are enabled!"
-		fi
-	fi
-
-	if ! use latin1 ; then
-		# The following tests will fail if DEFAULT_CHARSET
-		# isn't set to latin1:
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_xa_prepared_disconnect \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			innodb.innodb_pagesize_max_recordsize \
-			innodb.innodb-system-table-view \
-			innodb.mysqldump_max_recordsize \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			main.type_string \
-			main.information_schema \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-			rpl.rpl_xa_survive_disconnect \
-			rpl.rpl_xa_survive_disconnect_lsu_off \
-			rpl.rpl_xa_survive_disconnect_table \
-		; do
-				_disable_test "$t" "requires DEFAULT_CHARSET=latin1 but USE=-latin1 is set"
-		done
-	fi
-
-	# Try to increase file limits to increase test coverage
-	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
-		# Upper limit comes from parts.partition_* tests
-		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
-		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
-			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
-			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
-			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
-				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
-			else
-				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
-			fi
-		else
-			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
-		fi
-	else
-		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
-	fi
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd &>/dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || die "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
-
-src_install() {
-	local MULTILIB_WRAPPED_HEADERS
-	local MULTILIB_CHOST_TOOLS
-	if use client-libs ; then
-		# headers with ABI specific data
-		MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/mysql/server/my_config.h
-			/usr/include/mysql/server/mysql_version.h )
-
-		# wrap the config scripts
-		MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
-		multilib-minimal_src_install
-	else
-		multilib_src_install
-		multilib_src_install_all
-	fi
-}
-
-# Intentionally override eclass function
-multilib_src_install() {
-
-	cmake-utils_src_install
-
-	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-multilib_src_install_all() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
-	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
-
-	if use server ; then
-		mycnf_src="my.cnf.distro-server"
-		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-			"${FILESDIR}/${mycnf_src}" \
-			> "${TMPDIR}/my.cnf.ok" || die
-
-		if use prefix ; then
-			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-
-		if use latin1 ; then
-			sed -i \
-				-e "/character-set/s|utf8|latin1|g" \
-				"${TMPDIR}/my.cnf.ok" || die
-		fi
-
-		eprefixify "${TMPDIR}/my.cnf.ok"
-
-		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
-		if use tokudb ; then
-			# Remove some unwanted files
-			rm -fv \
-				"${ED%/}"/usr/COPYING.AGPLv3 \
-				"${ED%/}"/usr/COPYING.GPLv2 \
-				"${ED%/}"/usr/PATENTS \
-				"${ED%/}"/usr/README.md \
-				|| die
-		fi
-	fi
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-}
-
-pkg_config() {
-	_getoptval() {
-		local mypd="${EROOT%/}"/usr/bin/my_print_defaults
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
-	}
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX}/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-	if [[ ! -x "${EROOT%/}/usr/sbin/mysqld" ]] ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]] ; then
-		local MY_DATADIR_s="${ROOT%/}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT%/}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]] ; then
-			if [[ -d "${MY_DATADIR_s}" ]] ; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]] ; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client ; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${EROOT%/}/$MYSQL_TMPDIR" ]] ; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_TMPDIR"
-	fi
-
-	if [[ ! -d "${EROOT%/}/$MYSQL_LOG_BIN" ]] ; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_LOG_BIN"
-	fi
-
-	if [[ ! -d "${EROOT%/}/$MYSQL_RELAY_LOG" ]] ; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_RELAY_LOG"
-	fi
-
-	if [[ -d "${ROOT%/}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT%/}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-
-		einfo "Please provide a password for the mysql 'root' user now"
-		einfo "or through the ${HOME}/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options
-	local sqltmp="$(emktemp)"
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR%/}/mysqld-help"
-	"${EROOT%/}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-
-	einfo "Creating the mysql database and setting proper permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT%/}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]] ; then
-		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]] ; then
-		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
-	fi
-
-	pushd "${TMPDIR}" &>/dev/null || die
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	echo "USE mysql;" >"${sqltmp}"
-	"${EROOT%/}/usr/bin/mysql_tzinfo_to_sql" "${EROOT%/}/usr/share/zoneinfo" >> "${sqltmp}" 2>/dev/null
-	chown mysql "${sqltmp}" || die
-
-	# --initialize-insecure will not set root password
-	# --initialize would set a random one in the log which we don't need as we set it ourselves
-	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
-	einfo "Command: ${cmd[*]}"
-	su -s /bin/sh -c "${cmd[*]}" mysql \
-		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
-	if [[ $? -ne 0 ]] ; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
-	fi
-	popd &>/dev/null || die
-	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-
-	use prefix || options="${options} --user=mysql"
-
-	local socket="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT%/}/usr/sbin/mysqld \
-		${options} \
-		$(use prefix || echo --user=mysql) \
-		--log-warnings=0 \
-		--basedir=${EROOT%/}/usr \
-		--datadir=${ROOT%/}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--socket=${socket} \
-		--pid-file=${pidfile} \
-		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]] ; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'"
-	"${EROOT%/}/usr/bin/mysql" \
-		--no-defaults \
-		"--socket=${socket}" \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
diff --git a/dev-db/percona-server/percona-server-8.0.19.10-r1.ebuild b/dev-db/percona-server/percona-server-8.0.19.10-r1.ebuild
deleted file mode 100644
index 44544aaf5cc7..000000000000
--- a/dev-db/percona-server/percona-server-8.0.19.10-r1.ebuild
+++ /dev/null
@@ -1,1185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake-utils flag-o-matic linux-info \
-	multiprocessing prefix toolchain-funcs check-reqs
-
-MY_BOOST_VERSION="1.70.0"
-MY_PV=$(ver_rs 3 '-')
-MY_PV="${MY_PV//_pre*}"
-MY_PN="Percona-Server"
-MY_P="${PN}-${MY_PV}"
-MY_MAJOR_PV=$(ver_cut 1-2)
-MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/${MY_MAJOR_PV}/"
-
-# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.19.10-patches-01.tar.xz"
-
-SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
-	https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
-	${PATCH_SET}
-"
-
-HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server https://github.com/percona/percona-server"
-DESCRIPTION="Fully compatible, enhanced and open source drop-in replacement for MySQL"
-LICENSE="GPL-2"
-SLOT="8.0"
-IUSE="cjk cracklib debug jemalloc latin1 libressl numa pam +perl profiling
-	rocksdb router selinux +server tcmalloc test tokudb tokudb-backup-plugin"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
-RESTRICT="!test? ( test ) libressl? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc )
-	cjk? ( server )
-	jemalloc? ( server )
-	numa? ( server )
-	profiling? ( server )
-	router? ( server )
-	tcmalloc? ( server )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	>=app-arch/lz4-0_p131:=
-	sys-libs/ncurses:0=
-	>=sys-libs/zlib-1.2.3:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( >=dev-libs/openssl-1.0.0:0= )
-	server? (
-		dev-libs/icu:=
-		dev-libs/libevent:=
-		>=dev-libs/protobuf-3.8:=
-		net-libs/libtirpc:=
-		net-misc/curl:=
-		cjk? ( app-text/mecab:= )
-		jemalloc? ( dev-libs/jemalloc:0= )
-		kernel_linux? (
-			dev-libs/libaio:0=
-			sys-process/procps:0=
-		)
-		numa? ( sys-process/numactl )
-		pam? ( sys-libs/pam:0= )
-		tcmalloc? ( dev-util/google-perftools:0= )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	virtual/yacc
-	server? ( net-libs/rpcsvc-proto )
-	test? (
-		acct-group/mysql acct-user/mysql
-		dev-perl/JSON
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster
-	!dev-db/percona-server:0
-	!dev-db/percona-server:5.7
-	selinux? ( sec-policy/selinux-mysql )
-	!prefix? (
-		acct-group/mysql acct-user/mysql
-		dev-db/mysql-init-scripts
-	)
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-CHECKREQS_DISK_BUILD="9G"
-
-mysql_init_vars() {
-	: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	: ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	: ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-	MY_DATADIR="${MY_LOCALSTATEDIR}"
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-	use server && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if has test ${FEATURES} ; then
-		# Bug #213475 - MySQL _will_ object strenuously if your machine is named
-		# localhost. Also causes weird failures.
-		[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-		if ! has userpriv ${FEATURES} ; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-
-		local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null)
-		[[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] \
-			&& die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!"
-
-		if use latin1 ; then
-			# Upstream only supports tests with default charset
-			die "Testing with USE=latin1 is not supported."
-		fi
-	fi
-
-	if use kernel_linux ; then
-		if use numa ; then
-			linux-info_get_any_version
-
-			local CONFIG_CHECK="~NUMA"
-
-			local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
-			WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
-
-			check_extra_config
-		fi
-	fi
-
-	use server && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	mv -f "${WORKDIR}/${MY_P}" "${S}" || die
-}
-
-src_prepare() {
-	eapply "${WORKDIR}"/mysql-patches
-
-	eapply_user
-
-	# Avoid rpm call which would trigger sandbox, #692368
-	sed -i \
-		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
-		CMakeLists.txt || die
-
-	if use jemalloc ; then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-
-	if use tcmalloc ; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
-	fi
-
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	# Remove man pages for client-lib tools we don't install
-	rm \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1 \
-		|| die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		# Using bundled editline to get CTRL+C working
-		-DWITH_EDITLINE=bundled
-		-DWITH_ZLIB=system
-		-DWITH_SSL=system
-		-DWITH_LIBWRAP=0
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
-		# The build forces this to be defined when cross-compiling. We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-		-DWITH_CURL=system
-		-DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
-		-DWITH_ROUTER=$(usex router ON OFF)
-	)
-
-	if is-flagq -fno-lto ; then
-		einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
-		mycmakeargs+=( -DWITH_LTO=OFF )
-	elif is-flagq -flto ; then
-		einfo "LTO forced via {C,CXX,F,FC}FLAGS"
-		myconf+=( -DWITH_LTO=ON )
-	else
-		# Disable automagic
-		myconf+=( -DWITH_LTO=OFF )
-	fi
-
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
-
-	mycmakeargs+=(
-		-DWITH_ICU=system
-		-DWITH_LZ4=system
-		# Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex
-		-DWITH_RAPIDJSON=bundled
-	)
-
-	if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then
-		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-		ewarn "You MUST file bugs without these variables set."
-		ewarn "Tests will probably fail!"
-
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-		)
-	elif use latin1 ; then
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=latin1
-			-DDEFAULT_COLLATION=latin1_swedish_ci
-		)
-	else
-		mycmakeargs+=(
-			-DDEFAULT_CHARSET=utf8mb4
-			-DDEFAULT_COLLATION=utf8mb4_0900_ai_ci
-		)
-	fi
-
-	if use server ; then
-		mycmakeargs+=(
-			-DWITH_EXTRA_CHARSETS=all
-			-DWITH_DEBUG=$(usex debug)
-			-DWITH_MECAB=$(usex cjk system OFF)
-			-DWITH_LIBEVENT=system
-			-DWITH_PROTOBUF=system
-			-DWITH_NUMA=$(usex numa ON OFF)
-			-DWITH_PAM=$(usex pam)
-		)
-
-		if use profiling ; then
-			# Setting to OFF doesn't work: Once set, profiling options will be added
-			# to `mysqld --help` output via sql/sys_vars.cc causing
-			# "main.mysqld--help-notwin" test to fail
-			mycmakeargs+=( -DENABLED_PROFILING=ON )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_EXAMPLE_STORAGE_ENGINE=0
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_FEDERATED_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_INNODB_MEMCACHED=0
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_ROCKSDB=$(usex rocksdb 1 0)
-			-DWITH_TOKUDB=$(usex tokudb 1 0)
-		)
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DWITH_SYSTEMD=no
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-# Official test instructions:
-# ulimit -n 16500 && \
-# USE='perl server' \
-# FEATURES='test userpriv' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-	_disable_test() {
-		local rawtestname bug reason
-		rawtestname="${1}" ; shift
-		bug="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
-		echo ${rawtestname} : BUG#${bug} ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-	if [[ -z "${MTR_PARALLEL}" ]] ; then
-		local -x MTR_PARALLEL=$(makeopts_jobs)
-
-		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
-			# Running multiple tests in parallel usually require higher ulimit
-			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
-			# are known to hit timeout when system is busy.
-			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
-			# using "auto".
-			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
-			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
-			einfo "${info_msg}"
-			unset info_msg
-			MTR_PARALLEL=4
-		fi
-	else
-		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
-	fi
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" &>/dev/null || die
-
-	touch "${T}/disabled.def"
-
-	local -a disabled_tests
-	disabled_tests+=( "auth_sec.keyring_file_data_qa;0;Won't work with user privileges" )
-	disabled_tests+=( "gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)" )
-	disabled_tests+=( "innodb.percona_changed_page_bmp_flush;6807;False positive on Gentoo (PS)" )
-	disabled_tests+=( "innodb.percona_changed_page_bmp_log_resize;0;Sporadic failing test" )
-	disabled_tests+=( "innodb.upgrade_orphan;0;Sporadic failing test" )
-	disabled_tests+=( "main.myisam-blob;0;Sporadic failing test" )
-	disabled_tests+=( "main.mysqlpump_basic_lz4;6042;Extra tool output causes false positive" )
-	disabled_tests+=( "main.ssl_bug75311;5996;Known test failure" )
-	disabled_tests+=( "main.ssl_san;6808;False positive on IPv6-enabled hosts" )
-	disabled_tests+=( "main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
-	disabled_tests+=( "main.with_recursive;6804;Known rounding error with latest AMD processors" )
-	disabled_tests+=( "rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure" )
-	disabled_tests+=( "rpl_gtid.rpl_multi_source_mtr_includes;0;Know failure - no upstream bug yet" )
-	disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware" )
-	disabled_tests+=( "x.message_compressed_payload;0;False positive caused by protobuff-3.11+" )
-	disabled_tests+=( "x.message_protobuf_nested;6803;False positive caused by protobuff-3.11+" )
-
-	if ! hash zip 1>/dev/null 2>&1 ; then
-		# no need to force dep app-arch/zip for one test
-		disabled_tests+=( "innodb.partition_upgrade_create;0;Requires app-arch/zip" )
-	fi
-
-	local test_ds
-	for test_infos_str in "${disabled_tests[@]}" ; do
-		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
-
-		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
-			die "Invalid test data set, not matching format: ${test_infos_str}"
-		fi
-
-		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
-	done
-	unset test_ds test_infos_str test_infos_arr
-
-	if [[ -z "${MTR_VAULT_TOKEN}" ]] ; then
-		local impossible_test
-		for impossible_test in \
-			encryption.default_table_encryption_var \
-			keyring_vault.innodb_online_alter_encryption \
-			keyring_vault.innodb_row_log_encryption \
-			keyring_vault.install_keyring_vault \
-			keyring_vault.keyring_udf \
-			keyring_vault.keyring_vault_config \
-			keyring_vault.keyring_vault_config_qa \
-			keyring_vault.keyring_vault_timeout \
-			keyring_vault.key_rotation_qa \
-			keyring_vault.rpl_key_rotation \
-			keyring_vault.table_encrypt_2 \
-			keyring_vault.table_encrypt_2_directory \
-			keyring_vault.table_encrypt_2_keyring \
-			keyring_vault.table_encrypt_5 \
-			keyring_vault.table_encrypt_5_directory \
-			keyring_vault.table_encrypt_kill \
-			keyring_vault.temp_table_encrypt_keyring_vault \
-		; do
-			_disable_test "${impossible_test}" "0" "MTR_VAULT_TOKEN is not set"
-		done
-	fi
-
-	# Try to increase file limits to increase test coverage
-	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
-		# Upper limit comes from parts.partition_* tests
-		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
-		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
-			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
-			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
-			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
-				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
-			else
-				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
-			fi
-		else
-			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
-		fi
-	else
-		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
-	fi
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd &>/dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || die "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED}/usr/data" ]] ; then
-		rm -Rf "${ED}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
-	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
-	eprefixify "${TMPDIR}/my.cnf"
-	doins "${TMPDIR}/my.cnf"
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
-	cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
-	eprefixify "${TMPDIR}/50-distro-client.cnf"
-	doins "${TMPDIR}/50-distro-client.cnf"
-
-	mycnf_src="my.cnf-8.0.distro-server"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR}/${mycnf_src}" \
-		> "${TMPDIR}/my.cnf.ok" || die
-
-	if use prefix ; then
-		sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8mb4|latin1|g" \
-			"${TMPDIR}/my.cnf.ok" || die
-	fi
-
-	eprefixify "${TMPDIR}/my.cnf.ok"
-
-	newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
-
-	if use router ; then
-		rm -rf \
-			"${ED}/usr/LICENSE.router" \
-			"${ED}/usr/README.router" \
-			"${ED}/usr/run" \
-			"${ED}/usr/var" \
-			|| die
-	fi
-
-	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
-	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	# NOTE: $MY_LOGDIR contains $EPREFIX by default
-	[[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}"
-
-	# Note about configuration change
-	einfo
-	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
-	elog "to several files in /etc/mysql/mysql.d."
-	elog "Please backup any changes you made to /etc/mysql/my.cnf"
-	elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
-	elog "You may have as many files as needed and they are read alphabetically."
-	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
-	einfo
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		einfo
-		elog "You might want to run:"
-		elog "  \"emerge --config =${CATEGORY}/${PF}\""
-		elog "if this is a new install."
-		einfo
-	else
-		einfo
-		elog "Upgrade process for ${PN}-8.x has changed. Please read"
-		elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html"
-		einfo
-	fi
-}
-
-pkg_config() {
-	_getoptval() {
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		local cmd=(
-			"${my_print_defaults_binary}"
-			"${extra_options}"
-			"${section}"
-		)
-		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
-
-		if [[ ${#results[@]} -gt 0 ]] ; then
-			# When option is set multiple times only return last value
-			echo "${results[-1]}"
-		fi
-	}
-
-	_mktemp_dry() {
-		# emktemp has no --dry-run option
-		local template="${1}"
-
-		if [[ -z "${template}" ]] ; then
-			if [[ -z "${T}" ]] ; then
-				template="/tmp/XXXXXXX"
-			else
-				template="${T}/XXXXXXX"
-			fi
-		fi
-
-		local template_wo_X=${template//X/}
-		local n_X
-		let n_X=${#template}-${#template_wo_X}
-		if [[ ${n_X} -lt 3 ]] ; then
-			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
-			return
-		fi
-
-		local attempts=0
-		local character tmpfile
-		while [[ true ]] ; do
-			let attempts=attempts+1
-
-			new_file=
-			while read -n1 character ; do
-				if [[ "${character}" == "X" ]] ; then
-					tmpfile+="${RANDOM:0:1}"
-				else
-					tmpfile+="${character}"
-				fi
-			done < <(echo -n "${template}")
-
-			if [[ ! -f "${tmpfile}" ]]
-			then
-				echo "${tmpfile}"
-				return
-			fi
-
-			if [[ ${attempts} -ge 100 ]] ; then
-				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
-				return
-			fi
-		done
-	}
-
-	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
-	if [[ ! -x "${mysqld_binary}" ]] ; then
-		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local mysql_binary="${EROOT}/usr/bin/mysql"
-	if [[ ! -x "${mysql_binary}" ]] ; then
-		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
-	fi
-
-	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
-	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
-		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
-	fi
-
-	if [[ -z "${MYSQL_USER}" ]] ; then
-		MYSQL_USER=mysql
-		if use prefix ; then
-			MYSQL_USER=$(id -u -n 2>/dev/null)
-			if [[ -z "${MYSQL_USER}" ]] ; then
-				die "Failed to determine current username!"
-			fi
-		fi
-	fi
-
-	if [[ -z "${MYSQL_GROUP}" ]] ; then
-		MYSQL_GROUP=mysql
-		if use prefix ; then
-			MYSQL_GROUP=$(id -g -n 2>/dev/null)
-			if [[ -z "${MYSQL_GROUP}" ]] ; then
-				die "Failed to determine current user groupname!"
-			fi
-		fi
-	fi
-
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	local -x HOME="${EROOT}/root"
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Read currently set data directory
-	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		die "Sorry, unable to find MY_DATADIR!"
-	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
-		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
-		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
-		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
-	fi
-
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	# These are dir+prefix
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-
-	# Create missing directories.
-	# Always check if mysql user can write to directory even if we just
-	# created directory because a parent directory might be not
-	# accessible for that user.
-	PID_DIR="${EROOT}/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]] ; then
-		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
-		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
-			|| die "Failed to create PID directory '${PID_DIR}'!"
-	fi
-
-	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_pid_dir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_pid_dir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
-	else
-		rm "${_pid_dir_testfile}" || die
-		unset _pid_dir_testfile
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]] ; then
-		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
-			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
-	fi
-
-	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_datadir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_datadir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
-	else
-		rm "${_my_datadir_testfile}" || die
-		unset _my_datadir_testfile
-	fi
-
-	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
-		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
-			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
-	fi
-
-	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
-		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
-		[[ -z "${MYSQL_TMPDIR}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
-
-		mkdir "${MYSQL_TMPDIR}" || die
-		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
-	fi
-
-	# Now we need to test MYSQL_TMPDIR...
-	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
-	[[ -z "${_my_tmpdir_testfile}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-	if use prefix ; then
-		touch "${_my_tmpdir_testfile}" &>/dev/null
-	else
-		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
-	fi
-
-	if [[ $? -ne 0 ]] ; then
-		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
-	else
-		rm "${_my_tmpdir_testfile}" || die
-		unset _my_tmpdir_testfile
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
-			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
-	fi
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_logbin_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_logbin_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
-		else
-			rm "${_my_logbin_testfile}" || die
-			unset _my_logbin_testfile
-		fi
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
-		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
-			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
-		[[ -z "${_my_relaylog_testfile}" ]] \
-			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
-
-		if use prefix ; then
-			touch "${_my_relaylog_testfile}" &>/dev/null
-		else
-			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
-		fi
-
-		if [[ $? -ne 0 ]] ; then
-			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
-		else
-			rm "${_my_relaylog_testfile}" || die
-			unset _my_relaylog_testfile
-		fi
-	fi
-
-	local mysql_install_log="$(_mktemp_dry "${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log")"
-	if [[ -z "${mysql_install_log}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysql_install_log}" || die
-		chown ${MYSQL_USER} "${mysql_install_log}" || die
-	fi
-
-	local mysqld_logfile="$(_mktemp_dry "${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log")"
-	if [[ -z "${mysqld_logfile}" ]] ; then
-		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log' failed!"
-	else
-		# make sure file is writable for MYSQL_USER...
-		touch "${mysqld_logfile}" || die
-		chown ${MYSQL_USER} "${mysqld_logfile}" || die
-	fi
-
-	echo ""
-	einfo "Detected settings:"
-	einfo "=================="
-	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
-	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
-	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
-	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
-
-	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
-		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
-	fi
-
-	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
-		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
-	fi
-
-	einfo "PID DIR:\t\t\t\t${PID_DIR}"
-	einfo "Install db log:\t\t\t${mysql_install_log}"
-	einfo "Install server log:\t\t\t${mysqld_logfile}"
-
-	local -a config_files
-
-	local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..."
-	fi
-
-	config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf"
-	if [[ -f "${config_file}" ]] ; then
-		config_files+=( "${config_file}" )
-	else
-		ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..."
-	fi
-
-	if [[ ${#config_files[@]} -gt 0 ]] ; then
-		if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then
-			local user_answer
-
-			echo
-			einfo "Please select default authentication plugin (enter number or plugin name):"
-			einfo "1) caching_sha2_password [MySQL 8.0 default]"
-			einfo "2) mysql_native_password [MySQL 5.7 default]"
-			einfo
-			einfo "For details see:"
-			einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password"
-			read -p "    >" user_answer
-			echo
-
-			case "${user_answer}" in
-				1|caching_sha2_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password
-					;;
-				2|mysql_native_password)
-					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password
-					;;
-				'')
-					die "No authentication plugin selected!"
-					;;
-				*)
-					die "Authentication plugin '${user_answer}' is unknown/unsupported!"
-					;;
-			esac
-
-			echo "Selected authentication plugin: ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" >> "${mysql_install_log}"
-
-			unset user_answer
-		fi
-
-		local cfg_option cfg_option_tabs cfg_section
-		for config_file in "${config_files[@]}" ; do
-			cfg_option="default-authentication-plugin"
-			cfg_section="mysqld"
-			cfg_option_tabs="\t\t"
-			if [[ "${config_file}" == *client.cnf ]] ; then
-				cfg_option="default-auth"
-				cfg_section="client"
-				cfg_option_tabs="\t\t\t\t"
-			fi
-
-			if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then
-				einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \
-					"${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!"
-			else
-				einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
-				sed -i \
-					-e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \
-					"${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!"
-			fi
-		done
-		unset cfg_option cfg_option_tabs cfg_section
-	fi
-	unset config_files config_file
-
-	echo
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client ; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-
-	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
-		local pwd1="a"
-		local pwd2="b"
-
-		echo
-		einfo "No password for mysql 'root' user was specified via environment"
-		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
-		einfo "file like '${HOME}/.my.cnf'."
-		einfo "To continue please provide a password for the mysql 'root' user"
-		einfo "now on console:"
-		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same!"
-		fi
-
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-
-		echo
-	fi
-
-	local -a mysqld_options
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-
-	local opt optexp optfull
-	for opt in host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-	; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
-	done
-
-	# Prepare timezones, see
-	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	local tz_sql="$(_mktemp_dry "${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql")"
-	[[ -z "${tz_sql}" ]] \
-		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql' failed!"
-
-	echo "USE mysql;" >"${tz_sql}"
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
-	if [[ $? -ne 0 ]] ; then
-		die "mysql_tzinfo_to_sql failed!"
-	fi
-
-	# --initialize-insecure will not set root password
-	# --initialize would set a random one in the log which we don't need as we set it ourselves
-	local cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--initialize-insecure"
-		"--init-file='${tz_sql}'"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		"--log-error='${mysql_install_log}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Initializing ${PN} data directory: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
-
-	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
-		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
-	fi
-
-	rm "${tz_sql}" || die
-
-	local x=${RANDOM}
-	local socket="${EROOT}${PID_DIR}/mysqld${x}.sock"
-	local pidfile="${EROOT}${PID_DIR}/mysqld${x}.pid"
-	unset x
-
-	cmd=(
-		"${mysqld_binary}"
-		"${mysqld_options[@]}"
-		"--basedir='${EROOT}/usr'"
-		"--datadir='${MY_DATADIR}'"
-		"--tmpdir='${MYSQL_TMPDIR}'"
-		--max_allowed_packet=8M
-		--net_buffer_length=16K
-		"--socket='${socket}'"
-		"--pid-file='${pidfile}'"
-		"--log-error='${mysqld_logfile}'"
-		"--user=${MYSQL_USER}"
-	)
-
-	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
-	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
-
-	echo -n "Waiting for mysqld to accept connections "
-	local maxtry=15
-	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-
-	if [[ -S "${socket}" ]] ; then
-		# Even with a socket we don't know if mysqld will abort
-		# start due to an error so just wait a little bit more...
-		maxtry=5
-		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-	fi
-
-	echo
-
-	if [[ ! -S "${socket}" ]] ; then
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
-		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
-	fi
-
-	local mysql_logfile="${TMPDIR}/set_root_pw.log"
-	touch "${mysql_logfile}" || die
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
-	cmd=(
-		"${mysql_binary}"
-		--no-defaults
-		"--socket='${socket}'"
-		-hlocalhost
-		"-e \"${sql}\""
-	)
-	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
-	local rc=$?
-	eend ${rc}
-
-	if [[ ${rc} -ne 0 ]] ; then
-		# Poor man's solution which tries to avoid having password
-		# in log.  NOTE: sed can fail if user didn't follow advice
-		# and included character which will require escaping...
-		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
-
-		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
-		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
-	fi
-
-	# Stop the server
-	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-		echo -n "Stopping the server "
-		pkill -F "${pidfile}" &>/dev/null
-
-		maxtry=10
-		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
-			maxtry=$((${maxtry}-1))
-			echo -n "."
-			sleep 1
-		done
-
-		echo
-
-		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
-			# We somehow failed to stop server.
-			# However, not a fatal error. Just warn the user.
-			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
-		fi
-	fi
-
-	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
-}
diff --git a/dev-db/percona-server/percona-server-8.0.21.12.ebuild b/dev-db/percona-server/percona-server-8.0.21.12.ebuild
index 14f08b79a9b5..5081142e8ad8 100644
--- a/dev-db/percona-server/percona-server-8.0.21.12.ebuild
+++ b/dev-db/percona-server/percona-server-8.0.21.12.ebuild
@@ -17,7 +17,7 @@ MY_MAJOR_PV=$(ver_cut 1-2)
 MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/${MY_MAJOR_PV}/"
 
 # Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.21.12-patches-01.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.21.12-patches-02.tar.xz"
 
 SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
 	https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
diff --git a/dev-db/percona-server/percona-server-8.0.20.11-r2.ebuild b/dev-db/percona-server/percona-server-8.0.22.13.ebuild
similarity index 97%
rename from dev-db/percona-server/percona-server-8.0.20.11-r2.ebuild
rename to dev-db/percona-server/percona-server-8.0.22.13.ebuild
index e75b78da1705..42612652afc5 100644
--- a/dev-db/percona-server/percona-server-8.0.20.11-r2.ebuild
+++ b/dev-db/percona-server/percona-server-8.0.22.13.ebuild
@@ -5,10 +5,10 @@ EAPI="7"
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
-inherit cmake flag-o-matic linux-info \
-	multiprocessing prefix toolchain-funcs check-reqs
+inherit check-reqs cmake flag-o-matic linux-info \
+	multiprocessing prefix toolchain-funcs
 
-MY_BOOST_VERSION="1.70.0"
+MY_BOOST_VERSION="1.73.0"
 MY_PV=$(ver_rs 3 '-')
 MY_PV="${MY_PV//_pre*}"
 MY_PN="Percona-Server"
@@ -17,7 +17,7 @@ MY_MAJOR_PV=$(ver_cut 1-2)
 MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/${MY_MAJOR_PV}/"
 
 # Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.20.11-patches-02.tar.xz"
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.22.13-patches-01.tar.xz"
 
 SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
 	https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
@@ -59,7 +59,7 @@ COMMON_DEPEND="
 	!libressl? ( >=dev-libs/openssl-1.0.0:0= )
 	server? (
 		dev-libs/icu:=
-		dev-libs/libevent:=
+		dev-libs/libevent:=[ssl,threads]
 		>=dev-libs/protobuf-3.8:=
 		net-libs/libtirpc:=
 		net-misc/curl:=
@@ -101,8 +101,6 @@ RDEPEND="${COMMON_DEPEND}
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
-CHECKREQS_DISK_BUILD="9G"
-
 mysql_init_vars() {
 	: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
 	: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
@@ -247,7 +245,6 @@ src_configure() {
 		-DENABLED_LOCAL_INFILE=1
 		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
-		-DWITH_DEFAULT_FEATURE_SET=0
 		# The build forces this to be defined when cross-compiling. We pass it
 		# all the time for simplicity and to make sure it is actually correct.
 		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
@@ -424,6 +421,7 @@ src_test() {
 	disabled_tests+=( "innodb.percona_log_encrypt_change_rk;6805;False positive on Gentoo (PS)" )
 	disabled_tests+=( "innodb.upgrade_orphan;0;Sporadic failing test" )
 	disabled_tests+=( "main.myisam-blob;0;Sporadic failing test" )
+	disabled_tests+=( "main.mysql_load_data_local_dir;7416;Known test failure" )
 	disabled_tests+=( "main.mysqlpump_basic_lz4;6042;Extra tool output causes false positive" )
 	disabled_tests+=( "main.ssl_bug75311;5996;Known test failure" )
 	disabled_tests+=( "main.ssl_san;6808;False positive on IPv6-enabled hosts" )
@@ -433,24 +431,17 @@ src_test() {
 	disabled_tests+=( "rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure" )
 	disabled_tests+=( "rpl_gtid.rpl_multi_source_mtr_includes;0;Know failure - no upstream bug yet" )
 	disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware" )
+	disabled_tests+=( "sys_vars.innodb_sys_tablespace_encrypt_basic;7415;Known test failure" )
 	disabled_tests+=( "x.message_compressed_payload;0;False positive caused by protobuff-3.11+" )
 	disabled_tests+=( "x.message_protobuf_nested;6803;False positive caused by protobuff-3.11+" )
 
-	# Known test failures due to expired SSL certificates -- fixed in 8.0.22
-	disabled_tests+=( "auth_sec.admin_ssl_crl_crlpath;100055;Fixed in 8.0.22" )
-	disabled_tests+=( "auth_sec.admin_ssl_crl;100055;Fixed in 8.0.22" )
-	disabled_tests+=( "auth_sec.server_withssl_client_withssl;100055;Fixed in 8.0.22" )
-	disabled_tests+=( "main.ssl_crl_clients_valid;100055;Fixed in 8.0.22" )
-	disabled_tests+=( "main.ssl_crl;100055;Fixed in 8.0.22" )
-	disabled_tests+=( "main.ssl_crl_crlpath;100055;Fixed in 8.0.22" )
-	disabled_tests+=( "main.ssl_ca;100055;Fixed in 8.0.22" )
-
 	if ! hash zip 1>/dev/null 2>&1 ; then
 		# no need to force dep app-arch/zip for one test
+		disabled_tests+=( "innodb.discarded_partition_create;0;Requires app-arch/zip" )
 		disabled_tests+=( "innodb.partition_upgrade_create;0;Requires app-arch/zip" )
 	fi
 
-	local test_ds
+	local test_infos_str test_infos_arr
 	for test_infos_str in "${disabled_tests[@]}" ; do
 		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
 
@@ -460,7 +451,7 @@ src_test() {
 
 		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
 	done
-	unset test_ds test_infos_str test_infos_arr
+	unset test_infos_str test_infos_arr
 
 	if [[ -z "${MTR_VAULT_TOKEN}" ]] ; then
 		local impossible_test
@@ -482,6 +473,7 @@ src_test() {
 			keyring_vault.table_encrypt_5_directory \
 			keyring_vault.table_encrypt_kill \
 			keyring_vault.temp_table_encrypt_keyring_vault \
+			main.persisted_variables \
 		; do
 			_disable_test "${impossible_test}" "0" "MTR_VAULT_TOKEN is not set"
 		done
@@ -752,6 +744,7 @@ pkg_config() {
 	fi
 
 	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
 	# These are dir+prefix
 	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
 	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 5b1d13d86fd4..62d9c9c75ef2 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -4,8 +4,10 @@ DIST pgadmin4-4.17.tar.gz 28007097 BLAKE2B d296f2b9372c23067db899fa82e1b8e732837
 DIST pgadmin4-4.25.tar.gz 33167393 BLAKE2B 5a40e45c53f79ea66c6f685d1605ddce7b1758540bf3a6863d4b092cc4dab5b00daff15832cd6feee28aa348c7a5376e25a93508fd348d8ffd4d29031e2b6c68 SHA512 a1944f9c65b8aa7ec5bd83ef75702293d869ae341ea73f81fb4358bfbc7f91a6981237eb9f1b20055c5f3fa182428afe19dc170963265789c34d73f2e240c268
 DIST pgadmin4-4.26.tar.gz 33525278 BLAKE2B 2a4061f59299bc48b029a4a93f410538170b6c3d97597074d2b3b6eed1de0f9a1ac88bc187614d9e46d8fe872941f173ba0f0a02def590451dad09e6a3b78e5a SHA512 952a4771f80541c54234fcaa9c870283fdf4887246d0d9751a77c28340b7e39ba871141f230086efda9a274d5e6bd567305047cdc7edf766ccd41112281fdf94
 DIST pgadmin4-4.28.tar.gz 35386627 BLAKE2B 6cbee6ccadf3b35e1b0aece2e8fc4b9e35dd04ed70436a3b74d69c09e887499c3a2ab8710d16df3327cd848c3c5ee1fac2cde06facbdc5605673b04a4a4fc434 SHA512 b9e8946e8133b382b9d69126c1ec6fc07a4b2051316c2151c339f15652900fa2bdf0a07811e052548c3f8699e382d8c16d187e89409b194e491148123558522e
+DIST pgadmin4-4.29.tar.gz 35389494 BLAKE2B faaa84c0eee9c92ba483f4adffaf9e39e0c5f8ea21630a9ee8fad62aa833c88aa913df50c760be740afa0696aa1fbf1b6902a8b5bfd322822472f7d2dcb295e1 SHA512 2c7d20d10c96712f41621c2862a6a6222f6d6dad4a0b3e1aaf04744e65744460dcae4220f61b27785e02c82a624fa0793df2ea9d8e83ac0a6de048455929e615
 EBUILD pgadmin4-4.17-r1.ebuild 3307 BLAKE2B 2f4dab13a9365051abc89e66101bf6b8c93400b3eefb34f53033feb9d6d49321f9e2fcb7c3f58340ab21b1d358006d0a1846a08ce6a26048bde0a4a779cdf131 SHA512 4c80f4f5f243a25aee956ee3230ff6ee9a55e1dce19fcd1c1da91b00b4f16942fdc64815559bfbc873a67f99b6676f463cf923987d7fe039ed8d027b7a64b51a
 EBUILD pgadmin4-4.25.ebuild 3545 BLAKE2B 3e716cd6cb3f4fe19d2ffe6f6f8581f6ce9b558df9291c21eec36de684e766373fac11e610585d416911eb097d13310804320fe82985428a14f5fcbfb3c6acaf SHA512 46b1e593c9d10d4d69df656656bd1a5d020698a6e799e06b63f8f27358dfbcac2501ce2d34c55d2448d274aacf6a1a85eb89dea43f6e6113b74f02c6ee77bd8e
 EBUILD pgadmin4-4.26.ebuild 3796 BLAKE2B 4ab6ed9b8e922936ad19c8968300616a70910f5080e396e8f581c3666421f96511ce0d3311273f599cc3ff44eff14bb2d0bdcfa44be4d7a67c369aa9a8fa9e09 SHA512 c774d2c53b6bb431a60eec11b74f6458f8d7cf090dc603bc1f6d2f8ed9908c067f4e70b6cca62a252b08a01d9ca5b5066a9dde595357003e516b15b3f9fb24c9
 EBUILD pgadmin4-4.28.ebuild 3924 BLAKE2B fea400403695aeb1507ba07615ebde52cd9bd8b23e05eafd734c4b6eb9e837e170777c9af29b0fde2e0e04f351183acbba50970e9e44f267acaa2046859d00ae SHA512 353570463deffe5a45926dac13389d137267b3b642f79ccc46fdf0be243d2162f2b18a7ff407996bb84181d11b2377a13fc5712c86e4ddcf046f1ef603a0536b
+EBUILD pgadmin4-4.29.ebuild 3924 BLAKE2B fea400403695aeb1507ba07615ebde52cd9bd8b23e05eafd734c4b6eb9e837e170777c9af29b0fde2e0e04f351183acbba50970e9e44f267acaa2046859d00ae SHA512 353570463deffe5a45926dac13389d137267b3b642f79ccc46fdf0be243d2162f2b18a7ff407996bb84181d11b2377a13fc5712c86e4ddcf046f1ef603a0536b
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-4.29.ebuild b/dev-db/pgadmin4/pgadmin4-4.29.ebuild
new file mode 100644
index 000000000000..f795a75bfb27
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-4.29.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+inherit desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="GUI administration and development platform for PostgreSQL"
+HOMEPAGE="https://www.pgadmin.org/"
+SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+# libsodium dep added because of 689678
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/libsodium[-minimal]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
+"
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	virtual/imagemagick-tools[png]
+"
+
+# In 4.25's requirement.txt, bcrypt is listed as <=3.17, but upstream's
+# git history shows this is just for compatibility with <python-3.6.
+# In 4.26's requirement.txt, cryptography is listed as <=3.0, but upstream's
+# git history shows this is just for compatibility with Windows.
+# 4.28; requirement.txt: Flask-Security was renamed to
+# Flask-Security-Too. This is still the same dev-python/flask-security.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-compress-1.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-wtf-0.14.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/ldap3-2.5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/passlib-1.7.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-5.7.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pytz-2020.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.13[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sshtunnel-0.1.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/werkzeug-0.15.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/bcrypt[${PYTHON_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+S="${WORKDIR}"/${P}/runtime
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+}
+
+src_configure() {
+	export PGADMIN_PYTHON_DIR="${EPREFIX}/usr"
+	eqmake5
+}
+
+src_compile() {
+	default
+	use doc && emake -C "${WORKDIR}"/${P} docs
+}
+
+src_install() {
+	dobin pgAdmin4
+
+	cd "${WORKDIR}"/${P} || die
+
+	local APP_DIR=/usr/share/${PN}/web
+	insinto "${APP_DIR}"
+	doins -r web/.
+	newins - config_local.py <<-EOF
+		SERVER_MODE = False
+		UPGRADE_CHECK_ENABLED = False
+	EOF
+	python_optimize "${D}${APP_DIR}"
+
+	insinto /etc/xdg/pgadmin
+	newins - pgadmin4.conf <<-EOF
+		[General]
+		ApplicationPath=${APP_DIR}
+		PythonPath=$(python_get_sitedir)
+	EOF
+
+	if use doc; then
+		rm -r docs/en_US/_build/html/_sources || die
+		insinto /usr/share/${PN}/docs/en_US/_build
+		doins -r docs/en_US/_build/html
+	fi
+
+	local s
+	for s in 16 32 48 64 72 96 128 192 256; do
+		convert runtime/pgAdmin4.png -resize ${s}x${s} ${PN}_${s}.png || die
+		newicon -s ${s} ${PN}_${s}.png ${PN}.png
+	done
+	domenu "${FILESDIR}"/${PN}.desktop
+}
diff --git a/dev-db/pgrouting/Manifest b/dev-db/pgrouting/Manifest
index 27552278d5d3..35a431b91f68 100644
--- a/dev-db/pgrouting/Manifest
+++ b/dev-db/pgrouting/Manifest
@@ -1,5 +1,7 @@
 DIST pgrouting-2.6.2.tar.gz 6065517 BLAKE2B e27e28cf988040de1e894a857e3d210bc7676271f69d898afc2d6116d5b88d87404723b2cb1283ef77b4449b4aa62a03e2dbcd489ac641a4721a596d29f8fecd SHA512 6e37f66e631d0cc87e135be7d095822aae21656bb56b3d18afa5bececaad8cee6324d37e8e152bbf69e3374ded1f10aa4b9a4c52b873e3a4c43e73cd877fddcb
 DIST pgrouting-3.1.1.tar.gz 6133979 BLAKE2B b7657eeb88773773e6166190cda73d9e657774ff81ce7e9f005333a8dcb9d56587d4a793410356092bb1623ec287549dbc60d814b1d5156ff28301503acee776 SHA512 73285d2d47be844203df136b8a8c13d1672ad8c2dac44a1ff7ce16e4676043692a8f2a60a305542132891da83560c49c5eaeb7712e3e3dd250cd8fd550260d4a
+DIST pgrouting-3.1.2.tar.gz 6063893 BLAKE2B a371fb9c744b14072c65af5ceb1ea73d2cdb69821626be3ac79e08c9dee854272ce8cb3816d1de3eade06d50a7520846dd6bccda06934b9db926f9092719f131 SHA512 3cf3e0a4a726f6f11887d15ad71b789a9067f3bc5a675288f22730215aa12d12b94d75f9bdc8ab3077de8368c45c55c0dc27128d0453c4c30965bfc0cf118dcd
 EBUILD pgrouting-2.6.2-r1.ebuild 1224 BLAKE2B d1f10f219e584e2167fbb3351cc35424fb35f10def7e7ba115aa4bec54c259f43e771e47f52d7fddf19c838117d0d265252d4886599ec401020287f590223d35 SHA512 6087d2e8e20c815defe78c440d5ba58e30de353e8ee0722b7347bff79c32ae7abc1d46d48b95c32c0b28db55043f198609217053012134dbfe27b1e879c06eb4
 EBUILD pgrouting-3.1.1.ebuild 1092 BLAKE2B 9e255ade68e57e65f0fb38dc36985f2eaf77323a0e2f769d86031caece6bd08544397b2be8ace08003173b9626663158c54483a0cefc50173117a5991fd6ead3 SHA512 c17720ec34aa5c0c97c39c1e428a45415d78c3b099acb6bce34e8644b2f8f3499bb6219e68efcf2752bc6035354fad239f546589503269e7a098a69ff00eda90
+EBUILD pgrouting-3.1.2.ebuild 1056 BLAKE2B 1fa30057f61f0d7857ddd0e98b577b93321326ef9b6b0a81409c6b5f6d0de621b6f73d7c7c98a61872620ac7fd7d3332421d4f82aeb946f4db0b57af57268606 SHA512 2aeb113d2e83966939215772762645edc9bd607c65735d3edfd54174ed6cca3b9367e7e68cc54a8a33cdb2b3ff5696e372da8e05309b2d35960eb409554a7903
 MISC metadata.xml 457 BLAKE2B d2432768e9244c7648720e1569195498ffa3bda4f862a5b5a2edbbd4383d3ca0ab83063c1004680ea6eb662d74f13c2ec4991baa25365ae9ae8f513b93c973b1 SHA512 bbfc5eec69256ba3addfe5c3158b11b4561b347682474ac2f5ac4cb3be8ca30df130957c751f09d761d3a3d8ad62cf3e59193414a31a9b46d793084285c9406d
diff --git a/dev-db/pgrouting/pgrouting-3.1.2.ebuild b/dev-db/pgrouting/pgrouting-3.1.2.ebuild
new file mode 100644
index 000000000000..addf00e4158a
--- /dev/null
+++ b/dev-db/pgrouting/pgrouting-3.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE="Release"
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_USEDEP="server"
+
+inherit cmake postgres-multi
+
+DESCRIPTION="pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality."
+HOMEPAGE="https://pgrouting.org/"
+LICENSE="GPL-2 MIT Boost-1.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="https://github.com/pgRouting/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE=""
+
+RDEPEND="${POSTGRES_DEP}
+	>=dev-db/postgis-2.0
+	dev-libs/boost
+	sci-mathematics/cgal
+"
+DEPEND="${RDEPEND}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+src_prepare() {
+	cmake_src_prepare
+	postgres-multi_src_prepare
+}
+
+my_src_configure() {
+	local mycmakeargs=( -DPOSTGRESQL_BIN="$($PG_CONFIG --bindir)" )
+	cmake_src_configure
+}
+
+src_configure() {
+	postgres-multi_foreach my_src_configure
+}
+
+src_compile() {
+	postgres-multi_foreach cmake_build
+}
+
+src_install() {
+	postgres-multi_foreach cmake_src_install
+}
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index a2c644945395..d5cbb0c3d82b 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -1,4 +1,5 @@
 AUX postgis-2.2.0-arflags.patch 535 BLAKE2B 6420573e9623d4e2115ed3616bc3b8648ae7782bf4624ee60d3827a4d61cbdac1dc62b4937f36113ed6d0856af4728f5cc1b544d502512e88dd87a7b590135ab SHA512 7f8b92a582dd11b3040832278b75e65036315ca0e438cb9b19cc5b63a7b5c5bcae8ec274a487a29abadfbbc31cdfacf6c668e46f249d4bf88c09607501cacf66
+AUX postgis-3.0.3-avoid-calling-ar-directly.patch 2302 BLAKE2B b45f5c1e3bfd694acc2ee9a07ba5e47eb02fae1cb53786ebc9a25e00c06510d411437cec1dd12984bcc9ebbddba3fe43e8b3cf6f5d63b25a5e0b6a33680e6074 SHA512 856b06dd9cbaf3ad7d8e62d749ef703bfd98402a904a70bacca22c86c857634d70912882c487a06c1ddaa34e299419564d73e62fe2c2a64a066b3895a88dab3e
 DIST postgis-2.5.3.tar.gz 16424752 BLAKE2B 94c2ccd41eb88a39c6db48ad7f4d142742a1b0791e3abe57adb2c778406dcc8286afc6d55c80067e0b94a1300eff1c76a227d3cfd813e12541c715edeea11a9b SHA512 1c9f873ba8f8ff4aeae248c68c001eb4174416de1e00ce6a0d0c9ea129b475e887a83235027068d52f587ab95c549adbfaa7e5dccdda77855e39c55dac0fdc2d
 DIST postgis-2.5.4.tar.gz 15882033 BLAKE2B 317e6f3857dce8b1c054b5cdb6c6b215b015b89266aeaa0187803b9355cdc3cbb62be89f36ffe29e2fcbc1e7b693a7f88fb23b5c172fcefea376f6afea3c064d SHA512 767c146245ae11545ce4e0764f9bd313cfdf2eed78c485c5aa5530517edb8e433bcdbaffcf4d92b0c0f3c997de9831b5e3beed7638fc3bc773f264b45e5d8ab4
 DIST postgis-2.5.5.tar.gz 15936193 BLAKE2B df5d0e51bb5042a72ecd070273c4a87738b2ba482993d39948137c8ba2da0a47845393023a6b4e45f01a91d37ef8fc9f89302203c639fb32b4451cb905fd08b3 SHA512 407c9ddf5b73aaa8d36ec606f974b86c16c9ed4aafbfd4a0b7f96cfc7a9f8a8fa38528cb4787bdd50de479416dbfb09934a85d189463cec549da66863060292e
@@ -13,7 +14,7 @@ EBUILD postgis-2.5.5.ebuild 3195 BLAKE2B 55cbf1823a6c2f04a1ee11b5e9506db868ee2f1
 EBUILD postgis-3.0.0-r1.ebuild 3201 BLAKE2B 099dcddb6188239cd7738cb265e73e5b218265aec531e957b5db791149a5c8e3c3bd425b3a169fafdd451028ba29b21cdfa3031bad8f6b78958f1131ae2958b1 SHA512 0b343e8a7e6afdd0bc5d999a44f1f117eac7191360af83c535dd476408a4661aff61da697e0d48098e4e7403821402405a43e81ff2df5afa2d5163c2d0361e63
 EBUILD postgis-3.0.1.ebuild 3191 BLAKE2B 90839e4df5c915d0450e9e7943bd6a87dcf48c27760d3ebac75a826720099b2e0e0044dfbe932225aba8e80abc3b5211173709252d6779e75bbd80507204e7f5 SHA512 4680c28c2f38b9a1c812121ce8fe9df171042bb19bc790abf92a9d0401ad7c58c4118721d6a0cd345d22d33332ebc0d72941fc7bd825e5781382e957d2ce90ec
 EBUILD postgis-3.0.2.ebuild 3191 BLAKE2B 6c97ff25a22159ab9bda13f8014aa626a650bede7a4bc9a649c9c21f086f2d1f4b0f936f8e38c3025c75dab236fea876eff86a230173d7f8683a952b0ca64c4d SHA512 7f8dd7a7b0e14700d02061e13cdec5b5028606e3000743946a2f9e8936cde51990d41fd655d80ffd6604642451a7db29525c161a4da191b003dde7cf17e70f84
-EBUILD postgis-3.0.3.ebuild 3191 BLAKE2B 6c97ff25a22159ab9bda13f8014aa626a650bede7a4bc9a649c9c21f086f2d1f4b0f936f8e38c3025c75dab236fea876eff86a230173d7f8683a952b0ca64c4d SHA512 7f8dd7a7b0e14700d02061e13cdec5b5028606e3000743946a2f9e8936cde51990d41fd655d80ffd6604642451a7db29525c161a4da191b003dde7cf17e70f84
-EBUILD postgis-3.1.0_alpha3.ebuild 3156 BLAKE2B e7f38e0deba338fa32c88b2d53c2af0d2d01d4ed3b2f181c8fe66bf9b4a81306c88abce907366bb18be84f1216dba876bc23b8c52bbcffcb158f778659c2edb5 SHA512 d2d305c28b3da070bf30732d8f54c86ee5e10397c423b2dc1539564aba2d1167520b9e5cb1bf80347a13c8c92028c19bfc04d28538e534aa47629c1b6028824b
+EBUILD postgis-3.0.3-r1.ebuild 3244 BLAKE2B 978a4cbb90843045ec3de7bb7f742a4dc660d44941f60928d961bac997811efbbefeb0279b7b661289223a7ec5076951c124ae40f444e4b3cf0cce0833c36072 SHA512 e533cdfba58eaceba46636770ab8270f9abd317651037fc471d35bb07e8d524568e7cac79586e4987dca18327c04623b4449368261bf65b043dce5410849f0b7
+EBUILD postgis-3.1.0_alpha3-r1.ebuild 3216 BLAKE2B 65776d1bb1743bd66515e26c35d7f182aafe04ef35293655a460042c44ec925cc51d85b6ece776b11c64bcd47eeb659ccca00acc62612c6ffdc39a927e57505b SHA512 c7a0d7e2dbf2b0fb5a90f039d3f7220479cbbc62fc9a6667ed611ddc6af58bf06d29cb2e80f15238f9772c7b8f3ba87e440a2d2011f534100c9cd9e651cd64d7
 EBUILD postgis-9999.ebuild 3201 BLAKE2B 099dcddb6188239cd7738cb265e73e5b218265aec531e957b5db791149a5c8e3c3bd425b3a169fafdd451028ba29b21cdfa3031bad8f6b78958f1131ae2958b1 SHA512 0b343e8a7e6afdd0bc5d999a44f1f117eac7191360af83c535dd476408a4661aff61da697e0d48098e4e7403821402405a43e81ff2df5afa2d5163c2d0361e63
 MISC metadata.xml 779 BLAKE2B 9dfbc86514c5f6e0c859dc41a46890e4f518f23c572786bf340112eadf21b35f5f583a3835f6ba58bef8c99a7ef8483f3a98898d372d1c0e5cc537bb9ecc2b12 SHA512 33ad2ddabf49e97af2cf188f2c0f72e1a936c228b43d8d3637230c43be0df82ec2aa20b63cb5f2385e936c215263fcd009332afe504bc5f30746a387b9b37ada
diff --git a/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch b/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch
new file mode 100644
index 000000000000..66a82e1e7261
--- /dev/null
+++ b/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch
@@ -0,0 +1,85 @@
+From 7c5acb8ab83ee278f6a16c7279c3a12ca93499e9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sat, 5 Dec 2020 13:38:03 +0100
+Subject: [PATCH] avoid calling ar directly
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ configure.ac               | 2 +-
+ deps/wagyu/Makefile.in     | 4 +++-
+ libpgcommon/Makefile.in    | 4 +++-
+ raster/rt_core/Makefile.in | 1 +
+ 4 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4f26390..362d3e6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,7 +14,7 @@ AC_CONFIG_HEADERS([postgis_config.h])
+ AC_CONFIG_MACRO_DIR([macros])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_PROG_INSTALL
+-
++AM_PROG_AR
+ 
+ dnl Invoke libtool: we do this as it is the easiest way to find the PIC
+ dnl flags required to build liblwgeom
+diff --git a/deps/wagyu/Makefile.in b/deps/wagyu/Makefile.in
+index 03d2279..05d6629 100644
+--- a/deps/wagyu/Makefile.in
++++ b/deps/wagyu/Makefile.in
+@@ -28,6 +28,8 @@ LDFLAGS = @LDFLAGS@
+ top_builddir = @top_builddir@
+ libdir = @libdir@
+ LIBTOOL = @LIBTOOL@
++AR = @AR@
++ARFLAGS = rs
+ 
+ WAGYU_OBJS = \
+ 	lwgeom_wagyu.o
+@@ -78,7 +80,7 @@ WAGYU_HEADERS = \
+ all: @WAGYU_LIB@
+ 
+ @WAGYU_LIB@: $(WAGYU_OBJS)
+-	ar rs @WAGYU_LIB@ $(WAGYU_OBJS)
++	$(AR) $(ARFLAGS) @WAGYU_LIB@ $(WAGYU_OBJS)
+ 
+ $(WAGYU_OBJS): %.o: %.cpp ../../liblwgeom/liblwgeom.h $(WAGYU_HEADERS)
+ 	$(CXX) $(CXXFLAGS) -c -o $@ $<
+diff --git a/libpgcommon/Makefile.in b/libpgcommon/Makefile.in
+index c44cf5b..78eb282 100644
+--- a/libpgcommon/Makefile.in
++++ b/libpgcommon/Makefile.in
+@@ -12,6 +12,8 @@
+ CC=@CC@
+ CFLAGS=-I../liblwgeom @WARNFLAGS@ @CFLAGS@ @PGSQL_BE_CPPFLAGS@ @PROJ_CPPFLAGS@ @PICFLAGS@ @GETTEXT_CFLAGS@
+ LDFLAGS=@GETTEXT_LDFLAGS@ @LIBINTL@
++AR = @AR@
++ARFLAGS = rs
+ 
+ NUMERICFLAGS=@NUMERICFLAGS@
+ 
+@@ -39,7 +41,7 @@ all: libpgcommon.a
+ install uninstall:
+ 
+ libpgcommon.a: $(SA_OBJS) $(SA_HEADERS)
+-	ar rs libpgcommon.a $(SA_OBJS)
++	$(AR) $(ARFLAGS) libpgcommon.a $(SA_OBJS)
+ 
+ maintainer-clean: clean
+ 
+diff --git a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
+index 380a3e7..b399661 100644
+--- a/raster/rt_core/Makefile.in
++++ b/raster/rt_core/Makefile.in
+@@ -18,6 +18,7 @@
+ #
+ #############################################################################
+ 
++AR = @AR@
+ ARFLAGS = rs
+ 
+ CC = @CC@
+-- 
+2.29.2
+
diff --git a/dev-db/postgis/postgis-3.0.3.ebuild b/dev-db/postgis/postgis-3.0.3-r1.ebuild
similarity index 96%
rename from dev-db/postgis/postgis-3.0.3.ebuild
rename to dev-db/postgis/postgis-3.0.3-r1.ebuild
index 3e05e061edf1..ef6c9bc20dbb 100644
--- a/dev-db/postgis/postgis-3.0.3.ebuild
+++ b/dev-db/postgis/postgis-3.0.3-r1.ebuild
@@ -53,7 +53,10 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cunit )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-arflags.patch"
+	"${FILESDIR}/${P}-avoid-calling-ar-directly.patch"
+)
 
 src_prepare() {
 	default
diff --git a/dev-db/postgis/postgis-3.1.0_alpha3.ebuild b/dev-db/postgis/postgis-3.1.0_alpha3-r1.ebuild
similarity index 96%
rename from dev-db/postgis/postgis-3.1.0_alpha3.ebuild
rename to dev-db/postgis/postgis-3.1.0_alpha3-r1.ebuild
index 36cb7623ef8f..d9647334f4e1 100644
--- a/dev-db/postgis/postgis-3.1.0_alpha3.ebuild
+++ b/dev-db/postgis/postgis-3.1.0_alpha3-r1.ebuild
@@ -53,7 +53,10 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cunit )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-arflags.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-arflags.patch"
+	"${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
+)
 
 src_prepare() {
 	default
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 030f9e27e752..2cb76a697d4e 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/binary/Manifest b/dev-haskell/binary/Manifest
index 6cec0c0cbcef..602a5687f497 100644
--- a/dev-haskell/binary/Manifest
+++ b/dev-haskell/binary/Manifest
@@ -1,3 +1,3 @@
 DIST binary-0.8.7.0.tar.gz 57443 BLAKE2B 27d892ff28410e37fa9c8f3b852bf6c420fee8c7241815737c7c488e0e1754685ad4efe6a93eed055638870c0b64dc311e1c6e6bc6bf498420f1640557d4ef27 SHA512 2648ea70b6615c01a0e336b3fc187ecb0ad298c620df056da250fa237a2614d23f2ad11a0b11216d799aabb107f89b89d8e63daa30868bf8829ba358b9586aff
-EBUILD binary-0.8.7.0.ebuild 1157 BLAKE2B bad4b22ba7fef0efe03e4c82f3b1f115075000ca361c33a9f51df1343c8501e046ddf57595e351dc722af98436d5ed355007b51e0fa42741b4c2081224908a1f SHA512 90be944aaf5d35cd623b04fe0174fcbb3f25caabf59e5ad82da326d598a7b596bf5c90d6b8ea2859b47cc2036b3ba79792f9a442ab099d8bc66e6375498b29ca
+EBUILD binary-0.8.7.0.ebuild 938 BLAKE2B b9aaff5d7d6d5ebf3ed55234e29b1d4a3e688069d7a9895d95e96857809a802a5fb05c6e78283913f4e14f384eac75b7289f74ad680839412dd2569086514341 SHA512 9b3210bede51a5d766ef8b751ce00e3a3f399751ab80aa9ee37541029e3361cdc1c77ba124a0f4021788b5d613bf5a6f588870237353236862c7394cb3cc3eb2
 MISC metadata.xml 677 BLAKE2B c28648a0dd6140c8763a604e7976bfc20b9b8174dabb66a63d64df2947ac5ad3d5ceffeb6c60143a88c1328f2b822505e5938161654246c3e33ca0cce4a8e811 SHA512 0b2e3503d82f796a6c3bef7dcaf307de19b3f7d0081690971e0b5f9c9b49451260e87d25e0bd2e311f1249ed111568bb62b246b6a1510b16138c6788aaccb563
diff --git a/dev-haskell/binary/binary-0.8.7.0.ebuild b/dev-haskell/binary/binary-0.8.7.0.ebuild
index 47206fbe4a64..5755eb819db0 100644
--- a/dev-haskell/binary/binary-0.8.7.0.ebuild
+++ b/dev-haskell/binary/binary-0.8.7.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # ebuild generated by hackport 0.6.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite has circular depends
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circular depend: test-suite"
 # break circular dependencies:
 # https://github.com/gentoo-haskell/gentoo-haskell/issues/810
 CABAL_FEATURES+=" nocabaldep"
@@ -21,17 +21,11 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RESTRICT=test # binary[test]->test-framework->text->xml->binary
+RESTRICT=test # circular depend: test-framework->base-orphans->cabal->semigroups->nats->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 )
-# "
+DEPEND="${RDEPEND}
+"
 
 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/clock/Manifest b/dev-haskell/clock/Manifest
index e5bb05f8cf2d..4a2b1e8d4e55 100644
--- a/dev-haskell/clock/Manifest
+++ b/dev-haskell/clock/Manifest
@@ -1,3 +1,3 @@
 DIST clock-0.7.2.tar.gz 7465 BLAKE2B 209e720ba6e856fb5e56cc2d2dd48aa4e7b63ab15f356bcddbd5ee0936495a158ecd2c1cbdf9ce54ed89bcbd047091b3a515bcb04b6a30796bc9d659d610f187 SHA512 cf44dfca6c0825a003018c68266ef0fe503a9b147aaf784435f6297b365c6d18fc71b63b77a23ee2a3298ace638a35de0c6118e361d43b418a45d4fdd24d57cf
-EBUILD clock-0.7.2.ebuild 785 BLAKE2B 129b880a9ce9488b7384a09b6db8593e75fa112590dd145a1183cb15fc483f47a84608c95d4c02e11ddc66d470f272f0bc871a9e7f52d6c15cb140085fa1e76b SHA512 becd697426d1cf9fd5a454dd41909740ad3c9f763f8df8f718809001bc48a50454ece43639e83c5bade33a759685d237a58c65b362e6cf0e9c7b1095b65e83da
+EBUILD clock-0.7.2.ebuild 743 BLAKE2B 7b5887114eee903d7d88dd9f43c035f5babad4437ee3368907064a491e461e61186c4629c71548d99b1f14bdb72447a0ad9f44014151fbf4bb99fccdc6d6a855 SHA512 21534c784df2a9eb29f60969fb8e3b441c28102dc06e223230d49f98d4ff42c6bdccf0134b0dacce9a46655fa598ad38c7a6e579834ff0fed94854b507ffbc42
 MISC metadata.xml 1121 BLAKE2B e6c4ec9b3b756d458cb26b8de6803795150b1c06098bd86324259c2b63ca68aafd213df66f9da96c58b399cbf6fc57409ac0fa92c7706ce1b4ed26ff825c8ec2 SHA512 e216043158a3f54c2af217e1976adbc1bb1806b41577aa70cb2d4d061a35a4c87d0eb9060035e0eabbadee072a4f7f6266ebc0b4b81d1685fad9baeb0c0dda51
diff --git a/dev-haskell/clock/clock-0.7.2.ebuild b/dev-haskell/clock/clock-0.7.2.ebuild
index ee39489573f7..3cf62699328d 100644
--- a/dev-haskell/clock/clock-0.7.2.ebuild
+++ b/dev-haskell/clock/clock-0.7.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=6
@@ -6,7 +6,7 @@ EAPI=6
 # ebuild generated by hackport 0.4.7.9999
 #hackport: flags: -llvm
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: circular depends
 inherit haskell-cabal
 
 DESCRIPTION="High-resolution clock functions: monotonic, realtime, cputime"
@@ -24,8 +24,6 @@ RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/tasty-0.10
-		dev-haskell/tasty-quickcheck )
 "
 
 src_configure() {
diff --git a/dev-haskell/parsec/Manifest b/dev-haskell/parsec/Manifest
index e5ee236d57d3..847b4a45a493 100644
--- a/dev-haskell/parsec/Manifest
+++ b/dev-haskell/parsec/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD parsec-3.1.13.0-r1.ebuild 1487 BLAKE2B 19d19b9a05c77810d032135254746a483e5bec18affb3406b149e58a45202971145f15e41005fe43a989a8b5ca54c12dc54bcd2732458b564c8ac4a7d77f89e8 SHA512 c0182c6ecbbb800a305016f38f3a115c9eece16201208362f7fd3c86833d0ef2e1e7b3aee7bb36cc8cd187cfb849bef748466324f59599f228b53e961917f446
-EBUILD parsec-3.1.14.0.ebuild 1441 BLAKE2B 7f3f319d9851e01b930c0df7ba15d945176e0a170263d41349f5da32d89f137c873ef58c4400cd9ed03be03aa5d1c3f5a00ffb55ce86051c1edc68244c1528cc SHA512 e634c34f9a3b3a41fcdea553067693e25a8f2723769ceb1dc6a9452e58e9ab2e6a09680e57f666e888b39fa62cb351d0e650cc0fede6d77db42851d700be8edc
-MISC metadata.xml 307 BLAKE2B 16cc6920f5961ab10f92062508514149a785fb6011d4c68de20b40083cd8c80cc6e284a1ec8ab90a8937f14ffffe05602e753e91cc25cf2a28664c292fb5aa47 SHA512 bfda6d40cdde23fd32b6640ef6089cf3060a0d608ae4ba12954df60fd27d86fd3c0e1336a362754927bb00651db8e1a541be195c4cc464fd8bb417f3811b7a51
+EBUILD parsec-3.1.13.0-r1.ebuild 1306 BLAKE2B 875dcad5ebad6d756fffdd7da232c7ab9a35666eded41f15d8e7e00f1ccbb9bc4eea4167797ba25827fa70ec8a96909d61c33d1efa50d7434be0c60302977bd0 SHA512 4d8d56676d71a9034354ed63116ca6af3b226c64667db9d53a29850daed0518795da884c7d234f545e760bff66d422a2be85cfcf59d2f2afb30148d80dbb20a3
+EBUILD parsec-3.1.14.0.ebuild 1262 BLAKE2B 5e8e3230fb9c83939ab48413536aeab995c3478d17de9461361621650075bc3d6ec359f3cd6a8474eb7a21571e5df7d2234b0405d329b3e6af7c7741b4114ced SHA512 a55281aaf54fd412909c6433d3624463fb19841cfb65530167d0e7134318415ca79ffdd36a8024dffd6734bc34162fc932413c3e7e833f8302cba1695267ca22
+MISC metadata.xml 636 BLAKE2B 546955f2794df86c208026c6b3705535af628a8603ba09e942655c268684bf19e30f7c7b6b2965985cb5b8397a9e58ff278261bf08800f6ba7f0d2a74989d7e8 SHA512 ac9389b16e95e34ddbbcbf567449f2cdbd2247a2e419c58d8d07de32a782e29153271da8e80e4382f61e3af469894f80926acbc7f01ea172b53916cf1b32003d
diff --git a/dev-haskell/parsec/metadata.xml b/dev-haskell/parsec/metadata.xml
index e593d5b00bd3..93067ba142c1 100644
--- a/dev-haskell/parsec/metadata.xml
+++ b/dev-haskell/parsec/metadata.xml
@@ -1,10 +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>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">aslatter/parsec</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Parsec is designed from scratch as an industrial-strength parser
+		library.  It is simple, safe, well documented (on the package
+		homepage), has extensive libraries and good error messages,
+		and is also fast.  It is defined as a monad transformer that can be
+		stacked on arbitrary monads, and it is also parametric in the
+		input stream type.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild b/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
index 9999fac242a9..0a7c5b66927a 100644
--- a/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # ebuild generated by hackport 0.5.5.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circulare depends: test-suite"
 # break circular dependencies:
 # https://github.com/gentoo-haskell/gentoo-haskell/issues/810
 CABAL_FEATURES+=" nocabaldep"
@@ -17,11 +17,10 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RESTRICT=test # circular dependencies
+RESTRICT=test # circular dependencies: dev-haskell/base-orphans->cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans
 
 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?]
@@ -29,12 +28,7 @@ RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	>=dev-haskell/text-0.11.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
-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 ) ) )
-"
+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:9999"
 
diff --git a/dev-haskell/parsec/parsec-3.1.14.0.ebuild b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
index fde0a720b3b4..7cebba59ce2d 100644
--- a/dev-haskell/parsec/parsec-3.1.14.0.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # ebuild generated by hackport 0.6.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite has circular depends
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circular depens: test-suite"
 # break circular dependencies:
 # https://github.com/gentoo-haskell/gentoo-haskell/issues/810
 CABAL_FEATURES+=" nocabaldep"
@@ -21,7 +21,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RESTRICT=test # circular dependencies
+RESTRICT=test # circular dependencies: dev-haskell/base-orphans->cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans
 
 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?]
@@ -30,10 +30,5 @@ RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	>=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"
+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:8.10.2 PM:9999"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 928083a2e5da..1da9b3e6bda5 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 4f04c52c051e..d235ebf27a97 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,5 +1,5 @@
 DIST javatoolkit-0.6.3.tar.bz2 26071 BLAKE2B 50adb0871e814ad1716fedec1e1429b1da69349ea502139bed75c175a89142e1f10abbecfb434875eda46e21c86ae49d273beeb5aaddd10a903ffe153a1adc4b SHA512 b4e57d26e30455587c7bc8273420c3300c1a776f3321d8ed36638f6aae41c13ba785b37650be5577908e24aa2bf4fa4e11d3157211dc64b6e3c814c4df3b7d6a
 DIST javatoolkit-0.6.5.tar.bz2 24380 BLAKE2B 69442b45e32e63e9f4f8104570ae644d6dd5571b6b909fd751a7060abddfedf84cc147f342a40ade8c4e04764f1a8362d853fae91353171708d5daf68ef3f8e1 SHA512 8a9cf0f2b7951bfe9ab544b48eecf5857ae4bddf129a1a0b928a2b37df7960b082495c44f42954cffe885d48f850b070781593352f09221d1b35b9a94ba5b55b
 EBUILD javatoolkit-0.6.3.ebuild 828 BLAKE2B b8284438bba4f9539b4435d98ca0aa83676f6a51ba5ea6efbfcc061990b128de0997f061f2efb0f3724729cc1079878c688f6cfa6b0159c519d5139ece1aa1a7 SHA512 a8f2167aac2ce4d33be6906250ed3e02bf2ec3a03cf28c4b6946289176581741d95c1836da783fdac9b90598e3e4552cd13b038660d8683e4e1b53d191fab0e1
-EBUILD javatoolkit-0.6.5.ebuild 835 BLAKE2B 5ea4e9da5188d8732efd7b2083f9602fc3819582ceabd8d9a73b2f166c8e26808fa0a5b7232a42d70b0be1a4d2ec46e166d4c0ab619e06252ad7c7cecacd2524 SHA512 a2ddb04978fb8b49aac4eaafe43293c4aded094d20389694c2f5a07a379b7abf83122b33ecfeb8570b8a6c96f18de02bfed5f04e1a3ba2850081c778fcdaf85e
+EBUILD javatoolkit-0.6.5.ebuild 832 BLAKE2B 9abbaa7ea887ac75715721c3fe7489ba74a3fbac214203646a93b15140d9803dc09a66d280d282d511f6af30df2af3ad3f352da632a087bce9782cf0e2099679 SHA512 b62a6605458d908f5e3c7497221fe9f7b797cc089f57a5bc8a889e973e26a8bbd98f180a2e8e3edfc907a36296031f228f2fb0f0cec3233e9a21122b8f9b13cc
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
index ce3df6ba5a07..750d5192e26c 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_prepare_all() {
 	hprefixify src/py/buildparser src/py/findclass setup.py
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index dc69f4d6b379..b7ee14ef683e 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -22,7 +22,7 @@ EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cac
 EBUILD tomcat-servlet-api-7.0.106.ebuild 905 BLAKE2B 9957aa960b21b87cefbe5cc3fb979e9c9489e35caaf47b53e66a6cc37b71f5412fe43a84d6530f4841446c2a7a1b6387af610ef3b00ee54284c696c91b123b11 SHA512 2f0fb2ec3f2026c33efeedda13aed94283a8ad1d958c44af873b2b41c43521fc59e4696a049e25465df9233a4458d84ce6f73d7dc70935fe5347ad3bcdac4370
 EBUILD tomcat-servlet-api-7.0.107.ebuild 2997 BLAKE2B f3f4d7bfab2ab5290da8bf0d3cd318f40811080c67017921ef23ca08b20a8064c9d3e533d0068de10d0404617d069088c035d7d1ba022cd230058afd1f044ae4 SHA512 769a9cfcca2baed04d1a0e5a91fc2d81c7bf29545ec52544c5e5004f0d4f79c354ef655cdd5a843f2a7298508cd57584e10f0a60318cb3829e436759bd2a3160
 EBUILD tomcat-servlet-api-8.5.59.ebuild 1010 BLAKE2B a366fb083a2773dc36ea015153eeeb3938baa9f660f156ced603f854cf75b2ad515e8c0a900a1230b96c3eb99b9af8df130cb7c94208a1b0ecd6f1885b4c5813 SHA512 955beccf5a490a86c20fc3d77bb9aaf6e115ab2cebbb8a05b85ea4a8cb22cb1267fe323bfd0cd97576f8e581276e2f15d6f4cdd7e5fa9cbf62bb808b8c4759b9
-EBUILD tomcat-servlet-api-8.5.60.ebuild 3007 BLAKE2B b425ccd012cefe0971f8b6d89245882223f08d10b9b39297f5261f416b59960bed818737b6ac522a402b8e7ed31ab6b24bdbd6def22c9cdae40801c974a752b7 SHA512 76545499eebd2686c095f0b342afd8ea521101b6ffa6d5dd80dea273c6df3d44102612ec0a64ad807e4a3ff8c616c9b2d09075a76b9e08cbdd6e7b1779da34a9
+EBUILD tomcat-servlet-api-8.5.60.ebuild 3006 BLAKE2B 7608f3ce7ecb52570528e05e040ec079b76970fd4dc408e481842d005bbcd292b5db0a45985b3833d3f2129ec8e69792d225b6bbac2f474e9221ffb38af4667b SHA512 e21868d016e2ce116be08ed06827f59da07dc3bf4ca0f0ffd29369c3b8865ee3c73ff0aeced838cab3cbc7defabdb637ae13ff77f083de8bb1f46f7da4e16539
 EBUILD tomcat-servlet-api-8.5.61.ebuild 3009 BLAKE2B 73382c67d346ac48e0a3cc8fc35fd48be7c2a9bfe8fc9b18da0dec532f0d131875dd169916eea4f32aa82005e025c5b1073d6cdb3da25b9886b9687287cb7284 SHA512 e085c0821b6635da8c3201c472d883d40900828780f0ab8143c17c87c86d837a9602da05e0574a2af3fca268a3bf73de71be2ed5f6798c59aea3b97497220c60
 EBUILD tomcat-servlet-api-9.0.38.ebuild 1011 BLAKE2B d5a942f88d3e07432b5ad8d71bf254ee99d37adfa7a556ef770217ab8639ea81071f554f5d80dfe3b2ed91144d6f90fc5fba8a7e56c3a82990ca31813f529755 SHA512 42710ac1b7ff3a70992fd9b112a012aad285aae2ac6e547f313f437d04198d88cb8655e5b63d3ef8b8181e418e312fe68ebd9b7f0ab988a1e0ca8c1793a78824
 EBUILD tomcat-servlet-api-9.0.40.ebuild 3172 BLAKE2B 6c853abc08b2448a4f6cb507968a4d06c8c952f631b142ac50f72443c55a3a27fd44c347b987a6beee703fd13e1922de9d4da20920c4d4a34f06598d8daa6bb2 SHA512 e3ecd5cffcaef886fee3bfcc7f11d54258c3e2642d8e2b4328ce9b60089dd4992c4bc4ff137eec99f3d2f8a74e72115e50541486268f4cedfa8962eaf491250e
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild
index 96955e69108a..58af7d6be6b3 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index f24969847c4b..f1a97640c560 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index db7dbbff8590..6361155b614c 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -22,6 +22,7 @@ AUX ghc-8.0.2-no-relax-everywhere.patch 766 BLAKE2B 76ca925d56a9d2961cd342971ef8
 AUX ghc-8.0.2_rc2-old-sphinx.patch 434 BLAKE2B ede17cd4e5848b452edeaa3b429a7485f324cf1c9133098c7d9f84a22816eedeaf55143fea082e514b5e987ca40f65b68a476060e0c18d19bb5f8b5b993fda92 SHA512 fc8fd8d40c70a77a3aecfbdb0993bee9ef1582402b7220ed3066e1c6d4bc480c5b569cab44b58b3c54d1e68f506dc5b86ff87518d744a5a846d4de6cb1093db2
 AUX ghc-8.10.1-allow-cross-bootstrap.patch 541 BLAKE2B b77b3c9ebb7a33af6f82ec1b9927664e9bfce04450560a8e436ffa87feca50d606824192b7333e3b98d5552622592b6d39d0b184037ce646d6f7ebd205deb348 SHA512 d87a99ac96846e161d8c939079f8314d380be8e1dc62f956e3afcce1339a76447a14002b30bac1c86c807fd8eba23a0648912a3d074248f3513f9aadacd27489
 AUX ghc-8.10.1-no-relax-everywhere.patch 910 BLAKE2B 3afdc92313cb48a00698b8c4cc8af822b843dd107d546a95d598fa0d7e7fc4507e3e7dc8ab06faaafcb0cd24770df28826987088898a6cc2d1b914fc7576ec75 SHA512 21f1c64ed75c5b062a00f48b7439753aab15083c583a1cbea76b63398873ac14f52a45fe62e4cf3751c5dbb623e75a4f96c416f5e8f7a1f7822798b21cadcbb1
+AUX ghc-8.10.2-revert-linker-rtsSymbols_more_linker_symbols.patch 13879 BLAKE2B 6e36243742c4b4bdd900bd9f049f06c480e1582154f2dbc0071c1ba07e8e4dc4b9e37c3425840f35fee6cfe290036b6ac12493da574efa65260589ce63aa28f2 SHA512 3b14656faa2ba0416f01693fae43f856032e6607f1e27b22bf86e39f56e31dd06878d340fb4e7bf297af59fe6f3d2f32458e49efdc18191c2b887ac47ebf3d8e
 AUX ghc-8.2.1-darwin.patch 910 BLAKE2B 2f1a44dd7ead59301b5dd59c8cab932710655416640f2c8d5273cf07da4a45bf702d840768e2d32822e89f1b07cc9ed3a6110e1847e11468fca5c515e9e26f70 SHA512 0177fda8717d9158a99d96853feb1bf40ff13df8f5c5669c7c48f33accf69d6ddb05876776cda66705e85ee56c5ecff8f81722d8e748b6c2ed6b9bf611e42a2c
 AUX ghc-8.2.1_rc1-cgen-constify.patch 14371 BLAKE2B 96f9607cf857bb113b475d173a62998f2b0424f09f14c20ae3cab8497a25ab2df7523850f46e3b2867dcd75a499b3487345376b7cdd8e6f4a5e8008e160cf3d0 SHA512 8715c2f7c497eeefffd13b578ff718f36ec22bfe397501f685db0c781c614ebaa1178a9ca7550a722876d1cf9ace39aaa44493ecb934a828fa5010471672acfa
 AUX ghc-8.2.1_rc1-ghci-cross.patch 2828 BLAKE2B 89776c87d4ca8c0b74f0d7ef11680d2cea217774389bf297df1a61f9d95ea515b5f9d44387eac7715fec59d9c91e91bd06215c851c94f091c05b03f84d0b8699 SHA512 55e8f2e6bf69ff26976005e0b89c400df9facda5eb974f7340af89625361adce48371616a5d292dafbd4d98cbfbc0b656d36749f2e16918b275a0469ed88cea2
@@ -46,6 +47,8 @@ DIST ghc-7.8.4-src.tar.bz2 10600755 BLAKE2B 6cf27f663178513b25032b648cf36b016e01
 DIST ghc-8.0.2-src.tar.xz 10687760 BLAKE2B 3b2a487c115680342ce308ff1a42d2b6fa6fb1f31e2670b27a305b4d44160056611b77273c9d47f2e37a1ef01b1aba59c36e76b65c83142a5f09812bf3b1ea02 SHA512 58ea3853cd93b556ecdc4abd0be079b2621171b8491f59004ea4e036a4cba4470aaafe6591b942e0a50a64bdc47540e01fe6900212a1ef7087850112d9bfc5ef
 DIST ghc-8.10.1-src.tar.xz 19781652 BLAKE2B 61ff73d3a895cfa0c836e25a684d7a31cf099dcc33d1f308eaf56aa4b2a75b8f38cf963197c11dad9d027270845af20e00a7d81e5417b0fb8b4a98ddbadd53d8 SHA512 e6bb5c326f8354f0892324586c164c6e04168215d8bfeccb594173a838a535e37bac38db6fbdb01fb37150099c12842c53be5e912dfb6a6feeae3c75d4ae24d0
 DIST ghc-8.10.1-testsuite.tar.xz 2091988 BLAKE2B 88796f0fb6ea2bdd749161c84ec88768f3bf87063d2224a083db24f69282e615227626fe3c7b41d4abec10883e22042abed6a231582bab4ea530feffd683ed0b SHA512 35147f98301c5bfb6c939e108de48b2a1133adc1028aaa720ce49d60faa06a4b486a9eded658295e3f203731b4dd53475b57e8213491c45b05959430030be269
+DIST ghc-8.10.2-src.tar.xz 21880680 BLAKE2B 0c1b67c1576cfd1067d11838301f96041cabf66b94cfd546cfe6bef57babe940fc3814918ff9327e59fe73a8e230fa1d62d7816d7c6cae274dd8c53de6e81736 SHA512 6c3f1311feab3665419a301b17fcb09d303ec822f8eb8c4021edfacff00d9b52e71895bed0e58f11d8f7970415bd8c6f95ffde1294afe795e15607199b20cefc
+DIST ghc-8.10.2-testsuite.tar.xz 2101788 BLAKE2B 0d4528223471dfd68cadcda47931d53508c9eafa415716ca5990ea519eb89bfa2bdd444280057be33467382dd3d178887262d54ef633aa8ce88ea91eb9d58ece SHA512 043faaf2f0dc34a868c481b284b94afd78aa1ec1a4056d1f3c97ca3f7dadb3e9cff0517a4cfb378fe5187389db7c9027763bf066328e7dcfd264b737f6d09e41
 DIST ghc-8.2.1-src.tar.xz 10736016 BLAKE2B 60993cfc9569e83b0c383591ef30a7280e0138fbb7bd696ad62d87e68dcbccf31c0b8ba211b6647922b8595c7aec2c783648f12c67da53e0766b71c7d7c923fc SHA512 d9aa2aa7f9414db8f4e51d6c275694b46df515e68331a1a2b6018256333a2c63ebd877b75ee90407ecce5be672ec9afc6bebd62aadbf8ae06b94f1760d1736be
 DIST ghc-8.2.2-src.tar.xz 10753272 BLAKE2B 6fd792390d3df20f84836466705c3f3c931ba2d594dcbe2b808ea0ae284460000b443df8aae74903eabf05ff9064d68a303086cf888ea68222eb1c60959c8f21 SHA512 6549416f470b599973d409fa45f59c25b07e6a94798cef1a19ad432547dc225338cf4dbc4a4793114b4a417798a3b59b122b92b020251074405c5302b7ffe799
 DIST ghc-8.4.1-src.tar.xz 11301528 BLAKE2B 6dcf467d04cace856b68315c85b80f19b517dcbc8ae6e2a08c60afa141c9e0261e012738452c9ca208f9fc40c48bd1a0817e5e0fe9f4737383cd7b44ca65c8d9 SHA512 f8ae11f498bf2911fb92635534c6906c96f1fbe5072c7b7447bd3f69e408026b674564515af02a8aaddc57ee6905ce78d10005b12478a39c220580aaec13a9f7
@@ -86,6 +89,8 @@ DIST ghc-bin-8.0.2-ppc64.tbz2 117432068 BLAKE2B cae202f0d6e825127d543996b2fe7ae0
 DIST ghc-bin-8.0.2-x86_64-pc-linux-gnu.tbz2 130852973 BLAKE2B 24d2032bbfc664d924800c1a317334e2342c8ec1e529178f9d1bb99bb4772a9cc100603bf70111b8cfafa715c1cccc643f115c77cf6adcdfb17d1f1735ee6682 SHA512 c36e0e2600fc7c284562a323d396a03062cb6e8fa63c353e672be61e76d2ec5c7698485e3a370a57cf512db9e5ba6a68338fff2ab404d9fe67b1a468ed72638f
 DIST ghc-bin-8.10.1-i686-pc-linux-gnu.tbz2 123398571 BLAKE2B 3650f9dbaaa5af684abad589953bcef5b1684a91a4cc2695d0ef735536057bb031231fe3d73dd74bc38a199f0890ef91764b551e5e158c120affc0d7bc3175b7 SHA512 52cc172de08ef30d6e89384e86eda1b8bbdef2bbff526041eb47d85d77b70ab49314ac7f33f18b40864c16fa546256f1b4c7964e65aa5d3cfbb7f9cbec505dc9
 DIST ghc-bin-8.10.1-x86_64-pc-linux-gnu.tbz2 122227601 BLAKE2B 84340866c70044eb1444a70b0cbed6814808037b697db28f567d2b14bb791cbe7d9bf2a327cc47ae85ce3c4970ba039854b4a6df44eb85cdc18040c5a4d15f4f SHA512 81df9de95aec47d60ad8d699756ad323eb525c3a16536fac8c6717e1754272061bd8d7d70cd38f5c509a2fc323305333e4f898c9b6dc27645521bb29ee218bdb
+DIST ghc-bin-8.10.2-i686-pc-linux-gnu.tbz2 123683156 BLAKE2B a486076ea6e67f124c850e037be0e63a873181c3fd746f437861f7367a968e0df6723afc934c966432274a55936c0fe48a9a43a48199840b37636843da4caccc SHA512 29cc1703bbdbfcbef8aa2a5a563b83b0663970f5902a1fc70230515a128ef47e27a3a6df2b47a01009c3976b4936cf8e64e5da4dfdda0c1bcf73ab7ea5ac0b6d
+DIST ghc-bin-8.10.2-x86_64-pc-linux-gnu.tbz2 122818630 BLAKE2B 030a68e2aca0eb0a273e0d48a3e180d92b219b2d1826d1d58fa133d0a6cae1316b3ccceadb55a4fa5870f87c3df85df2998e7611b93dbc1fea592437748b2daf SHA512 23bf47ee45fae54a843de9e6991b67fccb79c14ad8d08eff9f38a68a3530496c8ce4bc8cae8a731bb690ddd6cd0bf36d6d5bf37eb68ddae8ce646a0bf3916d8f
 DIST ghc-bin-8.2.1-i686-pc-linux-gnu.tbz2 96157437 BLAKE2B 2b9608845db8cea78db07209fa054b3b05085d5c3ac07cbe3de02a93c87fb0cff12b1820f08757221c59c8a0a9e7a5563c44266b181525d916825e5cf5bac34c SHA512 e891e76557fa61853e28829b8bedc4a6abb92954f90cc1ebcf22a13cc137556bbe9262e7398b7e1aedbabeb997916b008bf1561a52f16a569f3d58ea9404f41e
 DIST ghc-bin-8.2.1-x86_64-pc-linux-gnu.tbz2 97490496 BLAKE2B 3666ea70cb8b3645db071040d2069fe244042c11954b34e5d92aaa90132d2316c0ee8c176cd4e674772bea3b99df150404f62bd8745c046cdaf102ecf0a0fa54 SHA512 52630a185d0eab56bce0469a612a54109895bfee041ec362ced59a9b35ba3b9c185e86bc7dbf0a5939081d3626baa19fbb3306e36d1857530248a7b9bfc100bb
 DIST ghc-bin-8.2.2-i686-pc-linux-gnu.tbz2 96638908 BLAKE2B b470f838e77330969f162196b0f1035fa764f5d123687fbf67c14323280bfe55216af0e16f8b79c62f290905d96abc8bfafee650f8d27c81608853e78329b2c9 SHA512 15b1525890477539878385efc15ce5f1cf2f126cc785c42923be958cabe3298cebe73526a2370cf4c630124160a7ca0f0f9062aebbf035dce807a0374eaddd14
@@ -116,6 +121,7 @@ EBUILD ghc-7.10.3.ebuild 21673 BLAKE2B 9bddf804dbe6e8ee1ab8a21e8d31c50ed40c4b264
 EBUILD ghc-7.8.4.ebuild 19808 BLAKE2B ce921fa76b8f089e80a2766c46939e0b11bf1ba992aa23bb91cf1ad03adb7cae222c2690c4273dd4f9b47912d678bdd6484df2c1f26643b0221a0b70792c6de6 SHA512 ddb849f7682d5e9a98745227c99bfcd54555b0740802641ec444e3933f8ecb9a2f26e0a4c41d532eb7a6643d42d932028120424efcfac771ddf17bb7230e6294
 EBUILD ghc-8.0.2.ebuild 21608 BLAKE2B 7cfbdaf9fa3f2fc2771e48a32d235c50aad5f7db427df443d141c5b32cee52c80a216a0e856eae57bdbf1d115bd1e15056516412172b95757f7f904c15d2a26e SHA512 aa48e12a06818945fed9f4b13a25bd287d988b7fb8aedde7cb32ec35ffbf2f9780c4ea9285fe9b0ff71486467c4fcaf7f97f2455955d8373e7393902a85bf869
 EBUILD ghc-8.10.1.ebuild 25824 BLAKE2B 9c925cb8412805abe8c90c09dfabb50239bf48e76d5a10434f8dc076229230a08a46be0d093f809426997baa20adc96816558d32d120f61538060a34c3c5c8bb SHA512 78f98718c8a2de96932012be35b8bbb14e0eb64b2b76539d6e88978620d1812ae186f391b248e5493ffcaddc4f78f8c9445f890c29cec0bcf0d2cbf07c1a2c7d
+EBUILD ghc-8.10.2.ebuild 25849 BLAKE2B 3711a29cbcdc6a88f0c8c28e17da3c1245ae7008c64ded69489fd43e85a5cef86e789874f3a63ba6760c4c64459954318fc97084da9856587a05a093fcc1971a SHA512 4de790bfcd4ac0757235ee481498c921e2d8c6c6768fe5f71b63447561524bd1f78c7d00e7d2a9a95a7a6d25046486398554b7336134b4e287ee25e3e2e72cd0
 EBUILD ghc-8.2.1.ebuild 24841 BLAKE2B cefde1d2763d9e33b151a3a8ef1f9f5e8cdd308314301bd4ca5420a71c4237f9f8291ed37db88eae9d7d0606277fd3f4e45a15c31e17062e5acca3b989cd5331 SHA512 205a0ec31af711eb874fb2f356d2d3a64e0b5d8b8135ccc96eb9601e61765bf6ff4a4ceac027fef63994a8d17e76957c1ba498e5db9a1ba46ace819f82ec9d4b
 EBUILD ghc-8.2.2.ebuild 24810 BLAKE2B 57e39bfa9674dc7fd83fcb3cc80067c29a16f700bfde7027397fdd211679424aca00fd40f41df539f0c998b79b6a536f8d72320c58b134a5fcd55397347b0437 SHA512 fb4fcf882896d527db7ca442fad5f06b2e335a9b33a393d52d9b6cef7d5b186c7918ef2787b2489a8a649b8d65142a35ca93068cf48e89b12cea47ab2b4853f5
 EBUILD ghc-8.4.1.ebuild 24628 BLAKE2B a10b6221aea42908be8f79b8c932a7d1dfa756bffd2174d232b6c6a7e27f0e13e477ce262349b79c1042bd279e2e8db8b4a1700f8020543fca6dafa03fbb4472 SHA512 bc4a20691ff721281964b26d8bab83da9de663cd793f6457ed8ffe00a80aa34a65fa2caa133b198874a85b85ed6cb456d5a13c73233e014d1124202f4107afc9
diff --git a/dev-lang/ghc/files/ghc-8.10.2-revert-linker-rtsSymbols_more_linker_symbols.patch b/dev-lang/ghc/files/ghc-8.10.2-revert-linker-rtsSymbols_more_linker_symbols.patch
new file mode 100644
index 000000000000..eb30d9d9dd4c
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-8.10.2-revert-linker-rtsSymbols_more_linker_symbols.patch
@@ -0,0 +1,296 @@
+From fac083e7ac8a37b61a4082bbbca2848e52fd1bb2 Mon Sep 17 00:00:00 2001
+From: Ben Gamari <ben@smart-cactus.org>
+Date: Sun, 9 Aug 2020 09:15:16 -0400
+Subject: [PATCH] Revert "[linker/rtsSymbols] More linker symbols"
+
+This reverts commit aa2e5863699306920513b216f337de09e29b5bb8.
+---
+ rts/RtsSymbols.c | 224 ++++-------------------------------------------
+ 1 file changed, 17 insertions(+), 207 deletions(-)
+
+diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
+index d10a6900db..b2f90a892d 100644
+--- a/rts/RtsSymbols.c
++++ b/rts/RtsSymbols.c
+@@ -58,6 +58,7 @@
+       SymI_HasProto(signal_handlers)            \
+       SymI_HasProto(stg_sig_install)            \
+       SymI_HasProto(rtsTimerSignal)             \
++      SymI_HasProto(atexit)                     \
+       SymI_NeedsDataProto(nocldstop)
+ #endif
+ 
+@@ -976,213 +977,29 @@
+       RTS_USER_SIGNALS_SYMBOLS                                          \
+       RTS_INTCHAR_SYMBOLS
+ 
++
+ // 64-bit support functions in libgcc.a
+-// See https://gcc.gnu.org/onlinedocs/gccint/Libgcc.html#Libgcc
+-#define RTS_LIBGCC_SYMBOLS_32                          \
+-      SymI_NeedsProto(__fixunsdfdi)                    \
+-      /* 4 The GCC low-level runtime library         */\
+-      /* 4.1.1 Arithmetic functions                  */\
+-      /* SymI_NeedsProto(__ashlsi3) */\
+-      SymI_NeedsProto(__ashldi3) \
+-      /* SymI_NeedsProto(__ashlti3) */\
+-      /* These functions return the result of shifting a left by b bits. */\
+-      /* SymI_NeedsProto(__ashrsi3) */\
+-      SymI_NeedsProto(__ashrdi3) \
+-      /* SymI_NeedsProto(__ashrti3) */\
+-      /* These functions return the result of arithmetically shifting a right by b bits. */\
+-      /* SymI_NeedsProto(__divsi3) */\
+-      SymI_NeedsProto(__divdi3) \
+-      /* SymI_NeedsProto(__divti3) */\
+-      /* These functions return the quotient of the signed division of a and b. */\
+-      /* SymI_NeedsProto(__lshrsi3) */ \
+-      SymI_NeedsProto(__lshrdi3) \
+-      /* SymI_NeedsProto(__lshrti3) */ \
+-      /* These functions return the result of logically shifting a right by b bits. */\
+-      /* SymI_NeedsProto(__modsi3) */ \
+-      SymI_NeedsProto(__moddi3) \
+-      /* SymI_NeedsProto(__modti3) */ \
+-      /* These functions return the remainder of the signed division of a and b. */\
+-      /* SymI_NeedsProto(__mulsi3) */ \
+-      SymI_NeedsProto(__muldi3) \
+-      /* SymI_NeedsProto(__multi3) */ \
+-      /* These functions return the product of a and b. */\
+-      SymI_NeedsProto(__negdi2) \
+-      /* SymI_NeedsProto(__negti2) */ \
+-      /* These functions return the negation of a. */\
+-      /* SymI_NeedsProto(__udivsi3) */ \
+-      SymI_NeedsProto(__udivdi3) \
+-      /* SymI_NeedsProto(__udivti3) */ \
+-      /* These functions return the quotient of the unsigned division of a and b. */\
+-      SymI_NeedsProto(__udivmoddi4) \
+-      /* SymI_NeedsProto(__udivmodti4) */ \
+-      /* These functions calculate both the quotient and remainder of the unsigned division of a and b. The return value is the quotient, and the remainder is placed in variable pointed to by c. */\
+-      /* SymI_NeedsProto(__umodsi3) */ \
+-      SymI_NeedsProto(__umoddi3) \
+-      /* SymI_NeedsProto(__umodti3) */ \
+-      /* These functions return the remainder of the unsigned division of a and b. */\
+-      /* 4.1.2 Comparison functions */\
+-      /* The following functions implement integral comparisons. These functions implement a low-level compare, upon which the higher level comparison operators (such as less than and greater than or equal to) can be constructed. The returned values lie in the range zero to two, to allow the high-level operators to be implemented by testing the returned result using either signed or unsigned comparison. */\
+-      SymI_NeedsProto(__cmpdi2) \
+-      /* SymI_NeedsProto(__cmpti2) */ \
+-      /* These functions perform a signed comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\
+-      SymI_NeedsProto(__ucmpdi2) \
+-      /* SymI_NeedsProto(__ucmpti2) */ \
+-      /* These functions perform an unsigned comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\
+-      /* 4.1.3 Trapping arithmetic functions */\
+-      /* The following functions implement trapping arithmetic. These functions call the libc function abort upon signed arithmetic overflow. */\
+-      SymI_NeedsProto(__absvsi2) \
+-      SymI_NeedsProto(__absvdi2) \
+-      /* These functions return the absolute value of a. */\
+-      /* SymI_NeedsProto(__addvsi3) */ \
+-      SymI_NeedsProto(__addvdi3) \
+-      /* These functions return the sum of a and b; that is a + b. */\
+-      /* SymI_NeedsProto(__mulvsi3) */ \
+-      SymI_NeedsProto(__mulvdi3) \
+-      /* The functions return the product of a and b; that is a * b. */\
+-      SymI_NeedsProto(__negvsi2) \
+-      SymI_NeedsProto(__negvdi2) \
+-      /* These functions return the negation of a; that is -a. */\
+-      /* SymI_NeedsProto(__subvsi3) */ \
+-      SymI_NeedsProto(__subvdi3) \
+-      /* These functions return the difference between b and a; that is a - b. */\
+-      /* 4.1.4 Bit operations */\
+-      SymI_NeedsProto(__clzsi2) \
+-      SymI_NeedsProto(__clzdi2) \
+-      /* SymI_NeedsProto(__clzti2) */ \
+-      /* These functions return the number of leading 0-bits in a, starting at the most significant bit position. If a is zero, the result is undefined. */\
+-      SymI_NeedsProto(__ctzsi2) \
+-      SymI_NeedsProto(__ctzdi2) \
+-      /* SymI_NeedsProto(__ctzti2) */ \
+-      /* These functions return the number of trailing 0-bits in a, starting at the least significant bit position. If a is zero, the result is undefined. */\
+-      SymI_NeedsProto(__ffsdi2) \
+-      /* SymI_NeedsProto(__ffsti2) */ \
+-      /* These functions return the index of the least significant 1-bit in a, or the value zero if a is zero. The least significant bit is index one. */\
+-      SymI_NeedsProto(__paritysi2) \
+-      SymI_NeedsProto(__paritydi2) \
+-      /* SymI_NeedsProto(__parityti2) */\
+-      /* These functions return the value zero if the number of bits set in a is even, and the value one otherwise. */\
+-      SymI_NeedsProto(__popcountsi2) \
+-      SymI_NeedsProto(__popcountdi2) \
+-      /* SymI_NeedsProto(__popcountti2) */ \
+-      /* These functions return the number of bits set in a. */\
+-      SymI_NeedsProto(__bswapsi2) \
+-      SymI_NeedsProto(__bswapdi2)
+-#define RTS_LIBGCC_SYMBOLS_aarch32                     \
+-      /* armv6l                                      */\
+-      /* TODO: should check for __ARM_EABI__         */\
+-      SymI_NeedsProto(__aeabi_d2f) \
+-      SymI_NeedsProto(__aeabi_d2iz) \
+-      SymI_NeedsProto(__aeabi_d2lz) \
+-      SymI_NeedsProto(__aeabi_d2uiz) \
+-      SymI_NeedsProto(__aeabi_d2ulz) \
+-      SymI_NeedsProto(__aeabi_dadd) \
+-      SymI_NeedsProto(__aeabi_dcmpeq) \
+-      SymI_NeedsProto(__aeabi_dcmpge) \
+-      SymI_NeedsProto(__aeabi_dcmpgt) \
+-      SymI_NeedsProto(__aeabi_dcmple) \
+-      SymI_NeedsProto(__aeabi_dcmplt) \
+-      SymI_NeedsProto(__aeabi_dcmpun) \
+-      SymI_NeedsProto(__aeabi_ddiv) \
+-      SymI_NeedsProto(__aeabi_dmul) \
+-      SymI_NeedsProto(__aeabi_dneg) \
+-      SymI_NeedsProto(__aeabi_dsub) \
+-      SymI_NeedsProto(__aeabi_f2d) \
+-      SymI_NeedsProto(__aeabi_f2iz) \
+-      SymI_NeedsProto(__aeabi_f2lz) \
+-      SymI_NeedsProto(__aeabi_f2uiz) \
+-      SymI_NeedsProto(__aeabi_f2ulz) \
+-      SymI_NeedsProto(__aeabi_fadd) \
+-      SymI_NeedsProto(__aeabi_fcmpeq) \
+-      SymI_NeedsProto(__aeabi_fcmpge) \
+-      SymI_NeedsProto(__aeabi_fcmpgt) \
+-      SymI_NeedsProto(__aeabi_fcmple) \
+-      SymI_NeedsProto(__aeabi_fcmplt) \
+-      SymI_NeedsProto(__aeabi_fcmpun) \
+-      SymI_NeedsProto(__aeabi_fdiv) \
+-      SymI_NeedsProto(__aeabi_fmul) \
+-      SymI_NeedsProto(__aeabi_fneg) \
+-      SymI_NeedsProto(__aeabi_fsub) \
+-      SymI_NeedsProto(__aeabi_i2d) \
+-      SymI_NeedsProto(__aeabi_i2f) \
+-      SymI_NeedsProto(__aeabi_idiv) \
+-      SymI_NeedsProto(__aeabi_idivmod) \
+-      SymI_NeedsProto(__aeabi_l2d) \
+-      SymI_NeedsProto(__aeabi_l2f) \
+-      SymI_NeedsProto(__aeabi_lasr) \
+-      SymI_NeedsProto(__aeabi_lcmp) \
+-      SymI_NeedsProto(__aeabi_ldivmod) \
+-      SymI_NeedsProto(__aeabi_llsl) \
+-      SymI_NeedsProto(__aeabi_llsr) \
+-      SymI_NeedsProto(__aeabi_lmul) \
+-      SymI_NeedsProto(__aeabi_ui2d) \
+-      SymI_NeedsProto(__aeabi_ui2f) \
+-      SymI_NeedsProto(__aeabi_uidiv) \
+-      SymI_NeedsProto(__aeabi_uidivmod) \
+-      SymI_NeedsProto(__aeabi_ul2d) \
+-      SymI_NeedsProto(__aeabi_ul2f) \
+-      SymI_NeedsProto(__aeabi_ulcmp) \
+-      SymI_NeedsProto(__aeabi_uldivmod)
+-#define RTS_LIBGCC_SYMBOLS_64                          \
++#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32)
++#define RTS_LIBGCC_SYMBOLS                             \
++      SymI_NeedsProto(__divdi3)                        \
++      SymI_NeedsProto(__udivdi3)                       \
++      SymI_NeedsProto(__moddi3)                        \
++      SymI_NeedsProto(__umoddi3)                       \
++      SymI_NeedsProto(__muldi3)                        \
++      SymI_NeedsProto(__ashldi3)                       \
++      SymI_NeedsProto(__ashrdi3)                       \
++      SymI_NeedsProto(__lshrdi3)                       \
++      SymI_NeedsProto(__fixunsdfdi)
++#elif defined(__GNUC__) && SIZEOF_VOID_P == 8
++#define RTS_LIBGCC_SYMBOLS                             \
+       SymI_NeedsProto(__udivti3)                       \
+       SymI_NeedsProto(__umodti3)
+-
+-/* for aarch64                                        */
+-#define RTS_LIBGCC_SYMBOLS_aarch64                     \
+-      SymI_NeedsProto(__netf2)                         \
+-      SymI_NeedsProto(__addtf3)                        \
+-      SymI_NeedsProto(__subtf3)                        \
+-      SymI_NeedsProto(__multf3)                        \
+-      SymI_NeedsProto(__extenddftf2)                   \
+-      SymI_NeedsProto(__fixtfsi)                       \
+-      SymI_NeedsProto(__fixunstfsi)                    \
+-      SymI_NeedsProto(__floatsitf)                     \
+-      SymI_NeedsProto(__floatunsitf)
+-
+-#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && defined(arm_HOST_OS)
+-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32 RTS_LIBGCC_SYMBOLS_aarch32
+-#elif defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32)
+-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32
+-#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 && defined(aarch64_HOST_OS)
+-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64 RTS_LIBGCC_SYMBOLS_aarch64
+-#elif defined(__GNUC__) && SIZEOF_VOID_P == 8
+-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64
+ #else
+ #define RTS_LIBGCC_SYMBOLS
+ #endif
+ 
+-#if !defined(mingw32_HOST_OS) && !defined(DYNAMIC) && (defined(_FORTIFY_SOURCE) || defined(__SSP__))
+-#define RTS_SSP_SYMBOLS                                \
+-      SymI_NeedsProto(__stack_chk_guard)               \
+-      SymI_NeedsProto(__stack_chk_fail)
+-#else
+-#define RTS_SSP_SYMBOLS
+-#endif
+-#if !defined(DYNAMIC) && defined(linux_HOST_OS)
+-// we need these for static musl builds. However when
+-// linking shared objects (DLLs) this will fail, hence
+-// we do not include them when building with -DDYNAMIC
+-#define RTS_LINKER_SYMBOLS                             \
+-      SymI_NeedsProto(__fini_array_start)              \
+-      SymI_NeedsProto(__fini_array_end)
+-#else
+-#define RTS_LINKER_SYMBOLS
+-#endif
+-
+-#if defined(darwin_HOST_OS) && defined(powerpc_HOST_ARCH)
+-      // Symbols that don't have a leading underscore
+-      // on Mac OS X. They have to receive special treatment,
+-      // see machoInitSymbolsWithoutUnderscore()
+-#define RTS_MACHO_NOUNDERLINE_SYMBOLS                   \
+-      SymI_NeedsProto(saveFP)                           \
+-      SymI_NeedsProto(restFP)
+-#endif
+-
+ /* entirely bogus claims about types of these symbols */
+-/* to prevent a bit of define expansion, SymI_NeedsProto is a variadic
+- * macro.  And we'll concat vvv with the __VA_ARGS__. This prevents
+- * vvv from getting macro expanded.
+- */
+-#define SymI_NeedsProto(vvv,...) extern void vvv ## __VA_ARGS__ (void);
++#define SymI_NeedsProto(vvv)  extern void vvv(void);
+ #define SymI_NeedsDataProto(vvv)  extern StgWord vvv[];
+ #if defined(COMPILING_WINDOWS_DLL)
+ #define SymE_HasProto(vvv)    SymE_HasProto(vvv);
+@@ -1209,8 +1026,6 @@ RTS_DARWIN_ONLY_SYMBOLS
+ RTS_OPENBSD_ONLY_SYMBOLS
+ RTS_LIBGCC_SYMBOLS
+ RTS_LIBFFI_SYMBOLS
+-RTS_SSP_SYMBOLS
+-RTS_LINKER_SYMBOLS
+ #undef SymI_NeedsProto
+ #undef SymI_NeedsDataProto
+ #undef SymI_HasProto
+@@ -1230,7 +1045,7 @@ RTS_LINKER_SYMBOLS
+ #define SymE_HasDataProto(vvv) \
+                     SymE_HasProto(vvv)
+ 
+-#define SymI_NeedsProto(vvv,...) SymI_HasProto(vvv ## __VA_ARGS__)
++#define SymI_NeedsProto(vvv) SymI_HasProto(vvv)
+ #define SymI_NeedsDataProto(vvv) SymI_HasDataProto(vvv)
+ #define SymE_NeedsProto(vvv) SymE_HasProto(vvv)
+ #define SymE_NeedsDataProto(vvv) SymE_HasDataProto(vvv)
+@@ -1251,8 +1066,6 @@ RTS_LINKER_SYMBOLS
+ #define SymI_HasProto_deprecated(vvv)   \
+    { #vvv, (void*)0xBAADF00D, true },
+ 
+-void *RTS_DYNAMIC = NULL;
+-
+ RtsSymbolVal rtsSyms[] = {
+       RTS_SYMBOLS
+       RTS_RET_SYMBOLS
+@@ -1264,14 +1077,11 @@ RtsSymbolVal rtsSyms[] = {
+       RTS_LIBGCC_SYMBOLS
+       RTS_LIBFFI_SYMBOLS
+       SymI_HasDataProto(nonmoving_write_barrier_enabled)
+-      RTS_SSP_SYMBOLS
+-      RTS_LINKER_SYMBOLS
+ #if defined(darwin_HOST_OS) && defined(i386_HOST_ARCH)
+       // dyld stub code contains references to this,
+       // but it should never be called because we treat
+       // lazy pointers as nonlazy.
+       { "dyld_stub_binding_helper", (void*)0xDEADBEEF, false },
+ #endif
+-      { "_DYNAMIC", (void*)(&RTS_DYNAMIC), false },
+       { 0, 0, false } /* sentinel */
+ };
+-- 
+2.25.4
+
diff --git a/dev-lang/ghc/ghc-8.10.2.ebuild b/dev-lang/ghc/ghc-8.10.2.ebuild
new file mode 100644
index 000000000000..8f5cdd922f31
--- /dev/null
+++ b/dev-lang/ghc/ghc-8.10.2.ebuild
@@ -0,0 +1,798 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# to make make a crosscompiler use crossdev and symlink ghc tree into
+# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
+inherit multilib multiprocessing pax-utils toolchain-funcs prefix
+inherit check-reqs
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="https://www.haskell.org/ghc/"
+
+# we don't have any binaries yet
+arch_binaries=""
+
+BIN_PV=${PV}
+# sorted!
+#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
+#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
+arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
+#arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )"
+#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+
+# various ports:
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
+# 0 - yet
+yet_binary() {
+	case "${ARCH}" in
+		#alpha) return 0 ;;
+		#arm64) return 0 ;;
+		#arm) return 0 ;;
+		amd64) return 0 ;;
+		#ia64) return 0 ;;
+		#ppc) return 0 ;;
+		#ppc64)
+		#	use big-endian && return 0
+		#	return 0
+		#	;;
+		#sparc) return 0 ;;
+		x86) return 0 ;;
+		*) return 1 ;;
+	esac
+}
+
+GHC_PV=${PV}
+#GHC_PV=8.10.0.20200123 # uncomment only for -alpha, -beta, -rc ebuilds
+GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
+
+SRC_URI="!binary? (
+	https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-src.tar.xz
+	test? ( https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz )
+)"
+S="${WORKDIR}"/${GHC_P}
+
+[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
+
+BUMP_LIBRARIES=(
+	# "hackage-name          hackage-version"
+)
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test"
+IUSE+=" binary"
+RESTRICT="!test? ( test )"
+
+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 )
+"
+
+# This set of dependencies is needed to run
+# prebuilt ghc. We specifically avoid ncurses
+# dependency with:
+#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
+PREBUILT_BINARY_DEPENDS="
+	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+"
+# This set of dependencies is needed to install
+# ghc[binary] in system. terminfo package is linked
+# against ncurses.
+PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
+	sys-libs/ncurses:0/6
+"
+
+RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-python/sphinx
+		>=dev-libs/libxslt-1.1.2 )
+	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )"
+
+# we build binaries without profiling support
+REQUIRED_USE="
+	?? ( ghcbootstrap binary )
+	?? ( profile binary )
+"
+
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+is_native() {
+	[[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
+}
+
+if ! is_crosscompile; then
+	PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
+fi
+
+# returns tool prefix for crosscompiler.
+# Example:
+#  CTARGET=armv7a-unknown-linux-gnueabi
+#  CHOST=x86_64-pc-linux-gnu
+#    "armv7a-unknown-linux-gnueabi-"
+#  CTARGET=${CHOST}
+#    ""
+# Used in tools and library prefix:
+#    "${ED}"/usr/bin/$(cross)haddock
+#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+
+cross() {
+	if is_crosscompile; then
+		echo "${CTARGET}-"
+	else
+		echo ""
+	fi
+}
+
+append-ghc-cflags() {
+	local persistent compile assemble link
+	local flag ghcflag
+
+	for flag in $*; do
+		case ${flag} in
+			persistent)	persistent="yes";;
+			compile)	compile="yes";;
+			assemble)	assemble="yes";;
+			link)		link="yes";;
+			*)
+				[[ ${compile}  ]] && ghcflag="-optc${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${assemble} ]] && ghcflag="-opta${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${link}     ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				;;
+		esac
+	done
+}
+
+# $1 - lib name (under libraries/)
+# $2 - lib version
+# example: bump_lib "transformers" "0.4.2.0"
+bump_lib() {
+	local pn=$1 pv=$2
+	local p=${pn}-${pv}
+	local f
+
+	einfo "Bumping ${pn} up to ${pv}"
+
+	for f in ghc.mk GNUmakefile; do
+		mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
+	done
+	mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
+	mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
+}
+
+update_SRC_URI() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz"
+	done
+}
+
+update_SRC_URI
+
+bump_libs() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		bump_lib "${pn}" "${pv}"
+	done
+}
+
+ghc_setup_cflags() {
+	# TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N>
+	if ! is_native; then
+		export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
+		export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
+		einfo "Crosscompiling mode:"
+		einfo "   CHOST:   ${CHOST}"
+		einfo "   CTARGET: ${CTARGET}"
+		einfo "   CFLAGS:  ${CFLAGS}"
+		einfo "   LDFLAGS: ${LDFLAGS}"
+		einfo "   prefix: $(cross)"
+		return
+	fi
+	# We need to be very careful with the CFLAGS we ask ghc to pass through to
+	# gcc. There are plenty of flags which will make gcc produce output that
+	# breaks ghc in various ways. The main ones we want to pass through are
+	# -mcpu / -march flags. These are important for arches like alpha & sparc.
+	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
+	strip-flags
+	strip-unsupported-flags
+
+	# Cmm can't parse line numbers #482086
+	replace-flags -ggdb[3-9] -ggdb2
+
+	GHC_FLAGS=""
+	GHC_PERSISTENT_FLAGS=""
+	for flag in ${CFLAGS}; do
+		case ${flag} in
+
+			# Ignore extra optimisation (ghc passes -O to gcc anyway)
+			# -O2 and above break on too many systems
+			-O*) ;;
+
+			# Arch and ABI flags are what we're really after
+			-m*) append-ghc-cflags compile assemble ${flag};;
+
+			# Sometimes it's handy to see backtrace of RTS
+			# to get an idea what happens there
+			-g*) append-ghc-cflags compile ${flag};;
+
+			# Ignore all other flags, including all -f* flags
+		esac
+	done
+
+	for flag in ${LDFLAGS}; do
+		append-ghc-cflags link ${flag}
+	done
+
+	# GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build.
+	# Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported
+	# options to gcc.
+	if is_native; then
+		# prevent from failing to build unregisterised ghc:
+		# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
+		use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
+	fi
+}
+
+# substitutes string $1 to $2 in files $3 $4 ...
+relocate_path() {
+	local from=$1
+	local   to=$2
+	shift 2
+	local file=
+	for file in "$@"
+	do
+		sed -i -e "s|$from|$to|g" \
+			"$file" || die "path relocation failed for '$file'"
+	done
+}
+
+# changes hardcoded ghc paths and updates package index
+# $1 - new absolute root path
+relocate_ghc() {
+	local to=$1 ghc_v=${BIN_PV}
+
+	# libdir for prebuilt binary and for current system may mismatch
+	# It does for prefix installation for example: bug #476998
+	local bin_ghc_prefix=${WORKDIR}/usr
+	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
+	# backup original script to use it later after relocation
+	local gp_back="${T}/ghc-pkg-${ghc_v}-orig"
+	cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
+
+	if [[ ${bin_libdir} != $(get_libdir) ]]; then
+		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
+		# moving the dir itself is not strictly needed
+		# but then USE=binary would result in installing
+		# in '${bin_libdir}'
+		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+
+		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+			"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+			"${WORKDIR}/usr/bin/hsc2hs" \
+			"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+			"$gp_back" \
+			"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+	fi
+
+	# Relocate from /usr to ${EPREFIX}/usr
+	relocate_path "/usr" "${to}/usr" \
+		"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+		"${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/hp2ps" \
+		"${WORKDIR}/usr/bin/hpc" \
+		"${WORKDIR}/usr/bin/hsc2hs" \
+		"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+		"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+
+	# this one we will use to regenerate cache
+	# so it should point to current tree location
+	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
+
+	if use prefix; then
+		hprefixify "${bin_libpath}"/${PN}*/settings
+	fi
+
+	# regenerate the binary package cache
+	"$gp_back" recache || die "failed to update cache after relocation"
+	rm "$gp_back"
+}
+
+ghc-check-reqs() {
+	# These are pessimistic values (slightly bigger than worst-case)
+	# Worst case is UNREG USE=profile ia64. See bug #611866 for some
+	# numbers on various arches.
+	CHECKREQS_DISK_BUILD=8G
+	CHECKREQS_DISK_USR=2G
+	# USE=binary roughly takes
+	use binary && CHECKREQS_DISK_BUILD=4G
+
+	"$@"
+}
+
+pkg_pretend() {
+	ghc-check-reqs check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ghc-check-reqs check-reqs_pkg_setup
+
+	# quiet portage about prebuilt binaries
+	use binary && QA_PREBUILT="*"
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use ghcbootstrap; then
+		ewarn "You requested ghc bootstrapping, this is usually only used"
+		ewarn "by Gentoo developers to make binary .tbz2 packages."
+
+		[[ -z $(type -P ghc) ]] && \
+			die "Could not find a ghc to bootstrap with."
+	else
+		if ! yet_binary; then
+			eerror "Please try emerging with USE=ghcbootstrap and report build"
+			eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
+			die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Create the ${S} dir if we're using the binary version
+	use binary && mkdir "${S}"
+
+	# the Solaris and Darwin binaries from ghc (maeder) need to be
+	# unpacked separately, so prevent them from being unpacked
+	local ONLYA=${A}
+	case ${CHOST} in
+		*-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
+	esac
+	unpack ${ONLYA}
+}
+
+src_prepare() {
+	ghc_setup_cflags
+
+	if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
+		# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
+		# See bug #313635.
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${WORKDIR}/usr/bin/ghc-${BIN_PV}"
+
+		# allow hardened users use vanilla binary to bootstrap ghc
+		# ghci uses mmap with rwx protection at it implements dynamic
+		# linking on it's own (bug #299709)
+		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc"
+	fi
+
+	if use binary; then
+		if use prefix; then
+			relocate_ghc "${EPREFIX}"
+		fi
+
+		# Move unpacked files to the expected place
+		mv "${WORKDIR}/usr" "${S}"
+		eapply_user
+	else
+		if ! use ghcbootstrap; then
+			case ${CHOST} in
+				*-darwin* | *-solaris*)
+				# UPDATE ME for ghc-7
+				mkdir "${WORKDIR}"/ghc-bin-installer || die
+				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
+				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
+				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
+				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
+				popd > /dev/null
+
+				pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
+				# fix the binaries so they run, on Solaris we need an
+				# LD_LIBRARY_PATH which has our prefix libdirs, on
+				# Darwin we need to replace the frameworks with our libs
+				# from the prefix fix before installation, because some
+				# of the tools are actually used during configure/make
+				if [[ ${CHOST} == *-solaris* ]] ; then
+					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+				elif [[ ${CHOST} == *-darwin* ]] ; then
+					local readline_framework=GNUreadline.framework/GNUreadline
+					local gmp_framework=/opt/local/lib/libgmp.10.dylib
+					local ncurses_file=/opt/local/lib/libncurses.5.dylib
+					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
+						install_name_tool -change \
+							${readline_framework} \
+							"${EPREFIX}"/lib/libreadline.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${gmp_framework} \
+							"${EPREFIX}"/usr/lib/libgmp.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${ncurses_file} \
+							"${EPREFIX}"/usr/lib/libncurses.dylib \
+							${binary} || die
+					done
+					# we don't do frameworks!
+					sed -i \
+						-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
+						-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
+						rts/package.conf.in || die
+				fi
+
+				# it is autoconf, but we really don't want to give it too
+				# many arguments, in fact we do the make in-place anyway
+				./configure --prefix="${WORKDIR}"/usr || die
+				make install || die
+				popd > /dev/null
+				;;
+				*)
+				relocate_ghc "${WORKDIR}"
+				;;
+			esac
+		fi
+
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${S}/ghc/ghc.wrapper"
+
+		cd "${S}" # otherwise eapply will break
+
+		eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
+		eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
+		eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
+		eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
+		eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch
+		eapply "${FILESDIR}"/${PN}-8.10.2-revert-linker-rtsSymbols_more_linker_symbols.patch
+
+		# a bunch of crosscompiler patches
+		# needs newer version:
+		#eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
+
+		# mingw32 target
+		pushd "${S}/libraries/Win32"
+			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
+		popd
+
+		bump_libs
+
+		eapply_user
+		# as we have changed the build system
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if ! use binary; then
+		# initialize build.mk
+		echo '# Gentoo changes' > mk/build.mk
+
+		# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
+		echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
+		echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
+
+		# We also need to use the GHC_FLAGS flags when building ghc itself
+		echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
+		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
+		echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
+		# Speed up initial Cabal bootstrap
+		echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
+
+		# We can't depend on haddock except when bootstrapping when we
+		# must build docs and include them into the binary .tbz2 package
+		# app-text/dblatex is not in portage, can not build PDF or PS
+		echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
+		echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
+		echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
+
+		# this controls presence on 'xhtml' and 'haddock' in final install
+		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
+
+		# not used outside of ghc's test
+		if [[ -n ${GHC_BUILD_DPH} ]]; then
+				echo "BUILD_DPH = YES" >> mk/build.mk
+			else
+				echo "BUILD_DPH = NO" >> mk/build.mk
+		fi
+
+		# Any non-native build has to skip as it needs
+		# target haddock binary to be runnabine.
+		if ! is_native; then
+			# disable docs generation as it requires running stage2
+			echo "HADDOCK_DOCS=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+		fi
+
+		if is_crosscompile; then
+			# Install ghc-stage1 crosscompiler instead of
+			# ghc-stage2 cross-built compiler.
+			echo "Stage1Only=YES" >> mk/build.mk
+		fi
+
+		# allows overriding build flavours for libraries:
+		# v   - vanilla (static libs)
+		# p   - profiled
+		# dyn - shared libraries
+		# example: GHC_LIBRARY_WAYS="v dyn"
+		if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
+			echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
+		fi
+		echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
+
+		# Get ghc from the unpacked binary .tbz2
+		# except when bootstrapping we just pick ghc up off the path
+		if ! use ghcbootstrap; then
+			export PATH="${WORKDIR}/usr/bin:${PATH}"
+		fi
+
+		echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk
+
+		# don't strip anything. Very useful when stage2 SIGSEGVs on you
+		echo "STRIP_CMD = :" >> mk/build.mk
+
+		local econf_args=()
+
+		# GHC embeds toolchain it was built by and uses it later.
+		# Don't allow things like ccache or versioned binary slip.
+		# We use stable thing across gcc upgrades.
+		# User can use EXTRA_ECONF=CC=... to override this default.
+		econf_args+=(
+			AR=${CTARGET}-ar
+			CC=${CTARGET}-gcc
+			# these should be inferred by GHC but ghc defaults
+			# to using bundled tools on windows.
+			Windres=${CTARGET}-windres
+			DllWrap=${CTARGET}-dllwrap
+			# we set the linker explicitly below
+			--disable-ld-override
+		)
+		case ${CTARGET} in
+			arm*)
+				# ld.bfd-2.28 does not work for ghc. Force ld.gold
+				# instead. This should be removed once gentoo gets
+				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
+				econf_args+=(LD=${CTARGET}-ld.gold)
+			;;
+			sparc*)
+				# ld.gold-2.28 does not work for ghc. Force ld.bfd
+				# instead. This should be removed once gentoo gets
+				# a fix for missing --no-relax support bug:
+				# https://sourceware.org/ml/binutils/2017-07/msg00183.html
+				econf_args+=(LD=${CTARGET}-ld.bfd)
+			;;
+			*)
+				econf_args+=(LD=${CTARGET}-ld)
+		esac
+
+		if [[ ${CBUILD} != ${CHOST} ]]; then
+			# GHC bug: ghc claims not to support cross-building.
+			# It does, but does not distinct --host= value
+			# for stage1 and stage2 compiler.
+			econf_args+=(--host=${CBUILD})
+		fi
+
+		if use ghcmakebinary; then
+			# When building booting libary we are trying to
+			# bundle or restrict most of external depends
+			# with unstable ABI:
+			#  - embed libffi (default GHC behaviour)
+			#  - disable ncurses support for ghci (via haskeline)
+			#    https://bugs.gentoo.org/557478
+			#  - disable ncurses support for ghc-pkg
+			echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
+			echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
+		elif is_native; then
+			# using ${GTARGET}'s libffi is not supported yet:
+			# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
+			econf_args+=(--with-system-libffi)
+			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
+		fi
+
+		einfo "Final mk/build.mk:"
+		cat mk/build.mk || die
+
+		econf ${econf_args[@]} \
+			--enable-bootstrap-with-devel-snapshot \
+			$(use_enable elfutils dwarf-unwind) \
+			$(use_enable numa)
+
+		if [[ ${PV} == *9999* ]]; then
+			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
+			GHC_P=${PN}-${GHC_PV}
+		fi
+	fi # ! use binary
+}
+
+src_compile() {
+	if ! use binary; then
+		# Stage1Only crosscompiler does not build stage2
+		if ! is_crosscompile; then
+			# 1. build/pax-mark compiler binary first
+			emake ghc/stage2/build/tmp/ghc-stage2
+			# 2. pax-mark (bug #516430)
+			pax-mark -m ghc/stage2/build/tmp/ghc-stage2
+			# 2. build/pax-mark haddock using ghc-stage2
+			if is_native; then
+				# non-native build does not build haddock
+				# due to HADDOCK_DOCS=NO, but it could.
+				emake utils/haddock/dist/build/tmp/haddock
+				pax-mark -m utils/haddock/dist/build/tmp/haddock
+			fi
+		fi
+		# 3. and then all the rest
+		emake all
+	fi # ! use binary
+}
+
+src_test() {
+	# TODO: deal with:
+	#    - sandbox (pollutes environment)
+	#    - extra packages (to extend testsuite coverage)
+	# bits are taken from 'validate'
+	local make_test_target='test' # can be fulltest
+	# not 'emake' as testsuite uses '$MAKE' without jobserver available
+	make $make_test_target stage=2 THREADS=$(makeopts_jobs)
+}
+
+src_install() {
+	if use binary; then
+		use prefix && mkdir -p "${ED}"
+		mv "${S}/usr" "${ED}"
+	else
+		[[ -f VERSION ]] || emake VERSION
+
+		# -j1 due to a rare race in install script:
+		#    make --no-print-directory -f ghc.mk phase=final install
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
+		#        -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644  utils/hsc2hs/template-hsc.h \
+		#           "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
+		#    /usr/bin/install: cannot create regular file \
+		#           '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
+		emake -j1 install DESTDIR="${D}"
+
+		# Skip for cross-targets as they all share target location:
+		# /usr/share/doc/ghc-9999/
+		if ! is_crosscompile; then
+			dodoc "distrib/README" "LICENSE" "VERSION"
+		fi
+
+		# rename ghc-shipped files to avoid collision
+		# of external packages. Motivating example:
+		#  user had installed:
+		#      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
+		#      dev-haskell/transformers-0.4.2.0
+		#  then user tried to update to
+		#      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
+		#  this will lead to single .conf file collision.
+		local shipped_conf renamed_conf
+		local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+		for shipped_conf in "${package_confdir}"/*.conf; do
+			# rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
+			renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
+			mv "${shipped_conf}" "${renamed_conf}" || die
+		done
+
+		# remove link, but leave 'haddock-${GHC_P}'
+		rm -f "${ED}"/usr/bin/$(cross)haddock
+
+		if ! is_crosscompile; then
+			newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
+			newbashcomp utils/completion/ghc.bash         ghc
+		fi
+	fi
+
+	# path to the package.cache
+	local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+	PKGCACHE="${package_confdir}"/package.cache
+	# copy the package.conf.d, including timestamp, save it so we can help
+	# users that have a broken package.conf.d
+	cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
+
+	# copy the package.conf, including timestamp, save it so we later can put it
+	# back before uninstalling, or when upgrading.
+	cp -p "${PKGCACHE}"{,.shipped} \
+		|| die "failed to copy package.conf.d/package.cache"
+
+	if is_crosscompile; then
+		# When we build a cross-compiler the layout is the following:
+		#     usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries
+		# but
+		#     usr/lib/${CTARGET}-ghc-${VER}/bin/ directory
+		# containst host binaries (modulo bugs).
+
+		# Portage's stripping mechanism does not skip stripping
+		# foreign binaries. This frequently causes binaries to be
+		# broken.
+		#
+		# Thus below we disable stripping of target libraries and allow
+		# stripping hosts executables.
+		dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}"
+		dostrip    "/usr/$(get_libdir)/$(cross)${GHC_P}/bin"
+	fi
+}
+
+pkg_preinst() {
+	# have we got an earlier version of ghc installed?
+	if has_version "<${CATEGORY}/${PF}"; then
+		haskell_updater_warn="1"
+	fi
+}
+
+pkg_postinst() {
+	ghc-reregister
+
+	# path to the package.cache
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+
+	# give the cache a new timestamp, it must be as recent as
+	# the package.conf.d directory.
+	touch "${PKGCACHE}"
+
+	if [[ "${haskell_updater_warn}" == "1" ]]; then
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+		ewarn "You have just upgraded from an older version of GHC."
+		ewarn "You may have to run"
+		ewarn "      'haskell-updater'"
+		ewarn "to rebuild all ghc-based Haskell libraries."
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+	fi
+}
+
+pkg_prerm() {
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+	rm -rf "${PKGCACHE}"
+
+	cp -p "${PKGCACHE}"{.shipped,}
+}
+
+pkg_postrm() {
+	ghc-package_pkg_postrm
+}
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 7d665ab768ae..a2a964eb8fe7 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,8 +1,4 @@
 AUX mujs-1.0.5-flags.patch 839 BLAKE2B 843d1bf60167dfb91a5736ee936098c8f6b716f7a70118512d102adb3dc00223d5a3f1fb8da3a57b89797d5b26ebf8120cc1ef2013162aeff288be07cb99d99f SHA512 35681b868e129edffe27e41b793ef073b9ebeb5842212116f9740257515a3fb0d2f00d828a72d96b630c7632184ff9340325a5d79503e5a4c5a52892bd26f4bd
-DIST mujs-1.0.6.tar.gz 121385 BLAKE2B b74da9cc9df6c51d81fe4b6170fddd9bfd3e37cc1c48509ddbcc9b657feb7169cfa98427770a118fb9c0923e70320668198739ea111cbd5d1c2303b2ada7093d SHA512 c3062348dcc79b8ea3726fc528b3ba765d3462232059617b9ab221ba47fa904cc81a305a6199a9a2cea24a2d891ca63d475b4884cd4e53fa715b3a55f51ca4d9
-DIST mujs-1.0.7.tar.xz 93928 BLAKE2B 3c29ad3c23b75ee310824a36c0b08ede07b4ebaebff78558d07bc0eda55d6a994551502089cebd5b53ae24364ec1170e0865b7f1560d909dd15a18040666fea2 SHA512 30cc06ce4a608e091d46ba903ffc2eda29972cf583eb077d7824627fa20423c4721a406bf4271ebd5e5cade74f34e19acc9cffbc6d4d44314085a5525e91564f
 DIST mujs-1.0.9.tar.gz 123113 BLAKE2B c55deaf14508c412394bf5fe3a53ef581d4e4726024d65f2ba5155eb2400a6e2f043c9f6721b170d19297e2cd38c62c462f3b4e102eb4bfe6e7857b40156c18b SHA512 a3dbc8dbf5c16b7de9803954fe38ea9f77c0e5b7de3895966ec0877e063d463c9950499791ea0d102e464bd0426413689f3edb15e38db3f13915d72f27556725
-EBUILD mujs-1.0.6.ebuild 1306 BLAKE2B 3b8443a25740336511efe985d48079fccb76a8c8c5e9bf69ca307c0393923423339a673eab22310cec31739e88bf62799126a17f4b6fa6e52de111978731a0dd SHA512 cbd0bfdccee68ea8d01c5438fc6f27169f3afade7f5fb809c117b4d9fe8fcc3dff98473480983c17fc7ca6ba6969e474e6ddc021ab966eb5895fc740ccddb537
-EBUILD mujs-1.0.7.ebuild 1277 BLAKE2B 6fe2022d19344c58d2ca3c69fab015aee765eca4b7818249e8c7b064cad5a95256563707766d4d02d2c87e963884afc97ac976dfbc68e2120148ec7898fdf396 SHA512 18da4d979159a1cbb1051d1bcacece833b4b0a311960411cfe0185c2ae931a64a352429d2797450e495f681f5a52529ec1eb4af7be7ce6df4f3ae7213f2d7fb0
 EBUILD mujs-1.0.9.ebuild 1382 BLAKE2B 20eb932acd9e393a3180105580dedeb681e9f577ea7ffd2474909342fdadf22424b594ed72ffff16d1df303a467b6f25f43b8a699caac35c010f72109b5846dc SHA512 eb702eee9ff0a5e1036a72d02a4841b5fd7b5326788c75a6cb2456687aa1fe8334cca5f70eee806dc42affbd666722490b19339e54836634fdc1c78969c81d18
 MISC metadata.xml 615 BLAKE2B 6eaeafe3a3827b4df244d65ebad6f90b1340ea690679d4b98bfd30ac36d985797a06d511c24fbbb8a458df7dbea1270e2ebe789b8eb2222fccdb2d7192059b49 SHA512 47d65a0ab37ab4defb5b2d5bba8f7a9b4abe263c59c65884da1d9eb895eab5a90e49a6e849e71ed0e54826988301ece5f973a54bb19c06ae771a2b104d3f9c56
diff --git a/dev-lang/mujs/mujs-1.0.6.ebuild b/dev-lang/mujs/mujs-1.0.6.ebuild
deleted file mode 100644
index c6663ac60e38..000000000000
--- a/dev-lang/mujs/mujs-1.0.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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="An embeddable Javascript interpreter in C."
-HOMEPAGE="
-	https://mujs.com/
-	https://github.com/ccxvii/mujs/
-"
-SRC_URI="https://github.com/ccxvii/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-# subslot matches SONAME
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.5-flags.patch"
-)
-
-src_prepare() {
-	default
-
-	tc-export AR CC
-
-	# library's ABI (and API) changes in ~each release:
-	# diff 'usr/includemujs.h' across releases to validate
-	append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
-}
-
-src_compile() {
-	emake VERSION=${PV} prefix=/usr shared
-}
-
-src_install() {
-	local myeconfargs=(
-		DESTDIR="${ED}"
-		install-shared
-		libdir="/usr/$(get_libdir)"
-		prefix="/usr"
-		VERSION="${PV}"
-		$(usex static-libs install-static '')
-	)
-
-	emake "${myeconfargs[@]}"
-
-	mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
-
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
-}
diff --git a/dev-lang/mujs/mujs-1.0.7.ebuild b/dev-lang/mujs/mujs-1.0.7.ebuild
deleted file mode 100644
index b95335f324a9..000000000000
--- a/dev-lang/mujs/mujs-1.0.7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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="An embeddable Javascript interpreter in C."
-HOMEPAGE="
-	https://mujs.com/
-	https://github.com/ccxvii/mujs/
-"
-SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
-
-LICENSE="ISC"
-# subslot matches SONAME
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.5-flags.patch"
-)
-
-src_prepare() {
-	default
-
-	tc-export AR CC
-
-	# library's ABI (and API) changes in ~each release:
-	# diff 'usr/includemujs.h' across releases to validate
-	append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
-}
-
-src_compile() {
-	emake VERSION=${PV} prefix=/usr shared
-}
-
-src_install() {
-	local myeconfargs=(
-		DESTDIR="${ED}"
-		install-shared
-		libdir="/usr/$(get_libdir)"
-		prefix="/usr"
-		VERSION="${PV}"
-		$(usex static-libs install-static '')
-	)
-
-	emake "${myeconfargs[@]}"
-
-	mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
-
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
-}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 3817c3166f7e..07f6f234219f 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -9,7 +9,7 @@ DIST php-7.2.34.tar.xz 12309432 BLAKE2B 50522786d39296bc7411931c4f357d53c7a25da2
 DIST php-7.3.25.tar.xz 12136668 BLAKE2B b9bfb1de15a3f02bf5d228a2cf9b307c9eeadaea10cac22d40647db0147f4f93b41858ea4affa0701478dd397f0a87cae4e2f29a378f7c6730fdf7da5c48e0e8 SHA512 30b27deab12cf2544671afbbdaefd4bfea308eeed8e9c2150751c5bc9ece18d981bcc020eace35cbdbe88b45cffba8a1fca718fc4e74c3a7903d8b038015d31e
 DIST php-7.4.13.tar.xz 10319848 BLAKE2B c1da97eb605f1fc2b36190bfe92feb1fd527f4aaf1483865561a08cf990e70445f5520c8abcea7d9c6482dc47e500507644e0cd2cc756cfa99adfec0359cd795 SHA512 3525f4fd4ea6d97ed75ed8360d2a851e8577c09247ae3c6eb7e7b43265ee418297d91c1022bf5bbb64d1eecdebbbc2e0f6d42b560f584a741b475db2c6897ea7
 DIST php-8.0.0.tar.xz 10726788 BLAKE2B 16c4aa075ba5dee6d47086323cd152b33dc7b62ac6b3ab6637ec386c1048e256a160d72e72cbc88450af1e84389042ebf2d644d3361c9a34879cc494d5b9b64f SHA512 65630940c95436f3e3ecb71b9f1ca15bb4118267dbda604ed1ee009d528c21a3ec21f48a15e4dd3529fe9cd2b354c211a7b4975b5de43e1f2afa6656cabe1fd0
-EBUILD php-7.2.34.ebuild 22651 BLAKE2B 9431a6e26752b96101826946c969e4ac1a2a1c04b9b42ad7f2b8f4733d8e3ec0614b75dddb2a54c40868d76e7a9b3a46001dc0b2a5152ac540175b0875753603 SHA512 bb61083533a443fe07b76c30028a3b7b8657a7c51ece6003ebc44a5e53224a70e8cad6d82fadcd509ea1ae4e4383ddad1c8d7edea7f200c5d37e445a88913d41
+EBUILD php-7.2.34.ebuild 22817 BLAKE2B e023a261a1b7a4dc2906eaafa023d54e68d2c916b63f95de69821b07cd1fdfa04bf25fa483c1b426c1f8d3f420226ebbcd68202c0b8393226304b019b18fb374 SHA512 98f081f97ffd519f479a4241487b4e23811a9c11fa76538133355c566ab68bb936f171e3cb59c62d53863c34126d8ce0d6fa03a742dc4ee8f6d6080105d13289
 EBUILD php-7.3.25.ebuild 22664 BLAKE2B 2191d27cc589cf5b0d85c33c3c81cddec0389719973c82b2665b4ae5be145e08c427fe4d59978ba07d04e3b3026f54c5471a51f20ce8ab02e55f4e6a269a3e47 SHA512 70a1783a530b13c38f1a9ecb8c381cd34ae9cad6124ff96cf7b28bdb97c447f133acbdd9bbe515b799eecfdc201d7d3524079a405fa989d07e7b9661916b374b
 EBUILD php-7.4.13.ebuild 21413 BLAKE2B 274ac296e7874ec14d3f458672156dc127c83d6627419856ddf762cd66e2ddb2b081a671d7f135e8827b5f718508b4cee016d52c93e759cc1dacb364f945cfdb SHA512 2be6393ecc2d877ccd13c7731794c1fbd817594ac33576e04e7d1510d8c6f1e8fbf49a6d4dd00e7e65e266853e12c9042fb94d1e4cf12d7ad2999fc1b85a4979
 EBUILD php-8.0.0.ebuild 21276 BLAKE2B e58d02e2c685bd56435360a6c3801c1c6e1f7d27f9614cac40737efefc62e8e62c168556a7c139b7e3b49171f6f3d2f65dc9f0de77848362dc8be0a7af22517b SHA512 5f4a494f280fd5079d80ea27ea25b6bf14a4cfc33380cefbdfd9f5b92367eb734bcc7fcf0cd4bc75740113e73531449d77b0af1c748701034845cbf19aaf1be4
diff --git a/dev-lang/php/php-7.2.34.ebuild b/dev-lang/php/php-7.2.34.ebuild
index 07f0645b8d80..b7fe1520efba 100644
--- a/dev-lang/php/php-7.2.34.ebuild
+++ b/dev-lang/php/php-7.2.34.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit flag-o-matic systemd autotools
+inherit flag-o-matic systemd autotools toolchain-funcs
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://www.php.net/"
@@ -239,6 +239,10 @@ src_configure() {
 	addpredict /usr/share/snmp/mibs/.index #nowarn
 	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
+	# Fix building against >=ICU-68, https://bugs.php.net/80310
+	append-cflags -DU_DEFINE_FALSE_AND_TRUE=1
+	append-cxxflags -DU_DEFINE_FALSE_AND_TRUE=1
+
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
 	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 9adbc28204d2..d25e5881ceb1 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -29,7 +29,7 @@ DIST python-gentoo-patches-3.8.6.tar.xz 10956 BLAKE2B e3241d97f886d0a37f85735102
 DIST python-gentoo-patches-3.9.0-r1.tar.xz 13728 BLAKE2B 50e85194c6bafefb8a0ddc4c9dea39227fc2c170db37ab44fa1e068340fa2fc5a59489f50431f0792024df551fc54a20de594579b57717c89fa134b3f000bb6d SHA512 a38c2800e3a0740af79f75f4120c925c7a891aa1f14a71ab56ad97fbabca3573c571140da3f34050bd9f97bd854a704453a910fa6883162196e6d1335a965b61
 DIST python-gentoo-patches-3.9.0rc1.tar.xz 8856 BLAKE2B 7bd032dfd047640c6a53633b5b9ee7b24199106b985230f772dda978d3b79fe0406eea64c4a842603a20afb71a90469befa7ec59a5ef1f793e4c901aa85952d1 SHA512 85a7d4397abf2a0f3c3d07a94a3e184ba3dcb347f3b70ee2cb77e81aac63846b01323a0228afd0fd1d32b3cafb64b18f82e6f5bfd88e4d564261ddae11e747eb
 EBUILD python-2.7.18-r4.ebuild 10624 BLAKE2B 3981c0899d899e4dfbe198618e005bc9190af8cfbc6ca5b85911c717127bfa19ca546e0dcbf7b0317497e7f4d3fd8498e4b153f38468f31f83008c1f39da2067 SHA512 e3aee3d42db1539233a2a543818cd8a733dcb7c2a33a804d7f6b45cd1d087cd1e665e150ef308e61f49e969477fc1d3f8bd55ba5e9117a274e7e9645e65a3f3d
-EBUILD python-2.7.18-r5.ebuild 10628 BLAKE2B f32e660cba19a249cb56db7b9d8b50f86df80a98df23451bd59e7a620b16262955cd5ffa843cc001a02ccfbce68a7349cc00cd70b545177e4a5d339f5d138807 SHA512 46645265f815014399e7f83b5424dd03285d8eab9c513629243780e5a63fc118dc103c28f4729521b750c0cc105262a58c339decac683d09fa0f019dd64fe334
+EBUILD python-2.7.18-r5.ebuild 10627 BLAKE2B 1d50d2743f31982e24caa2107317883a1a2bd8f83201e7626aa09c744b5cd68436b22becffa1901753673622ab0967fd4d0954d99625571e651fb4e54f5e6aab SHA512 f6a4b0ee545be19fbceace65bfa5286fbca301c4744b923e6a969981d536b955a494bb71f6e9f271ff5dab9efd3cd95d2f48e5e99151c3601ba089f16c67b335
 EBUILD python-3.10.0_alpha1.ebuild 9548 BLAKE2B 7f7fadcf9b5f9b09764229ee2c1a4d5be6fc4bc90da7555cafecb16d2690df9098cf28fe3bb719533ad9a608424ed389b17518091d130cd9e0ced7bcf3e787b9 SHA512 fb0e052eef6ba52360903b4112f30f1ea255ba9a56061079124fd7a6379ddce708efc1d2d9241f268f370f0c8158532a83e014d305c469e643ed74392181a301
 EBUILD python-3.10.0_alpha3.ebuild 9548 BLAKE2B 7f7fadcf9b5f9b09764229ee2c1a4d5be6fc4bc90da7555cafecb16d2690df9098cf28fe3bb719533ad9a608424ed389b17518091d130cd9e0ced7bcf3e787b9 SHA512 fb0e052eef6ba52360903b4112f30f1ea255ba9a56061079124fd7a6379ddce708efc1d2d9241f268f370f0c8158532a83e014d305c469e643ed74392181a301
 EBUILD python-3.6.11-r2.ebuild 10610 BLAKE2B d9074e767b11ed420c843665b87c466f0014713221c0db4a026fbd91a39debc69689a1674db8a0c0b80dc3eb8df7bc86fe92972918f4c95ef8a52da2936bf631 SHA512 693795866815e724267877e4f97e14d09eda9f321b5c2b481f54952fcefc0859072ab42306eb03b81bd8b3e0a2d71435367452330caabf6bfebbcd2062d1ced0
diff --git a/dev-lang/python/python-2.7.18-r5.ebuild b/dev-lang/python/python-2.7.18-r5.ebuild
index 96ab96cf4a88..a9a3f73e8e05 100644
--- a/dev-lang/python/python-2.7.18-r5.ebuild
+++ b/dev-lang/python/python-2.7.18-r5.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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="-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.
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index f344f17567c9..dd474c87ea32 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -9,9 +9,10 @@ DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912
 DIST vala-0.46.10.tar.xz 3417400 BLAKE2B 2f78de3e198f994a148e7ed4c82ef2417b70c19af3ce1874ee80aa7d0160691a50db24ad4898a04520e91d67a41bb508d3854ac2f4d90d2507a5a6558854716c SHA512 ae3734036f6a1b7088bac45083b75a49eee76947219f530493f81aa4ee60807cfa5424cf1b982d8d8f28f56119d66f06a9150b67884d80dd4b6724e152e32e62
 DIST vala-0.46.13.tar.xz 3434196 BLAKE2B 49b7e0b776e185653c1b8c00747a150ceb42cf89006fd55d37e3efd0824dace379d2c72cdb45d481b0545d0b4b37299bc6161b2d083d3221d2d8d8ca7c10d6dc SHA512 6d8d1acebf4706346d5dc986f5c900cfda929ca59ca3f3907cff56892a496bf524b1f74032ac6c8587b236a473124e15c6f83f949636e28141a55c8abeddf004
 DIST vala-0.48.11.tar.xz 3487944 BLAKE2B fe47bba9ddb31c469d63d9ca32d631901d59db19c417d864088bc33aa2845d388e762ecc39b2d9574aafbfc501eb61abb3604e07754b2d8eff63d23c53f1eb84 SHA512 6ddad88ab4d2a34352be9ce0a0c13dc3382ebcb494c08e2531a0195aad21a80db70e7dc3ffd2d27ef03a4ca30ac2bf31869521489ffd95fc520c4085362fc5e7
+DIST vala-0.48.12.tar.xz 3492200 BLAKE2B 0a401ac4349dc1c628fa608b5a89504583d6d2bb05ca74eb507e766cca418121e14adfe6e8cfeb8f42212c717280b9b91426309df415d869896654be626c46c5 SHA512 da7becf8b92985a07b139651c14bd41ec86aed3e2b610029d2b376f70335c98607f39de4a1fa4efe9d51e6088edd4c13d22431cada389679d55f684ad548f4d1
 DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
 DIST vala-0.48.9.tar.xz 3472540 BLAKE2B 1c85b5d9a1f3819d5b26b521c7da423adee313b2acacb354e324abd9ccf24707dcfcd1a455bab867043f674c4daa5f1a62210847ac271dfce09a288651220f53 SHA512 076fcbea34dde1a84c15e4e2b6acd009c2fea578d48eb28a99a604eb4edc8bb53ac6883ca93ec906968d43d4b341707abc730d6ac8a7b3682a2fa5f0030d5256
-DIST vala-0.50.1.tar.xz 3508924 BLAKE2B 4a6acd2ac9e098e8da9c1264584f02a22429ed096292ec8baf4c9c5ac2d0be4bf20c6c2eb6a41e31295461e1a7e0929c471512e435245c04228bf67c91f372ed SHA512 2f5d0bee6dcac3031108fffaa3a9a0339c8c79ff92d1824292f266a704bef1cf4f9eed15ebf424b608f09129b3e0577ed8cd7798a4fa12bfd9d06026909de769
+DIST vala-0.50.2.tar.xz 3514208 BLAKE2B f2f7e86b90ac1245d593ba82204667a830843e2fdb8e9a5afaa44453a146461f0ce2b9f9338ef4743bc6055bbce6c023ae92f0bf2ca66757cddd7fc3d7a4db63 SHA512 77069b53037adcd4c3fed2dc4a5c740216b950c52e8a0ed777a5cf9a5d9f078d0abbc4dbce08e122817cd3de0ac75ebd150b0f6f0b0cf4a09cb4a46f96bf4c3e
 EBUILD vala-0.36.20.ebuild 801 BLAKE2B 28a0b45feb749184a38652c09c10e4e10fa89e13ae613394fc89395244249783d5d66e63b9a808a3d2b6d0585f6f03c70d418874ab103032502df7830e64ef0f SHA512 fb5d44393b0ecb62098873f25f16ee9f9f2b268faa5524268923ba88258ada9b6e9d74f3ab4d0d9c11d1972d869ae1e97bae848f4005ebbe29069219a4078d47
 EBUILD vala-0.40.20.ebuild 1188 BLAKE2B 9754e3990f8b9d97a9db2d475a8338dbad1ac0daa74118a4966d08709bbb8d713817ae4a163bdc79ef2ce26aad00e633418734a2333a4e2c72b8a10b6a53d814 SHA512 d55a8a950eda084f4d527d090fa768436808922b4adafbd756cdaed73fb7214d9a1f74c77fc1c0d232e3dc6bd7548ded04ff3fbe566c609c7c2677404e757636
 EBUILD vala-0.40.23.ebuild 1189 BLAKE2B 42ec55f24d20afeb5c3e268c5491be25084e9cd6f94e306568e9a0377c0e2a3197b4a5da9ec5108ce39433d31a339075a26485546d59ce9bc5a845f6efc40500 SHA512 18066dadbb427a8f494fd28402bb3dc71752209f47432e29fa9935c82e8a9f417eeea6fdb5b6e63a2f95ffdf6fae8bc133aa1ac1e79f1bd8ba9a2cb3cf97ffab
@@ -20,7 +21,8 @@ EBUILD vala-0.44.11.ebuild 1110 BLAKE2B caa359b186daa04e09b9f3c2185280dfedabd842
 EBUILD vala-0.46.10.ebuild 1304 BLAKE2B 00ff3c6ac28fd59d5a914c4702bfefcb4885c6147dee21ab99bd1f0179844a2e2f919cbb7e1681a44d09a121d3e00ec518a705b3dd11c66158b93462ba6a9ebc SHA512 a014c280ed597aeacc6c1bc754237b6e9d53cc323968aad50c8d1f6c398cacb01319916d3ec13f987b25210aca84e23f1a69a4e7618cda7e4c9b3f4fc1eee237
 EBUILD vala-0.46.13.ebuild 1303 BLAKE2B 9eab2887ca949595c7673fb81cd9066bacdcec0a3a3608924ae7d42ce38f8c60609a7ea641d48e379ed882908743d4dd3b62401ec1f97ba12992b5a8ff755efa SHA512 a7d042b51962a8e9d921d2dd04bc4dc6a3e6db4061c894aad3eb60bd142c655f1982f3277224ed85107ee1b20f8d407c2c2f836885f446c9392203cb08b103de
 EBUILD vala-0.48.11.ebuild 1312 BLAKE2B 2a5c969f40a6f1ec8869e5de0e41e16ee78db748069bc0016e9b5b5ecb1dbc2be307995939134fe36a37b94e4a89284478d4704c04f32db9ae9c0a2786b875b8 SHA512 7354b9ffa72a263f0035b6803d6ab4071c7870cc90a1c9a57355ca637392420e78be6d5bedb866f327a522c0f852f1c78ea798ba66c62f8b5753fac9ec21a969
+EBUILD vala-0.48.12.ebuild 1312 BLAKE2B 2a5c969f40a6f1ec8869e5de0e41e16ee78db748069bc0016e9b5b5ecb1dbc2be307995939134fe36a37b94e4a89284478d4704c04f32db9ae9c0a2786b875b8 SHA512 7354b9ffa72a263f0035b6803d6ab4071c7870cc90a1c9a57355ca637392420e78be6d5bedb866f327a522c0f852f1c78ea798ba66c62f8b5753fac9ec21a969
 EBUILD vala-0.48.6.ebuild 1304 BLAKE2B d90e05ab7274beb9ce6e4893527ce84e9e57d1687a88f71e4a890609d42761bea1b59d718a6cc3c03c7782fa4f10edd0bdbb7b54b045c9e902dd8fd179f18187 SHA512 12e9eea51d27a9863f8697530d4c6b6d8ec352961474d1772823a55facf2cfad18c9d727fcafcd70ae3862e4d52f0315735d983c50bc5a52c8fb33b55c8d1dc8
 EBUILD vala-0.48.9.ebuild 1303 BLAKE2B 432d720113f6d171a8131562c9182d55ae92870855b39dca906eb8db9e76371c5b463a3408a9d80242592e5d3684307fb473a371de4b62f53ef4b6ab3c1ea520 SHA512 7966b7114fff3b3424095fb655f1f6181c8cf8893c2b5d24fe59e8ac3566d23553531e93bfe59f6990dc46c43a43019c062a17b7e38ace70509ecf2a3fac5636
-EBUILD vala-0.50.1.ebuild 1312 BLAKE2B 507ce10645273e1b88b85552e019ac819425b5b483fb0ae2d711d8632e4d6c01da13b9a263455e876634aa9671713dc3b88ec7abe7c8187da3d7430ee75f7d29 SHA512 2d85349c7a4ad95d79e44f4c4fb259edbe4f83e44ceda05ad22d74f2fab9d5d745465537aa6f1a06e771f062a4f19d72f597ede88c4efa52bae9627d60c565e3
+EBUILD vala-0.50.2.ebuild 1312 BLAKE2B 507ce10645273e1b88b85552e019ac819425b5b483fb0ae2d711d8632e4d6c01da13b9a263455e876634aa9671713dc3b88ec7abe7c8187da3d7430ee75f7d29 SHA512 2d85349c7a4ad95d79e44f4c4fb259edbe4f83e44ceda05ad22d74f2fab9d5d745465537aa6f1a06e771f062a4f19d72f597ede88c4efa52bae9627d60c565e3
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
diff --git a/dev-lang/vala/vala-0.48.12.ebuild b/dev-lang/vala/vala-0.48.12.ebuild
new file mode 100644
index 000000000000..1f7c05bd15c1
--- /dev/null
+++ b/dev-lang/vala/vala-0.48.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.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-lang/vala/vala-0.50.1.ebuild b/dev-lang/vala/vala-0.50.2.ebuild
similarity index 100%
rename from dev-lang/vala/vala-0.50.1.ebuild
rename to dev-lang/vala/vala-0.50.2.ebuild
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c93eb93dfee4..78d5d2dcdfd4 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index f83c612d001e..b101ea201154 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -10,5 +10,5 @@ DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb82
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
 EBUILD apr-1.6.3-r4.ebuild 4375 BLAKE2B 90b64f9ff2c75943dc1e3af995f20da04d39f5eda30a11af369c29c5abfe7fd81fde013556bf39b9c12977fbaf85b8c4ab48276acb59fe49bbc720d19cc71a91 SHA512 fb52c26e6b03dd7451530d4197b09fa4aa77d423dab40b5e99fca39f31c846e5f938dab13a9388c55041425585acff58cceaec341638ff24e6c223b3177ef6e6
 EBUILD apr-1.6.5-r1.ebuild 4323 BLAKE2B 938bf92a460eb858b5a904e35fdaea447c8555ff4f2e8773469ae3dbaa455c1d3bd106db6139d09a95fb832fe6c785ef8d2edcc624a890031370957c43695849 SHA512 92afea5a9bfe44ad89926b62989cd4910c3f53b906cd89f15c9be9ef79e82ec1a825ce24fec0015888f95ff6bdb4f5954dab08eb67257b634f44a05cf8abebdc
-EBUILD apr-1.7.0-r1.ebuild 4231 BLAKE2B 12bd618f1b5fb3a8428184f33c19498cadb9f92addcbad9508973087e94e5af3aa98dc7d1cd925f24d073889750046fff31ccf0d70e97f0f5d55ba20128c8e3f SHA512 5122c27eff77d364e5cd05db6f4fcf4c6eb2f5ce4315cd97fea5787328be118b0eb4b5fa5df36b25f41335261677446c9dff2206ac1f58bad7828ab6b055098c
+EBUILD apr-1.7.0-r1.ebuild 4230 BLAKE2B 48e60097117a82e2ed54c76db9459c279ff6027a37a117b31956d301d8d2bac667e7172aa7594cfaf5b6c6214859bda7929a80615d0671707d334992e4015b32 SHA512 95b3159d75de6da4f969572877ceca635b63eec2b6f396acbf7047dee130ba50d0e42e7483decb2f21caf68c3dcb500efc2190bc61777ce759a983cf7f727104
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 3eb682d0fc11..006d3ad66017 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index cfbdd6513ee3..a2d9d5b80289 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,7 +1,5 @@
-DIST Botan-2.15.0.tar.xz 5920688 BLAKE2B 1bbb9cadb0f754194851bddf8b14dbcd291285c5f3fbaad35920277a11c3d9e1b1e5cc484c0d37b1c7999b3084a1c90da56631df0b07e788372b95aff5197031 SHA512 0965a0a6141df44e38bd7da038b89dd2b3808ed9a4ebaafbf089abf60718e62cba78d7b64eaf272b5df8c5a489222e4cad4fb511cde38e76cdaed87f35896c18
 DIST Botan-2.16.0.tar.xz 5938644 BLAKE2B a4b7bb48aee0dbf0f8b81a407b6a39707c3e6040a2bb93f9c34208ab87ea64879b2e56af66f090a73d66b64156e333c89e490d206e666e665a5eb4fbcd98d13e SHA512 12550425c695119d7f448a47b7956565de373e1bc86b8fdfa0a2a5b9fed1ef93a36101b6480e7a2f78e9262c988904c353fa021b681543691d09bf5b00495bd4
 DIST Botan-2.17.2.tar.xz 5940964 BLAKE2B 009df11c9d4379a15a48697554a82df3baffad0fff98af995f9a5b9b3223e4db42837650d41b7081170b07fb70d62ab347c5577ef2480a8f7011b40e1cf1764d SHA512 fa9bd30d02540c4544646971c7b82d3873f32362668d2496b4bc1a92f47d52f75ec9533d5848a7d8e9b9077c7ae2866b55d70d39101c705eec0edf9dbf01d6cf
-EBUILD botan-2.15.0.ebuild 3091 BLAKE2B 2da5cfb879e65537227b0a6d524c30f7ec186a41a3e71797c4a57dd3b85013c10ddb60d8f5ddcadc02418978292be393d71b8fd2bd8521f13578c0234964768d SHA512 6f1bf731cb1a704cf6e40d5bd7fe36ebeb7a3690303f10dde754ffcb3eb0ab47dd2ca04df8d114662df5e35a55cd2292f5d061463d707c38052d3db6e6ecb1ec
 EBUILD botan-2.16.0.ebuild 3089 BLAKE2B b75fc14404acbcc0d1e88278e47283ba0655c318c393deea9b4d26020e7ff45e892beb26d2fee90aec797c34a8c4caa4ca46acd920d434c3f7c89ad3476c6ea3 SHA512 5a8813e00f96d2201dea7bf5c1d10043180a59cca1217b7cdf291c65c1529069e38451b30569c4727af6e548ccdc103c2617d6e6275d703d0ad5835172383730
 EBUILD botan-2.17.2.ebuild 3096 BLAKE2B 1708642bd29b845938675e193b4dbad68b72395116a10ae4eb918c7bda1a693e9659aa11ff46593ddf8ced6c077e98c454e5a0d6ac16f77bc7f4bb685348a0dc SHA512 27d13a9582cbb9b0a923419bfd4b5eabe4126d18bf0c3b226443278aa9e7c742cf409b002e581636e1dbe6437bd5a018dd7829160fe818b220f8fc46c6247989
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.15.0.ebuild b/dev-libs/botan/botan-2.15.0.ebuild
deleted file mode 100644
index b0108d71ae26..000000000000
--- a/dev-libs/botan/botan-2.15.0.ebuild
+++ /dev/null
@@ -1,132 +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} )
-
-inherit python-r1 toolchain-funcs
-
-MY_P="Botan-${PV}"
-
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
-LICENSE="BSD-2"
-
-SLOT="2/$(ver_cut 1-2)" # soname version
-
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
-IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	')
-"
-
-# NOTE: Boost is needed at runtime too for the CLI tool.
-DEPEND="
-	boost? ( >=dev-libs/boost-1.48:= )
-	bzip2? ( >=app-arch/bzip2-1.0.5:= )
-	lzma? ( app-arch/xz-utils:= )
-	python? ( ${PYTHON_DEPS} )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	sqlite? ( dev-db/sqlite:3= )
-	zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# NOTE: Considering patching Botan?
-# Please see upstream's guidance:
-# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
-
-python_check_deps() {
-	if use doc ; then
-		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
-	fi
-}
-
-src_configure() {
-	local disable_modules=()
-	use boost || disable_modules+=( "boost" )
-	use bindist && disable_modules+=( "ecdsa" )
-	elog "Disabling module(s): ${disable_modules[@]}"
-
-	# Enable v9 instructions for sparc64
-	local chostarch="${CHOST%%-*}"
-	if [[ "${PROFILE_ARCH}" = "sparc64" ]] ; then
-		chostarch="sparc32-v9"
-	fi
-
-	local myos=
-	case ${CHOST} in
-		*-darwin*) myos=darwin ;;
-		*) myos=linux  ;;
-	esac
-
-	case ${CHOST} in
-		hppa*) chostarch=parisc ;;
-	esac
-
-	local pythonvers=()
-	if use python ; then
-		_append() {
-			pythonvers+=( ${EPYTHON/python/} )
-		}
-
-		python_foreach_impl _append
-	fi
-
-	# Don't install Python bindings automatically
-	# (do it manually later in the right place)
-	# https://bugs.gentoo.org/723096
-	local myargs=(
-		$(use_enable static-libs static-library)
-		$(use_with boost)
-		$(use_with bzip2)
-		$(use_with doc documentation)
-		$(use_with doc sphinx)
-		$(use_with lzma)
-		$(use_with sqlite sqlite3)
-		$(use_with ssl openssl)
-		$(use_with zlib)
-		$(usex hppa --without-stack-protector '')
-		--cpu=${chostarch}
-		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
-		--docdir=share/doc
-		--libdir=$(get_libdir)
-		--os=${myos}
-		--distribution-info="Gentoo ${PVR}"
-		--prefix="${EPREFIX}/usr"
-		--with-endian="$(tc-endian)"
-		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
-		--without-doxygen
-		--no-install-python-module
-	)
-
-	tc-export CC CXX AR
-
-	./configure.py "${myargs[@]}" || die "configure.py failed"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
-	default
-
-	# Manually install the Python bindings (bug #723096)
-	if use python ; then
-		python_foreach_impl python_domodule src/python/botan2.py
-	fi
-}
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 6e9ed6cbc046..a2976a069482 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -8,4 +8,4 @@ EBUILD crypto++-5.6.5-r1.ebuild 1508 BLAKE2B 414f8076a72da047953f6153e867ba9f3a4
 EBUILD crypto++-7.0.0-r3.ebuild 1055 BLAKE2B 227217e396ccaa5da08fc2ab159f0519cc9ec0d9283a480d2f9f8f9fa1861fdd7d99b20c50ed891fb206faadc770d77fb894d6140ab15e088faa2ed57a439c17 SHA512 46579432b7c764ff592ec94a5d744aad6f1a9453dc2a4583dc71872fcf52260052d8e3edf790364b7eb36e30ebdb1459ee6fe9400fb62881fe81c5ecce96924f
 EBUILD crypto++-8.2.0-r2.ebuild 1734 BLAKE2B 75558e27ac641842302bb1204ae483852c71b65741de7f426c415b15907ae1b20515c0e9f2518248884003157b4eabfca8637eba01ac2df7f0c26be77074b454 SHA512 7d75f266de075a6410ef26999697db14c76ff8b38316afa227419c1532b63c62a70a9cdee67684cded93b12aa49e592be1ba7c0f9ef81666fb95c692d2b99587
 EBUILD crypto++-8.2.0.ebuild 1100 BLAKE2B 2f84080a48c493a2c6ecb94c5b59a24ef253ceec47bacf364fb81e3ef9a79254c9171f62199087586a853cc21da3febda660e4c0601974ede860bff18ed5f8b6 SHA512 01afc48b803f776c94836a762f7a6734f0497922636acacab3063d8f4f9903bab0173e87467e3dc3364a51789537c4561761353497b55585382e2cfbb9526622
-MISC metadata.xml 428 BLAKE2B 6ca5f3c3550c7f7f20310c7dfeedc7925110a37d7924b2dfe7f34e3e6be5c3f2fa514135490bbe67390a4041bd81b3096dc21993978de631bf45f88f8ebbd3a6 SHA512 3c656067d4fef5353733a2c3ac3ca3798a0c57e8863e4479c304b4c5f4c1f1100f14b1188244b4f5125daf0ba1c9f5dca79e0cd0270cbff0001628511125e18b
+MISC metadata.xml 505 BLAKE2B 8c1bfd20c9717c7b410af1d0dab008327049437c0c3a046bd3d3d79cac08cac11fe39c29eb933ce5dce3b3a7b57c017367d486b0c1ed70c78496b61ae0ebf981 SHA512 1a4c274988ad19a49919d882eb403c8bb75ebef7ebdc6350e6d705ab6abe672bb6ee32e8be71dbc52c3b71cdd84aee6b7b44e0a42b571de2480b7b78fc871253
diff --git a/dev-libs/crypto++/metadata.xml b/dev-libs/crypto++/metadata.xml
index 4c8d518abcc4..ed5b7931ce10 100644
--- a/dev-libs/crypto++/metadata.xml
+++ b/dev-libs/crypto++/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="person">
+    <email>sam@gentoo.org</email>
+    <name>Sam James</name>
+  </maintainer>
   <use>
     <flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
   </use>
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 36c41d0b89d9..436b13c13e29 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,5 +1,5 @@
 DIST fstrm-0.3.0.tar.gz 185153 BLAKE2B 1e1e16792288255c1d963f2831b6f362d08a343cb58ae7ae8e24c5d9a70d870b238c399b9f2cb30da939dbfbf5faa49a61609725036113e579f2c7d63a36e599 SHA512 4134da0ed8579cb6784a419bba76b3be7487ec67b6fad65e0e662b40e668389010381176794d15da9c96339292f0faedc143f87b7ef3815b69bbc8b165af5c4d
 DIST fstrm-0.6.0.tar.gz 135214 BLAKE2B 237b371450ea2e92e466aaeab2d6ebf9ba7c6bbf14d1517431818b01a2609c1765299bb576bb3a4a3a99a9ce7644992c3f5eaf82c01d903a1bad358d49ed47b4 SHA512 8e327f40fb49b36998d8bb9353b30b9924630b85adf1e4462ce4b456daa7eea727892a59f43ddd48de5bf5059a450fef54726b09af6d7f210fa182c4055d65f4
 EBUILD fstrm-0.3.0.ebuild 803 BLAKE2B 52f8d34804c41344d3414cb9b07e476f49cef9f6e41db960e33fce21d404cc011ad97b92dee7288e868a12e10020a16e328b805c320c4395fc7967411faec988 SHA512 9d81084901f1d029c9e62117e294b1f6985870928db5f8aac00d71449874b67a378d5d3f7d46503ce8eed22ea916eefdf4e60142059b092addc9dd7a0dbdb829
-EBUILD fstrm-0.6.0.ebuild 828 BLAKE2B a7b481fa2a227491417d4d09e6d540c6667caef22343663f442b22500691f8ab21c86d94fcf9ce8415a5a9a2e04b1b861ba37fc865d2ef7bf7dc6bc4d4bc3bcc SHA512 1c8e905ac28673f0e881a5c57e0b4ef78b2c6ab335d95927a287f8224cb9b6ba257cfc3c4c279f1d6e48b4210469cba6f441482449dc331dbb9ce30eabc8017a
+EBUILD fstrm-0.6.0.ebuild 823 BLAKE2B 9f7199b0abb553b95cc6acd025e60c433322b747a179a6e228926238ed4532dae564cc44b717ca8d3a91a89ed0c1717329b1a4f57bb779f380d47b55175c5cfb SHA512 4dc401e6f451defddf2b5b154344f889ebef17717e88a710a7b3a83ece9c2b80dee64be0e9b9b4034d27f355a8e978192eecca16c51650f863cde070e1d29055
 MISC metadata.xml 321 BLAKE2B 4513b4f120d44149f4419f74664e9f345f365c4f6f3938f9c751021ce00a2bee3c1f655b2c47113eded5f743dbc8c8968f7e3fba76ff71189e4026777700724a SHA512 a2bd9cbe2b311f26fa6bb62aa783fa8577f0e07d6e284370c787386e08b6aaf98d4f5bf655f69283d864b0e7a7fe847c75142ac67ff12dd93596f9ddddcbb065
diff --git a/dev-libs/fstrm/fstrm-0.6.0.ebuild b/dev-libs/fstrm/fstrm-0.6.0.ebuild
index 806ef1cc0cf3..7f3c9880c50f 100644
--- a/dev-libs/fstrm/fstrm-0.6.0.ebuild
+++ b/dev-libs/fstrm/fstrm-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/farsightsec/fstrm/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="static-libs utils"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index e3cbf697b72a..88974b280b7e 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -4,9 +4,9 @@ DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005
 DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
 DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
 DIST glib-2.66.4.tar.xz 4838124 BLAKE2B de2b8690c9ef9d66378b396ec0abe2bc83380654b3ca2e221678fb6dc9bf449c544a7e2b2a662739f7b400e9ce0a5a0af115ba2f06b8f5597967e518fdec4937 SHA512 b3bc3e6e5cca793139848940e5c0894f1c7e3bd3a770b213a1ea548ac54a2432aebb140ed54518712fb8af36382b3b13d5f7ffd3d87ff63cba9e2f55434f7260
-EBUILD glib-2.62.6.ebuild 9758 BLAKE2B ad374e654c1afbe60c8b65e04cf1934791f8c487a3881b82deb0684f0c903e4d7a4e08c954f325a896a42f935634ecc37d764ad6e16a4fcd6b1a04528aaab378 SHA512 bf35ad4fa21d1d9a7e1bd495a800d67fed2aca2f5002cf8df58523ed980abb05b076d19382274556a99a72fa4bf4a796d693534b19ed4e309fb642e4ed7f0feb
-EBUILD glib-2.64.5.ebuild 10340 BLAKE2B cd7a783302d17fe7804354bf5a64e5d912d978431d6759624d0721e1f7acbd294ee824f397fb0f2a4a3b7fd01d240dee92217177566a66e982ea6d436a7a1969 SHA512 353274e00044263633096844343b2e029d48ab7fe9ab1c8b9549ae89d6bdc501258bee4fb8651a259c118f3a5aaefbfc49683de6289d60e74da2009519861e2e
-EBUILD glib-2.66.2.ebuild 10454 BLAKE2B 204dd4544642d4cce4981bc44cddcb17cc13712d971e9d3a3d8e56b451807a47b91b2d200955a7c27261bdd587dc0259ec537b2ebe9b065785d09bd762366293 SHA512 696011bd3cc46e3ea4a3daa784e39b287aac2da934b395ebaccbe36c22a7fb309cd293c8307a0c5b92a39b29cdd9ad3828f343489ce65ee7cef3727a87b5f9ba
-EBUILD glib-2.66.3.ebuild 10450 BLAKE2B c1e96ebe1ddaf053feeeb70869d00ecfbe5c538a9a6c47d2b58030b2cddea851c516d8c786dde43ef2e95b1cd7a1710bdc6bd4a8e261d3fa643e8ffcea41e732 SHA512 31b186d9c63a842e599b8beca4236fb7a938a4ca60b08e15032b189f14856d20864048b947d6bc45d1cb3381c1d419efc6c7df03510ed1d0687a9185901fd1c3
+EBUILD glib-2.62.6.ebuild 9415 BLAKE2B 7f93a93dad98ab32e56f8be3d547be1050b50dc88898ed8f59fc882d1103df2a476fb52b12d2c0f4163e0d46d58c3d2786e8b9030e684eccc456519bc4b24a67 SHA512 108f2c940b9bff4cdaa06addbd2b26073a830000c475b0bcb29c9ea0846d9eede3151995b20ba66ed344caf48470f5e997961266142162e20643398cbd57d009
+EBUILD glib-2.64.5.ebuild 9997 BLAKE2B 750961837d1573cccee0f7d304fe4ec9d4f658c1f73cccf6d38be0b0adb7026f6610c4187433fd136717aeed5422d30cb0371d8d13cf098c4e6850ca5d531653 SHA512 8e99667971bc2ea84cc63a77dd2314b4c2345c29a230d76d14b6e30c1ee6bb0c34b56e069266f9e9d11ed65749da988f6372c81ba4013de2951a45e944134ed8
+EBUILD glib-2.66.2.ebuild 10111 BLAKE2B 3f06797786070fc3a02b4cb2dfd529fc926b41054583e41163d9151f323341e2f58870a44688546e550f71a4857f10bc69a9e99fbe5bd244d0f1ebcd375ba869 SHA512 9153430dc81b6cfeee1ba90bfb4d8e484b141363897f2f57143b15f5de3c76062929ff7d311f0c1979eb2c6b180ae330e63eaa15dac74afd2ae20c9356498b7d
+EBUILD glib-2.66.3.ebuild 10107 BLAKE2B 1acfd9e0aa0237b8f78c8dc1ee1d1130c8a25450684c969c5d3da2b5135ee09488e9a4651c94600d74c93d3bcd7d49480f0b0c9bb4e831ba6f6b7f51a35275dd SHA512 5d96e609c366e369b51b88a9b42d98b61f11572ea190b0f1e8b69f7ff3c785727ef8c83b6019b61cb9b53992f9e50740570a2daa97dfc3c9d0e1b31c5d101c44
 EBUILD glib-2.66.4.ebuild 10450 BLAKE2B c1e96ebe1ddaf053feeeb70869d00ecfbe5c538a9a6c47d2b58030b2cddea851c516d8c786dde43ef2e95b1cd7a1710bdc6bd4a8e261d3fa643e8ffcea41e732 SHA512 31b186d9c63a842e599b8beca4236fb7a938a4ca60b08e15032b189f14856d20864048b947d6bc45d1cb3381c1d419efc6c7df03510ed1d0687a9185901fd1c3
 MISC metadata.xml 1098 BLAKE2B f2bd17f50d68c553b9040e954c0ef91edd29a3f1f7731bc7f45e3a936f702209985d111ad376ca0b51bdb4736d9ee508151fbb57b273a32beb1148aa027226c6 SHA512 2745b70b29ba0517144343f5d3f4b7c3389200b1ecbd2830e29bd9a90ca59ebeedf4d66b26a3241e3d3a3066f9a26ae223d075b9b2b82d67e4642e784f236c20
diff --git a/dev-libs/glib/glib-2.62.6.ebuild b/dev-libs/glib/glib-2.62.6.ebuild
index 57adaa590548..654ff3b9d44d 100644
--- a/dev-libs/glib/glib-2.62.6.ebuild
+++ b/dev-libs/glib/glib-2.62.6.ebuild
@@ -250,14 +250,7 @@ pkg_postinst() {
 		gnome2_giomodule_cache_update \
 			|| die "Update GIO modules cache failed (for ${ABI})"
 	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
+	multilib_foreach_abi multilib_pkg_postinst
 }
 
 pkg_postrm() {
diff --git a/dev-libs/glib/glib-2.64.5.ebuild b/dev-libs/glib/glib-2.64.5.ebuild
index 0f1b0aee616c..6e3a6137257b 100644
--- a/dev-libs/glib/glib-2.64.5.ebuild
+++ b/dev-libs/glib/glib-2.64.5.ebuild
@@ -257,14 +257,7 @@ pkg_postinst() {
 		gnome2_giomodule_cache_update \
 			|| die "Update GIO modules cache failed (for ${ABI})"
 	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
+	multilib_foreach_abi multilib_pkg_postinst
 
 	for v in ${REPLACING_VERSIONS}; do
 		if ver_test "$v" "-lt" "2.63.6"; then
diff --git a/dev-libs/glib/glib-2.66.2.ebuild b/dev-libs/glib/glib-2.66.2.ebuild
index c7debe737f8a..af3ca09f98b1 100644
--- a/dev-libs/glib/glib-2.66.2.ebuild
+++ b/dev-libs/glib/glib-2.66.2.ebuild
@@ -259,14 +259,7 @@ pkg_postinst() {
 		gnome2_giomodule_cache_update \
 			|| die "Update GIO modules cache failed (for ${ABI})"
 	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
+	multilib_foreach_abi multilib_pkg_postinst
 
 	for v in ${REPLACING_VERSIONS}; do
 		if ver_test "$v" "-lt" "2.63.6"; then
diff --git a/dev-libs/glib/glib-2.66.3.ebuild b/dev-libs/glib/glib-2.66.3.ebuild
index 10400fd0dd1f..6d419aa86b68 100644
--- a/dev-libs/glib/glib-2.66.3.ebuild
+++ b/dev-libs/glib/glib-2.66.3.ebuild
@@ -259,14 +259,7 @@ pkg_postinst() {
 		gnome2_giomodule_cache_update \
 			|| die "Update GIO modules cache failed (for ${ABI})"
 	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
+	multilib_foreach_abi multilib_pkg_postinst
 
 	for v in ${REPLACING_VERSIONS}; do
 		if ver_test "$v" "-lt" "2.63.6"; then
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 4b40e3151abb..96b0a0d692fc 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -4,5 +4,5 @@ DIST gmp-6.2.0.tar.xz 2012444 BLAKE2B 928141cf7b0b70f78b66e7bc52aecd39a5fc30e886
 DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
 DIST gmp-man-6.2.0.pdf 828998 BLAKE2B 0bf56bf0a6f1aac0e1fb9a5a37552f846a2d4a01bfd3f5b5c531d42a9afc48c19552e08971785805f59e3f2a5fd89e3f986f841dca2e340813596cfd76574e61 SHA512 25d129efedd329cd2d4535557c6912191f587bfd8ef028618b4ca6199ec7bf7a9ae862e7f5e5b5448c86888452a39fc7bf95cf9c18311858dd1aa9ae1c716239
 EBUILD gmp-6.2.0-r1.ebuild 3008 BLAKE2B 32304976b7a0c1c8d8dd5cde7f0b30b41e3568e40fb3b22283fcd87df5e9fca03224dc0f9a5ef31040df914c499070edb9664c34db3534a1d8b5662eef90a564 SHA512 1f007bbd5ebcfe296cdc58db07a96a64819e4e9b2354b3480580b905f458a90e7756157ba9dc88f34dd0b556c0e111956164d477285ce299c134decc166e8124
-EBUILD gmp-6.2.1.ebuild 3090 BLAKE2B 649e43d598437975eade390df11c295f0525af1f68f906bbb5b9fe8a7d13fa17755c28d1a15724bb44f58eefa22df3b219be22200dfd7815423126f4163aa206 SHA512 5ab0d2e36e55fc4373bb2224ab6ea6f86f049973df60c95d9cded1a7d2d8ba6ea40044213332ebd24d26e2671257ce05e8c135014580d563e3b0b16bbbdbd81a
+EBUILD gmp-6.2.1.ebuild 3084 BLAKE2B 50c511142aefb4514ab3af7c0f55b338e9714eb7035465c11681e02e16fcdbfa522015b0e1fe0439989716c36fe19d1887efafd62a26b61c753a29c262cb39da SHA512 dace8a2a8e26b69e259d18f68603168a9af8f55e2637f1307b6edbc7e3c8fdbd71aa5568dbe7bf8434acfcfa43db30377124d8e0d41e733b733c5282749163de
 MISC metadata.xml 523 BLAKE2B fc919502e81ea5a1a169284b1782a8044887082e485cfb8497eef7c4cd5cf6c2170818ca6a60b43d90d92eea03f82535a58e72346ba3e8eff240a3a3be4a7f99 SHA512 ea63c1b90851f602787ff84b8e6dbc51f56bf9e5c724ff4a9e7367af83ce8d2d8d0a17770c29e23d00167cbe033292b614195912bd40cb404824c4d22bdda82b
diff --git a/dev-libs/gmp/gmp-6.2.1.ebuild b/dev-libs/gmp/gmp-6.2.1.ebuild
index 85f0e1d3160b..84c3a6978e1b 100644
--- a/dev-libs/gmp/gmp-6.2.1.ebuild
+++ b/dev-libs/gmp/gmp-6.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-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="+asm doc +cxx pic static-libs"
 
 BDEPEND="sys-devel/m4
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index 1932eb5329eb..d7aebbac85d9 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -4,5 +4,5 @@ AUX hiredis-1.0.0-disable-network-tests.patch 1760 BLAKE2B 9e2837834e0e7b0411ad4
 DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f
 DIST hiredis-1.0.0.tar.gz 97507 BLAKE2B 247852d53be96e36dbdd7d4d8cfbda4406aa66281f26c28c3f80ab4593679122fd59430b2d5f04d20126b4459fc75af0a1fd67f1ee1db691d8db575debad2b61 SHA512 eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69
 EBUILD hiredis-0.14.1.ebuild 1891 BLAKE2B 6a726c09ee27e8fe8a1aa11ec7f3ddbfb107dcb6921173999025db849124f63f72943ded24d31a1d419cbc829bd17b07e82239fa8f191e18e353177d6d37855b SHA512 9f0049bf99a2968dbcb122d4ad67b65ce27e0993a47bf26d8928b40f01889de4d3c725ab92b32b1bbab697fddbc08f4563091585dcdd4d1c0f292a061195f43c
-EBUILD hiredis-1.0.0.ebuild 1909 BLAKE2B 1bd07e25cfd34bf388f6a5abdd1d8854997510226e9b3989282e74b3541b9c0118154ccf8402df89c65764193f9ad5c64614df6cf391a83570efc2ab44cdd5da SHA512 e2cefdae93d43e4b338477b83d2092f7d94f0d3310dd15c3a111effb08d1491ba3fddd5028d8c8da11fb5966ac3cfa4d13df4d0b2ec6b591a592220bd51c1d48
+EBUILD hiredis-1.0.0.ebuild 1908 BLAKE2B 6f415c7c8e2723722cfdd0a425bab7a311966cdc90a2370dd8b19cfea1214649db5bcf10e944c19a9c728f7e392412d8a6e2d192230b44fafbe6b0294eb764ea SHA512 3036ed40a03d1c77a3b082abad14ec7dc2e221832af1b8a221a2fdd251a205d221efa8ef15ecd758c4d8b86772cbbb0cb91222f51c592dd9d6601045c8158353
 MISC metadata.xml 324 BLAKE2B 4b317777c17533d9f574064a410d1431dde5ac68fe50b25140f63cd21829b30cede1a4e3d38996eb50de1cc38257a9e5eabb2c2871c1d5727132a698048de93e SHA512 5c81a7e5c915ae46f6d2849806534ee520d413f8ca2f640c7441a61a478652bdc6f0a2501504843b1f07b557c06c0045e92ee87a949e018f7d95884e38faf78c
diff --git a/dev-libs/hiredis/hiredis-1.0.0.ebuild b/dev-libs/hiredis/hiredis-1.0.0.ebuild
index be1b00061713..20d56c4f2ebd 100644
--- a/dev-libs/hiredis/hiredis-1.0.0.ebuild
+++ b/dev-libs/hiredis/hiredis-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
 IUSE="examples ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index f499c0741f5a..058c6701f75a 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,6 +1,8 @@
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
 DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
+DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
 EBUILD icu-layoutex-67.1.ebuild 2502 BLAKE2B e452136b482c356e571acffad2a251bd784425dad08053c0d07f8d844e85e1838600ac60413e4bbd2fc19c654e355dce1609d72b1f89bad9d01f71210e9e80bd SHA512 5ef730853a72505f6d0f36033b128b5de2c3182eff92c3c36607b33d4f6095e96f46419fc9105a32341a2fcfc679ebc1ab5ffe2f1f10542c14b4d13b6a67020b
 EBUILD icu-layoutex-68.1.ebuild 2508 BLAKE2B 9e75c5ef13e8930c2c690ca9957f0613a4b738b40769c2cec3f7c0d184c2e6dbcf8d7eb48977b9e4e362013d8d6efe81ced246be054176ef03a5f733519c942c SHA512 bf0d113999c2e0f8b24bdddf604fe75815c1fc6a9aa9ef183b52a6797b27c547168a35d6ddec57d0f0ded491141296e9ed5e3edef48c36026b7be6bb54b69ad9
+EBUILD icu-layoutex-68.2.ebuild 2508 BLAKE2B 9e75c5ef13e8930c2c690ca9957f0613a4b738b40769c2cec3f7c0d184c2e6dbcf8d7eb48977b9e4e362013d8d6efe81ced246be054176ef03a5f733519c942c SHA512 bf0d113999c2e0f8b24bdddf604fe75815c1fc6a9aa9ef183b52a6797b27c547168a35d6ddec57d0f0ded491141296e9ed5e3edef48c36026b7be6bb54b69ad9
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild
new file mode 100644
index 000000000000..62b585924f49
--- /dev/null
+++ b/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="External layout part of International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
+	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN/-layoutex}/source"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
+)
+
+src_prepare() {
+	# apply patches
+	default
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--enable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	pushd layoutex &>/dev/null || die
+	emake -j1 VERBOSE="1" check
+	popd &>/dev/null || die
+}
+
+multilib_src_install() {
+	pushd layoutex &>/dev/null || die
+	default
+	popd &>/dev/null || die
+}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index b6caaa2948aa..5c34e353170b 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -3,6 +3,8 @@ AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e4
 AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d12941db39980abea1fff2328c112196b62cc89d521e8cc2a1f7c11b58816401a838bb8fcbe50036e80d3d9e4343 SHA512 5d605cc1cbbd16221603a9509d07713d64201f4fc1a372d29c18f8d49a4618fcd7e0a0bb0a459024a288e5c2c339a9aa0849abe88691ee2cdb24b92c9b61e290
 DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
 DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
+DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
 EBUILD icu-67.1.ebuild 3335 BLAKE2B 355e74e20aee373cec9241a9b080f610f8c29461b0636c04767c7132826f34346532b15c45d027fd27708744063efaa7163e65040b8b1612c679056c23a66290 SHA512 30ed94fe4c6fb563e2421921b33d2bc5c0066a80f531337861fb0d1614098d4ea411bc58dccd1873296c2d6e39ff39cea8d8402059135aa5fd07fab18fe57602
 EBUILD icu-68.1.ebuild 3386 BLAKE2B 615a1f49dd938525623ce8f084e38feae5b4155e394ee742028fa3f69ba69ff79a82b8d068af96d9fb2d145b050223e7d31521f32f08ccf344b997fcfe3a8681 SHA512 185c6bf733b5030533dd683c634cfcce13a4966135d7680384946a516fcd5e327268ff941f9d71948803fad1f21924c5049aac992d7b07147ea8167b62f38154
+EBUILD icu-68.2.ebuild 3386 BLAKE2B 615a1f49dd938525623ce8f084e38feae5b4155e394ee742028fa3f69ba69ff79a82b8d068af96d9fb2d145b050223e7d31521f32f08ccf344b997fcfe3a8681 SHA512 185c6bf733b5030533dd683c634cfcce13a4966135d7680384946a516fcd5e327268ff941f9d71948803fad1f21924c5049aac992d7b07147ea8167b62f38154
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-68.2.ebuild b/dev-libs/icu/icu-68.2.ebuild
new file mode 100644
index 000000000000..e13a81c1b337
--- /dev/null
+++ b/dev-libs/icu/icu-68.2.ebuild
@@ -0,0 +1,142 @@
+# 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 autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://site.icu-project.org/"
+SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug doc examples static-libs"
+
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-64.2-darwin.patch"
+	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
+)
+
+src_prepare() {
+	default
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable examples samples)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	# make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL="${EPREFIX}/bin/sh"
+	# probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	docinto html
+	dodoc ../readme.html
+}
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index aaddfe53152b..7b5c802b2c08 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,6 +1,6 @@
 AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27
 DIST isl-0.22.1.tar.xz 1676948 BLAKE2B cf1661f785344d8132e8f8a339ed8d457677ca1bf943a597d3d0be1e80d8c42e788cdde79fd073d130d681424da7a8e3ca9fa2cd4cd4232220f5c5a1ce99ab99 SHA512 8dc7b0c14e5bfdca8f2161be51d3c9afcd18bc217bb19b7de01dbba0c6f3fdc2b725fb999f8562c77bf2918d3005c9247f7a58474a6da7697390067944d4d4aa
 DIST isl-0.23.tar.xz 1729656 BLAKE2B ce026eaa1d6c814f4067c555d97a453bdf01d5fa240aa9b6ccd22c9a0e7f19b0c30cd834f976a29b10a5d57eaa747a3f45cf55717f05d98ae405ec93dd42f27b SHA512 da4e7cbd5045d074581d4e1c212acb074a8b2345a96515151b0543cbe2601db6ac2bbd93f9ad6643e98f845b68f438f3882c05b8b90969ae542802a3c78fea20
-EBUILD isl-0.22.1.ebuild 1331 BLAKE2B e22315634005c66ad6cb1bc0960d5350233d194044cb7e96bcfdeb97d1228befde5a7f8a699e385e41e09a8420a92d3557f76a1464aa79f8e0235efdeaed244a SHA512 3cb1827059d630d334c22eede743300b0d6b6199525607653b8970bf3b8f4f533ba9c27447f759687643a05975d2a5d7afb8b54354f88c2d3724d50abb898a96
-EBUILD isl-0.23-r1.ebuild 1862 BLAKE2B e7736afdca4453dd17c8ba7b53b8b4419bc110ddd5733ed309f37da37928d79d25303e13cf8fe841168f229cff71d1eb1cc05f957a2edccdf7eafa166ebb0a63 SHA512 45a62ce2c2f08f3f32c91634121e701b13d38a2453c0918c77e0c76b3ad49337aa66e03c62367dd259979b34cd690fcc02662d088837a3032137f80a51d2d37c
+EBUILD isl-0.22.1.ebuild 1342 BLAKE2B b30eb0d7b7441ad45cc987e548be0c942492c6f78f6332d7defe6961a4f28b02e6fa5881dd0b631190fd169ea2fd0f5af3a473420bcd993323610866b92f8305 SHA512 e75af99ec615dc4f02ca08ae293cbb38ff1650707975f730090508e76c7c97899df2258b92a20829584177e9c223235d07ff528428d29b4f043b411978bc77a6
+EBUILD isl-0.23-r1.ebuild 1866 BLAKE2B 983e73d0bae5858b1ee77764d7019684e8f0bded036ed69e943fb15c00d8de8cbd9e5604571edc5a80062970f0b2edd9487deb47807a140ed2c43d95a805a03f SHA512 3b7ead24efb79511ee6dd6fd6f73d0b3cdf8f4e203bd78d0bb6832132b8dfba6341bf7a2465b48bfc723f4cf68a50cb4139df9c7d6cbcc14a78dd92d598665b0
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/isl-0.22.1.ebuild b/dev-libs/isl/isl-0.22.1.ebuild
index 62d47d20a57d..8835c838fc72 100644
--- a/dev-libs/isl/isl-0.22.1.ebuild
+++ b/dev-libs/isl/isl-0.22.1.ebuild
@@ -15,7 +15,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig"
 
diff --git a/dev-libs/isl/isl-0.23-r1.ebuild b/dev-libs/isl/isl-0.23-r1.ebuild
index ee79d99fae15..1b2b92589eb7 100644
--- a/dev-libs/isl/isl-0.23-r1.ebuild
+++ b/dev-libs/isl/isl-0.23-r1.ebuild
@@ -11,11 +11,12 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/23"
-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="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig"
 
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 27aaffa9ecff..16224b28733d 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,5 @@
 DIST jsoncpp-1.9.3.tar.gz 212922 BLAKE2B 6f89762e899ffe127705a30c1fe86f458d62fa05b8dbde6c465c73b6855d3945f3d739ff0c26e1a6326a211c946277908684ace9363df72ba0f460f66b3e3fd8 SHA512 f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
 DIST jsoncpp-1.9.4.tar.gz 214057 BLAKE2B 9a8c52e5d0b78f1593c93bc40f48d3789b031ba0da519c99cce17f1f6e104b24e0ffe88138c25da6dfa250586aeb9e98d00fbf74d9fb9309b29a6d4f17762263 SHA512 adfd4afbdf6b79bd37edcf0e248f07864994f1c4bcb7431f3b44102490ce467f72381908066655fa486dec12f467af0a11f42f859bbf719895974c7339db7d22
 EBUILD jsoncpp-1.9.3.ebuild 1026 BLAKE2B ba65cafacac63ce802717de8e05e95108371fb7489ff4bd4a29c4fe098ab8fb50fb559b7b284a6c402f42686ba3db2758d62983f4c86d8f8b67c2ced72b15aa6 SHA512 9d6d9e5fd9e45605a5fe24c5f738c7e3bf7b5b2bdcbb67ad4ff4c2abddef1abfd54c2efe4fd2af0b9d431bd51e6379fa778633b64acbc926101f225d4ae4eee4
-EBUILD jsoncpp-1.9.4.ebuild 1064 BLAKE2B e4f5d769ce44f942019af2d52773abb8051688e354398922337d2fc01b5c78ab8d90286ce1edc655d8936ad223c2625e2f935980b64818c3f4d295b3d99dcb39 SHA512 b856847c5e543abc0a81094101fbe0ac47d979c7e525f0797f66fd4379ab2d8e3a5373aab039ceb436849eac6e127bfe4cacf9007a078dea3d3ffbf1fcdfc166
+EBUILD jsoncpp-1.9.4.ebuild 1075 BLAKE2B fdc39efdde4e5f9f4108540dacd6033eb9423b2519540d97b9cd3e66c819a89c9e0b9f57e6e6f6102dc5d028af94a7b1a70d8418ea6d60ed589766a8113abb64 SHA512 f6ac8a91f623985fdcaec150f21c5c9f6fe02411a758f4c2cfe943eb2fa0fb849ac2a2e60452a27d1d8f2c299a542ab818f7c2347a414100ae216f5f4146017d
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
index 34689e2fbbc9..56c363d61a41 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 860c03c40377..2cc4f897cc9f 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,5 +1,5 @@
 DIST libclc-0.2.0_pre20191024.tar.xz 128628 BLAKE2B dc750725ee48456e3678cb4f730cc889045ff7401c4b40ac3ae9b656da9fe429aa2094c2042a18eda4f7e87c786ff8ae121fbf726a18de03884f30dad48b3fa1 SHA512 b4c2ca980fb28b5662055bea951de844284fcf122695234d7618439234f0203baf82b5cc5cf8acddfe387f19d32be3a958e53511bb1e33e9469f6be5951dbcdb
 DIST libclc-0.2.0_pre20201001.tar.xz 122180 BLAKE2B 8587c5b29d517a6c54a927b529f7e5651f154785e4299ad6b90007bdbae19ffccea75ec873a308b9a025effbb6316f91e70f82af19cdcdaad87c4f1af2595f78 SHA512 1fc10fcd6163991fe3ce474351d07f892a628fbd4e4cfb9ea96f1288db421b7be87c1f818593bea7409e7a17a5fd4c84a07a88f5c3d998ef97ac0425970abf4d
 EBUILD libclc-0.2.0_pre20191024.ebuild 1576 BLAKE2B eb9ab28009e52164890c3e99bba1c644b06c536df84f96d950ddc3171a2a6157c0a081b6a0038254176ed7964320dcc4dae0a66552e98b59e24ea5d5ff32cead SHA512 1ce5f96ecfb430f93f90e06b3ffae33e3db9e98923237649501e35376acdf7556560c7879e748da30b8b7b04ca072a274e729b7a3d0ce5be5677b6b961c78c0a
-EBUILD libclc-0.2.0_pre20201001.ebuild 1471 BLAKE2B 51a055a6ee1be3c231e3d190194316803be383434678195015dd9510fc00b7da8ece0cb3d30a483bf4c70ecf9fd00cb359e4fba6f66759c05dff5af6e439ca02 SHA512 5d4fb75d751b94a00dbf863860c34c954d9ba776e20df9f9349be4bced02d9ff224dc58c6567c8600c8486a2c8ef872ee6e0bbb7f4a87d2f2a29789df8719ee3
+EBUILD libclc-0.2.0_pre20201001.ebuild 1470 BLAKE2B 6d23398dd61293a066f481d07a287b58b03aa8058ab0bc651ad01addf51c46e44f2bf0e4233b284879d0ba467b53c491ca61347053746bd8c859e6bc6b94dccc SHA512 597617890e4d0dc60958755cccc548c54aa52ceff6d847c6a275704e9c4282a05b472f5fc65c488d826f4681b4977aee592325c58b0a38b95b97639773b588cb
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
index 110a3886c5dd..44bc4a4976ad 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 IUSE="${IUSE_VIDEO_CARDS}"
 REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 0c2e512f866c..39ee79aeca72 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1,3 +1,3 @@
 DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
-EBUILD libcroco-0.6.13.ebuild 1320 BLAKE2B 12011f5289f50d77cd3e98d4268fa769989a5a55b18a372a02e17be9251b6ec269dcbd59749b2b797765d7576238b239dbd4ffe18a12deedb56b10c18dc38b49 SHA512 997181ea088f09fdeabc4aab4e016fcf2c221aaab8d050fdf67d7b4ad277100c1814f6cf091fdd8937efa31faafe30f0f3d2ba54309ab4fe623e8252bf5adfcb
+EBUILD libcroco-0.6.13.ebuild 1312 BLAKE2B 6af54f25f634b6549a14151bc1f7056902686768e126ed32d5d6b604fbeb5994292c8ae7a6deb548301d8ad5dbb93f48833c6fb81457951ecb6302258a600fb2 SHA512 0096164dbcdeb1ae0d6b2455100137d6e7f4792e2c1d6b650ca176d614b8d13536c5767c5e0c98f90d29cd06167028db2edf1822d36b8346ac588d5b9dbc76e4
 MISC metadata.xml 677 BLAKE2B 075dc643dd13fa706bb3240a389f715e760c6d06c851c5074d6c58843668bbcbda2167fff34f720e57d48f01aaacf61dc2a5a98c11a5240550b7e2500bfef6a2 SHA512 57849cfa0cf0e61f52db3e7a357957d3eb0ea3e93381475ad1821a5e0d63c7971f31b4f52a9a851d303bac59a83edbb5fbdc76d54ccfdd6332ca5c93a43a0b14
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
index 4208a3c7ceba..3ab0d95fc923 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
 
 inherit gnome2 multilib-minimal
 
@@ -19,7 +18,8 @@ RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
 	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/gtk-doc-am
 	virtual/pkgconfig
 "
@@ -50,6 +50,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+	DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
 	einstalldocs
 }
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 35a852e929b7..59ebc668adf3 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,6 @@
 DIST libevdev-1.10.0.tar.xz 445792 BLAKE2B b7638ae85cac8b8d29c3255da1de50a06db9eb97d752b383852c85c32f8f93f31135e9d28acd474695d36d87eba04d455abd99badf6e492c2561893c47f796d2 SHA512 94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f
 DIST libevdev-1.9.1.tar.xz 442740 BLAKE2B 8a0e6c555ffa09890556c33e346e03b878eb0dac8585164d7561b6e20e5795c39299508f761a1fa15737d0802e362ba5c9d17de89d96fb79f1bfa1afa28423ab SHA512 7d845ce2279d2e2ef12437f6218550265ea0c85e5b6c0d116aff09787b73626b338fe3084baff060085d393688b5ae3d33772689e0581684eff257af01c4c645
-EBUILD libevdev-1.10.0.ebuild 1257 BLAKE2B 1fd79768a654b4d3a0903fd57b93c6cae785ae12ea299f76d3581af6b3b9e165a8d6817634c1d68f7177edbb9e1ed8fffd842b7c26e8193a9ce8545d1c137a10 SHA512 c14e530c748e1a8f74627c073d98b1dd97122cf8087ef4481b58d3b4eca00868c3293c64245220705c888f2c4c8d1e439154eca0ab2176fa0912d13b2fd97c2a
+EBUILD libevdev-1.10.0.ebuild 1255 BLAKE2B 226dcbbae4a087334de230e2d6c853be81557c26f0465d556197b399ad9c4e9a7d0152c26f0072c116751ecd8614c27975c1d28b4773e7831463e367868896db SHA512 32f4d20788b3649f7c3205786ceb019da6844faae50e2158cc28a2303b35558e6b11b2e4fb49e9320ab75ebf883a667b9d1bdb9be5781d13f06385444344683f
 EBUILD libevdev-1.9.1.ebuild 1246 BLAKE2B 4c752d3fb3115742cf9bbae3c4fe024ff653c9b95d4205c47fdeae72dfc66ef90f23cfa862385275a671a738390109a62733ec79e3deb4354aaba6ea88e5f926 SHA512 52d2ed4b2a193975188e43d9bf5aa610fbbbd8892eb89549007e8ba42746fcfe6950d79c989578ee97873cbe6df0cf750908c933edd6aaeefcfd4b48a67b85b0
 EBUILD libevdev-9999.ebuild 1255 BLAKE2B db5362fc5b28a3fb4217f21ec2429ee91410b8f5a6289c9ff3794428fe5374d45368d0dba4de29923c7b410000592fc8033c24a0a20a9bd24b177dc7d0ee364f SHA512 098e5b1adb48cdab57951e68a91f6d5128116ad0eb4248ea6c039790c753a4f8cbc38646d0ce328ab1574cd23500445a92659047161e8ec4f5a1e1b6ec9a25a3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.10.0.ebuild b/dev-libs/libevdev/libevdev-1.10.0.ebuild
index 022ffa450bed..12a8b20fbe69 100644
--- a/dev-libs/libevdev/libevdev-1.10.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.10.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	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="MIT"
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 71d48bf77c45..55320ecd7047 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -7,5 +7,5 @@ AUX libffi-3.3-ppc-int128.patch 2309 BLAKE2B 5b0c89e8f9f63329d2cb796d23b3a22c48b
 AUX libffi-3.3-ppc-vector-offset.patch 1425 BLAKE2B 334ed26ea082c603cfbf43d37e9cf64ac34a7054857743a9fbf5d05c7226402dfec4fd955cc3dc5652f57712bbaadcd0551ff727cfd8f8305edf38daa9814be2 SHA512 742ef73d95e39eefcbcfb423c4729966a31bf88ff00d20eab6c4db1db04e97f53784bf29111c57c577d1f6264735ee4ed797b4537a74d0ae1753de2990cd3ce9
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
-EBUILD libffi-3.3-r2.ebuild 2132 BLAKE2B f43309407a223ae675f111dce582d96b1a9400bdaa9ed92fcd9c2a7218e9e669e06fd81deb171d2c3848ae22fc4315d864ddd2bea4863c1b10bdcc614ddd7b83 SHA512 3c377d5ad57c7d4063a6d84eb055fe5be502ec1d3acf1b3ec330f60c879ce1f20342f454e917b93cf5f1451fd6713ee189012fb9b225e60b81177063c21804ec
+EBUILD libffi-3.3-r2.ebuild 2340 BLAKE2B 7b7b24adf408d6424471e5af71ab01cfda1f704c70c7d69ae51896646e6c9cfa66209352a91f602fb74e990ef1c121289c2e56af35a1c2a99f897654a5a8ca02 SHA512 0a60f79ebd87bea1b52691d79f0eafdb83dd3af3b6e39b0265ed3ab11e53abfb527dc297a2d344d5313363bc16772f2638d9a31c5a05a07babcf96e7232b3097
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index 55138eb082d5..438d54d74f2a 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -39,6 +39,15 @@ S=${WORKDIR}/${MY_P}
 
 ECONF_SOURCE=${S}
 
+src_prepare() {
+	default
+	if [[ ${CHOST} == arm64-*-darwin* ]] ; then
+		# ensure we use aarch64 asm, not x86 on arm64
+		sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \
+			configure configure.host || die
+	fi
+}
+
 multilib_src_configure() {
 	use userland_BSD && export HOST="${CHOST}"
 	# --includedir= path maintains a few properties:
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 7fbc8d1a3ee0..7553c2cf731b 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -3,5 +3,5 @@ DIST libfilezilla-0.24.1.tar.bz2 560439 BLAKE2B f4848149839fa121ed856726769a9517
 DIST libfilezilla-0.25.0.tar.bz2 562726 BLAKE2B 8e6f381d2eb00445b4553418aafca750ee2a49a10410fe8de0f31ee15a3d33bf679ee1a10bc6e77800747d14bd79e0e90a585a8a090a09e55adb392a96020907 SHA512 7c07807a6d11f3455e41c9593ddeab8b5947448c5205f10e1e7306e0df27df24821189c75167007e00671b5d573ded72208e6f923406e37e8e5e3c28181ebe1a
 EBUILD libfilezilla-0.20.2.ebuild 1084 BLAKE2B 86e8f9e37f842925b7d681ed00924c72d8555553dec8a84fce045e92320c25bcc299ace08e52879bdd67d2f57eccd95ba6db5937e92b214d29414654095bbb16 SHA512 1c79733f899c6703df637720591b5b84b17fcee1acc224b224fe25c440d77dde0fbd54d272b715436d2fa69560de76406a2856500e979864ca5caaf42620d4e2
 EBUILD libfilezilla-0.24.1.ebuild 1200 BLAKE2B b8d2c893287e66eaccae594600ffa32e213acda9ea9e0497bde9f66565ed8345808f1150bc41bc53742f50864b71a2d59cf99c59185cfbc66f4c328946a51fbc SHA512 ea02ad677ac756401955b22045a527d4285120fcb50304f0b886110f0b4f1a80fe8c3660df667a70262449f31f028404986ced7e776b05e34c845bb741ab7ee7
-EBUILD libfilezilla-0.25.0.ebuild 1201 BLAKE2B 427473b746a72e37aa0eb92d658c31fc0af5501c85f1a6f3fd8a9cfe48f6b2584ebf2ca9ebcd62c2c62159c9be082155ba35fb1604dc278f6ff3981386033fdd SHA512 ab8a7e31c21f61998eca7055a1a0fcfac0111a9bb953d567901cd8bbeaf9778e3247d2d728798f58b85217b09ac73e63be310ac9fab71fd98c9405654e83c56a
+EBUILD libfilezilla-0.25.0.ebuild 1200 BLAKE2B 28af14ac9580fe55fa5371249a4b441af91ed10695e4d002f2a71da5d9bb61951520298fe1fe73de38663394b2755e12c6b01906cd363a077b6c9f274804c1c7 SHA512 be823fb0bb3d47f529353381155e045cf216e0ef18d041d7c4ee046c5e38da6a62b26d9f1d4442e6e5d06c4c0ccbf338e60b734c8f4c21daceff55592ef6489e
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild
index 74e3d6fd82a5..9b5d37c80567 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/10" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index fa60b2e37ffe..d007077193d2 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,5 +1,3 @@
-DIST libgit2-1.0.1.tar.gz 5312878 BLAKE2B 7eb97bb97d66240ce135e21d348f6dea0c5626992b608f8944b75f9bae5de933fffa07edd536c0353841f8d02c950feec1451008003e35f53554f3c59b069a7f SHA512 7c307822b22e3771e5e908b115600310f7901b3250287532c498003b25a5b1e007bfa23592f16ec4d83c1567a9213710526f78cab7c120316e9a8fc74c5e57a9
 DIST libgit2-1.1.0.tar.gz 5426975 BLAKE2B 2a1c1f71d2a2e06448c78eb46028fdcfd59682dccf2365851c4bd059cdd78842320f9a5ba7345e761611a5b4eba634faf2e26cc669097da0ba2e1c832c23059f SHA512 347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8
-EBUILD libgit2-1.0.1-r1.ebuild 1723 BLAKE2B 66423a046e92f83e993832162461d1b667e4e76b0044e67b1951b5b589f2b3d42017a8390b8bc18365ada4f01cbbcfae4327f2001eeb3388b71839ffd406d029 SHA512 50a855668687a4eacac6d0bd61095b4523ed595b438d14854e03d6e06c4fe146164b415753bf252e7a8261327d017a65ae85ff5cda56fe9074e2b0b84d4e7b3c
-EBUILD libgit2-1.1.0-r2.ebuild 1726 BLAKE2B 8719d7921245e69f0b1bc0a99f330e5c87814bf241dc560a2fa1830c850e715bf25b6ce6709ff3770ba85283fd4c3f2b005ef5c993104ce43e5c4c4668ca6c5a SHA512 17faff5d133aea4692b8cd3e92c4e5eabc7c8ca730bbdb65db6ab09a20e8cf8966ce3966c34016cd75a91a940c841bf14293206cfd47fbd1a9343e25be42e8af
+EBUILD libgit2-1.1.0-r2.ebuild 1723 BLAKE2B f681539c08f6f364e89dc0d2000d19f4c65a325428ed55bdb08ebe47b2d6e8cf4bb5dbcf458c99369b5357e4bc3c9eed3311cce8a9fc5a045e8a7fe8ed136850 SHA512 c1e10f6e9a5c46e80101a4d1d60ca65100a95ddd19554d9af7860e913b6587e964cb083077e46bd372d1480e5649a9e319e39b72effe795718f70725db6076b6
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-1.0.1-r1.ebuild b/dev-libs/libgit2/libgit2-1.0.1-r1.ebuild
deleted file mode 100644
index 19f69847b508..000000000000
--- a/dev-libs/libgit2/libgit2-1.0.1-r1.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,8,9} )
-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="
-	dev-libs/libpcre:=
-	net-libs/http-parser:=
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	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.1.0-r2.ebuild b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
index c86c4c67b54f..7266a4febc0f 100644
--- a/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
+++ b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/1.1"
-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/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 7b7116bfb6aa..d2851c64700c 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,3 +1,5 @@
 DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b
+DIST libgudev-234.tar.xz 273244 BLAKE2B c0556988e37d5a5c48ba906b121d3c7a16c6a8ee4d05eb0e51913b9cde51bdc10966dcf8ceeccf62021dd8e47b004c85ed3412942d9d2bd5176d604931745f50 SHA512 cb01906d532b05cf8f69acdf80a8f05fbd4863fd98e88928b491e3657e60844f7ae6ca903ddd773fbea37268ff85d12719de47fd92a2f18b98fa2dbfe85e8151
 EBUILD libgudev-233-r1.ebuild 1098 BLAKE2B 01e9a601ff8142d174ceed9397f231d9e49540b15b66129059ca0fd6a7843ed44cf7156bd9c885c67e1bc55c68c93ca16b28f987b7da8570bd080b820e5a8b9a SHA512 52f0b728dec487a6316b2a31652280bcc5c456ced107acf3f97f7fdcee3568f5f5555afa3d1bfdd415be3a903e1e55506f18aa2a593dbacec2106bf48e7febc2
+EBUILD libgudev-234.ebuild 1088 BLAKE2B d68554cedb46ae8b80abf12231a33ee4eb6e11084288725f11e995bba710ddc43e8b966d1f5cc60067d6bf75b723e893199f000c4c91ad7659d9448d5ae7c5a2 SHA512 4a12613ed87f07af65bced25f7474e2660f9f1b3885f44cf618541e1cc41fa87feddd39f0688433b5067f60e7b9d2dd106172c0925714ec2e73239ca828f42df
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-234.ebuild b/dev-libs/libgudev/libgudev-234.ebuild
new file mode 100644
index 000000000000..e163aab6636e
--- /dev/null
+++ b/dev-libs/libgudev/libgudev-234.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="GObject bindings for libudev"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="introspection static-libs"
+
+DEPEND="
+	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs(-)?]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+"
+RDEPEND="${DEPEND}
+	!sys-fs/eudev[gudev(-)]
+	!sys-fs/udev[gudev(-)]
+	!sys-apps/systemd[gudev(-)]
+"
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.18
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	local myconf=(
+		$(multilib_native_use_enable introspection)
+		$(use_enable static-libs static)
+		--disable-umockdev # umockdev tests currently don't pass (might need extra setup)
+	)
+	local ECONF_SOURCE="${S}"
+	gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 8ca6ee429d2e..c5d9b3ce2ba2 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,5 +3,5 @@ DIST libinput-1.16.3.tar.xz 594948 BLAKE2B 6fad03dc8ab0280435b89a1049ed019d29e79
 DIST libinput-1.16.4.tar.xz 596028 BLAKE2B ad2160d83bcbdd65383272e0c4b35e35c7b46a6d0c771d7c0188c92b204d57dae73d0820bb93f662f155c1eab19c0195110f5a18a68de890c808925d5c056814 SHA512 a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee
 EBUILD libinput-1.16.1.ebuild 2230 BLAKE2B 74ca4324289826313f0d01cc08308062483e5c4d204f87f30abe91d2eda88b1278fad9b62a4901c1fbf6b749abacb0f5f92e3b7c52708023c6435392244a46fa SHA512 6290bda45e9c91dafe2a38e3d08c5c83e46c88f13ba186184998c41b8d91f884768d5d12d70fc1072763ddce9ba7545e892699cbbc190e16d757ce32c1833c03
 EBUILD libinput-1.16.3.ebuild 2238 BLAKE2B 5282a6ccdf93a3d7de289b4daa66a22b81ae1dc5101d94936ba227ade8fef918cc4363f7af79d5bd8b981e3d3dbc07a7973302a44d9b2953789a9f90416838e3 SHA512 aa7ac4b79f3aa8ea5d9ee7e7356c8cfbc8d7d0005bef446084a0d974dbf413d3c30dec25a4cfc595efcd60ea653cebc63e2236662a3fac5483eada9950929ec8
-EBUILD libinput-1.16.4.ebuild 2234 BLAKE2B af8ec23d8f9c285a9f5b15dd2dbe821bd2998b804e8cdc697e35a996de55a6b0cf7375e98741d62189957797ca53d4df1d0637954a5a3c68865b15ea3336e351 SHA512 263114afccfe7338cf8d9c3f72897a21effb8b5525646d3761ec103ff7044617c321f115839ae179e332d6a93a2cdff9331484ef1ed1a0e79623e5c362e971d4
+EBUILD libinput-1.16.4.ebuild 2239 BLAKE2B 9af975f56d4d799fa1d92a7a661c56342671e2fcdcf9e8809dd36d037360d7873b8f9f004308b00bed91abd2376d160414a3c9028bd5daa1ec3d47b112d0220f SHA512 3ead7a83a4173b88d5ff755e175ea0d00cd1442035193e3efb94547a577fe919c458c66d00ac04f6a32801c0ff884c1ec2c02465bdc9849a3ed9a389355683a9
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.16.4.ebuild b/dev-libs/libinput/libinput-1.16.4.ebuild
index ad71da0e96ca..e2cc5fe76a2c 100644
--- a/dev-libs/libinput/libinput-1.16.4.ebuild
+++ b/dev-libs/libinput/libinput-1.16.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 70e770efaebc..4d7012285708 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,11 +1,3 @@
-DIST liblinear-210.tar.gz 381662 BLAKE2B d64d217f7ba67605821062f66d4e9f130f4f2396dde14cd35532bad11f4af4f34bc231a1e3796ba2d0e14f84830ec05c6358d40018e048f4ae3fa62db2b1d0d7 SHA512 4e4558467f2ebb3dbd640c172b1129c8e5981c231a043abb0398a803252559795604a34992baee50ae6689646050733d3a908d7d76f8b1c94309b859eae7f8c8
-DIST liblinear-221.tar.gz 520288 BLAKE2B b28c837488f5827ae76f32dc14a1b92027eb5ff123a15c07e9974197eea842c8247420632d259defdba3968383749538c1ed16f6b5c982fad87b3bc52572b485 SHA512 abf21f9030e67886d88a95ad1699e566f8b67bb3bd23253f1f656460911f92a5c3c184fe127390d6100bbf9970cf7a246ef3611b0788907c35a33286228f1753
-DIST liblinear-230.tar.gz 524693 BLAKE2B 02e52f6dc26f6ae19dfe52691e4a86c64ea92c40a50d0fbe8a7bddcf06e1216b8f28462fb2105539dedf15ddb07f39ef7e7f78fa7cfd74eac955246e9ed050e7 SHA512 c8acdd9f5cfcf7ef1ff9b9fac658ff51ac4677801fdb9ce6a210ccca7fb136a7957d0edaf45e83269c1928de1926de0200d669cd94e09371c06821d42ba539bc
-DIST liblinear-240.tar.gz 558915 BLAKE2B 50aba25c0cb6f9be505b6f9f2b84c67c772b1c8c56cb4b3580b4615c22d30b97a510b28e3d180af29e6c29c4ad77d011319298d6301cb4b2708ad6caf0e1dfc2 SHA512 70e392700cf278d1b62ee7a0b5862dd2a8ea0de28e9660c6d7bc4cac7f098608eba2d20d8f28b5ce0132af09a4446a2cf8aac2ed5f62d35fe304d7a8709ef1d5
 DIST liblinear-241.tar.gz 559122 BLAKE2B 793ef45fc652d6f35908465e754e0aed6568125e74e68ca72466c4d71cc0e30746a999e978521c09a3ada079698f59f2bf65a430679538b7bebc133a258f2588 SHA512 a9ca47b051e28046829a3f355a552b2f5b270dd706170e1d21db1509ef09eca55e2d8ff29695d9e8192baad8bcf50aa76e75a3683948c726f2c9b915a3e4bf27
-EBUILD liblinear-210-r1.ebuild 1164 BLAKE2B 2f0412e646bf6a35ade1f2bd59c74cb989180008899db2b2ddc12d65cfe0d0da3901d9135cce7fa70ea1e6bf39748471c5e65190ff86a9a632d334c45c8e83f1 SHA512 3ac2479b283923a91379aa06fa1922035d25b939907cf2246201019ee1d87557534658a69dab596645b115f45b37c731b77d4d3adbed8caf48fd66ddebbc8b04
-EBUILD liblinear-221.ebuild 1197 BLAKE2B 64ad293b87d993029ab7348cfcf70d10d110f65bd91fd3eb1cb98d9f5dc533a88f33af75d9eb599f29b1f5168a34694a5defee5b1ddeb536fb33efe6d4914b35 SHA512 5734a47d1ed7565a5ebed78d2c1e200c9d2efa9a725e532e05af6af543ce078746b1ad0a33ae0c6dafdacd1e51dda15aee22ad0b7fd7b4ad01ab5b98980d5912
-EBUILD liblinear-230.ebuild 1197 BLAKE2B 64ad293b87d993029ab7348cfcf70d10d110f65bd91fd3eb1cb98d9f5dc533a88f33af75d9eb599f29b1f5168a34694a5defee5b1ddeb536fb33efe6d4914b35 SHA512 5734a47d1ed7565a5ebed78d2c1e200c9d2efa9a725e532e05af6af543ce078746b1ad0a33ae0c6dafdacd1e51dda15aee22ad0b7fd7b4ad01ab5b98980d5912
-EBUILD liblinear-240-r1.ebuild 1197 BLAKE2B b5fe1724ad652ab0edbde72c15403c4ffd261c046a51636529eec347291a3e835a31a0e6b17cca09a4699057d1432e3966d40fd2d253a7e2a8cfc429adcf2e33 SHA512 1a3cc696d0c8b6783be860522ed931057bd334f73ed4033f763d74a564db453d6141e6423a3a633013469359801e379797c448bf8faecf1340b28f92413aecc5
 EBUILD liblinear-241.ebuild 1459 BLAKE2B c2053330cc42af2e9e8e7efd0cd676f2d3e99dd9839e2a8c60215a142e098adebbbd2a6e60f5a1775179dac886de5d5d905c27fc473885e5546b3a9000b879a4 SHA512 61ca6696331498d62a5d983d23122158e7bcea23b4a7bcf50c0b7ef8ae64fc637e025222bb4488b1acfe329e169d4b0ed4503c33142a18c4f208ba933acc6d4e
 MISC metadata.xml 320 BLAKE2B a4ab81f29b93f305fc5a005917955d67596886df3a9ee7708734714ca0c052297d4bf18b68cbe6de7f42a1e0f4f6052a1b0a93390c17bbe554bc3f536db5b251 SHA512 34ae964cd916b9a3cf711def8a12c20c4fb7642d569d07d019abc12804f013c90081da4d5b1802a0cd8fccec98c5929554766ac575d992a9fdce8d574f2d311e
diff --git a/dev-libs/liblinear/liblinear-210-r1.ebuild b/dev-libs/liblinear/liblinear-210-r1.ebuild
deleted file mode 100644
index fb59d193d192..000000000000
--- a/dev-libs/liblinear/liblinear-210-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A Library for Large Linear Classification"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
-SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-src_prepare() {
-	sed -i \
-		-e '/^AR/s|=|?=|g' \
-		-e '/^RANLIB/s|=|?=|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		blas/Makefile || die
-	sed -i \
-		-e 's|make|$(MAKE)|g' \
-		-e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		AR="$(tc-getAR) rcv" \
-		RANLIB="$(tc-getRANLIB)" \
-		lib all
-}
-
-src_install() {
-	dolib ${PN}.so.3
-	dosym ${PN}.so.3 /usr/$(get_libdir)/${PN}.so
-
-	newbin predict ${PN}-predict
-	newbin train ${PN}-train
-
-	doheader linear.h
-
-	dodoc README
-}
diff --git a/dev-libs/liblinear/liblinear-221.ebuild b/dev-libs/liblinear/liblinear-221.ebuild
deleted file mode 100644
index b99f3d0ac3d3..000000000000
--- a/dev-libs/liblinear/liblinear-221.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"
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A Library for Large Linear Classification"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
-SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^AR/s|=|?=|g' \
-		-e '/^RANLIB/s|=|?=|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		blas/Makefile || die
-	sed -i \
-		-e 's|make|$(MAKE)|g' \
-		-e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		AR="$(tc-getAR) rcv" \
-		RANLIB="$(tc-getRANLIB)" \
-		lib all
-}
-
-src_install() {
-	dolib.so ${PN}.so.3
-	dosym ${PN}.so.3 /usr/$(get_libdir)/${PN}.so
-
-	newbin predict ${PN}-predict
-	newbin train ${PN}-train
-
-	doheader linear.h
-
-	dodoc README
-}
diff --git a/dev-libs/liblinear/liblinear-230.ebuild b/dev-libs/liblinear/liblinear-230.ebuild
deleted file mode 100644
index b99f3d0ac3d3..000000000000
--- a/dev-libs/liblinear/liblinear-230.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"
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A Library for Large Linear Classification"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
-SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^AR/s|=|?=|g' \
-		-e '/^RANLIB/s|=|?=|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		blas/Makefile || die
-	sed -i \
-		-e 's|make|$(MAKE)|g' \
-		-e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		AR="$(tc-getAR) rcv" \
-		RANLIB="$(tc-getRANLIB)" \
-		lib all
-}
-
-src_install() {
-	dolib.so ${PN}.so.3
-	dosym ${PN}.so.3 /usr/$(get_libdir)/${PN}.so
-
-	newbin predict ${PN}-predict
-	newbin train ${PN}-train
-
-	doheader linear.h
-
-	dodoc README
-}
diff --git a/dev-libs/liblinear/liblinear-240-r1.ebuild b/dev-libs/liblinear/liblinear-240-r1.ebuild
deleted file mode 100644
index ede9a159d953..000000000000
--- a/dev-libs/liblinear/liblinear-240-r1.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"
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A Library for Large Linear Classification"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
-SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^AR/s|=|?=|g' \
-		-e '/^RANLIB/s|=|?=|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		blas/Makefile || die
-	sed -i \
-		-e 's|make|$(MAKE)|g' \
-		-e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		AR="$(tc-getAR) rcv" \
-		RANLIB="$(tc-getRANLIB)" \
-		lib all
-}
-
-src_install() {
-	dolib.so ${PN}.so.4
-	dosym ${PN}.so.4 /usr/$(get_libdir)/${PN}.so
-
-	newbin predict ${PN}-predict
-	newbin train ${PN}-train
-
-	doheader linear.h
-
-	dodoc README
-}
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index 9aad0190b280..b428e0664498 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -1,6 +1,6 @@
 DIST libpfm-4.10.1.tar.gz 1005988 BLAKE2B 7bdc64540cdf0404bfab0a631e506f37a79ca090d68c798fe4943f627ebc3e15e01f6c4530d4eec2c82a6f759845af518cbf34b3ad19ecc5fa48a874611aaa16 SHA512 33d99824216b4d83784e0db9f1aae3b39f84c2ba42dee64dde0b3c43cc5ee3a18c206d9044e75bf10867768add7cb9967c6318f7aa196f178f334271fa05e1aa
 DIST libpfm-4.8.0.tar.gz 828853 BLAKE2B e6caa0ffa4584dab805ef08ce5318bf73fda906afddb30b1490a34ec62e522a6bb713563c5ffecb22596e6c5c1c06c245c5b9bc59fea74face90a9edcbfb4eac SHA512 a06f3713c70fb4fe694154057604ae42627ad764486a3d3e28b0ef2e46fdd0a0431ec1a3c52ebc711ae174a1fbd7b3ddd0c736a568f57d4606ecf8064ff38228
-EBUILD libpfm-4.10.1-r1.ebuild 938 BLAKE2B dd7e9675b68c2b97dd42eed5c13f97f09ab0157ddacd68851b30e4f7d61495d74a2c412391ea1dd7f2f7b118cf04d3925c70b203399f3d13ca139e956c0807a6 SHA512 c721e48649ba19ddd3f459da6c5315c016ae9da951c1e5b1b9324d4d510058f56833e40ea65ec8013fafb53aeee3c1c7d5252d9a87da68f61e08022f0e699b90
+EBUILD libpfm-4.10.1-r1.ebuild 943 BLAKE2B f7bed42ab115ce1621b1937f81fc5e3cc76a11047bb6f1f8484170f6c7fc94db4e5c382112e8caca83242df5173b3c6426bae8ecefa4d35f070b46b0262c9a4f SHA512 73644399740a6c5b855b4becd7feb02c966549553081d9f3214c943823ec12371ee35dfe518115dcdb1683bd7a0d84091350a8315e8c3aa17bf2d704423102a5
 EBUILD libpfm-4.10.1.ebuild 911 BLAKE2B ac53ebf9f52a16f7e858a3ed19f819a2fac6b701ca0d004161560c8d7fe6fff89ff8e2e554c7daf0ac27b15fad3c141ed56fa56cb392b674f2ee6176110ffa59 SHA512 3144203053c462d094ffc34932328837898dac743bbccaa46d0bf0a1e076294cac0bfd4cb639e68dc0ed5e1cef1ad443060c139bebb25fc3eac7889e6a683f96
 EBUILD libpfm-4.8.0.ebuild 905 BLAKE2B ff05bc659b6caf37ac53b4052017dd9d454e6db023869dec984ac3cacdd97d4543361f2a055724624318bddc9adc18f7e19b2cdb6db7e7963093ec01c66063b5 SHA512 a12aa728c30342c051f850587c7c5a7052c837a61208d0e483fc116d48a0bd392ddb3848763fa4b9e13f680ed442d245e1ea9ab9a30f6977c298ae634e34ad95
 MISC metadata.xml 245 BLAKE2B 1e997172fd9bcc973ca12e8e67047a3b873376bc0110c7005244d7352f728d3d87fd310a200da274dcb6b0c47701b2652bd51440370f519ee51af7e1556a0048 SHA512 98e5a067f6f6b505c2e52e1a33464d536b0bbfcb495a63808869c5e76052d64b6d18c608072b83c4ce284589a07549e363fb2e108d487473d0646bea6afcc2c8
diff --git a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
index c9a1afd2bcd4..1e0e67de31be 100644
--- a/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
+++ b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index e6396e09135a..d3ca0659f987 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -1,5 +1,5 @@
 DIST libpipeline-1.5.2.tar.gz 994071 BLAKE2B 997c13bdf632f2be161576e1b21d1be26ea29dc770ab74e4b105f21c926b8ae5e07a605b72ec56f55a55db3a3c1d487cfe64d571363e040612ea52b445f0bc3e SHA512 721024cea4e8dd85ba31af23e6f65b6ab2323e4006a769674d18101744a5a990aa9ee9fcd9b35360fa1442a6d4a72bfed0227665d4eacba541808b1c48bc9a53
 DIST libpipeline-1.5.3.tar.gz 994663 BLAKE2B 57365ac07d1b61462eaea3be0ae1136f8511ea54484b1fcbe734796da760ced062a43cfb13b69eb24b521448253e603c248c59306f3fb3d871641a17530dcf82 SHA512 db0796bffbcdd8e875902385c7cdc140e3e0e045b3d0eba1017e55b4c66027c20cc2cd0fccaf52f59fa941d0925134011317b9c27986765a1ec2a73132ebaec6
 EBUILD libpipeline-1.5.2.ebuild 670 BLAKE2B b1059dfc0555227bfc9a26fd4c45c2a3fabd89dd75db054946f6b5f6a4532b334e7bded0192d56d0a054061913d9a9197510846accf9a14ca1ababb6825d97c9 SHA512 2a946a55cfc00674e4f350a3260738ab32296fb2cbac6f45cb46f508de58727e0f5b8ac5074b8fd11d84b8563381b170c05370b96f6dedb8e7c27bb9874c6f2b
-EBUILD libpipeline-1.5.3.ebuild 679 BLAKE2B 9128932a7d785ebfb2110eb5dc46fd8bcbe0774f4f0cdca9456b06180dacafcf82f836063d640d3161eefe5469d1a32e8e25a8051a3e84c81b76e5457983f041 SHA512 77ac386a5134a145a587d45af254900f9cefce7aba61e659bc86d42209919f755231bf382fe178652cf96b91b028169a1f8d341f64e07a52a14be04500535ced
+EBUILD libpipeline-1.5.3.ebuild 678 BLAKE2B f0c862fba403214e8552d475d64b6dac9b9c7fd4ba97a670156d3d36d9edf4de60d09a843c3a47c197602f4226cd358464b80914256af0166ba418da9bfa98ab SHA512 d21355ebdde378bd1c36b95165cf428b0d5d4f9a54283660b7b006fd8db3c870516291a12691b730eb9998b08bd672da7ea23527d4d3c4f7ac786aa22aaa077f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
index f3cacf173e23..d5105befe7ff 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 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"
+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"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 6a681241a6ac..579bc800393e 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,5 +1,7 @@
 DIST libpqxx-7.1.2.tar.gz 693152 BLAKE2B da28d0041fc345eb7774eadf0a886e2a89692ac47d870120991aa97328a6be7d10e8cb2d6deb9e056dc7e05b04fd317d9d0fe4dcf8eab901114b27cd64bf4ff6 SHA512 a4a76c62f6115f5898e4c4bb1c6f095284bdb7ae6a1efa45add9efd422d2a8280d1698caa2469acbb087168208ae0fd8efa36c8735a8ce30e58853e27acd4161
 DIST libpqxx-7.2.1.tar.gz 691486 BLAKE2B ef1b12e436e33a26faa8f5acceef8d5ab1063b0618798fdf881fe38ab101da6d78989cc30c1e24f60fd81dd4f4034267e8b220b7b1d1932793028abf7e17c614 SHA512 baaa53f12aa87f512bbbe7494c915242cda8508b43414b79e6cd047dbd61902cbe54cb34af13d75bdccd70bdbafcaca155b4ccb426d8b831bd4df46e9a57e3a2
+DIST libpqxx-7.3.0.tar.gz 694012 BLAKE2B 35770599fcb3131081e08c18d96b753cc6d412c6ea8fddf5617df7da2035cf8ee3a031b7c14d592e0c9560e1e1074e633734337113ed0b3943e519aa44806307 SHA512 897af8e1c0ab12df745116e5387d3c31fb8800b6c599f49413ddcc67df7968fb1922c96896c818ce3f34d9649fb6c1d2ea59784f8765fb765481b156be44eaa2
 EBUILD libpqxx-7.1.2.ebuild 2024 BLAKE2B 621549d79c7cc9da9dac463fa6be48af6a1d687ddc8368d0fa67fba5c2978a9cd036db4927cac5c64545020333b07c79206e1ff382fa43b7f7da890f0fcdac00 SHA512 15a9a65617d82b0e6d146eb0497ff669ed8d11bf86b5aa688f186ca93dd0d5cd6c734f99d3e786865dd71f8cf614b7908c87d21af0bfd978103a5dfe2e9aa2d7
 EBUILD libpqxx-7.2.1.ebuild 2029 BLAKE2B ae7b19a14ee982b723075335d4508a67bc2897c4d85445b28669874b555775a866d7666cebf04f01be97978846c387b0450b6e83fddb9635e7a30bd29e130b64 SHA512 aa731379a97c82083a93d22e3b9887544ebd902c0ee9d18df214150040694e72d749ae927a8ce7df821735a078163e29d041a90928281eb5ea88d3de35690351
+EBUILD libpqxx-7.3.0.ebuild 2029 BLAKE2B ae7b19a14ee982b723075335d4508a67bc2897c4d85445b28669874b555775a866d7666cebf04f01be97978846c387b0450b6e83fddb9635e7a30bd29e130b64 SHA512 aa731379a97c82083a93d22e3b9887544ebd902c0ee9d18df214150040694e72d749ae927a8ce7df821735a078163e29d041a90928281eb5ea88d3de35690351
 MISC metadata.xml 611 BLAKE2B 1960af3cc6dc4e15de110c38b2ca41ca94355054539cf28169de54c952726e96327ce21c82dcc0e439d997fd52a8deb825a9f6bc921e727636a9edb9a3ce176b SHA512 2cc8f173d0f1e390e212741307420722c6a8fa8b5afe60ff6a706d4cec17086c88e84ce5f3ed265a0d8d8699de8fffa83c10fb7e1e700370f1eef1d6c3ba4bd3
diff --git a/dev-libs/libpqxx/libpqxx-7.3.0.ebuild b/dev-libs/libpqxx/libpqxx-7.3.0.ebuild
new file mode 100644
index 000000000000..1ce7f1510f3c
--- /dev/null
+++ b/dev-libs/libpqxx/libpqxx-7.3.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-any-r1
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
+SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://pqxx.org/development/libpqxx/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND="dev-db/postgresql:="
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? (
+		app-doc/doxygen
+		app-text/xmlto
+	)
+"
+
+DOCS=( AUTHORS NEWS README{.md,-UPGRADE} )
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable doc documentation) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	einfo "The tests need a running PostgreSQL server and an existing database."
+	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
+	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
+	einfo "    ${EROOT}/etc/libpqxx_test_env"
+
+	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
+		if [[ -f ${EROOT}/etc/libpqxx_test_env ]] ; then
+			source "${EROOT}/etc/libpqxx_test_env"
+			[[ -n $PGDATABASE ]] && export PGDATABASE
+			[[ -n $PGHOST ]] && export PGHOST
+			[[ -n $PGPORT ]] && export PGPORT
+			[[ -n $PGUSER ]] && export PGUSER
+		fi
+	fi
+
+	if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
+		local server_version
+		server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
+		if [[ $? = 0 ]] ; then
+			cd "${S}/test" || die
+			emake check
+		else
+			eerror "Is the server running?"
+			eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
+			eerror "    Role: ${PGUSER}"
+			eerror "    Database: ${PGDATABASE}"
+			die "Couldn't connect to server."
+		fi
+	else
+		eerror "PGDATABASE and PGUSER must be set to perform tests."
+		eerror "Skipping tests."
+	fi
+}
+
+src_install () {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
new file mode 100644
index 000000000000..fe488a3a066e
--- /dev/null
+++ b/dev-libs/libtomcrypt/Manifest
@@ -0,0 +1,3 @@
+DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893
+EBUILD libtomcrypt-1.18.2.ebuild 2925 BLAKE2B a65809e9d7e040654bd8b131ffde91f92718e5b15a06377d14c086078d164af488e442cafbb78f3aeb9aa62e0d02ff242bf3869bab110821f75ec005e4e52d06 SHA512 1e1236d8d763a2edeb5a4526932d55fce3673ab27c0d843600c98dae777d75722d7d9c632e09443661e6d2ad4aad36d307823c3e01c8803a04d6bbe4f6013c79
+MISC metadata.xml 643 BLAKE2B e66df23ddfeb04650dfa8c4cbd7d6e6a1816164fd0cac86dba9990610b672957c5ff7b6e83a17f8b6c19f75d1f50a1b448b8b618058510b8d6f54259ad451822 SHA512 7517fc02844cd6b9a9801b371c2c8faf9626dded317ad610af234cd89078221be021acb9da66f9078bb4b754a5e2f1b5efcbca2ccb1ef5c58afd8cf925e7a44e
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2.ebuild
new file mode 100644
index 000000000000..9b87379612a7
--- /dev/null
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="LibTomCrypt is a comprehensive, modular and portable cryptographic toolkit"
+HOMEPAGE="https://www.libtom.net/LibTomCrypt/ https://github.com/libtom/libtomcrypt"
+SRC_URI="
+	https://github.com/libtom/${PN}/releases/download/v${PV}/crypt-${PV}.tar.xz
+		-> ${P}.tar.xz"
+
+LICENSE="|| ( WTFPL-2 public-domain )"
+# Current SONAME is 1
+# Please bump when the ABI changes upstream
+# Helpful site:
+# https://abi-laboratory.pro/index.php?view=timeline&l=libtomcrypt
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gmp +libtommath tomsfastmath"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	gmp? ( dev-libs/gmp:= )
+	libtommath? ( dev-libs/libtommath:= )
+	tomsfastmath? ( dev-libs/tomsfastmath:= )
+"
+
+mymake() {
+	# Standard boilerplate
+	# Upstream use homebrewed makefiles
+	# Best to use same args for all, for consistency,
+	# in case behaviour changes (v possible).
+	local enabled_features=()
+	local extra_libs=()
+
+	# Build support as appropriate for consumers (MPI)
+	use gmp && enabled_features+=( -DGMP_DESC=1 )
+	use libtommath && enabled_features+=( -DLTM_DESC=1 )
+	use tomsfastmath && enabled_features+=( -DTFM_DESC=1 )
+
+	# For the test and example binaries, we have to choose
+	# which MPI we want to use.
+	# For now (see src_test), arbitrarily choose:
+	# gmp > libtommath > tomsfastmath > none
+	if use gmp ; then
+		enabled_features+=( -DUSE_GMP=1 )
+		extra_libs=( -lgmp )
+	elif use libtommath ; then
+		enabled_features+=( -DUSE_LTM=1 )
+		extra_libs=( -ltommath )
+	elif use tomsfastmath ; then
+		enabled_features+=( -DUSE_TFM=1 )
+		extra_libs=( -ltfm )
+	fi
+
+	# If none of the above are being used,
+	# the tests don't need to link against any extra
+	# libraries.
+
+	# We only need to do this strange logic for tests
+	# anyway because we're choosing what to build a binary with.
+	if [[ ${TEST} != 1 ]] ; then
+		extra_libs=()
+	fi
+
+	# IGNORE_SPEED=1 is needed to respect CFLAGS
+	EXTRALIBS="${extra_libs}" emake \
+		CFLAGS="${CFLAGS} ${enabled_features[*]}" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		LIBPATH="${ESYSROOT}/usr/$(get_libdir)" \
+		INCPATH="${ESYSROOT}/usr/include" \
+		IGNORE_SPEED=1 \
+		"${@}"
+}
+
+src_compile() {
+	mymake -f makefile.shared library
+}
+
+src_test() {
+	# libtomcrypt can build with several MPI providers
+	# but the tests can only be built with one at a time.
+	# When the next release (> 1.18.2) containing
+	# 1) https://github.com/libtom/libtomcrypt/commit/a65cfb8dbe4
+	# 2) https://github.com/libtom/libtomcrypt/commit/fdc6cd20137
+	# is made, we can run tests for each provider.
+	TEST=1 mymake test
+	./test || die "Running tests failed"
+}
+
+src_install() {
+	mymake -f makefile.shared \
+		DATAPATH="${EPREFIX}/usr/share/doc/${PF}" \
+		DESTDIR="${ED}" \
+		install install_docs
+
+	find "${ED}" '(' -name '*.la' -o -name '*.a' ')' -delete || die
+}
diff --git a/dev-libs/libtomcrypt/metadata.xml b/dev-libs/libtomcrypt/metadata.xml
new file mode 100644
index 000000000000..9dda15fd9cfb
--- /dev/null
+++ b/dev-libs/libtomcrypt/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="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name="libtommath">Uses <pkg>dev-libs/libtommath</pkg> for mathematical operations</flag>
+		<flag name="tomsfastmath">Uses <pkg>dev-libs/tomsfastmath</pkg> for mathematical operations</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">libtom/libtomcrypt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index fca05458b304..710feccb5335 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,5 +1,3 @@
-DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91
 DIST ltm-1.2.0.tar.xz 622120 BLAKE2B 1537dad7da5c14264f03280e9d49fa0b7e6c1c4924c805f202d31c60569b9e3bee40674301d67b0f5b049c1c2dc5ec71b6c566ff5c9b8168d16840b031acc400 SHA512 6f9ccd0691831f07f86ddc81cb6145504b3d5da66dd3e92312c64cce0ea986fa4e08ba65ca8991aaebe56702c2d7c15f309696785b813dffb4c112a4ad04b203
-EBUILD libtommath-1.1.0.ebuild 1513 BLAKE2B bf645873cb4e262f6244f1958369efe699b86480ea651942abe527018f846f1dc6748da60c42b1055ec41f86b25029efe5531a723aff7f24a5f77b6f257c6dc6 SHA512 8cee336bd78ba5392f3e595e76492144b59f241205aabffbb8bd790710333999e3a8fd191759aa99d5dc5f0f22f1f7f5d342a5b585d04b67667201799425f226
 EBUILD libtommath-1.2.0.ebuild 1584 BLAKE2B bd745a6e56474e1a331966ef3543158297306ec8fde22164aae322f17822529bb27423b523c1f4ee18eb6bde22b33c4399e888e12e56e39996294fe2dbb88c10 SHA512 89d58d2435522a5e240ed3942da793723c77733f90edce7045c12c9b7bd47d6dc275567d6a062b8f01f2f6e895de09709a4e48f820469a3d4d610aef36c39dbf
 MISC metadata.xml 3301 BLAKE2B c9999812b8504393673c8890cfcca6436eead1a2ce16d67000f2f0d2ebed6c993e654c720205ffc205ec248a9df1ef38c3a6c7389157fcef28eb407de94239ce SHA512 8f4beb6e7745581094557241bf74a7fd90d32e0091a6da59647887127daf99ec3dab6987811fac2863914504989549dd8d3bc79d88af7f1008c18e3eb9a5e03f
diff --git a/dev-libs/libtommath/libtommath-1.1.0.ebuild b/dev-libs/libtommath/libtommath-1.1.0.ebuild
deleted file mode 100644
index 70d7c93256b9..000000000000
--- a/dev-libs/libtommath/libtommath-1.1.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Optimized and portable routines for integer theoretic applications"
-HOMEPAGE="https://www.libtom.net/"
-SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}.tar.xz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples static-libs"
-
-src_prepare() {
-	default
-	# need libtool for cross compilation. Bug #376643
-	cat <<-EOF > configure.ac
-	AC_INIT(libtommath, 0)
-	AM_INIT_AUTOMAKE
-	LT_INIT
-	AC_CONFIG_FILES(Makefile)
-	AC_OUTPUT
-	EOF
-	touch NEWS README AUTHORS ChangeLog Makefile.am
-	eautoreconf
-	export LIBTOOL="${S}"/libtool
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-_emake() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		-f makefile.shared \
-		IGNORE_SPEED=1 \
-		LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		INCPATH="${EPREFIX}/usr/include" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test_standalone
-	./test || die
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-	# We only link against -lc, so drop the .la file.
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-
-	dodoc changes.txt
-
-	use doc && dodoc *.pdf
-
-	if use examples ; then
-		docinto demo
-		dodoc demo/*.c
-	fi
-}
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index c003c49d8ed7..9d0fb355646e 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,4 +1,4 @@
 DIST libuv-1.40.0.tar.gz 1274587 BLAKE2B 91d0e64a92be5686c0da3c4ad35fa52351012434a2a23db3fd91c26fc8e7b42d20d183a861feb876e2b5ab43e45ab59e720299f622a79c6bbdc6350b4b9e6e3d SHA512 14a6880e636e9d046e1f4c86061d7ca5fe0cdae0efb0c6fec6b6ad03b17c626da479d6cc1ae84da281ec04a75e0d56fa99ef25164432cdb246cf59f0964a7e8b
-EBUILD libuv-1.40.0.ebuild 1222 BLAKE2B 1ea452b11211781bfbb0fb7566f737208a9ceb288b41f613ee1c2189fca091127322bbfc1e4a8f71bd6e62527bff66bec218cdef398f31f0d0f05d69ceadc318 SHA512 5d9a665b8267f7cf058f6f3b3afe4de75e214973c7a9d8d9c0eecf062f60dfb30de805e4ab1ffff02238219e70ec7149ad554ec712a5a759503a0a9e9c6a49ec
+EBUILD libuv-1.40.0.ebuild 1712 BLAKE2B 79a7fb954570663f6a9be3c7da1fb42768c19d799a672a14d936afef7d70bbac62190552f7de94b208cb9bd80d02e5da6e17a6489e2223e7fb76e04a9e546f27 SHA512 e35815b72440117b8656ebf55c1e2698929eb02f93b4541c64284469bea988a7b90919b3d10741845a5a541fc9f53676a8faacfc2388bdd55759b413b00486e0
 EBUILD libuv-9999.ebuild 1000 BLAKE2B 39cca04aa13e367adbbe3aaab32e0eb2edd1d7966b6f81ea5a8b7772fb6e590aebb06da9ede6782ce9e4806737251d970992f2c4d56726469b11815ed58ee3e4 SHA512 170a10be4f9b177894113114b28f3932836a943a29dfe8c2ea12213421ea96c0d66b65039fa3ad60a208a30786ead3faabeda532433e741bb6d8f7b44f9dc21e
 MISC metadata.xml 1317 BLAKE2B dfa271e354ff7c8fb44eb02c8513f9069ff97f409caba0e171a598625732561e41208c61b1cd923f0d920cb7f91b982520c35f2306743b259b51c92247735e64 SHA512 43c3692fd4f7d9ab1e92bd6318782135e6e359c01da018525882f0ccd368814787203e0fedf650a48e3d57bff7f59d3d8418a7d2f72eb3ee061da7b5fb74d67b
diff --git a/dev-libs/libuv/libuv-1.40.0.ebuild b/dev-libs/libuv/libuv-1.40.0.ebuild
index 2bff012b3068..0e5e25477356 100644
--- a/dev-libs/libuv/libuv-1.40.0.ebuild
+++ b/dev-libs/libuv/libuv-1.40.0.ebuild
@@ -25,6 +25,22 @@ src_prepare() {
 	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
 		> m4/libuv-extra-automake-flags.m4 || die
 
+	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
+		sed -i -e '/!defined(__DragonFly__)/i!defined(__APPLE__) && \\' \
+			src/unix/udp.c || die
+		sed -i -e '/err = pthread_setname_np/cerr = 0;' \
+			src/unix/darwin-proctitle.c || die
+		sed -i -e '/int uv_if_indextoname/i\
+		static size_t strnlen(char *x, size_t len) {\
+			char *r = memchr(x, '"'"'\\n'"'"', len);\
+			if (r == NULL)\
+				return len;\
+			else\
+				return r - x;\
+		}' \
+			src/unix/getaddrinfo.c || die
+	fi
+
 	# upstream fails to ship a configure script
 	eautoreconf
 }
diff --git a/dev-libs/libverto/Manifest b/dev-libs/libverto/Manifest
index 01969db7f9f8..a2d06f808ab3 100644
--- a/dev-libs/libverto/Manifest
+++ b/dev-libs/libverto/Manifest
@@ -7,5 +7,5 @@ DIST libverto-0.3.0.tar.gz 380822 BLAKE2B 7dd31e62a4f4d8ce5cdb77ba96b9e4c957b117
 DIST libverto-0.3.1.tar.gz 383390 BLAKE2B 2d8366d85c2a02becf8fa9224d195a8d85f64aab735a0101997a52dd99750537b181a6dd2fc494b435b949b4a9cb785acb7222ba3f2424b7a7ddcf5d3c832387 SHA512 baef4fd280e0cb30167743608fd5a950fb4340eeb89e3630a0f63f8eab4d56f0f894a2e3283583b7ed8774d5e896c44e2c68c25882d95a07350f980af36b8740
 EBUILD libverto-0.2.5-r1.ebuild 1506 BLAKE2B 5849f6a5689d62b5d5e7e29bdcb3e012332996ab6c48f89ea91d36000dbb12bfa38c8fcff00bd1db6dbb745a36edf4c348c23b717d2308fe425b0d6b31601db3 SHA512 78cf8dfbb97b286b1bd71b8918346b0b513021979dfc0043dde5ef62aa7d747f48c2f8f54f9f86c8c2195ede84bd3d36018e823ad9c02a685d4eb42ed97fce29
 EBUILD libverto-0.3.0.ebuild 1728 BLAKE2B 0d62b343c892c3585949dd7bc2d5f5f1fe6d3c2007eaa68ef7ac3347bfe6a6a07cc71baa671ec79769b0daed0c736a46bab8e022b12f96390180c0227ae2bc0a SHA512 dfeb4d5922be73a243070242a6bb75c2e111fa1f29989b4a191354bc82eafef8433764c7da34daa291fed0c6374952cb324a52143ecb35e1b8d8c074d3275ed9
-EBUILD libverto-0.3.1.ebuild 1452 BLAKE2B 8592592628ae4ffb83def9fc484e2b1cb61c7189e705ce7e4991b21e7ddb288379045dbebd69e77e07cb9bd365b18d9d33c7749b30b662ee736f2f29e9e3978f SHA512 c5ed8d590537fa88db7e28971c98c39714d07df5db898a203661e706209fa4c6c144baaaaf31e999b38b405d01c454598899a1177f97cb06807505f705010542
+EBUILD libverto-0.3.1.ebuild 1448 BLAKE2B 7140bef0610a79083f466a40f16c6fc92631d44c0c38d7f258bfd352ee8cb26dc96a7c0f2eb02a95ef5f10a02bb0a054caa76db163d9a272f6044723d844b3b0 SHA512 7f9b92e79dfec9d9331f3cb153a10c7babe6b975a7235043b67d7f8cb2822760052360627386bf9ad40669b4357460e8db0f30778d7906d991a2d5c5cac7497a
 MISC metadata.xml 1080 BLAKE2B cb37ba132016891f547bbf860b3353348b3312d770e220b6cd6cadabbdaea8c272c0b66a391f7a74de7ca0927be2d0f4939b7238b5966d553b5a5b834df93bd6 SHA512 88399edcdaa1d9055b6990605fe3bd1a753eac2ffa3b10ccea88a7385323b9de9f123a0032d19493f27603968fa8d07d29aa09f4f0f21ab5998f0ba2af2e4c00
diff --git a/dev-libs/libverto/libverto-0.3.1.ebuild b/dev-libs/libverto/libverto-0.3.1.ebuild
index 883f3b2cfe0b..466fa5dc46b7 100644
--- a/dev-libs/libverto/libverto-0.3.1.ebuild
+++ b/dev-libs/libverto/libverto-0.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.g
 
 LICENSE="MIT"
 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="glib +libev libevent tevent +threads static-libs"
 
 DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index e37bdf5f04cd..0a975328eade 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -8,5 +8,5 @@ DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.10-r4.ebuild 6934 BLAKE2B 10ea3e8d538755eaa260d1a4ea8e4661349e522169b093e3bf847286ccbc5c9b29041ca6322435fd381252b98b2ffb288b95ffc7f9d771719d26f304bc8b6260 SHA512 84b582b971e08881ee12321c9ab043b81477fab51fffefb1c240532315686f8964ec6d315e67d9ae87e02622c56e5d22b67c08d89e0dd041e507a1b61d9f3ba7
+EBUILD libxml2-2.9.10-r4.ebuild 6928 BLAKE2B e85035300d8e2e8b998542fc5e6466f48bc2fc6d74c78d5fa6f1b5f1abfe4fb2c7fbf80f889c9b6bad210e8b4a7562c754419e1e55de26843223f74ea594daff SHA512 145287d7dde68419fa4ef5d0daf190729050baf4bbdadf367d98d0afd1ca0177a13004f4727ac3b65bcb670f24651e4d75b511f5f979f9f9156d953f2f47e35f
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
index a6678320ffe2..65f752d81b4a 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
@@ -205,7 +205,7 @@ multilib_src_install_all() {
 pkg_postinst() {
 	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
 	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
+	if [[ -n ${ROOT} ]]; then
 		elog "Skipping XML catalog creation for stage building (bug #208887)."
 	else
 		# need an XML catalog, so no-one writes to a non-existent one
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index f85bfa57ae4d..b10b1d578fad 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,6 +1,6 @@
 DIST pugixml-1.10.tar.gz 381990 BLAKE2B ea446d11fe5213a5250b7e737a9e80a3976454724e1a1c326b689214ad4d3e183abd417a7782b3d5c68a0aabce42228e121352e4d2dd33f5f2bb2334f6c72c27 SHA512 bfc80661005d0a0fb82ca6d5299e5efdd1bb468e11ee52d7ee9367e15776d28efb60266ce03842715cd43aae023afc2b369797bb3cbecd6d6a65c3ae3903e469
-DIST pugixml-1.11.2.tar.gz 386166 BLAKE2B 21dee2f04e8f9d962cd6f0ebf54d608fb0434ed815a13807f5939dea47e98128009b6b918a761b80566b959f1c0651c4b771028515fd9e8b8b51a0e4e592d3dd SHA512 403ef9f642fba6aff2d642399516886c0cda44ca19c58eeb05594aa7220562afbee939a5edab0c85263596834c5bdaea82a346dd8ee00a712e97b564f0d1e52d
+DIST pugixml-1.11.3.tar.gz 386244 BLAKE2B 1c83b0e0c1f464d3ef2efc19decc425bac14b5f92face3ea3bbd9f970e442043d3c4d4c471178c8891d7b3245aa6193d89fe3bfea122886ec0261418a69cc2c6 SHA512 4af70f11bbbb8a33240bf12c6ea14973963303a8cf7fa6ce56376726a6c4764c2f6c87a4e6d7672961850a84d8f430712686d744da8bc12d5fe0a711dad6e90b
 EBUILD pugixml-1.10.ebuild 571 BLAKE2B 882d1cf798f1b6f033d26204059fef59169588d7f939620f8a61dbbfe582d9c6888bc9918b657841cef5eba110dee6a977dab63a5a2c731ceb2d9a329635d447 SHA512 eefcb601ccfe5aa7c529ab220a1e21faaf3fdf4dfbac06f847e268ec6b784d7f6d3962d57d53b92c0645d735529d7f8ed56009ddbcecedc0f640b5f5f20420ef
-EBUILD pugixml-1.11.2.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
+EBUILD pugixml-1.11.3.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
 EBUILD pugixml-9999.ebuild 569 BLAKE2B 353fb5e610b766647e1e3bd921a05390dec00f185d193437f96d7a8cf0bbfda8813168243dc80bf0b3cc1fd8c4e1c9e8e83b27590e1a3018f3a5ef1947f66e41 SHA512 248a298f4cde950be75592de172fc89fd36d979fcd76684c63e652456a60cd84a6bc0f2312248de003e4bc0771ce3bf2c9b28ff5c72087be245c202af50fbc99
 MISC metadata.xml 346 BLAKE2B 68e81d68ef327995169a33c1716bf546958902854870095704000abc97634073a87945a54968a1e167bb94b845032b5ab3d8822b1663e7fb3fdfdb5abaf0d789 SHA512 90152b3b666bf26a6b0be0a411aff980d340ab1b38e2068a170b809c883e7a1c29de6adc0c8aef90b5702682a8fe548ba59e2bf077cc3ad145f9d1e3699afcaa
diff --git a/dev-libs/pugixml/pugixml-1.11.2.ebuild b/dev-libs/pugixml/pugixml-1.11.3.ebuild
similarity index 100%
rename from dev-libs/pugixml/pugixml-1.11.2.ebuild
rename to dev-libs/pugixml/pugixml-1.11.3.ebuild
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
index 7ffb487eea57..2ec459570522 100644
--- a/dev-libs/tomsfastmath/Manifest
+++ b/dev-libs/tomsfastmath/Manifest
@@ -1,4 +1,6 @@
+AUX tomsfastmath-0.13.1-export-fp_isprime_ex.patch 297 BLAKE2B 4147cc95152298cfbbd88416d11e298b95f574d7bf083900a2b0e72069764f4efcade6b074fb632abfb8f92a4e15b2e71de9a9578b2e65d0c63e4e258923a4b2 SHA512 33bb97d9a33d8bdb81a6a2df5b1727430a421bcf73df292b965663be532e30a4d815c332ee63b9790e04425ed80e58a30d9915a746cc265d98ad71a10da8bc34
 AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff
 DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111
+EBUILD tomsfastmath-0.13.1-r1.ebuild 1704 BLAKE2B 93d8a2f6fffbe7fdb6f52e0898fb0f031cd41d1d482034bbf514b08274d90409aeabff00b7acff095d80afd742d96dbd891ea28e6cd61b7daf8b28ac054c9efb SHA512 b0b093c242383b53d993dbe0621d82626fdbec3a07478185512be34e40abaac758f3efe7d166abb95e39e4d8a0219cfaa69b221e4473da05f0ceb29afabd52dd
 EBUILD tomsfastmath-0.13.1.ebuild 1643 BLAKE2B 15e096a6fee99486b8bab90053a461a1282aa70fa484c325f30c0ea7da3e24c883faf57c7c8d2597fe7e4231cb422a37b8b53d220a8689cc5db380f366b95922 SHA512 ecad188a7f91f5d376fa6786f4418c6c02d9e9b8a014eaee26535adebef20a26301b8cd2bfa39d56ad1dbf64d7fad275694f4780507c2457e261ea7722cb05d7
 MISC metadata.xml 358 BLAKE2B 8dc827f40c0b51ca769622a56b5282b3265428fccc2330cb1732faa1ab03a6962057eccda6c0c0b58bfed3fa190e64c77fad4e6480cf65fe7ee251eb087422e8 SHA512 1473c76d0d4a743815de12895599cb3f9f97201f0eca1231af0f16600b5b795dcd8c4cba4847e3166004dc0b3319011bba2945dda510bd789d7b0ee066d96f88
diff --git a/dev-libs/tomsfastmath/files/tomsfastmath-0.13.1-export-fp_isprime_ex.patch b/dev-libs/tomsfastmath/files/tomsfastmath-0.13.1-export-fp_isprime_ex.patch
new file mode 100644
index 000000000000..627bf4b2f4d9
--- /dev/null
+++ b/dev-libs/tomsfastmath/files/tomsfastmath-0.13.1-export-fp_isprime_ex.patch
@@ -0,0 +1,13 @@
+Needed because libtomcrypt expects this symbol to be available
+https://github.com/libtom/tomsfastmath/commit/81530c207da8b3a43867da14df7d79d2cdf96978.patch
+--- a/libtfm.symbols
++++ b/libtfm.symbols
+@@ -16,6 +16,7 @@ fp_gcd
+ fp_ident
+ fp_invmod
+ fp_isprime
++fp_isprime_ex
+ fp_lcm
+ fp_lshd
+ fp_mod
+
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
new file mode 100644
index 000000000000..738e6706e8c4
--- /dev/null
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Fast public domain large integer arithmetic library"
+HOMEPAGE="https://www.libtom.net/TomsFastMath/
+	https://github.com/libtom/tomsfastmath"
+SRC_URI="https://github.com/libtom/tomsfastmath/releases/download/v${PV}/tfm-${PV}.tar.xz"
+LICENSE="Unlicense"
+
+# Current SONAME is 1
+# Please bump when the ABI changes upstream
+# Helpful site:
+# https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
+SLOT="0/1"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile-fix.patch"
+	"${FILESDIR}/${PN}-0.13.1-export-fp_isprime_ex.patch"
+)
+
+_emake() {
+	# Standard boilerplate
+	# Upstream use homebrewed makefiles
+	# Best to use same args for all, for consistency,
+	# in case behaviour changes (v possible).
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		DESTDIR="${ED}" \
+		LIBPATH="/usr/$(get_libdir)" \
+		IGNORE_SPEED=1 \
+		"$@"
+}
+
+src_compile() {
+	_emake -f makefile.shared
+}
+
+src_test() {
+	_emake test_standalone stest rsatest
+
+	# We choose to be verbose during the test process
+	# because the output is quite repetitive with no
+	# clear demarcation b/t tests
+	local tests=( "test" "stest" "rsatest" )
+
+	local test
+	for test in "${tests[@]}"; do
+		einfo "Running test (${test})"
+		./${test} || die "Test (${test}) failed"
+		einfo "Completed test (${test})"
+	done
+}
+
+src_install() {
+	_emake -f makefile.shared install
+
+	# Remove unnecessary .la files
+	find "${ED}" -name '*.la' -delete || die
+	# Same for static libs
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 570bbc0eaa90..2ba7a0400d31 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,7 +1,4 @@
-AUX uthash-2.0.2-cflags.patch 250 BLAKE2B fc632cc23ffb5ddc89e3d91ea753f0a8f2803890203c7227a01b694603842490027e411e304e3db3960b0920f53f1390010f570bffa38d94a449864cbec938eb SHA512 d87dfbc7be1df49d5c6f06c413800693491f2bc4d0b4b0bddff5f1519a7de4d4ab95d3642e15273d6ddca6a19a9d511859ec999aebf81c8739bab4a7caaebfc3
 AUX uthash-2.1.0-cflags.patch 250 BLAKE2B a42296b08231b3eb31ce0830cc07e0287ad2439c9fa239ffea3a3594f3265e3299a8800c2d44387d05666685e4b5b980306e1ebac23c2b663620d8f19f348f8f SHA512 79ad3d9d4efddc51307b6e9ec37925c46c01fb0bacdfe7343fc08a4a99278de09bdc486b59c2348116ee7b5eb5cce47935953a182f5f520f713b6ef43c9f84d4
-DIST uthash-2.0.2.tar.gz 191173 BLAKE2B a4a2ddb19fcc9af1105bc07deb8ccbe9c3f04518b609f7cfd16f0a05ec3e16ffb25fb5f0a5f258413f9f52facaa26adf4ea0683415416c12ab36bf11883976ae SHA512 0c2e686eb5a1d6a03a6fa1d42e803fca4e9b60b2d965c635a5a33d487c8d115f1f8155ff99a0e1874b69f6b66c04ea7d8866472a39abe5d1a23ae73f6fa956d7
 DIST uthash-2.1.0.tar.gz 191782 BLAKE2B 322661aca33e8df27ec3166cd16549b11f49a6f9eb12f11c78f44b75baf5d9f208825028fb3b89a380277de5784bf2d4c41a6cd2ff070b1d3cd667ec074a85d2 SHA512 c8005113a48ec7636715ecec0286a5d9086971a7267947aba9e0ad031b6113a4f38a1fb512d33d6fefb5891635fdd31169ce4d6ab04b938bda612ebbccb3eda0
-EBUILD uthash-2.0.2.ebuild 657 BLAKE2B f46b84a586d1ed7508316e8d9a196762eefe6e59fdc783d6404fad760b820e8f3c3d1ffe69b3a9354278223704c02c27438880a03da35fce21f4856879fd0c7c SHA512 c78a76a782147701bd6506967070150fbcf6c1f2ed9756572ab981826d6120888cef341c6f9adf4e0eb80d82474687a414ddcdf115fcfac02af9c4e8434adceb
-EBUILD uthash-2.1.0.ebuild 651 BLAKE2B d7a3c68953aae92fe62725c0ef767f6aa7134f153aad33b7fa542fe697f6359a7b0ee3a47e8d730bc999d20fa74c24cc5aec1f9ef34bd5913f477edc9d82464b SHA512 5a32950efb0bfeceb88c83d7e7d35fe5a16beb20235cbbc57e39f41b112134708f0788f62b26104c23242f728ad11efe7a60b8b1ca8691c0cf05f02bb418f582
+EBUILD uthash-2.1.0.ebuild 649 BLAKE2B 3afd91e81a06ac12ff967a8196d81282596a9b5d3db5d8dcff8cbc1e20efb48839df081406f96f29b997c0184907800d3abaa6df79be0700f98e54554262c9af SHA512 47043056937f33b1fb8f74f56c6ae22dd23b684069faac09058a4a48511f3069287c4472ee9afee643d9a6bb6184bf3d08057094cc32576f09e18db20dc14a90
 MISC metadata.xml 255 BLAKE2B ab14729a41f74f763ae36bef2284978ccc3d74ac40ed604ff797c16ea13029db8add12376bdc72c944356971a31e17a0f8fba2f08a822cf2f69de7792ace0423 SHA512 e251c1de46006091df4d8a908a540cf1251d4e3b0f4f8c3710221e25d9d822a66d9486b3972fb06cfcfeb1f488c351b38b0aa7fab54433f70d63de7ca9dcf479
diff --git a/dev-libs/uthash/files/uthash-2.0.2-cflags.patch b/dev-libs/uthash/files/uthash-2.0.2-cflags.patch
deleted file mode 100644
index e71506bce15b..000000000000
--- a/dev-libs/uthash/files/uthash-2.0.2-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- uthash-2.0.2/tests/Makefile
-+++ uthash-2.0.2/tests/Makefile
-@@ -18,7 +18,7 @@
- CFLAGS += -I$(HASHDIR)
- #CFLAGS += -DHASH_BLOOM=16
- #CFLAGS += -O2
--CFLAGS += -g
-+#CFLAGS += -g
- #CFLAGS += -Wstrict-aliasing=2
- CFLAGS += -Wall 
- #CFLAGS += -Wextra 
diff --git a/dev-libs/uthash/uthash-2.0.2.ebuild b/dev-libs/uthash/uthash-2.0.2.ebuild
deleted file mode 100644
index 95707126da3f..000000000000
--- a/dev-libs/uthash/uthash-2.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="An easy-to-use hash implementation for C programmers"
-HOMEPAGE="https://troydhanson.github.io/uthash/index.html"
-SRC_URI="https://github.com/troydhanson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-lang/perl )"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
-
-src_test() {
-	cd tests || die
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	doheader src/*.h
-	dodoc doc/*.txt
-}
diff --git a/dev-libs/uthash/uthash-2.1.0.ebuild b/dev-libs/uthash/uthash-2.1.0.ebuild
index 49f42356561e..c991385c4c34 100644
--- a/dev-libs/uthash/uthash-2.1.0.ebuild
+++ b/dev-libs/uthash/uthash-2.1.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 2a1d0db26046..9d853c613931 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,9 +1,11 @@
 DIST vala-0.48.11.tar.xz 3487944 BLAKE2B fe47bba9ddb31c469d63d9ca32d631901d59db19c417d864088bc33aa2845d388e762ecc39b2d9574aafbfc501eb61abb3604e07754b2d8eff63d23c53f1eb84 SHA512 6ddad88ab4d2a34352be9ce0a0c13dc3382ebcb494c08e2531a0195aad21a80db70e7dc3ffd2d27ef03a4ca30ac2bf31869521489ffd95fc520c4085362fc5e7
+DIST vala-0.48.12.tar.xz 3492200 BLAKE2B 0a401ac4349dc1c628fa608b5a89504583d6d2bb05ca74eb507e766cca418121e14adfe6e8cfeb8f42212c717280b9b91426309df415d869896654be626c46c5 SHA512 da7becf8b92985a07b139651c14bd41ec86aed3e2b610029d2b376f70335c98607f39de4a1fa4efe9d51e6088edd4c13d22431cada389679d55f684ad548f4d1
 DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
 DIST vala-0.48.9.tar.xz 3472540 BLAKE2B 1c85b5d9a1f3819d5b26b521c7da423adee313b2acacb354e324abd9ccf24707dcfcd1a455bab867043f674c4daa5f1a62210847ac271dfce09a288651220f53 SHA512 076fcbea34dde1a84c15e4e2b6acd009c2fea578d48eb28a99a604eb4edc8bb53ac6883ca93ec906968d43d4b341707abc730d6ac8a7b3682a2fa5f0030d5256
-DIST vala-0.50.1.tar.xz 3508924 BLAKE2B 4a6acd2ac9e098e8da9c1264584f02a22429ed096292ec8baf4c9c5ac2d0be4bf20c6c2eb6a41e31295461e1a7e0929c471512e435245c04228bf67c91f372ed SHA512 2f5d0bee6dcac3031108fffaa3a9a0339c8c79ff92d1824292f266a704bef1cf4f9eed15ebf424b608f09129b3e0577ed8cd7798a4fa12bfd9d06026909de769
+DIST vala-0.50.2.tar.xz 3514208 BLAKE2B f2f7e86b90ac1245d593ba82204667a830843e2fdb8e9a5afaa44453a146461f0ce2b9f9338ef4743bc6055bbce6c023ae92f0bf2ca66757cddd7fc3d7a4db63 SHA512 77069b53037adcd4c3fed2dc4a5c740216b950c52e8a0ed777a5cf9a5d9f078d0abbc4dbce08e122817cd3de0ac75ebd150b0f6f0b0cf4a09cb4a46f96bf4c3e
 EBUILD vala-common-0.48.11.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+EBUILD vala-common-0.48.12.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.48.6.ebuild 646 BLAKE2B d84fa9f606e5cba0763ee49202cf16f5cd01520dad44abdc02e089fd9890f3179c4a02fc33782d028b5d3a405135491309f5823004905d394eaa04b4b656dfb0 SHA512 443f71539e0605f9cfceb6b5c76792590dd36e4e51465f1848954f676e69dda63943c8e5ed9be4a7519f1ba9500f05d43ea275209677a9b2eb53434e9c304725
 EBUILD vala-common-0.48.9.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd46b2dec2f8c343d548a13cffe1a9364f0fc5675944540cd3b5b0dfa03e7660a7c572a81462366416a7227c9b2da18d SHA512 2dd63a63255cb20f3fc7fab488f9ea2a15dcfd20723bfdbe190dac19b2d706cdd388343d39045aaaca06f7b5d148050cf3860eac74a658227ed6191f00304d33
-EBUILD vala-common-0.50.1.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+EBUILD vala-common-0.50.2.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.50.1.ebuild b/dev-libs/vala-common/vala-common-0.48.12.ebuild
similarity index 100%
rename from dev-libs/vala-common/vala-common-0.50.1.ebuild
rename to dev-libs/vala-common/vala-common-0.48.12.ebuild
diff --git a/dev-libs/vala-common/vala-common-0.50.2.ebuild b/dev-libs/vala-common/vala-common-0.50.2.ebuild
new file mode 100644
index 000000000000..ee55cfcad100
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.50.2.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-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index b690c8eb8c06..354fab5dc12a 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,4 +1,7 @@
 DIST voikko-fi-2.3.tar.gz 694602 BLAKE2B 454afaa76be00645b8640f84c2c91ed0b31be5b46c98d31bba0f4967dce27919eee6a6c452941b3878b498c7f913a413a3d143d658bc38da2a07b32d876ac317 SHA512 b3478cbb6aecebcc25e1c4bce0881a657d664c11190a22c1c2c4ca7e7c62b4c4fd5d396718fbadc8c5ab3c9db5d4349d6cd81440a1394cf4c2f77c52ae608018
 DIST voikko-fi-2.3.tar.gz.asc 833 BLAKE2B 4d960595ac948ec59499448219c5c84fe17060f80bdddaf358d222db63b1c2d167713ff9feec04fa9cbf35072a6cc153486078851319cf6631b7f18b346cd034 SHA512 1990f737673931580236e1765aabc2e47766f0bc1f6fef150fd2fb63dd459244ceb0fef99cea9ba1f1295a75daab0336400b7c6b367f694038849759e000adbc
+DIST voikko-fi-2.4.tar.gz 701807 BLAKE2B 978871a733b12be53287ec2d4637428f6991cdb3098a97cc7fc673d7b1e1ac85eb6811653c1121a1f04b23f40e1b6ff6340a5514c2d1231cf7be37879c70cf20 SHA512 00098fd52d4f81b30fe7f0ecb97ee8f240d898dfd511da1fdc5e6fd7046f2bf94c0230dc733bc6034f178d56d26c3ee69965eb61c04fc7b30087131767701858
+DIST voikko-fi-2.4.tar.gz.asc 833 BLAKE2B f4f470118716cf3ad2348b8ae74f57d95a03adff3ffee66a1f09ae569e240a99ff08e026cd7bf575347ec9941bf6e0174c0b3b468a3434304dd8356db3e4d35d SHA512 bb68fe81c0d8cea206b93484d94d5bfc9a9272827616f3ce8016721027a736b190ae37679baed70df0350c3f84235fdb3d6a525d93123ff561ef6d83b7717562
 EBUILD voikko-fi-2.3.ebuild 847 BLAKE2B 3e56a0d3c4f2a32e7b17798b99f9c2452c093642b62007850e0b625a62892e6d8104187df2f456c599bf7eebdae53662e7bbfedbb89bd2dca4f81d35e199c4c7 SHA512 f7b38d806d87095af6dea361c45a501b2ed92975a5bb833240c9e5abca3c6ca79e1dc7470b335688e25e16543d5b49135f54348330a39cd45053c8fd894f1010
+EBUILD voikko-fi-2.4.ebuild 849 BLAKE2B 424141699532415d35234846a9ba8bd4c1534ad16649267cadbacca98c95030ced271c5ebe29130f89083cd41320c049e4e81a0f6a2858c8c6d67dc2e1598755 SHA512 985b9ab743be38311c8973759ec24551f8743caef645ed28f09f7107075642e981ffada0499e50c8f7ddb3043820ef610e6912781c305882f43aeb1909f8c94f
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
new file mode 100644
index 000000000000..527614bfd971
--- /dev/null
+++ b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1 verify-sig
+
+DESCRIPTION="Finnish dictionary for libvoikko based spell checkers (vvfst format)"
+HOMEPAGE="https://voikko.puimula.org/"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
+	verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/${P}.tar.gz.asc )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/foma
+	dev-libs/libvoikko"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libvoikko
+	verify-sig? ( app-crypt/openpgp-keys-voikko )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
+
+src_compile() {
+	emake vvfst
+}
+
+src_install() {
+	emake DESTDIR="${D}/usr/share/voikko/" vvfst-install
+	einstalldocs
+}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index b431b8317fa0..17f1fd06b530 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index b4ef7a6e5fd0..c07258a805d4 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,6 +1,6 @@
 DIST lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz 3690 BLAKE2B 8e31e8ad75bcc5840223068fdc9b634c2cbc42d713bba0792a0b04f8e018e36e3bab16a07aaa725d8b2bbd55c3a74271a21366c2cde1b4c6bd735c9438efedec SHA512 c461c23cd50ef43aa37ce2c819a9a485ead1011ecb5ff083a092e49ac79d5398aff1631f441cb8e59acd820024ed51e74420b74da751c0fccd2cfce94f039952
 DIST lua-compat-5.3-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 DIST lua-openssl-0.7.8_p0.tar.gz 397072 BLAKE2B 048ae34c195f6f0ff252f33d14a7151b629d5b9ba828c331459e58f23f0ee62e66f00b8fdbe5665eb7f247d4bb97986e158ea89107189aba4199fcb878f2d724 SHA512 a23b5010633aec70639903fe4d0473101e42c2690456ff2d730c45ef4710134058bc6b3e364c79d3cf3dd4c323a89bd98f07a17d23f226b0bb7e0bb1f2be32c5
-EBUILD lua-openssl-0.7.8_p0-r100.ebuild 2449 BLAKE2B b7469b721fbc35db1e2bc9bccfa4f92e4b6b6b3ba18af5821e1ff973d5b550538f90a381a79bc0b07345e691e497f9f33dfc67cea36df85577856f32e41fb9db SHA512 20d039165bc638f24ab7275a02cfbb64f887fdf25a05613094450e27cc122e3dffb2238766ffadd98e2d65d041cae20fff1ac5c4a1798f50c57330772e2fdd3a
-EBUILD lua-openssl-0.7.8_p0-r2.ebuild 2510 BLAKE2B baf5e8d6b7015c761ada5e63a4c219b7efdb6b09012b298edab2db61f9c855c72147a4863bb9ae43feab4718b837b780dd2c50dd59c32949fc0fa56e5bdb8241 SHA512 c8bf27ce0796c1ddfb59c78308713865913a49c4f87ca7776541112aea85a6973292959944de034eeec2e122b0f3e07435a5fd29cb6976be4db70ac76a13b185
+EBUILD lua-openssl-0.7.8_p0-r101.ebuild 2638 BLAKE2B 462c64e0d256afcf119406a7a64e9acf0dccf84b933469a683633d850cc685f08ae299bc46b42477a1714eb76129996262ca0229562192d892280784690f35bb SHA512 2d9153f2a0edac78c06a40e60212c1828547df2cd446a0befad8d3fcd44e751ae4173b963cf5ef7b1326c9764e513f8973c31f5f020271e53369723a47f56d0c
+EBUILD lua-openssl-0.7.8_p0-r3.ebuild 2699 BLAKE2B 6493cd72c0100cf0d398c830fdf267eea082c255e43b8ffcd857c052ace9862755c1b8545c1b1a8cfbb8f69573aa3789f363cd54711e7472458055b8ff70bf60 SHA512 83db54985fb38adfde94305bcfea5a7f3c717c150fb42b86316652f8de75268d0cb8c8ed7b38e03f76dc44575748c770327f4876da50686936be3abdbfaf96f8
 MISC metadata.xml 555 BLAKE2B 3f448f76d768881d14d1ec6514ee525aac2acffa168943bab1b72f9f86889b5ba434d53e774ef296ec76cfa689f86935e40ad752617cdf43b3b534c4a74350ff SHA512 235a3193b4ced9f5515bd89ed60f32e06d32dbfced30cc05f9c67dd46ab3521cd916da1a46e96457abf2f9e1fd11df1d4d2874775ffeea3ad156db8cef118202
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
similarity index 92%
rename from dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild
rename to dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
index f8e40f03140f..812eb60b0a60 100644
--- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild
+++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
@@ -46,6 +46,9 @@ DOCS=( "README.md" "samples/." )
 src_prepare() {
 	default
 
+	# Allow override of LUA* variables
+	sed -e '/LUA  /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die
+
 	# Prepare needed dependencies (source code files only)
 	rm -r deps/{auxiliar,lua-compat} || die
 	mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die
@@ -60,6 +63,7 @@ lua_src_compile() {
 	local myemakeargs=(
 		"AR=$(tc-getAR)"
 		"CC=$(tc-getCC)"
+		"LUA="
 		"LUA_CFLAGS=${CFLAGS} $(lua_get_CFLAGS)"
 		"LUA_LIBS=${LDFLAGS}"
 		"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
@@ -80,6 +84,8 @@ lua_src_test() {
 
 	local myemakeargs=(
 		"LUA=${ELUA}"
+		"LUA_CFLAGS="
+		"LUA_LIBS="
 		"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
 		"TARGET_SYS=${CTARGET:-${CHOST}}"
 	)
@@ -97,7 +103,10 @@ lua_src_install() {
 	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
+		"LUA="
+		"LUA_CFLAGS="
 		"LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)"
+		"LUA_LIBS="
 		"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
 		"TARGET_SYS=${CTARGET:-${CHOST}}"
 	)
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
similarity index 92%
rename from dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild
rename to dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
index c8c126b8cb44..88652952c1f3 100644
--- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild
+++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
@@ -45,6 +45,9 @@ DOCS=( "README.md" "samples/." )
 src_prepare() {
 	default
 
+	# Allow override of LUA* variables
+	sed -e '/LUA  /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die
+
 	# Prepare needed dependencies (source code files only)
 	rm -r deps/{auxiliar,lua-compat} || die
 	mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die
@@ -55,6 +58,7 @@ src_compile() {
 	local myemakeargs=(
 		"AR=$(tc-getAR)"
 		"CC=$(tc-getCC)"
+		"LUA="
 		"LUA_CFLAGS=${CFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
 		"LUA_LIBS=${LDFLAGS}"
 		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
@@ -67,6 +71,8 @@ src_compile() {
 src_test() {
 	local myemakeargs=(
 		"LUA=$(usex luajit 'luajit' 'lua')"
+		"LUA_CFLAGS="
+		"LUA_LIBS="
 		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
 		"TARGET_SYS=${CTARGET:-${CHOST}}"
 	)
@@ -76,7 +82,10 @@ src_test() {
 
 src_install() {
 	local myemakeargs=(
+		"LUA="
+		"LUA_CFLAGS="
 		"LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+		"LUA_LIBS="
 		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
 		"TARGET_SYS=${CTARGET:-${CHOST}}"
 	)
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 66dbadfef331..2b641295d988 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 03cec4dd980d..065e7dcd5031 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -3,5 +3,5 @@ AUX externalmeta5.patch 562 BLAKE2B 0618a1691472c3248f63f157f2ba36d886a7b34b1813
 AUX externalmeta6.patch 546 BLAKE2B d0d5f75c46704b280ae4480ffe2ebca097adbc457c845615721888b45612da1a8e71b41bd6d8d9dadb16cdffa35108fc87a3dfd32313fa96d92f0021817e0112 SHA512 c112b7d44101e483d408c56dcd0d2524208b6e95b65a09dfe01f8ad6d09a20617020f9174cb4631473bab2550fec151329fb5e8d0e2e3378991f1ab88cce0301
 AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-EBUILD findlib-1.8.1-r1.ebuild 1666 BLAKE2B dc1031afd592e0b82a11768991bc6c13d2034ce0354d8659d18397366e3eb4d5bbac50b1f62d0b944ec3e298cdd2ffe3134d10a16a9d2c2f53d8528188fc44a1 SHA512 ea9348133fa3c07f312121ea5a02e255cf5848ee6bc149972cf548df0531fb87e4c388d72e7134d0afdb61908d29390b6182aec36fe244dea51b6e3d3585dad7
+EBUILD findlib-1.8.1-r2.ebuild 1647 BLAKE2B e87f9ec61c280cbd09dbcfb9d18240d99b6ba6b044af9b0c5496278769b31ebc50fd9e4168bf9916dd6da5e1b3991a492a9c05f2bfd9e6c1c3af38c57a3ee545 SHA512 77a42202efbcc1b430464b660ba1e8b7cd01620f19453a8ef4cd4837fcc59c9f6a109b6b0b9a54b9390e18e63d43e29299c6cac8dfb4d7ed4500e0543688e7b6
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/findlib/findlib-1.8.1-r1.ebuild b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
similarity index 95%
rename from dev-ml/findlib/findlib-1.8.1-r1.ebuild
rename to dev-ml/findlib/findlib-1.8.1-r2.ebuild
index 9c3988c304ea..fa1af8f3e840 100644
--- a/dev-ml/findlib/findlib-1.8.1-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
@@ -3,19 +3,16 @@
 
 EAPI=7
 
-inherit multilib
-
 DESCRIPTION="OCaml tool to find/use non-standard packages"
 HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
 SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-IUSE="doc +ocamlopt tk"
 
 LICENSE="MIT"
-
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc +ocamlopt tk"
 
-DEPEND=">=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?]
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 44305e3bed33..c6d2f1a450f9 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-ocaml-10.0.1.ebuild 2990 BLAKE2B 3993630867acb739d621fa701f83e4c8ddbc44cb9b77e9c9ff1cbd173c18c894836a9eeb2aa2d9182fbed3e05af2d3cf180a535d27c74de4dd2f87afdadc8f99 SHA512 a6444d4877fc671390b0396f04a770363a5be803afa4f657c61bfb0449fa0aa8b68960f4be1ab6061d9c44f69d4130a64c6a4dff1d76e1896919ae2e59ec30d6
 EBUILD llvm-ocaml-11.0.0.ebuild 3052 BLAKE2B 9697dc5b6c2365415dd405b00c913606055d56366ef7710e559611c1bcd1b955777ae4d7836b75a49635bf5132feaf423af9ec7b033e34eb40864a6ecbed3c28 SHA512 855bcfbb8198e815c7d89dfed959fe95d78221eec20a6512c9190eb9e3d9c7b3ebada04a85ccf4653cf9e8e89e318b5339113b92afc1f99d8cd19ffd17c22dd5
 EBUILD llvm-ocaml-11.0.1.9999.ebuild 3037 BLAKE2B 4f8b569495b3248f95e3e363b7bcde257d28d7160be55500aca8dc5160937956ec52b3b3e0eb83bd98d50ebfd04117112c5eecf5afce6e5fb30873aa834f4b06 SHA512 3107f267f868c1420f2bad3a4b27e5f9863fbfa23f9548e568a82fd414ca64d5f1491d26e153dd2a2c11fc840051073f4892ef9056ab977c16ccc7afd436bbe2
 EBUILD llvm-ocaml-11.0.1_rc1.ebuild 3037 BLAKE2B 4f8b569495b3248f95e3e363b7bcde257d28d7160be55500aca8dc5160937956ec52b3b3e0eb83bd98d50ebfd04117112c5eecf5afce6e5fb30873aa834f4b06 SHA512 3107f267f868c1420f2bad3a4b27e5f9863fbfa23f9548e568a82fd414ca64d5f1491d26e153dd2a2c11fc840051073f4892ef9056ab977c16ccc7afd436bbe2
+EBUILD llvm-ocaml-11.0.1_rc2.ebuild 3037 BLAKE2B 4f8b569495b3248f95e3e363b7bcde257d28d7160be55500aca8dc5160937956ec52b3b3e0eb83bd98d50ebfd04117112c5eecf5afce6e5fb30873aa834f4b06 SHA512 3107f267f868c1420f2bad3a4b27e5f9863fbfa23f9548e568a82fd414ca64d5f1491d26e153dd2a2c11fc840051073f4892ef9056ab977c16ccc7afd436bbe2
 EBUILD llvm-ocaml-12.0.0.9999.ebuild 3042 BLAKE2B bd3be02016d1136e2f87dd8da51ff1815f9edc633c1c109ddf108f53d1aaa68ad9af967261ffab5836eb96911071525f20741841e45fada95b6edeb1ce1adc54 SHA512 7610604754b5cd6be108c532b211532a30fb3320216ac7f9042673b50c2411058532d01166610f049f7ecbda6ea45fb495841ce0b4d1b58d14690473d347d206
 EBUILD llvm-ocaml-9.0.1.ebuild 2952 BLAKE2B d0a7879b89bddff51521378d5cf96626b2bad80f35bae6b0026a51806fdc47139049b23a6ded6f64ce9161b1951341ec71e496a9b094e4b3aa1ca8c44e626cbb SHA512 f1937a057dd79a8fcb5ff587520199941d22e5d4ef18be5f5cc7c854e9d42e32beac3101f37897dd1ea32ef6a38a232685a11bee4b2cc83dfedbec3b5e08c75d
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..40fb0676b744
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+	test? ( dev-ml/ounit )
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index fd5108293f16..1cc948a2347f 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Text-BibTeX/Manifest b/dev-perl/Text-BibTeX/Manifest
index 04159e64d83e..f5bd106e2180 100644
--- a/dev-perl/Text-BibTeX/Manifest
+++ b/dev-perl/Text-BibTeX/Manifest
@@ -1,5 +1,5 @@
 DIST Text-BibTeX-0.85.tar.gz 299430 BLAKE2B bec61d93a4a0814bf1a6f357481da5ba337dd2ec4699ead948c9d4a48062664e77781babb82279582d04e3aee2ba26eab6c6a5b31af3008a076612c6f8cc4261 SHA512 e9ed337bde11b26626fc43c03bead2be54c0724194e19b4f543923634533220bbd68588f6349892eba0e6df6d305a51350fe82cfcb6cd24ea154284e4819b841
 DIST Text-BibTeX-0.88.tar.gz 301812 BLAKE2B 8a8249a95ef6a8af29346ba647543ebfb7cc24f18271fb79f2bb5b427b6e1fdc38c4e485ee7fba33b22f061c075533871fe6f6e226f6825313618d70632726c8 SHA512 63425590feb479b43b70605144edad400650471ddefbc3dc40f5bd1b6c78e5e50eabaf60501e469de520e36221bebd1806eae8d45124b59feef9446fc3257d18
 EBUILD Text-BibTeX-0.850.0.ebuild 984 BLAKE2B 5c3c7c73037714c56a20fcda6340796a71cacfa967021479f35771f1c9d59cf9727d91d1672fb74390444156b2cd70a971ae6b3f6aa6f063671191978b054e34 SHA512 dd5ff250716ae051c71b68e834defa256c3ffd75d366deeb7a7ca03264ee163dac1668f5ca3f7a995fb03a14cd6d71d58cf4941b3dec8e01c11f4208d8c0e777
-EBUILD Text-BibTeX-0.880.0.ebuild 986 BLAKE2B 0dadad45b2a8f73c990dc3d34869e0c166ba076e8deed2eb81257a721eb63ba194754f2ecd2c0bb01c504847b3949832a7afdbe1dc05a94b6b35970f838c12be SHA512 5cb709d1c2c11c921b2d6a1656c22e54ebfce79133ea783f446e2087e1919b30fe7c01105cff0dcebd812386e92687544da19c3c70b804959be370cb6692c022
+EBUILD Text-BibTeX-0.880.0.ebuild 984 BLAKE2B ac48f9b276e611fcac746618410ab477b1d5abccde9381ddb5beef7a0d04e4a7a0f20bed27e840659da289970dde73a930050285c0f40e883a7d81dfb4e46987 SHA512 7e348fe7d0a8d6d46312bfa00bdc83fcbf432bc04cc1b4a7561788367d34dea9f1208a199382a010ea8ae0b7ade9465b4dda7d7df680688c87cff2acd2394740
 MISC metadata.xml 1225 BLAKE2B 19cd79fc193f340c1251b663a74d1d8740bec487f352b665e344df91f76581a679300cbd5c5b01faf3e528c226cf365ed006036f89d9a12deb220677ffb53617 SHA512 f9b3f93b882cdf4d80ecebb0e4cf0d91de4baffa84ddd88708b6c5e3cfdee3791ccb1df40a61e6fcc4142a61909f94e40737d4ec83ff6b15ca9a7e7fc15db886
diff --git a/dev-perl/Text-BibTeX/Text-BibTeX-0.880.0.ebuild b/dev-perl/Text-BibTeX/Text-BibTeX-0.880.0.ebuild
index 039cbc9a8b87..7b3771f3439f 100644
--- a/dev-perl/Text-BibTeX/Text-BibTeX-0.880.0.ebuild
+++ b/dev-perl/Text-BibTeX/Text-BibTeX-0.880.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
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="A Perl library for reading, parsing, and processing BibTeX files"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Unicode-LineBreak/Manifest b/dev-perl/Unicode-LineBreak/Manifest
index 4e502fe8d84f..66b7fe7a9911 100644
--- a/dev-perl/Unicode-LineBreak/Manifest
+++ b/dev-perl/Unicode-LineBreak/Manifest
@@ -2,5 +2,5 @@ AUX Unicode-LineBreak-2017.004-dotinc.patch 4512 BLAKE2B e86fb471d296e642aedb254
 DIST Unicode-LineBreak-2017.004.tar.gz 311366 BLAKE2B 7f4ff93365c0542ae1a8f9d17e0e9e20224b95949c4965e69f241ff949f625793a19bde4a81830f9f0214abe3d18fa6c52f43f9a04860ec4d13db55169d120f7 SHA512 f372174a761f87663761dc8b0f9bf387ffe289ba267fc0fb58353ac06dfa9418d4b0ac6e4e0d7833d842feacae4f8e90e521cd677ab22db1bf32e75f10f2e727
 DIST Unicode-LineBreak-2019.001.tar.gz 312225 BLAKE2B e7bf274fcba3603acf93f520493d67b2ff113b4e098da39c8f5f5a180bcc75f403f04ede5248b8598f8b991498de9c19766c29e3ee25eea12e82aeac1241194b SHA512 2d285f928db2ed32aefa741629ce9f9bee82e69c247eaa2c9145fdb4e9bae4441bf822e108cbffc3955369539474c3299f0a8f69026a5f9686aa8458a1d87f27
 EBUILD Unicode-LineBreak-2017.4.0-r1.ebuild 513 BLAKE2B 2291e26ba5cf3d2989e20941e2ea905310218d8cdf1759d3bd501f0c82a1f3b754f2c72e90d74d0abbe266df2c6286f7e6e30785236c9968ff11b3c8252c43fd SHA512 c847490977afe134fe4a19429dfe63716f08bffee94859885b80130905d55aa6e48ac35513e2fd8978271c2dff22e52dee0b9648e79b7d457662f2c53a15f1f7
-EBUILD Unicode-LineBreak-2019.1.0.ebuild 467 BLAKE2B fc6c4f0a690f0cf639413f52aea34da12adeeaf66097e5bdc9e6025e6573336a102d159dda620b3f030b94e22bb04e5f8b86cc27c8a08405eed8bada26eaa771 SHA512 dfb127f23bfa5a9cf12fcafae61c1bef08f195fe4ee88bbbe9be842a294e3d2235146f0b9ef9ef6176e50001ae5efcce95efb45d4a5a0e6cadb480b4579a05f1
+EBUILD Unicode-LineBreak-2019.1.0.ebuild 461 BLAKE2B f55e6fa743f8b016ad87318cb555566603cd044997ea9174f42ea77a66557ad09d0c050ac097aad4f81ff6230318344222dae7df27a2486c51930552f021aa23 SHA512 7800f3f67751e18a9d7029a8532053af6c29bf2b4d954d5a9534d29c6d23b45ef8c2ccb58ceea54b16f6d72d2900f59ca4d838d92408ed557ba40e1656408ad2
 MISC metadata.xml 531 BLAKE2B 222c5b7ac9a391d440e8d2d74525ffe988ebfaaafeacbeb725b944bb688977ac2a44f5934ccdcf719ccf516d3580308f0cddb6b1f4c7d2b3ae2e2ceadd5cb1db SHA512 831c5152759f2a9b2c549295aec94a7a9a00f261fedeca2744aa5161ba4cc9c68efd59da63b80e3b70ea83fe16491f7438580fc614bfcf57fd813654307710ed
diff --git a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
index 41f6f60ab10b..5e40d52b4359 100644
--- a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
+++ b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="UAX #14 Unicode Line Breaking Algorithm"
 
 SLOT="0"
-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"
 IUSE=""
 
 RDEPEND="dev-perl/MIME-Charset
diff --git a/dev-python/Babel/Babel-2.9.0.ebuild b/dev-python/Babel/Babel-2.9.0.ebuild
index 625b41efab30..967e7252cf17 100644
--- a/dev-python/Babel/Babel-2.9.0.ebuild
+++ b/dev-python/Babel/Babel-2.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index bf47685e3811..c007be819562 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -3,5 +3,5 @@ AUX Babel-2.9.0-pypy3.patch 1130 BLAKE2B 23abff434e982c8d8f8350c599b3b94ee07775e
 DIST Babel-2.8.1.tar.gz 8471453 BLAKE2B bc2e66a3c1c77e5b190cdb3f53d149268b6f49adde3040cbe6a3dd8eb98f6caffb3988232e76083e606186a87b9ee6b2b5352de89b7bc43d4f72905f1f594127 SHA512 ed39ad01b873d40d0bc611739761d412ff442b2df3d4c2363ec24501547da678cb752f640a02470c8513073a76c468c27fc16248820c779ef7adbe14d0f07199
 DIST Babel-2.9.0.tar.gz 8682986 BLAKE2B 0e1e8fe647fdd27230ee9c97f0994772bd5877f262f9cd00eb450445c5780b278249f87d50f98c5ca3fa5eca287c6b4fc74c5e082c522c250d640912f0ebc581 SHA512 250d1a19741eb0d1bda9d6b862f2d4779b6c67f10b8e045f450a271a16587e30f26f35ccccfea8ca13bb519582d2ef83569fa4381d0590fb9b61bf3ebf67e5f6
 EBUILD Babel-2.8.1.ebuild 977 BLAKE2B da2189c23edb4ff4514ac122b7a011a090ba46a12814ef24a8767b75a49361a51dabdd4b2229d915a65f5b2438e09d809376f5edba67f689dd17aeb4aecfeaab SHA512 adeac488428e5d53d182635fe384dea49da15f155636314d2b0e812a6552fccdc8a72c1c7137ce7d704609cfe9d6cbb70fdbb33bfe641842396438a0db30f183
-EBUILD Babel-2.9.0.ebuild 923 BLAKE2B e0513deaa1b26f367b104800479b919a63534b23072ff918a3822725050294249c6c9fee95f257fe95abaa7f9ffa95132069fea47279c276e7e72af9073c8b5c SHA512 28e1d946896fde2ad737a28cd36b0d576e57fe1fbfc0b3230928a939caa60382c196440a757bec269eeb7198ab6331aa571ce7c99c7e20ac6a81b261fdd7a934
+EBUILD Babel-2.9.0.ebuild 930 BLAKE2B 54fb807fdde9c602712372faf11038be4bfd539a0318712c32577bfbab00ea2475e8385e50c2a2792223519847be61e623c99df54b341a18191fb44db61b31fa SHA512 bfe9151bb02eb0fca0aae3320aa086acb815f4c021e761e762975dceae713a12a22e9d1f633c670065bf818a6d901dd6c604a346ddbc32f09e840207e5e334ba
 MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 7cae96290c9c..bdee21b0bcae 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 45c7dd036572..5decaf5ab35a 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -5,5 +5,5 @@ DIST aiohttp-3.7.3.tar.gz 1113127 BLAKE2B 47d95565db1184c6b55a1e7d7a6df8cda872e4
 EBUILD aiohttp-3.6.2-r1.ebuild 6857 BLAKE2B 733c733bbdf573fd4bfc1c9fcc44b4224f5913ee886abbf1908f3ffb258fe611babb6c46cc5ace49996875140cab24286e79e961f17b1af00093862d6a37f4bf SHA512 ecef2bd9d04e3d6dcb626effce1a895da5d5cb6354d522305484f4c33f4298bcabc7b0a08cda9e3dc89545c2405a021351e62c71f755c937123d345b8b7b4f5c
 EBUILD aiohttp-3.7.1-r1.ebuild 2477 BLAKE2B 527e91b161455cbc91255adabf53e100608892eabcbb94483ead211c026165f37c50e7f0e8bdec68631df4d29bcd7c2a84c94e48b1e36a6e780a508a76b87628 SHA512 877eb53ac16bb279be2df54db3236b73374f792ccf4e09f248e87f5a771ab6c39701543d4ecb0dd160c9362797b08612fbc89852e25ccdda1efa2a531bd8db6e
 EBUILD aiohttp-3.7.2-r1.ebuild 2506 BLAKE2B eed6db56a3d93185ca0018ae4337841dd20e9d90cada19bdab7c0a7575eb1f124ec4457546c13a83886f918c37f0b056d9a3363e2b4768aa8ec0ccab8822132e SHA512 3aaf70bb8ae5d84f3e387879b590ff830df5c3db952664d32cacdb92908afd96efce76103bb74af57baf4f9c68b0217202a02fc84785e152eefbefdbef6d4889
-EBUILD aiohttp-3.7.3.ebuild 2513 BLAKE2B 3b6fca095b72abb6117c1fe26ad5d6dea02cefff3ea31bc02f71ea3c651a219655c42bc155c5c3994c2e04743e6428d5a521e6b9ca7509a1a46ea71c1cc362b5 SHA512 e2d6b665993e9a7f4938bd54ce3714c94198614e8d65460659152b8863893cb16ea68466a3d8fa333540780cc621bd5ee4a302a19181d276cc6372b728a6dea0
+EBUILD aiohttp-3.7.3.ebuild 2519 BLAKE2B 22a5f204da451da46facb899ff1ed3795e82fd0818e140c08a61c6cf416a64551ab0a968329a2145408ebc8130bf1b93cc09c3d329f4e962762c921f9fc63a6c SHA512 e2d95bb83dd4c3a173c9256b8e97601ab756505426e50291eb377a0c8850a50da5ca84a0f473b928ffb44ea49ac5d533e1c99d7efaa1e4df136fe8aa368fc73f
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.7.3.ebuild b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
index 6ad99a03e912..00de4b937726 100644
--- a/dev-python/aiohttp/aiohttp-3.7.3.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/backports-zoneinfo/Manifest b/dev-python/backports-zoneinfo/Manifest
index a93d9541436c..533f0a933a44 100644
--- a/dev-python/backports-zoneinfo/Manifest
+++ b/dev-python/backports-zoneinfo/Manifest
@@ -1,3 +1,4 @@
+AUX backports-zoneinfo-0.2.1-py38.patch 700 BLAKE2B c3bfc78001da6cfcd9e4b2ffae55f010e5237e68cce04bdadca40db95b5b2c2ef4e218cee884cba0e63ee182b817964ed5e9a7ef3b1992b0da041c0847d31b16 SHA512 d4210cf591a5c2a0266a3dc2f8b74b5ba5bde31923097aeb2044eea2c2934fa5946cafb747bb5e022a1af9a771049a4c6027acaf6886fcd0cc16db0c87a0a3ed
 DIST zoneinfo-0.2.1.tar.gz 85385 BLAKE2B a6382560dbe8c4207c5a53971431497126a3bad7374580f4a67ffd1ffe5940701f13a09bc3a5ba4b729ab8d2484516ea2dc71131b7276f5339b1f60fc39c4ab1 SHA512 1f17ce34eef489dcd263665d58780ab54cf8aa83a601d31148bb4316e600f94d0af1d0baa1d6554d069c0801af906e21b9d5535db2bf76de32333820c61e2364
-EBUILD backports-zoneinfo-0.2.1.ebuild 1568 BLAKE2B d4d391cae1db9c2e72dc0d531b2be6f6bf0e04c640e51ac5dfc341ff0cd8cfb1e8fd7e794c7631928e93b1dfe5ecf2aa902e6b8844b3a125f3eed5adc2de288c SHA512 ea078c89e0cda9c7540aca10e17326f61ec813c1a53253edc7192edadca724c5aa267823a3cc76b401fa85e4b250229394955eee63aab882a9fab3304b951f47
+EBUILD backports-zoneinfo-0.2.1-r1.ebuild 1694 BLAKE2B 1e08d89c33cee913e03f2927ed20616272af2f6d1f794965e416bf9026bb6ab9928b99e8022838970e7f0047fdd0db07125fc6f260d9764815e0bd96b8ba420b SHA512 181a2b69405e3611fb4d9c717548ffded07dcd8881b0050bb0eb40ab2ba3c7e1d357dadf66dac443922ba9650fd4afd7bba4b89d028a3cf2e50fef49bb1656fa
 MISC metadata.xml 299 BLAKE2B 1ee3feadaf1ca5ce9f21e6992db3308c45acde5db35f0484cfc9ce8c0c63fe4f6504dd72fcf795562a86a72f6dd566cb31dbccd95d0c162a47050c54c4df8433 SHA512 4429cae96d7f99e5ca93fbf6ae8b5c18a02c515c20f46a7ac7e9d19a9ec63567cfac4ac3122ff23cd04073f76aae3b41c6f1540ea6aab20f488f093bf130db45
diff --git a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
similarity index 87%
rename from dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild
rename to dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
index a5c5d51ed4a4..77b7ae5c51dc 100644
--- a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild
+++ b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -38,6 +38,12 @@ BDEPEND="
 # pytest-subtests
 distutils_enable_tests unittest
 
+PATCHES=(
+	# fix segv in py3.8.7rc1+
+	# https://github.com/pganssle/zoneinfo/pull/97
+	"${FILESDIR}"/${P}-py38.patch
+)
+
 python_test() {
 	if [[ ${EPYTHON} == pypy3 ]]; then
 		# pypy3.6 does not support dataclasses, and the backport
diff --git a/dev-python/backports-zoneinfo/files/backports-zoneinfo-0.2.1-py38.patch b/dev-python/backports-zoneinfo/files/backports-zoneinfo-0.2.1-py38.patch
new file mode 100644
index 000000000000..dbe9695a9a53
--- /dev/null
+++ b/dev-python/backports-zoneinfo/files/backports-zoneinfo-0.2.1-py38.patch
@@ -0,0 +1,22 @@
+From 0e42cc3999b4e3833b5f3f41857b8c1e3c9143f3 Mon Sep 17 00:00:00 2001
+From: Pablo Galindo <pablogsal@gmail.com>
+Date: Mon, 21 Dec 2020 02:02:34 +0000
+Subject: [PATCH] Decrement the refcount of _PyLong_One in the correct branch
+
+---
+ lib/zoneinfo_module.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/zoneinfo_module.c b/lib/zoneinfo_module.c
+index e0c72d3..07ef603 100644
+--- a/lib/zoneinfo_module.c
++++ b/lib/zoneinfo_module.c
+@@ -616,7 +616,7 @@ zoneinfo_fromutc(PyObject *obj_self, PyObject *dt)
+             Py_DECREF(args);
+             Py_DECREF(kwargs);
+             Py_DECREF(replace);
+-#ifndef ATLEAST_37
++#ifdef ATLEAST_37
+             Py_DECREF(one);
+ #endif
+ 
diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
deleted file mode 100644
index b9b8691aba81..000000000000
--- a/dev-python/backports/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST backports-1.0.tar.gz 2070 BLAKE2B 7fad9ef13abdc5bab550ddf62061a952991ff601642f5e03359c3ba2bf20d923701d86aed178dce530c60870efd33a4a2b4b2498802c78df73d406bc496239fb SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37
-EBUILD backports-1.0-r1.ebuild 582 BLAKE2B e1d6adb96b3f8bf8e95cda3f982a4132bc534e14e23f62f6c7757c07e187e92d7dfd35bdd1f9864dd9f319ebc239d3597e5c6e51c836e848ae061733bc546712 SHA512 c6f3fcb27296b64fcc988513c8a9619d4fb4fdf6500c407e52a500455ef81b4eb0cea937c1a56fb85c089d9b790729d40585565237388b98f1ed71130616280c
-MISC metadata.xml 312 BLAKE2B 88bf756abcddf4ffedbb8df1f3be3d95d37c904d8e29523c272b5e274b2dc82b7a06b8ab089b9504bfeb313b1419680d3d582ac6cc5ed371a242af4a7c2c65eb SHA512 b70bf4b03d5f244f65c4aef2614bc96ab73084099bffcbd5c800bee56f9e8db6520303b6e52544f8b0b6d8d483d840413d816f24a19bbe29124ab242a1762bda
diff --git a/dev-python/backports/backports-1.0-r1.ebuild b/dev-python/backports/backports-1.0-r1.ebuild
deleted file mode 100644
index 76c5d6cc2166..000000000000
--- a/dev-python/backports/backports-1.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Namespace for backported Python features"
-HOMEPAGE="https://pypi.org/project/backports/"
-SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-RDEPEND="!<dev-python/backports-lzma-0.0.2-r1"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 2dfbcec02f55..1e1a7e00a87e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,6 +5,7 @@ DIST boto3-1.16.36.tar.gz 341458 BLAKE2B 7e4cf667cd59caa8433226eb6914412370bfa4c
 DIST boto3-1.16.37.tar.gz 341684 BLAKE2B 4c9e7389ae4620edbb9cee2accfe6e7b520998b0a1110444d137387a098ed027a281e69a9bf6b2d3383a51b60b6dac16695b867ee27f44a9180459dd8a4b55b4 SHA512 1105b00d6aed4ebd36b77b21c6a3370dd1f34669df2621cd13dd776788d7fdd469086fd6956920632bf33a5291b14514518046983afd95441d54b35dc68347c2
 DIST boto3-1.16.38.tar.gz 341739 BLAKE2B 75cad4c53ae951b8f913e533dc73f6b5e0bfebe416cb28b7a7700b848a39f0e46e225a5d9c926a3343412d0ea90405c2f22ee6e2ba996c42fab3c62bc77cf5e6 SHA512 9f9edd5a9b3b9695c453e86d29b33271134d297772b0d1e6bc440bb6a87918144c4fee16a629d67be174b756392fa7417374e12dc866d19da24174ebbf31e368
 DIST boto3-1.16.39.tar.gz 341915 BLAKE2B 286a06b3e8bd6f2a1ddfb017705f19c4f73d20f46f47c74647ecdae0cc7df8246d4714b1d4f9474ce5d6748d161f1f324c84cb3371bee9945264a93d8e370d04 SHA512 e79c0f4f85364e0693e3931b70c7d6600ce8e1af990e103a2f2b4876653b472be2e20acc8fefda83c70d259661e7c4bcd5e1571fcd909a8fb3a78a924560cab5
+DIST boto3-1.16.40.tar.gz 342028 BLAKE2B 6728b658ee75b76d4885e43316a58508a8563476a85af39462adf58982bfd75a680b05d273a5a0aabd3c935cd87f72d93ffd815d7230b9f44d64337f66de5071 SHA512 4ebe3069fd93657165acd7bab40c44fb37de61326e103b9675f919a0f88ef20341c9efd6fe05684a13e26f10d5b18858a978bbb04225af628df6ff16ad8ab071
 EBUILD boto3-1.16.16.ebuild 1353 BLAKE2B acf7d5909ffe2c1b58d3c2438b8ce995f98e092b2a76977674ad1c0491b4e2093ea53d8a1cd45b225e3577ed28847b60319a1a682d1af74c71acde7a822c4da2 SHA512 fc2ac14ce0c1ce9e7ccac46bdc9fde2e84687a7c634a784cc0ac7e99556b84f4ef3d2d27e546c445b687b93dcc293b63a5e3716ae645b01a60d8550fda591c4c
 EBUILD boto3-1.16.23.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.16.30.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
@@ -12,5 +13,6 @@ EBUILD boto3-1.16.36.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44
 EBUILD boto3-1.16.37.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.16.38.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.16.39.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.40.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 32d6cf48455240fb127d359f94ab09e45ec78655fbd63a5a1f29cd5a2b3de2941599c7d7068abc186b6e25baf13456b5e52958879871a5a8fc338b87e087fceb SHA512 58d3f3b2a1c04252e9c7527ccb094ec7ca41c9191de1aab85b4f6b2c6babe0c95d43f189031d2c8d1da2b35689d3ece1c27cdced6ecdec596a286893e05a5f55
 MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.16.40.ebuild b/dev-python/boto3/boto3-1.16.40.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.40.ebuild
@@ -0,0 +1,56 @@
+# 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=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index a8141a3bf7c1..d5f258a19e20 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -7,6 +7,7 @@ DIST botocore-1.19.36.tar.gz 7291325 BLAKE2B d1f79298a0f47d704418cac8390a5d500b1
 DIST botocore-1.19.37.tar.gz 7335789 BLAKE2B 3df00ad1f0d34f8f8408741b503fafdf9bdaacd9f5b0c52ffbc0b3172e7b0d01e741a076430268c55c39f1fe050a9b8bcc2d183eb54830886c7f3f050a22c408 SHA512 53ff17dcba3e72910709de7fe4504a04a507a708c2674039cfb682276ea7f8f46d3afeadbb41103d02141183d6216aab5964b0df98033cd12946ed1c83373aaf
 DIST botocore-1.19.38.tar.gz 7358201 BLAKE2B 16dee2bd0d27996fd761b19918c36de0475c827cb27d0c1505e438436872337f0a5b0ddceb3c4ffb3b5c15592a2aa328f8eec94e2e6ab55aa705299ea847c465 SHA512 51a6c7a0ab950c4a7f0d7859d90c39f30f4be2789b55f520f5318a00878c62a2f5eaa9741e53953d3226a23137415fc4318ca09d37d690e71b8f2078b2662cfe
 DIST botocore-1.19.39.tar.gz 7371273 BLAKE2B 574b0dedfbae40d496d5600ca37ec1181e74d48301deacaeca8b1628df1d5bdb3dfcdd0310b3e4860c9f0605cca176dadb4e313040a27521a0c0643ac7d0df0f SHA512 4b8b197a222f70cb136aeeac04178a27c229a2e7a82e42c66ab5f7366039a3d1748290d59df14db9039016247782c8f144757890e9fa0ebef4ea61f81931600f
+DIST botocore-1.19.40.tar.gz 7371480 BLAKE2B afd861d013b78487ff2a6d47a531536f3928c6e21dc88dc1a203d90e335c688a530bc9b253f325a641f4b31fc592dcec39d880e1962118b22a170229c54dbd29 SHA512 9d59a80864926a6ffcee7bd35ae1bc70cb5c373eba97318737f8485d8dc45a3efb4719dd6de64ced58077462eae445862708c04f2e936da6bf1fd7a0c24b3401
 EBUILD botocore-1.19.16.ebuild 1494 BLAKE2B 46144609fec0e6664898d9408afe9e31590c90653c092f160c4d2ec369f3b1189d49b94255dfd6fe3ed1a0390418d7109c87c6aecc341781eda27cf8da1a451d SHA512 fb88fed5c0e0f117547952237e4e097d52fb3009ccb2fad160d35061aef86ac88a6d0cd2a59ffc20c746da35685bf475f336f5a47ac55cbb625041003a486d6b
 EBUILD botocore-1.19.23.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
 EBUILD botocore-1.19.30.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
@@ -14,5 +15,6 @@ EBUILD botocore-1.19.36.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2
 EBUILD botocore-1.19.37.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
 EBUILD botocore-1.19.38.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
 EBUILD botocore-1.19.39.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.40.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
 EBUILD botocore-9999.ebuild 1606 BLAKE2B 15b1624c806724dd4cf8f86099a4f9049214ab9c0afa47f0211c0a5f66fe37b6ecc03db5448bfb3b4764f8eda23e19ab9f37bbe1461837bf0dccfae7da17faa7 SHA512 b5e16cf97b370e96e814c413d80793684a1579d293bbaf16b435de83af274efb299dbe42fb824c955b28099c50841c46124c8212bd539861ff01b278e6a7ee3d
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.19.40.ebuild b/dev-python/botocore/botocore-1.19.40.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.40.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
index f032f752f8d0..a18bcfdc3454 100644
--- a/dev-python/brotlicffi/Manifest
+++ b/dev-python/brotlicffi/Manifest
@@ -1,5 +1,5 @@
 AUX brotlicffi-0.8.0-remove-dict.patch 5333 BLAKE2B e68065d06c072f61b0115925706e1476ef58d4217635c2d29e32a503cc0a98a2b55a9155f8bc189659b986a8bc7ca213b4b1f1405b0379e3f2813db50b5b949b SHA512 8e1acde07e98c609e295d0c2408823de026ffdfa88b3a45880ab5321b5293ce19791000bc5fd0d37ba96ccecb243151ac52ac2beaa2447ca912ae21d5a4a711c
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlicffi-0.8.0.gh.tar.gz 21997 BLAKE2B 5e817e228ce01cd7a831c59cca5bab3e851d676f1daa5efab8f61a203c0854bcc92605c88896dff5f4ce27fc880718da5ddfcf02a3bddbbd7b2e18c33f1e77a4 SHA512 fd0c64b400d3b48e0e2d113b4d75e32a2b33fd99505c7661d6d51ba9aedf5cc1f58be09bc90a5f1f7e3424addef2b54cc085a41e6291c87d53dd7d4e8fc7eb4e
-EBUILD brotlicffi-0.8.0.ebuild 1254 BLAKE2B e1509b8e7eef67790776cd636e949e5882bbb9acd36d652f9f638a09bfb68c959daa635cb186451911482bcc2d252378934c96dca1e9707daa262d2be5e3b40a SHA512 158164e87df8795f7b9955438a36022e26e6b58be897bbcb9839c44aa133f369f93b866d72329680db342724d43301b9df3978fa5b77cca3958495910b5051ed
+EBUILD brotlicffi-0.8.0.ebuild 1348 BLAKE2B 29d3c51a385ee89b6a514e39fb78f8e3b8b666e7acde84055ff406105e6e483f14f1afadf03bad0a5e62394037db81e0a2f279efbc4265afb73e1b98f7fa95f0 SHA512 61c51bb2782f407c318b22d9d108ec3cc44e92c20f3adf5840b10ba1ca3010e1710e0e8b02bbd2ed70a88dba6414fa35188ef912d2f3e30a46fafbea42225e2f
 MISC metadata.xml 376 BLAKE2B 7044a00a2d66d5f983cc9485bc9a3124d24162cb72fb65c716653f1b4bddf7c6a1d3e7a407726098650167f74d5c10bab2582cabbb533cbf966ac0b8292cbe70 SHA512 51fee847f41d497493f69a12962df09d1229357502538b00c1941025230745bda4595619dca1277e6c01840c788e677ec0d1033d897350373e84ca6e9222ddd4
diff --git a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
index 5dbd99180383..02bd07374538 100644
--- a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/brotlipy/Manifest b/dev-python/brotlipy/Manifest
index e1341e5b6d6e..96808abd6107 100644
--- a/dev-python/brotlipy/Manifest
+++ b/dev-python/brotlipy/Manifest
@@ -1,5 +1,5 @@
 AUX brotlipy-0.7.0-test-deadline.patch 913 BLAKE2B f7a57989defc3cbc6aa0f29d9db73d7aaf5abae22609b4d501699b4e5195f50fa8025feee64e7935584868d5100f3e088abcc2086056058464f3f4ad14a939e6 SHA512 c125622a149582b0e45397877f4f609ced2d9b388ed101a7a5c0bdbdbb849093538be5ba12e6d549c7a9fea1df3c74dc8dcc3d4bc894bb2ebae0117440b1d5af
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlipy-0.7.0.tar.gz 19375 BLAKE2B 035dc8757e491bc4fc0d8e2b6b82703eecc8f6f4150da42fda0f6c6f42a617519f5191371eb1dd976b8bbfeab88845bb018b874a395cdbf0ff409a6911f969f5 SHA512 bec8183cf3cc8ba9e594d1a86a8a33d88a6ac8e9c6a6287c837bda3726183ff1b486f2c49da4e489b5b3cb51b57dd5816413b59419920c2ced48435221f1beaf
-EBUILD brotlipy-0.7.0-r3.ebuild 1476 BLAKE2B d20460de46ba191242127e20ed96f6b89e1d404ad6a704eb793bffd8d252efb4b441cf3983d571bf08c6a9ddb6f172b6f8f958f9988feb1d53f38e47fa06eb8c SHA512 fddd9ef185395032d3cb22557715c74565ef6e6565e4c8c5c690424d3475f277c3e672f7290d07272a0e25bc55f729752391a6b9adc9bebecfffb0351043687d
+EBUILD brotlipy-0.7.0-r3.ebuild 1570 BLAKE2B c771af1e7afb8eb3eacd5ae5c6da6f02d2b3cf96410f9aacbf85427b2724419c36fc2da47dd87651bd0060fd0bac0bfc6e75951fe858a54615df50cfba31fb37 SHA512 028b2a88cf3efaa2170cbeac59ef0b77c2b61a2a7c21cef09eb770f55ddb5190378ae9b39f780c6922fef30c750862551cdd8018f8644522584c08d6ae1f6c12
 MISC metadata.xml 372 BLAKE2B 3911434692e9e18810246101a8a365425be643f6895718f6faaf9463a99624ab898a5197127d904942cf8ad452e28052da420f05abd1d8c8368f8b7da2fa08d4 SHA512 daa1c91e60f79c74e425cbbda5a60297659ccbc91e7356efc32053d435e666f56347c02f7ebebbc2059ce3b91919d73c7d70295c1a2a255d8abcc2e197a90e79
diff --git a/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild b/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
index 7cf79b8878fd..1a8f7a4d4e3a 100644
--- a/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
+++ b/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # module name collision with app-arch/brotli
 RDEPEND="
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index f025edcb25d5..32ef06c2bdb0 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -4,9 +4,11 @@ DIST cfn-python-lint-0.41.0.tar.gz 5192401 BLAKE2B 1f4c491446b552272cb9fea46d9d0
 DIST cfn-python-lint-0.42.0.tar.gz 5307120 BLAKE2B f54c4ae7fcefa6b56714a0cfdf89d9fbce20078daac0784c6169dfbe1a110da699e37b526f306ed9734504fb3387c660ccb997748579b65afe01438124361383 SHA512 ce2e6a0031e3d67953da6f5dc96f0b155f1a1144bee75a8a476490eca69fdb700c8a3d6fd89b0afa4c8d724956e5f86bc48417035d7c94f3eed00abda47f9931
 DIST cfn-python-lint-0.43.0.tar.gz 5329573 BLAKE2B 94ea659e3df02fb3b269984cdf6d879d0e2719aadf3c95f15c2982606cde220493da0a7e34e16538170f96a2611e8693dbad73033bd842e91de613c8cdcb2009 SHA512 fdde4cdffd01d1e8011f44b4eaec0bfe28f2189f53bdc3054d563cf4657c5f828751d8a12e2050d8e04687fe05bf768b5db8cbd27d2ed1c5e0d8967ede70d0ae
 DIST cfn-python-lint-0.44.0.tar.gz 5339555 BLAKE2B 880f03384247f4d6af1e87850b367bdc0846e00205aa943480a3028760115e36b3f6180f536a7b16b9a1aaf9f824ceaea5ab69b7adb1da3f345506c0268b55c0 SHA512 15ee6cc0cb373f7104d9c32acb06433b5669ae89997de010f1c4f382514481f1c6b87ceb387236275299e13e63aae1a5345e71ee934f2d99c1b66e566e1ef245
+DIST cfn-python-lint-0.44.1.tar.gz 5339578 BLAKE2B 7982cba9fe422a8323c6ea270bd7ff5f41800cc16ceaa39d9fc01c2929cda5cca3b19c45de50ca8338a56aad001c834e16bfbd0ab59140381b5189e28965ba38 SHA512 b7f9ad598411d89979334aa79c7b4667ede28eef82b0b546977ba10f33f57e89366d1448e8ceeb3f28a2e53b33a409c439c3faf7d10f53fc5819f6b8693e117d
 EBUILD cfn-python-lint-0.39.0.ebuild 1339 BLAKE2B 0493cbc1361e663531bb80becb0e09edb3e5d8da4fa6258748e68061ba6765c1e324894000d8c5daa110680714d9ea045ff79bba27b3218e65a115ec1d0750e4 SHA512 75ff46b3bf5265045fbddb5fc0621b900767c999a03abcdc4bd3925b391927876c98431fd5bcb4199e261fde46cdce73dd555f795e7e37419a0ee800be461098
 EBUILD cfn-python-lint-0.41.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
 EBUILD cfn-python-lint-0.42.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
 EBUILD cfn-python-lint-0.43.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
 EBUILD cfn-python-lint-0.44.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
+EBUILD cfn-python-lint-0.44.1.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild
new file mode 100644
index 000000000000..a83123122bcb
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild
@@ -0,0 +1,49 @@
+# 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="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index b57de226f6fe..69e6361f07b1 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B b96dbdf62c22c703a871c8d00971976f1f856dd81bcaf34859bbb0f4de72f74a459331d732fcd6cf9afe0913815573459a1db933e10091f5c99cb8b8d23be1a1 SHA512 f033ff3e59044f45926ce86a594226eaee03b76ad5ea7b9ca390cafb619d01416370005fc947f2b643072b2fd6d6d700f5ba0cd686fa10fadb6816fe56c6dffd
 EBUILD clang-python-11.0.0.ebuild 923 BLAKE2B b96dbdf62c22c703a871c8d00971976f1f856dd81bcaf34859bbb0f4de72f74a459331d732fcd6cf9afe0913815573459a1db933e10091f5c99cb8b8d23be1a1 SHA512 f033ff3e59044f45926ce86a594226eaee03b76ad5ea7b9ca390cafb619d01416370005fc947f2b643072b2fd6d6d700f5ba0cd686fa10fadb6816fe56c6dffd
 EBUILD clang-python-11.0.1.9999.ebuild 903 BLAKE2B 5aff11bd5e99e2f0073f945c1a1980a68c12c50d5becd20cac9631af5d1e130fd8062e2edf60e8d93f0950a1a831fd84c2b829ea1112d970b86128173c95ec38 SHA512 d2354a7cd8442519d77decd7b531ec173811596715af25163c37f8214c57a0f9b3a8afa475485360b34cf1dcf449efe8f4e8af83d9b74f3225991fdfd45031b4
 EBUILD clang-python-11.0.1_rc1.ebuild 903 BLAKE2B 5aff11bd5e99e2f0073f945c1a1980a68c12c50d5becd20cac9631af5d1e130fd8062e2edf60e8d93f0950a1a831fd84c2b829ea1112d970b86128173c95ec38 SHA512 d2354a7cd8442519d77decd7b531ec173811596715af25163c37f8214c57a0f9b3a8afa475485360b34cf1dcf449efe8f4e8af83d9b74f3225991fdfd45031b4
+EBUILD clang-python-11.0.1_rc2.ebuild 903 BLAKE2B 5aff11bd5e99e2f0073f945c1a1980a68c12c50d5becd20cac9631af5d1e130fd8062e2edf60e8d93f0950a1a831fd84c2b829ea1112d970b86128173c95ec38 SHA512 d2354a7cd8442519d77decd7b531ec173811596715af25163c37f8214c57a0f9b3a8afa475485360b34cf1dcf449efe8f4e8af83d9b74f3225991fdfd45031b4
 EBUILD clang-python-12.0.0.9999.ebuild 903 BLAKE2B 5aff11bd5e99e2f0073f945c1a1980a68c12c50d5becd20cac9631af5d1e130fd8062e2edf60e8d93f0950a1a831fd84c2b829ea1112d970b86128173c95ec38 SHA512 d2354a7cd8442519d77decd7b531ec173811596715af25163c37f8214c57a0f9b3a8afa475485360b34cf1dcf449efe8f4e8af83d9b74f3225991fdfd45031b4
 EBUILD clang-python-9.0.1.ebuild 924 BLAKE2B 8a666866e1c2fa2806c29ae6c6787cee7dd7bbb33ac8d2d99e9072d13f8fd0b1a98388de9f655b9f26bc43085269af402592d62c29dd1ff3f2e1564c2e8a4c39 SHA512 c0c164894497d871a3016ec8dc19e09142f5f77d194dfe27d9ad12043daf22df7abaacefaa2294e7355aab2d45fe7f578e80ff7df87af6dcc0c75e8128f885ca
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-11.0.1_rc2.ebuild b/dev-python/clang-python/clang-python-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..36c6ba65c994
--- /dev/null
+++ b/dev-python/clang-python/clang-python-11.0.1_rc2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 7a87bab4e92d..04fa59f59c95 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,7 @@
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
+DIST coverage-5.3.1.tar.gz 684457 BLAKE2B 82c8e311d85a6f758c46767957199e94099838e3c340f5da1472813a2877293245583cb190acc0139cddf3363ee5f299fb42f955c59912b80d9d1ece8cfb09fa SHA512 981ebc9f9490efe613edd68afdef83cb161b303e6de266335ffd2d1d3634bd5a088cbff249b0243071b55cb4f31b4b0c7537b5764660ccc86a7059307badd571
 DIST coverage-5.3.tar.gz 693632 BLAKE2B 9daa3a0fd7f8c3ff7c9d68603e11a0a419d3ab50e3c3fb6be5b694aa1f7566040e1212b7175dfa4f71a0a309db325c00f94a85e0e9e755ae8c4f09c499d0daf4 SHA512 f40a21c394b1a72118965f702ae2b8e09c4e0b2fe92709aedf1de4c8074cd9c2cae0ed4860fbb863e4e5479f1067ff806d7051f7683d6b324de9945c0cacfc39
 EBUILD coverage-4.5.4.ebuild 704 BLAKE2B 2a43852aeff1c2e12dcb3cdc197dc1a245e522f293bec33370da6f88b461fad3189d1fc35554d60897a34edb4ec484607a980de6b9e61df147fe150739390f36 SHA512 9cac3135fd8c6a52205ac3ae554cd6912082c78a5c500ed2edbdcf20fc056b8cfc62c84bf64f60316d5934aa82088003f78678aa9be346f0840ae56495aadb7b
+EBUILD coverage-5.3.1.ebuild 1913 BLAKE2B 1b554ce2bd4c12354104acdc85f5e760e5769ff8f2a40e868d12f35a75768ffda77c7f66f695080903a7530b30631719c95360c7720e3aec6066438fbaf013e7 SHA512 3200c2528029e6f8ed5181827b5fe3894413ecb49b568f2883b46e2ab92bc6b1c8a3f6f010e9c6fc840e11bb989de68a9b3d96dfc7f87ca2e71071a3b54097ad
 EBUILD coverage-5.3.ebuild 1905 BLAKE2B c6793ec3ccc9bd65faf0e18ba76769cede60399cb2430234cc415d88d68db7c75716635ac3415b5d45189514e0fe7c3bb6789ba1817f4e8fc7fa240f9af63460 SHA512 88e6566a399ce6b6326cc22217ee9a10656f0d2a88f336a6678ceca3261a1b01be7cde4e5bebf6f98c601166819def458e783240d89c16f374dc5b4e86f9f025
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-5.3.1.ebuild b/dev-python/coverage/coverage-5.3.1.ebuild
new file mode 100644
index 000000000000..d230bee7bae8
--- /dev/null
+++ b/dev-python/coverage/coverage-5.3.1.ebuild
@@ -0,0 +1,69 @@
+# 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 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+#IUSE="test"
+# The tests are impossible to appease.  Please run them externally
+# via tox.  Or fix the ebuild if you have hours of time to spend
+# on something utterly useless.
+RESTRICT="test"
+
+#BDEPEND="
+#	test? (
+#		dev-python/PyContracts[${PYTHON_USEDEP}]
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/hypothesis[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+#	)
+#"
+
+src_prepare() {
+	# avoid the dep on xdist, run tests verbosely
+	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+	local bindir=${TEST_DIR}/scripts
+
+	pushd tests/eggsrc >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	"${EPYTHON}" igor.py zip_mods || die
+	PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer py || die
+
+	# No C extensions under pypy
+	if [[ ${EPYTHON} != pypy* ]]; then
+		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+		PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer c || die
+	fi
+
+	# clean up leftover "egg1" directory
+	rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index d01230634f20..965d77e475d9 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,4 +1,6 @@
 AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea5360cf6a128a2f569782a51525c1ac9e6972bd03188f9777b1685f04900d48f2e554507db7c8b755de02c0a07de8defa26f05 SHA512 a105bb67702ef10d578e4df723452f060248287e9fc394754257c036ba0c6b186f90f5849a37e32e57cd70f16bbb73d0b8f84d9d153e1649d3ec5ab147dd6183
 DIST dbusmock-0.19.tar.gz 72567 BLAKE2B 973cfa02d1aec29f2151ce077471c49f7def3cee079eb975bbc1abca39cc6d391f5dc4aed40fcd9c9db3fcc25429e689f130dc495b94428b73c64f3c650a9c3a SHA512 9f49cb1818c0de8b774d4ccd0eed35de3b0a95de669e70539699237b5cdfee993da7747dc28375c8f1c26fac83d948b7ce25107d866e28b833b556c6f654706c
+DIST dbusmock-0.20.0.tar.gz 72228 BLAKE2B 704287414bf562bcda9c25c6febd6c4a7b0123c1c38dcbe00f5448dc94784eb6002825975f03b8633e253dd63b18126026c9630aa98fcd891d7e40eba207f123 SHA512 26660439801dbd4c2cdc146d67fa465ecfdfbe4dba4fbd163e0f00af415247d0ff502122d0a850b5bd6dde9f296dea601dcb180ba4bdd5d58966ee4ccdef8999
 EBUILD dbusmock-0.19.ebuild 1071 BLAKE2B ceac7e1a85ab974743225c48b6d76168b69cc55b703b59dc29caa6433a7c7b5ce13edb312355045d14eaf8a58d9d47ae86c9738eb93e07f64ce6c3878d728c54 SHA512 74a0aa6c85d547eca93f99c9e27fe9cc13136a74b963ef315ee560a332f7a809e4d7f154d2809a3be720cb1f7ec76b7e97becc32fc130b0c45bf4422e8b6663e
+EBUILD dbusmock-0.20.0.ebuild 881 BLAKE2B 212c8f42a9943921bbf41f7a341d3631949d71422c88fc933d62c674c912cb907d27133fe2c27e654e7463ca388c5db3495c4233edd3ed4ead029629b8b411df SHA512 382001ad6e78a5cebda97b3e9336de3ccc7e9582c3728040a71779ea7eb47ca0f2ef573233a6aea7d43b1cfea04fb48ded230ecf2a256e51ae62d5927d08bc8f
 MISC metadata.xml 331 BLAKE2B b328a0033b2b0c38d69fe4d8d37c6f270e5f0e2fccbdd2ac0b346cc7b067dbc99af9275f5d9eca50972522cdea6c5a5f2cea8465e9afb6b7c616506ef0ca9196 SHA512 6469bee681a79c9496171ee61cb26fedec1dc4317dfc81163a3597379fd3b295fca78990a6d2cb56ae1d7243ecb08416e0bb6dc618f2ce534691a0e5ba6e5b50
diff --git a/dev-python/dbusmock/dbusmock-0.20.0.ebuild b/dev-python/dbusmock/dbusmock-0.20.0.ebuild
new file mode 100644
index 000000000000..7a5a676663e2
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.20.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# broken by bluez5?
+	rm tests/test_bluez4.py || die
+	# needed for unittest discovery
+	> tests/__init__.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 0852d96465c6..8ed282a5eb99 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,7 @@
 DIST denonavr-0.9.7.tar.gz 101839 BLAKE2B d44600e6963c2e17ffc12f203926b522d2bf2d9a853e4f061583158fb087b8fb5dbc43be835aa639ffe11391aa494a8b061b2c177bccfc2568781b304547e311 SHA512 2b8a8224ec46b90d2256d7d516801c6ae18b4434a0ee901b0a9aa80cc0481216fa33566bf33d41928f0112361b165bbe40e5f44b65cd17f09beb7cb3f4d9d803
 DIST denonavr-0.9.8.tar.gz 101850 BLAKE2B b02a18d1f61547e7e63fbd51a72de57803ec6e78232be0027fb6b77176fa872227afcb5a414b0cb92ca4373116a5c6ec4975fea73ae272742ec399e4c0e3ad81 SHA512 30ca12ffffcf66b45c17434c96e496fe61af5cd42aa85dcb25502f6a21593ec4d884937d52726a430b405d9807ad024456e48e144a759ea1351fccc906a95af3
+DIST denonavr-0.9.9.tar.gz 101902 BLAKE2B de30ad9520781eaa66a651f8a77ed88c76daa191f0de716f2cc00e21a8c8ae8883c5aa0c32167754062517763f903949626e04342a2342894a632cb9b94d2e20 SHA512 45d3b4fc6f8487caed0911ff7dd90dd28482de688429b8d0fae68db9a5d78959005ab2aab1b34eab34e964f4e82bccb6d57aadea367f81fc4a7927e54d771728
 EBUILD denonavr-0.9.7.ebuild 641 BLAKE2B 53f5495703608ab5a8074b1e6a7c4e33e127974a7090834f3b3aba1e9a5ed74eed7f35b4fedfcb0b6fa057b48ebdbb53e50ca881d35c2c676bcd6ac6cc50d293 SHA512 2581fea7ab57070db673eaf7c8e3dd377521390b1704fb6bbb930d6a8d6046bf3481113f424d2ed49f023610e150f93bf4100fea3e6f750897b7f2a086429f63
 EBUILD denonavr-0.9.8.ebuild 641 BLAKE2B 53f5495703608ab5a8074b1e6a7c4e33e127974a7090834f3b3aba1e9a5ed74eed7f35b4fedfcb0b6fa057b48ebdbb53e50ca881d35c2c676bcd6ac6cc50d293 SHA512 2581fea7ab57070db673eaf7c8e3dd377521390b1704fb6bbb930d6a8d6046bf3481113f424d2ed49f023610e150f93bf4100fea3e6f750897b7f2a086429f63
+EBUILD denonavr-0.9.9.ebuild 641 BLAKE2B 53f5495703608ab5a8074b1e6a7c4e33e127974a7090834f3b3aba1e9a5ed74eed7f35b4fedfcb0b6fa057b48ebdbb53e50ca881d35c2c676bcd6ac6cc50d293 SHA512 2581fea7ab57070db673eaf7c8e3dd377521390b1704fb6bbb930d6a8d6046bf3481113f424d2ed49f023610e150f93bf4100fea3e6f750897b7f2a086429f63
 MISC metadata.xml 549 BLAKE2B 7031b8af81fe98059cf29d386d6f09493af833f33dacfd2be8f4e4e534a6ec1196e85cfc3ddf13ffe4a4333c0be7c95d453916bf6a223065e1520259956ce51f SHA512 01ecd0c14cce4a3479e70c3aea2d3f2e3c582bf9ff7bc8f887f341e19b0e45fd78638a12b6a617db018da4fe98704345e7e27fb9d6d0ed464daa71b2d1ccacf0
diff --git a/dev-python/denonavr/denonavr-0.9.9.ebuild b/dev-python/denonavr/denonavr-0.9.9.ebuild
new file mode 100644
index 000000000000..a1811fa7960b
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.9.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automation Library for Denon AVR receivers"
+HOMEPAGE="https://github.com/scarface-4711/denonavr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/diff-match-patch/Manifest b/dev-python/diff-match-patch/Manifest
index 878dc82b6e5e..6ba7ff3321cd 100644
--- a/dev-python/diff-match-patch/Manifest
+++ b/dev-python/diff-match-patch/Manifest
@@ -1,5 +1,5 @@
 DIST diff-match-patch-20181111.tar.gz 58554 BLAKE2B 2a74294bb9ac88447cdea794a9c3b44d705d93f7e0777d5e5ece4a306f43df47458a4ba0ec8b16624862a6e4540a605695c3a83ee7dad7749b22210ebe65705a SHA512 9b21726b9c0e350553533c14dd86cca823c6f98ab642e7166cf9348952a57b62bcb0576e3d6a3b76655ea1bcc8cef3fe7f33ffb068b5a4bfb4b4b521042484e6
 DIST diff-match-patch-20200713.tar.gz 60711 BLAKE2B 9108557050d0aced61e8073e0bfa1969e780e4350dba86e3cb159760d180b09ff2502e8b0a664370e0586bb0ca280f29cfebb983cddf051f10204e3cd1026d8f SHA512 f161efed3d87dd0693c98ee81aedb3868787f040f8f9f31015f9f1de04d50046be75b2351a65a4c26ae1d194b983dbc1420799cf70e7c25737ee4eb3cc78a183
 EBUILD diff-match-patch-20181111.ebuild 426 BLAKE2B 1cbe1110193148c8503ffbaeb87dd58f26f178d1c2c60b7948abef09a4c86cc0e7b402ecc5f81d0106a2a15b4f7e7aa96a2d05b6a266b369a28ddfcda4035d59 SHA512 33ce64d641aed8d149ca94d5aa8e0b6717086982042e653a4d5fb84c3e34ffc86345cf006a2c59019ef5b8a4c5a505d261f2308d9103a01d4b16f2c68089f83d
-EBUILD diff-match-patch-20200713.ebuild 429 BLAKE2B 6f09a4471de3e07389662a63681cb01a64dcc56e0f9d193ab5579b31f0e35ab4f033780aa1f6aec533cfb4dd513799c29f42a2a48710e677c4807f33a8ba9e52 SHA512 c9b2118f9244b077af10c8aa071955f0d47a2f13b7ce7889e402b97647dfac94647499ebcb6784ab11991513097d2500fbb0e6e4a79d60692951e0248b7eded8
+EBUILD diff-match-patch-20200713.ebuild 427 BLAKE2B d845dfd133562fd3188d239208d74c256c6af868d8227d4a58ea22e5203e88e84d32d85af396a45685914f88ce070c48a7e6595fa723a016675dffdc99d99575 SHA512 f1b43b727789b872e811f2e99164459b4ca5ea7e5546e91b9c46757402ca74669a74afff7227c3de13714c141917425f1ef3332bd7db3bb508b5dd5559a7a588
 MISC metadata.xml 1184 BLAKE2B 8379388bd406d14341910141a80b67840dee0c5023b2843c3712dbdb41188b275825737eeed75508b5b66a3911eebb2edcff2bdb84adbae60a9fcff3eabea95b SHA512 53c140a50cd13cdd304c481868b98e1464cfb310dbd6f9de4f7de33dc1a6d62d0365e53c3550c775a2530f5281580841703b5712a17e50b846795f2c1d8023b4
diff --git a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
index 727acdc84be5..e107f94810a1 100644
--- a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
+++ b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index ec1f948e0dd3..569600979045 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,4 +1,3 @@
-AUX dogpile-cache-1.0.2-pytest6.patch 703 BLAKE2B 308ef55e621c8521f15b716585355369af922447019da54c7eac368899e0133891fc2e336253faa5f71dca26a45d8e2271afd8bad0c1b3e8d8ec890d6123fb3f SHA512 97a3a7be1ed3dc84cff6e07b8c2492d3759e7070fe8c726f5a87cbd988dfb9706d4f2b60367a18fc97fd35b26107cff1a32a452ec29d94739336712d3630b577
 DIST dogpile.cache-1.1.0.tar.gz 365988 BLAKE2B c21b52d23566a9d1b607374a77e2b7cc0ff0705d02cd3fddee1f6110555cf082fc9e516ba37e8ddaf7c70253dd28301cc89c3d3ef5405728859263e2a763608c SHA512 48627e4124bd25678059985c49ffde75d49d987c429d1e9a02ddd60a77b20e41899da30ae78e0f2891ff76a9c3d72a6ec782e829d659c3048cdbc921022ebb55
 DIST dogpile.cache-1.1.1.tar.gz 366464 BLAKE2B 95887bd73cce4cc8b017cee43182d94efeacdaa91ce94907e18c0e9a762065abb334866bd592f5e2010eb07fd33a049e330b4b925a4c9d8e14e22dee5f802446 SHA512 86d5620c746e48fc596137cdba85d91fb65def9f9dd13f85bbe5d9411db257edfcf119b8787673aa37efb965ce2895063906c1518c8b432af8b0ac16cec7941b
 EBUILD dogpile-cache-1.1.0.ebuild 726 BLAKE2B 94a98f15a1e87c3258165c6dd6b8b51fb09d9deaa14bba2dacfe78fcd60ccb34722d1a02a6e46656ba78999770c5cf91fb24d201075d90b30f42cbdbe1283347 SHA512 77698e77945ab4a0f06115952868110ae89e92c5188ab1cb5c85abed57c03bd8f7cc6c0d3b5cc75aa26d3c507c3a877537ace8b552abf4d2e432a0999cd5b6af
diff --git a/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch b/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch
deleted file mode 100644
index cc8154822544..000000000000
--- a/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 625f73ce189b43541636dc40d8d0e4cd4f9a1386
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Sat Oct 31 02:23:06 2020 +0100
-
-    Support pytest 6
-    
-    See https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 10afafb..0b2a1e4 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -26,6 +26,6 @@ def is_unittest(obj):
- 
- def pytest_pycollect_makeitem(collector, name, obj):
-     if is_unittest(obj) and not obj.__name__.startswith("_"):
--        return UnitTestCase(name, parent=collector)
-+        return UnitTestCase.from_parent(collector, name=name)
-     else:
-         return []
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index dab2a57d0699..38eacd1a1800 100644
--- a/dev-python/funcy/Manifest
+++ b/dev-python/funcy/Manifest
@@ -1,5 +1,6 @@
 DIST funcy-1.10.1.tar.gz 29657 BLAKE2B fb2de795a5564f7009ff5717b8eadc3cb24a2cd4c30b9b9627861d7c8bcffdc1ea27f480c2895b8733f6dd965fbf9ee0fd7f12f8bbd3cf5f0d291829bc852f4b SHA512 123a5a828bd3cdbd38926923eb3979c4e5bca246da93179321eb1619df22cf6f722b5971d1309a1bdee2eeb362fc7fa85c6769a60efdd668350bf6c7d95e184c
 DIST funcy-1.14.tar.gz 548493 BLAKE2B fff352d0e0d685fb51fb30302542c2e8893209df1e01912efae06821fbc885b05ab3fea8786d6924b48ddf32cc6bdd6def5e90db1ff949b005437b5d3771c3c0 SHA512 0c7daf1a6d87f56663ae0d37cc65654c79646c313ec530ac57e6ee8de04849b8846556fda10dd762f92e44a5ffa54d32880bed4cd77cec99ae865de0203d123a
 EBUILD funcy-1.10.1.ebuild 427 BLAKE2B 5bef5e2eedfd364e39f99b86a8da7cf57245f280e6115d47e78e054dbca41ec8f3e13b0d8194248e2af6a49babc07635005017baad4d0271b948db4022069449 SHA512 6e126cbd12f1554e34733553b50df2ee835884170d99489080cbd479e493dc969368530d5d7dafed8d7c308b498e4248f99ab16e00a73106ac142f5d6f104f9d
+EBUILD funcy-1.14-r1.ebuild 688 BLAKE2B 745451ffc753b2fc12af67351967c54f7d8fce3ddaa5f45979c1972595ecf38f9db0a0cf2e602ed68c46456689f7e83f70dd2c7585cd164e07e076784474afc1 SHA512 4404bae8404555e7e833eb9bfdb680f46be1f0c9a2944bca8972d402878dacac6c423e6dedad90dcf31963ad2eefa98b45a029eccb6050fd785bab7ddc9930b6
 EBUILD funcy-1.14.ebuild 438 BLAKE2B b0e5f67af15dffb59b2ab2f0df9f0920ca4c5a6e22ff45452c1875ea5c044bf71282ff14a2b74eec7f529570c9897bf0559f862f9e65452d7ba77dda80140595 SHA512 81357b83df479ef25e0b6865caefda24d93dd7d970a37861520c6786b837b152ef535da3b072f2c0f4f1a0f30ac2e8a4d842cdcc972c27816a9b7c6aa5558af7
 MISC metadata.xml 315 BLAKE2B 52b30267367a6838d8846e5635823a23d55d16b3ee571d44ce1ff2ed866b1641b4b9dd31017e4f2fb0980e0f3ba74bd1aad168c1c2e7e02c3d193298a3259d30 SHA512 099a8357f523c5c62240f0fc43d7ba5b03b4caf4a6acbdc1a26941ca2f4b551a178bed0802afd9de1ddfe6df6920dc6d48590ba1b2a4cd8741d807ab652964a3
diff --git a/dev-python/funcy/funcy-1.14-r1.ebuild b/dev-python/funcy/funcy-1.14-r1.ebuild
new file mode 100644
index 000000000000..ac375d59f047
--- /dev/null
+++ b/dev-python/funcy/funcy-1.14-r1.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 python3_7 python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of fancy functional tools focused on practicality"
+HOMEPAGE="https://github.com/Suor/funcy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/whatever[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	distutils_install_for_testing --via-root
+	pytest || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 4ec48d8b32c9..a61796b03719 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,8 +1,5 @@
 AUX hiredis-1.0.1-api-0.14.patch 1332 BLAKE2B 08d5c2f1e85db8f0eb81e620c08f150c613f34f3e0e96716891dc60100dfbe5f3c74ad3bdd312db909951ceddc44f5516a14fb9719c7e8be7c676c93b5981db6 SHA512 3c32c157a9f86498c42bfad043577d981d611a6396408932595d7f58eef2737e7d9f3879c714e358c2233fdebd36958919875f8ff5da90775b4205625de0adb8
 AUX hiredis-1.0.1-system-libs.patch 519 BLAKE2B 8ba885963970dfa0a32b38f4b03e26b2a295a480a7d2033082317ec3b2d598f02acce32c95a784b439d938402a41716d6885e9450dd642b7240af5c6625cced3 SHA512 fb646b968cc14d06de0ec2cbebd6ad1418e1bc0d7c03b529d5c1febe3db9f09933b23e9cf1aa80c6c382923d4b96ce0100709337eb375cbe08508ebbb842059c
-DIST hiredis-1.0.1.tar.gz 54460 BLAKE2B 90bdbd99f47b0765636dbeee9fc3cbb9c71fd7ba752a0d58ab9c2c9d2ee93bfc1a343465618d1127703ae09a4870d6691d7d5b52f59150849a448eae73c6a1d3 SHA512 8aa5e29b09f42826d746857d55b8042b40ffa3977386b0f8b2ea1b2ede0c28337f3df4bbd177192d8873570810bc9d0987f1f2b29f094f27adaa4aaf409c3a6b
 DIST hiredis-1.1.0.tar.gz 54620 BLAKE2B 9991745d277e87efe836c1c8eabb2016ce401e2be52c7e1b3a154350776fae6fd3c49e3096da57231e42c57bf36ba692ce26bc993d0923b5246376d8694ad058 SHA512 ad37868376de91303c15ffe6109dc7fadb4f458efdd44b7ddc0a410937a389b8e062ab7d36b1aec3fe324ecafe6b1e5e6b92f547cbf619251dad22a28e02ee9c
-EBUILD hiredis-1.0.1-r1.ebuild 695 BLAKE2B 52e3464524bac8507451b0c3a78d02671af129f6a7f0f776d173c48901675433e4297446ca5d090f63cc1ed2f0184df2c8ca46c73a215f503dc6057ed384bb98 SHA512 6035dc5960cf34aa14cb19ed9aa1c3d05b7ec9b611262dfc5880d3ced6dc594a201a02ef798ad5a50b078eef3c71451d2b97b5ffc9b757b2e0e51a8530cb3c63
-EBUILD hiredis-1.0.1.ebuild 614 BLAKE2B 85965f6842d468009bc2891d894c4e5eb68ca3e8c33c868ef9f5a5009d5850ab0cc122fea158be852820f6fd0176a248340185b2598515fa6624c6e0e4d4b503 SHA512 0d275137363aba2de3135a23195ce8e82108d66da1ea62a81150475035301404e02c3113c9361894dd809654384b4c97c31e268ff9548ef20998c5ddaa8dcc9f
-EBUILD hiredis-1.1.0.ebuild 708 BLAKE2B 7957f0c486ff0514cf70541e70f18a87762c70f03da5426ff0c17e89071da914ee36451753ef80ee2c0f45f7d431c8a4ff25ce615ff5ed3882d87ece8d9df461 SHA512 bcd087b6ce015db62a273edcff4a8cf14c2c8327203eef70db2235aac652886e22a35ab491f88b3ec509340fc6d6366ee7c6078b4bf1b0b8bb3a0576aebb3b49
-MISC metadata.xml 580 BLAKE2B 41dbc73131a5460cd0013265c1e0e2e99214308b3d20f9b32734c24c1811e87c497b58d32ba8af572550bbe0ae95ec38a0f25ed2382cd4cced557277682a2ee8 SHA512 a7f1713d3f2085f0b8f17797cf46d49d56a7c7a0723650218894d8b9f5b21dc9fdcccff98549536fa2e04d5cd140cd8ddef6f9252e1eb3afad83b78469dd14a6
+EBUILD hiredis-1.1.0.ebuild 713 BLAKE2B 0912c15a7298d63c19268143148c84ee8bf24fc156c16e79347f724bd566af80cea12c16bb56daa07bcf8b879add31c0d5d0a00843771a34de16a7222c1d4aa3 SHA512 b0110272e0b25b504992cff0c88c23e0736de4b1bb55b3600701261fb72415e4dbf3f25280bf437fc4bd0eaeacb868c41e7e57fa0ab9e94a84ade86380cf9041
+MISC metadata.xml 578 BLAKE2B 39cbb3058e829134e69701f8acf4c89995d6ef1553b911b956a38ce2432267b78a7db070713d230dc2895c5df0c8e8295278caa442642fe64378a5cfdf444ac4 SHA512 da2ecff30312f5eed7611b107bf678af6d1fa45d5d87f75474d70412d7a17db4a37dae578a3047c45758e22a8041c123fa349c5f23580fdc98439300335636a7
diff --git a/dev-python/hiredis/hiredis-1.0.1-r1.ebuild b/dev-python/hiredis/hiredis-1.0.1-r1.ebuild
deleted file mode 100644
index 8e84e217d314..000000000000
--- a/dev-python/hiredis/hiredis-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/pietern/hiredis-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="system-libs"
-
-DEPEND="system-libs? ( dev-libs/hiredis:0/0.14 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	use system-libs && PATCHES+=(
-		"${FILESDIR}"/${P}-system-libs.patch
-		"${FILESDIR}"/${P}-api-0.14.patch
-	)
-	default
-}
-
-python_test() {
-	cd test
-	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
-}
diff --git a/dev-python/hiredis/hiredis-1.0.1.ebuild b/dev-python/hiredis/hiredis-1.0.1.ebuild
deleted file mode 100644
index bde16f819154..000000000000
--- a/dev-python/hiredis/hiredis-1.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/pietern/hiredis-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="dev-libs/hiredis:0/0.14"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-system-libs.patch
-	"${FILESDIR}"/${P}-api-0.14.patch
-)
-
-python_test() {
-	cd test
-	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
-}
diff --git a/dev-python/hiredis/hiredis-1.1.0.ebuild b/dev-python/hiredis/hiredis-1.1.0.ebuild
index 85eea435422f..062ab4b7da6e 100644
--- a/dev-python/hiredis/hiredis-1.1.0.ebuild
+++ b/dev-python/hiredis/hiredis-1.1.0.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/pietern/hiredis-py"
+HOMEPAGE="https://github.com/redis/hiredis-py/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="system-libs"
 
 DEPEND="system-libs? ( dev-libs/hiredis:0/0.14 )"
@@ -27,6 +27,6 @@ src_prepare() {
 }
 
 python_test() {
-	cd test
+	cd test || die
 	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
 }
diff --git a/dev-python/hiredis/metadata.xml b/dev-python/hiredis/metadata.xml
index 2bf5fbd7ca5f..2d6830cbdf6f 100644
--- a/dev-python/hiredis/metadata.xml
+++ b/dev-python/hiredis/metadata.xml
@@ -11,7 +11,7 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">hiredis</remote-id>
-    <remote-id type="github">pietern/hiredis-py</remote-id>
+    <remote-id type="github">redis/hiredis-py</remote-id>
   </upstream>
   <use>
     <flag name="system-libs">Use dev-libs/hiredis from system</flag>
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index c420bc980ef1..266769e1ac9d 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,5 +1,5 @@
 DIST joblib-0.17.0.tar.gz 345984 BLAKE2B 4f4cb83037fc02ce9ea17e7dc5d284235b847eeb90bf1a877c4168aabd9ad4dd762e45a6485806efc759cdfcb98e6ee70e6d9a498cd7645b1d6b0051a9f9ba2e SHA512 73c42a9f5949478a4a03b97ec31549cabca2ebc968d2c869632696b671c175dc85ae7aa8ac92905f13f830083b2305b56df1552f1d70fa7fe51945ae7286840a
 DIST joblib-1.0.0.tar.gz 346996 BLAKE2B 6f31dba31e451fe1d05e7a34bc211b641e10a6dda21cc6a4d283a594744caa3434748a2c2c661c468931e509d815596db18ce1cbed287ae6b0da287490256dec SHA512 3fad2f3d4d6651d2c0376403b3658defc9ae1acf08b2e187f77b440040ad414bf723241d685df862c08b88d784ded915f5794d0e0c29841d9acae4db200d7213
 EBUILD joblib-0.17.0.ebuild 1295 BLAKE2B ebd09b17853dff4f2125e8835d08c2e052144ae421e8ad51d4021ebcc88557a638c173389418f64e71e6f3db8299eca4f509d5342b6ee3b2d203dcfad2f710c7 SHA512 b54babf2a3c9685cb5ce2a1ad11271105434e9d34c02893f282e74f265953cb0751698b38bbc23ff7840fcd008e5238400a044107df8f5dc323e5da2aff8555d
-EBUILD joblib-1.0.0.ebuild 1162 BLAKE2B 5dce5fb5256ab42254f9f7abf8e145d75ea62484269cf97af9ea59bb2c669539e00f44e114eee3ca85af0f7c5cf8206dd34cd345b4d51887baeabcd95bee4ac9 SHA512 d845131dbd52e65e4f900d75ed7cdca6d954c82c0c6ce327913bbc987fad22bfb8c5e684030fe4cda127cbea005a761ff8c1c049e8c0b178ee40844a9dcb6f53
+EBUILD joblib-1.0.0.ebuild 1167 BLAKE2B 0d2f26440b99df32f960db3c348875f3be1b1ab6431f830f83d881fefdf6415ac7fe2d8411b9b66a4975b9497b0499adca47415107082727d78ea7bc22ff7146 SHA512 6431607de09e54b60c42639f88287835ba0aa0e03051783dcde2dcb9d3b709e524079ff321c221d9bf9518e96e7a6078357b8611cbd678c6a65b893bf6f45fbe
 MISC metadata.xml 857 BLAKE2B 54960e79cd772ee043d09577668c6197ddf0c2b6bbd4cc2bddcbf60ec25fdc9ee3c0a89611ec10d20acac23d69d3a0d4fef9bf225406fb5ba845c3fb6970746e SHA512 ba9709dae22587a7d2c17ff432d05c50f68bc51bf2f7b4e96fec9165304d76862889beafee4feb3a7dfbb5a54e9561ff4c804232a3c9a7dd7384bbd3467688f9
diff --git a/dev-python/joblib/joblib-1.0.0.ebuild b/dev-python/joblib/joblib-1.0.0.ebuild
index d1dbc58f1892..c614a1d387e7 100644
--- a/dev-python/joblib/joblib-1.0.0.ebuild
+++ b/dev-python/joblib/joblib-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index ed4c0c56c40a..226d59f307bd 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,5 +1,3 @@
-DIST libtmux-v0.8.3.tar.gz 131928 BLAKE2B 7979dc907d5c7805cf56422aa0fed554c89f0b50cf1f13b150809a1c7e24b0eab125701eada0431212afccc26f6479642c886b3f701c8c2ffc9c3ebb7d08c4cc SHA512 f7c5a84f16b400db672318d3c0b79cd8f328a0096d32349f6ce9360d72eecd75ed9915af5c37950adadd81943130b543716d718366522efee7780813a2c1a5d6
 DIST libtmux-v0.8.5.tar.gz 222445 BLAKE2B 5af148555eb89c66bdc66f3f214967f7e901d9b86ea85e02a9fba64f2eb3559828519ba8120eaee5eb86ec75bee2e599a08384dd096de8dc0969129c58172c1e SHA512 d456725c3ca41a672ee5239bfb5f42a262674638d308fa141627995be8b8fe348bb8713b735eb05c5a3cc73f35fe3f6fac12024f6254c950a3048b2e07606363
-EBUILD libtmux-0.8.3.ebuild 904 BLAKE2B 8bfe4291e9a5f72b367ac75810efb7558d4f5daef054a702da55597f0e5f0a08962d9cbb281779770c30f061a52bd03a7d77073aedd51e67624b4b0d166d6b11 SHA512 bb462d811dc4af3658e37f109f88790d2e0dc2fbde1d5b6e4414b783ac10a5a85b62f5585cd6225bf639eebdf2a664a4f505b902360e68b3d670b26c53545106
-EBUILD libtmux-0.8.5.ebuild 899 BLAKE2B 3aa62cc70d968e171b733c71ae82309c9977001f068da947639a164f10fb5f2ba733d502b77fe3c12b386071da39e25596395e63377d524e1fc1f5bd6b0cafe0 SHA512 547279cfe76093d7a729541189319bbbe80e74663c3effafb753fa4ef954496e84b9cf7d69305f7dcc9ddd741b74ef319ac06e0e667a3ce090e3b6d754fbd5cb
+EBUILD libtmux-0.8.5.ebuild 897 BLAKE2B d89efc5ceb8f7f0fda323066737eb98ef91908296c81d2137dbdc277f383bc77f736da8b7b57ccf6a2a5182a13dcf134beb3ce4093d4fa8994f6eb7cd6ec2ab5 SHA512 55ffaebde82d80ae60d5e840684d38dc1ecdc6c81f8618d8a9b559a60ddaebaaf89f45f8be35b3208a97b3ce30219293e967efd24aa9fde8cc4036972652855b
 MISC metadata.xml 343 BLAKE2B 66c3f5a64242dfaf69b7828e9e90de5eb93bd1d95a008cd41b748fe768280678f7be3d9e930690be44fa7f639de589074f056ec4d39bb882fdfff9dbc76f3558 SHA512 897920796a56516a2cd2455e689b364cf92080b65a3f7c0f8b40b56e2f4c1c693a29cd6eca755ff51e3b1b57a8be1136a5648f1ed8857933d6e7e20628eece5e
diff --git a/dev-python/libtmux/libtmux-0.8.3.ebuild b/dev-python/libtmux/libtmux-0.8.3.ebuild
deleted file mode 100644
index 440db1626d79..000000000000
--- a/dev-python/libtmux/libtmux-0.8.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND=">=app-misc/tmux-3.0a"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/alagitpull \
-	dev-python/docutils
-
-python_prepare_all() {
-	# avoid a dependency on sphinx_issues
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -i "s:'sphinx_issues',::" doc/conf.py || die
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libtmux/libtmux-0.8.5.ebuild b/dev-python/libtmux/libtmux-0.8.5.ebuild
index 10eaf095c176..0704a7ed3e99 100644
--- a/dev-python/libtmux/libtmux-0.8.5.ebuild
+++ b/dev-python/libtmux/libtmux-0.8.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND=">=app-misc/tmux-3.0a"
 BDEPEND="
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index a4229a8bc156..90e337a8622a 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lit-10.0.1.ebuild 893 BLAKE2B e23af1f7a6d50e660ccf67a800375129465f3fc0c89e0be4e8013318ba9882df788baee745ddc9e932e1d42664cefbc5b08c1ec550a162a3d1ea39e1f22e66b0 SHA512 20206b54df19decdcc35112630b734351a9aafc2093f8ea3b5a57baa2db822bc3583252fe784d8af4ca729a0ee5f0cb1ec53e2eba85e94e21cd7b6c4d80e5302
 EBUILD lit-11.0.0.ebuild 900 BLAKE2B 0224887621d00008b892a1549721c41e7495ea3ed80a34895ecdcd117b48be5d88607b1ab5a31c0e8441691c91ebd6b19ace2ac6e8ba919dde8fc8ba9b12ce27 SHA512 e418060f8cdc1654aa5be2345ff65c47aef24257ece4682092ae4c2663d68ef7ac9836491a79f6a4c084c6f3ad4419dc17ce0ff2f252dc1da1c8e5e1c3cb2d10
 EBUILD lit-11.0.1.9999.ebuild 869 BLAKE2B 0338f86d2256fc370fc708e65482eccdc101917726ffaea02dbea297d114e52abfda416673cc94f8029671c705396d36321518c080d38cdd5ee68691a5854136 SHA512 54c0401c0d4b07ba0cf2fa4b69975a58d2fab218bf7925488637069844d8e891eca2d76806d4a12ee26b04030d0f8e5d68d034264469620d95c880e867d90d3d
 EBUILD lit-11.0.1_rc1.ebuild 869 BLAKE2B 0338f86d2256fc370fc708e65482eccdc101917726ffaea02dbea297d114e52abfda416673cc94f8029671c705396d36321518c080d38cdd5ee68691a5854136 SHA512 54c0401c0d4b07ba0cf2fa4b69975a58d2fab218bf7925488637069844d8e891eca2d76806d4a12ee26b04030d0f8e5d68d034264469620d95c880e867d90d3d
+EBUILD lit-11.0.1_rc2.ebuild 869 BLAKE2B 0338f86d2256fc370fc708e65482eccdc101917726ffaea02dbea297d114e52abfda416673cc94f8029671c705396d36321518c080d38cdd5ee68691a5854136 SHA512 54c0401c0d4b07ba0cf2fa4b69975a58d2fab218bf7925488637069844d8e891eca2d76806d4a12ee26b04030d0f8e5d68d034264469620d95c880e867d90d3d
 EBUILD lit-12.0.0.9999.ebuild 869 BLAKE2B 0338f86d2256fc370fc708e65482eccdc101917726ffaea02dbea297d114e52abfda416673cc94f8029671c705396d36321518c080d38cdd5ee68691a5854136 SHA512 54c0401c0d4b07ba0cf2fa4b69975a58d2fab218bf7925488637069844d8e891eca2d76806d4a12ee26b04030d0f8e5d68d034264469620d95c880e867d90d3d
 EBUILD lit-9.0.1.ebuild 861 BLAKE2B c4d1a504e922e182102538cc19ea99683500c533af440179bbc99f22aa21558585a7d4f6bdc8ca4159c2300150ffedba1cc980c448fbf5f146d4168e65a3c9e7 SHA512 7916fc0e882021c5b3bf21b4b565e73e83380d9c221b61b31af0acb5939ee3413a1a6638f7328b0815081316300b78836273ba20448b4d8c9d5baf73278184d9
 MISC metadata.xml 282 BLAKE2B 36e6403814edc8e79eca456ef9648a7b261f79d4823082a8dce876127b11bf89182dabb02e58b2a42dec3cf9e21fe2f5c474ee4a8416213901f82cfc481ffcda SHA512 fa292059e410ff5e751980c5f5b0145c579b373d77970b797850c3d92641bbcf27b2c18a33d665e76e59553ba7dcc124ae09ec34fcaab4b2caed74248ace0e57
diff --git a/dev-python/lit/lit-11.0.1_rc2.ebuild b/dev-python/lit/lit-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..8e876ebd8594
--- /dev/null
+++ b/dev-python/lit/lit-11.0.1_rc2.ebuild
@@ -0,0 +1,40 @@
+# 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} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index a711809991ba..82995ddd30aa 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,3 +1,3 @@
 DIST loky-2.9.0.tar.gz 115019 BLAKE2B 2aa2042e32821b67db8b8de12d4b380d22af93d308bb35878271a4859325d6740a3bdab70b464a2c0d0af143903c8af3da81b4b804605cdae88779fefd7971a6 SHA512 d49354b834251f6f05a689ac44464aafa5a7a5b4a8ef84a308ec3bda138e810fc3dc31aa628307984dc69386a210f442d4c202b9499ae3e3864837b47a5b0cd9
-EBUILD loky-2.9.0.ebuild 869 BLAKE2B e393af893d7dcb07d18d362326dab66b2ecac7d97fda6d14879a378649a689b7f2ac9f139a71605592d6391d0b0c4b7b073ef3ba3c536da6f3aeea2e1ca11776 SHA512 7ba50004fff3e0c1c49ee3a9997b66734048ea156eb2ba738c56f8658284b6e5377876ce22ce397b6422501a5153176fe1fc09f6df332222e5fb7879cace5b7b
+EBUILD loky-2.9.0.ebuild 874 BLAKE2B ddd3b9237f1ed1d21a99e0fa14ef00028f4b8966e61e5048d433e35bb262e51e8926d1106bbbcc8b6e85cdb9f96e458a92a9bfd1ff8225c7418390374db1bc75 SHA512 689ab6dc7bba20f2a90706db28ac724981ac1ebeb4f8e64b10823c11e8c61247cb4a188108818bd6529cdddd28f1984e77de54e1c52acc1345779d56574b027c
 MISC metadata.xml 285 BLAKE2B 0a3a6c5d0dd5f4ba9ee472ae8d58d5ccc0c0a4677793e1b0350193fce534d96513ce5b16610e90ba5f8cd3cb71e03db6c45566e1d55ebc5fb52bf6f30b740d66 SHA512 ab759fe515785fa9dfc92ed5e3e71e67b32eea0f7c1d0ad7165bc41713e8345ddc04549bb771dd92973365ceb53b4465fdbad914b4d1f7f76232e278edec2577
diff --git a/dev-python/loky/loky-2.9.0.ebuild b/dev-python/loky/loky-2.9.0.ebuild
index 0cf126c023e3..953aa27b4ce7 100644
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ b/dev-python/loky/loky-2.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 92b81feb5ba7..7464c2d277ae 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,3 +1,5 @@
+DIST marshmallow-3.10.0.tar.gz 172801 BLAKE2B 1d1f5d531a9704a9b82170347e2c5dd2b3fd4488204a05f9be7705a39e5a6a42342bcce1438484c22944a6fb4470a731825314ed7ced79dbaf9cc195f049d9b2 SHA512 41520a7cfde483ca06a69e49ab04f8972932d0fbf7a6c75ef568779b55d5f2f666aead4c161e03416e9b90fba71fd73b3f14630f0d7050b8a7fe7a4bb50d5bf0
 DIST marshmallow-3.5.1.tar.gz 168839 BLAKE2B 8abf8e8d45d37794c3c615f6dac8ccd0acb76357e92ddaa4c23232b7aefba63db9bd42fb7f13dd99f9ea2ec4c7608459bc36014f9344ab91894176d0f02259c9 SHA512 89b3abce9e31dad6a20cf8ceef62270c8f95cbdf80965b6d29f1728d37d51171a020463da9d0354688183ea07e3f47a0ddab8694da13fe238f11a3dc755d4d6e
+EBUILD marshmallow-3.10.0.ebuild 679 BLAKE2B 0e864a43ccc7b50b784ef2d9fdb075e1063ea04df934f72832cec3ef6ec6e12cc1bcaa2c20e390fe6c356236ee299a9c6a21c0ed7f545a8d41fd05586d2ceeb5 SHA512 555ba06a1fd020262d3364e174c8c5821df03d3e5d537e4eff7ea62acde3f6b7cc3c2ebf987c1a702a85c45221028116ca1fd3c3b2a682340e8bdab81c7f4760
 EBUILD marshmallow-3.5.1.ebuild 726 BLAKE2B 64a22029b107e60909be345444282013116723dc4f52cf9628b4c8a2b47607a14db29cda4fb5f1f1c7f06b63519c4d2a0d84cc9e87319b329223dee5e097332a SHA512 9bea4bf43b5018e0f58a240db751b5505c8438305afd9a3fe293c816face9ac1509363041ab13f437d6026d06c26906e877dab7f4790917511ec0a153f7561ef
-MISC metadata.xml 360 BLAKE2B ed1f62630b417aaefbfc1ce52c275f16187a1fac9ee46e7172c4b703452329b64de253eed111bde2e7bcb4b85e7806d8423fd5d80899f93b23e7c3da61030a2d SHA512 51665fe5adb03e70bb1582f393b95783c9e4956c24f664c09d08017663bc8373b07080c142f714fd4c93381cbd5c55bec2b58ca412df6aa55980f9a61abebc54
+MISC metadata.xml 461 BLAKE2B d1723db313f210e554d88a75276965f8f1a385ba8f879d2c43d8875a774240e7db4df6e2cf2a73138069b67a65760b2170bac2ceca8d5cf8681242b01f68d974 SHA512 257a5648aa10d9f8ec87a62e1e090374595256a4cf66f32775be135772114396610ad57e7ddf5274b6ef4755c563bdd3bc364df2751e61b10593d10e12bcb654
diff --git a/dev-python/marshmallow/marshmallow-3.10.0.ebuild b/dev-python/marshmallow/marshmallow-3.10.0.ebuild
new file mode 100644
index 000000000000..7adf1de6ee1d
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.10.0.ebuild
@@ -0,0 +1,28 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/metadata.xml b/dev-python/marshmallow/metadata.xml
index 36de12026687..4398cbd0b3d1 100644
--- a/dev-python/marshmallow/metadata.xml
+++ b/dev-python/marshmallow/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">marshmallow</remote-id>
 		<remote-id type="github">marshmallow-code/marshmallow</remote-id>
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index f836dd12fd76..2a1f1d6e782c 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,8 +1,8 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
-DIST miniupnpc-2.1.20201016.tar.gz 97682 BLAKE2B 2c98f71ff7262a24a69a9a4af411dbeb58c20ec4181bca8bbdd61c628bf5bd49f7e9b763b73ffb5d3508b5b545a0c918828ead2a376b57b8ea5051cd7b8e9c13 SHA512 d619f7e205cac68137020fab31e8bdaeebd09eeaca5e42e1e03a9e0085a64d635ec896862a488b0d57798d1e6ce96e2ba5652f60c0b8df9fc866eea90baea152
-DIST miniupnpc-2.1.20201016.tar.gz.sig 543 BLAKE2B b8ddcadb58e7b8dc4646ea1ac4e10331fe70a5b9a27902dd5ad09ac306605160b63f2e21d96eda4aa0f77485800cb9c5aa110f215dbe3536a9f6ec1c4a5e9ed9 SHA512 fb7886d4198bd2ae1eeff293152ff509e7ebe6ff0f9b3c20d5824f7ca9f65091a61db2bc0a8ac9fb0449994aba594cff3bf6c556876dbb47d593ecf8b7b26d10
 DIST miniupnpc-2.2.0.tar.gz 98348 BLAKE2B 3464dc7f0b5416b558d0dd49121f3b851d9808a516c19d4f99fdb205e20149f27ef495d9f8da09ad3a28656580bfc16d1cf99ef993e41e9600cfe427b4a776d2 SHA512 b5bb674f162cae3d9e0205a9cdf6acc1fb334ab8ac5330be924411a8fd46833fb916d09f947d1e40d05224df7df1ecf6d812037185690e5022287c2024eb183f
 DIST miniupnpc-2.2.0.tar.gz.sig 543 BLAKE2B c75dbc54debc77e63ea3534f8f424a3904131893fc31d6485163ee6ecdafdab02fc0db8e290d28c834ac0efc5a37c34cbca7f14e1c78f859d22abc4e0b2ae48f SHA512 54f8cccea5886e06fbdaa04d270c12bd95d219be0b275491d9168f1089b1efe96e8a6f30ebf428091a3bae4bc349c0b8c94a22e94d56845a0a8b9724b1f9f74d
-EBUILD miniupnpc-2.1.20201016.ebuild 906 BLAKE2B 7719aef18f2ed3829e8005d67c6e6b3c381cf6de6c5012c5a2ca1a543057bb6a21aadafb04708a45814a28675582bbc0fa0fe899c1ac3c2fd0d1d5ced4d712ac SHA512 ca4c2772c17e29910d8cb90c2b5c9f611a395645f813b4daf81ea3cc8448e357c8082c669fc4500d67f92c35a998f5eced9defde665db117b2bc6e096069bbbb
-EBUILD miniupnpc-2.2.0.ebuild 908 BLAKE2B 49902625b602da896953744e4d331c14a5b672f9a88998b50d4912961896ff6c90488ed1e231e8823fe29d12f32a8d6f90b0a0f85b8dc9b30908f2c7993bc01e SHA512 721020e97a7230cac645bdb6a57eb6a7aa767e6dd1ce50fed7d2cc8f6af8b2be598275ed4bf6cbc2818d0acb3546f3adfe56e47d306855beaecddf3b7f201ead
+DIST miniupnpc-2.2.1.tar.gz 99595 BLAKE2B 07736eb15a985096178273c4578bb3f0cbf32a04632196e9c216d10751a6a5b1269af5fe2cbd447d85145746a7a8ce750ce13f674f5d8f9e4f6921b9d58204bf SHA512 62fc0098890980028199dd16e87b13ce23e78b2cc996433799792dc2a4fa9b5e230139593bde5c721f649c14fcee2e4d8a0558976c5506c21ff26deff6c7c907
+DIST miniupnpc-2.2.1.tar.gz.sig 543 BLAKE2B 19da35662cf75d47de9cd16d3d8f767119e3dc04370801bf8893a17cd0af47072456b75bc3415b587371972a7c5c36623665391bbf4b9c655d1da3c0e5b8beb7 SHA512 8b5d41556c66e6330673a63eb3be2397cb057c37f648d950e8dfa0bb00e646f343cfbcbd11a6547198d4fa6b1ca2a82b46724e284ce76e96d96ad6b3b5b41c3f
+EBUILD miniupnpc-2.2.0.ebuild 905 BLAKE2B 8a4c12bce19408b9835751b5b208bc87a401fa8e46771d1db5b8718acc8ad5efb57ebf9fff98b572dcaa0dd4329627366d4c305fa2171eca137e7f5d6a77245c SHA512 c84c6161a60c0d493e3d1124729cad5c1c4ff9b9de9b437f54996886f96d788ab68531dc9cce7af2396c40f7695acd8e5c0883bd5656e57ed8d3f9844965e2ef
+EBUILD miniupnpc-2.2.1.ebuild 909 BLAKE2B 00753901b995e32bb9224b5367b6fe621d3c8ceb1f4842e7afdfadd63ff67f72ed1bea31926f6e4152287b603b9ff3edac0424cefeca35c57f512069f649819d SHA512 089e58d6066fa3ddbcf37dde147d7a687384388723e050c4c5051964db6b42279dba0e448cbb4b5516f621148418edbf5b62553cc967d7615f5420f0825a3243
 MISC metadata.xml 319 BLAKE2B 7f3ef8f9588fa7c1f464aa78a5edc9b8d43d3d163ea0f1172b2f9bf2305e3cf0b92b60ac6c9155ace330c646f9ac9fe36e0e6829ce06508fbcb9a76e0483f032 SHA512 4d2f45df1390d755a9539ab1e94542b234df04ab89549be6d3f9e9cefb43985cd2d4506bce76db1a6b64d0eb8f43ac1f6c3f093ef27d004b001b16c02594c875
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
index 503942daaaed..2c91059596e0 100644
--- a/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1 verify-sig
 
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.1.ebuild
similarity index 91%
rename from dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
rename to dev-python/miniupnpc/miniupnpc-2.2.1.ebuild
index e2122994dfda..e768d83fe343 100644
--- a/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1 verify-sig
 
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 979dd9ee8986..fd2565595fb7 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,7 +1,9 @@
 DIST msgpack-0.6.2.tar.gz 119062 BLAKE2B 6b20a0d31b811ae66e66dbfaacec6f0cf2152b2937423b78f3e6244bfa49c87767788c5ee1db41b9020801b8777a4c15b1fe1853182718adf622bc7e1bff858e SHA512 95b92e3d35e0500dd4256d18bf76e586e57cc66319b4459ac5daef599277a5049177a89ad86e291dbdc4c7a918901a89d9218353ddc4a7d0b399e8a98afef363
 DIST msgpack-1.0.0.tar.gz 232331 BLAKE2B ab7b3aede06c31e0cf70a7f7fbdf2b1dddd89aa2d5d9847b11117c66a2f4572ac468674cdbcaf79bc571278f02429d223aeeb0ea8cb50c31ad251142642cc05f SHA512 6dc168b111cd37807e8e8a09840d1b116d7f38d56f4622b9d36ab7dbd983ebe2f34e763f48c6348148c6945c9f1c9a0f83f5f03e12d12bc18f7b8e0cbd669f87
 DIST msgpack-1.0.1.tar.gz 123151 BLAKE2B 4f040d6e292c588f20043e0091702e9a848d94357784ec7ef7a2ed2d1b5a08cae0bfea4a16cbb67e32b071260f25a43b0507d154ba7f6e180e65a60e3a2b4e9c SHA512 87412cc4022ce7ec82cfe376fbb3c663e5b7a430c2178cacbfe95b35489d95f314bdaf83a6170a7956f42939535ada3c5cbe45c6d7c105410494fe7e9a5cb870
+DIST msgpack-1.0.2.tar.gz 123033 BLAKE2B 8ecf743f5cae536bde9328974827e48376fdfbcaf4d3493fe295a114fd0de4c7dc2629d67a0abf6ece036131715587d2eeaefde0ea9614779a64015ea7fc2be8 SHA512 afe658c2cd5b443aae8fc3305eb3fd56811130062f95e283e3538cba27949d534de60171a927426fedb23b48a938de3f15d77057beda6c73e5204ef1130cd046
 EBUILD msgpack-0.6.2.ebuild 965 BLAKE2B 22e255852af105f9ff8076270f05d98539d4524f18334fe688222e271d52b775bea7017bdce52e3055a551fe90c5c3141bc3ae7399ab2ddb0ffb23c1e5154bf7 SHA512 a8b61e21a45683de30bf09f9faf22b926d47e38215e756b9735cc856789832a2bfe18dafad61d073049d5211eb1621be3d77536b024a74cf8241ebd34b3426f5
 EBUILD msgpack-1.0.0.ebuild 923 BLAKE2B dc80e570b84b80441c093f501ea2f412c6517b733dfc64c4235a61bd87fc705e9efe5045bdc81294685266edade3220983772297993376783d3960f6ef929f70 SHA512 53faf2e7be9c48b133f4872af4683b055bd9a4d8a43129519b7ecbb2f648f758522457d132501ebd54a15db9113a20ea3fc1f966c842537e45507505d906ea74
 EBUILD msgpack-1.0.1.ebuild 939 BLAKE2B 5b6a858a380ad896b10d531ee36d75231ce15e93aeb7d41aa01b2761368fc46aea22a17b64e4bf084091c022647c42da23a023cc281b87b9474109cb64c63ea5 SHA512 6644271c146dd9a72cd68c422c683d70509999e5414bb9c009203ff71143d332fc5f1501c2bcaa371d3c9c0669495319dbe504f05bc8e09605e912dab93efffe
+EBUILD msgpack-1.0.2.ebuild 978 BLAKE2B 98b4c413ed57818960c8640c108d16908316bb6430b1531882870055311b1dfb6a56690e8d85282bcb870b653bae958dd423c41d258dfd9847fedf09bf73f92a SHA512 a334c3be7ff38b5f348aa984a877fa142ec90527d2d080c1a3938b0b37418b29d01e0c58be41296394022526a6a5de0ea9a569f15616fa504223e66c635f3a8e
 MISC metadata.xml 519 BLAKE2B 2947e6ef092dec03d89e409684e08b7f8f2bdee001e0884424f75f9473bffa9cedc99d0932f83bce5a4e255ea29a02819611ec9eb3d16767b50a24982172e1e0 SHA512 27e121bfde1989d5018dc5c87d29b8cb317b264a41ab4480d6c13332d78219e23cb4cb9f803fdbf9198305af1d831000d5e1fa2e2e975d76425a73864561390e
diff --git a/dev-python/msgpack/msgpack-1.0.2.ebuild b/dev-python/msgpack/msgpack-1.0.2.ebuild
new file mode 100644
index 000000000000..a01a194cd8e5
--- /dev/null
+++ b/dev-python/msgpack/msgpack-1.0.2.ebuild
@@ -0,0 +1,39 @@
+# 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="MessagePack (de)serializer for Python"
+HOMEPAGE="https://msgpack.org
+	https://github.com/msgpack/msgpack-python/
+	https://pypi.org/project/msgpack/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x64-macos"
+IUSE="+native-extensions"
+
+# extension code is relying on CPython implementation details
+BDEPEND="
+	native-extensions? (
+		$(python_gen_cond_dep '>=dev-python/cython-0.16[${PYTHON_USEDEP}]' 'python*')
+	)
+	test? ( dev-python/six[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove pre-generated cython files
+	rm msgpack/_cmsgpack.cpp || die
+
+	if ! use native-extensions ; then
+		sed -i -e "/have_cython/s:True:False:" setup.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/namespace-jaraco/Manifest b/dev-python/namespace-jaraco/Manifest
deleted file mode 100644
index e8b7578e25d7..000000000000
--- a/dev-python/namespace-jaraco/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD namespace-jaraco-2-r2.ebuild 814 BLAKE2B 04236c8843566e344ef988df799947778ae986e93d9ce3f96658536d51a84a6ef95aff3ac02f1633a71e5f9afde6bdc729b06cadd9d7c1ab1e3e9a654ed650d9 SHA512 4c44abbf7bb9983c95b7939b5f6a7fe8f11fa1b3718e77f31365278893ee637a2f27766c97981c952a26a7fef3a71541c728682e6266e4c5d87265227fb75bd3
-MISC metadata.xml 370 BLAKE2B 67898c03de570c517571354b8c619545652be50d127e6bfbe0a2425e92633d7da71fe5e23feff4723f3876b44401d2d82b3eb4f8d53bdff07c00e5c77800f15a SHA512 de4c56b89a7617367cb8d0083e83a7876861e523069b4c3a6f6c0a18b82aa3fbf151321472e045a5563afc583d3870f0e32321b0fead381b8e93e2ca45dfce90
diff --git a/dev-python/namespace-jaraco/metadata.xml b/dev-python/namespace-jaraco/metadata.xml
deleted file mode 100644
index 243a15fbd9a9..000000000000
--- a/dev-python/namespace-jaraco/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sbraz@gentoo.org</email>
-		<name>Louis Sautier</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
deleted file mode 100644
index 782de62a1ae9..000000000000
--- a/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 python-r1
-
-DESCRIPTION="Namespace package declaration for jaraco"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
-IUSE=""
-
-RDEPEND="
-	!<dev-python/jaraco-packaging-5.1
-	${PYTHON_DEPS}
-"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_unpack() {
-	mkdir -p "${S}"/jaraco || die
-	cat > "${S}"/jaraco/__init__.py <<-EOF || die
-		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule jaraco
-}
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 3a2758ab8523..ab23ca63ad82 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-config-8.3.2.tar.gz 148787 BLAKE2B ae3bf5c715d647dc1d5f1c82a6882f3282c87cb622a30ece23eca6453aca997363b6a65d3dc92666d95387c5051c9e9a87f337fa212500607ce6426ce6024847 SHA512 273ce5aeb7aa47b12a0e3a14b9920f7c177854a13c78a2382268e06068f443362088acd105deffc854689af14839c553c62aab983e9b4e29b4e079836b472957
 DIST oslo-config-8.3.3.tar.gz 154910 BLAKE2B d9d3d45d3f9bd191e2be9ef277719d723c35d36006836b2803dfa973283432745d6f11c7d764f2cf4a9ce62098cc0b94ba6aecb364869fd8957ffa309d47bb38 SHA512 6071fbcb4f9e641e6914d676bab3f58cd9e763219bcce0f7de16017a4e1d3a16fcf4296a36c232ac14d8c5c4555f4c433fedc1811e505e62decb0400a9cc2a7c
-EBUILD oslo-config-8.3.2.ebuild 983 BLAKE2B cf8850a9e47336d43d027cdfd26f46de2aa65b36b8defe53fcdedcf7e340645f10bb76f2c3fd5b285f0ad176315d29d750bd85aff7c323ae80531ce140e3f101 SHA512 056349f131b8c270d798714cf27a07f3a761aaf3c94323801b2220e93ba3ff7d0e4ad1ea61933429cb6a1cee8ddcd9f13801c3fb3e999ffbcd056fcb11284214
-EBUILD oslo-config-8.3.3.ebuild 985 BLAKE2B 682c84ba3d531388c7f41ee698d7e64e5de29361bbc0ad470e76c0f52b7acada2e76e5299d5321aa9fb63c80ff07d2e19be32589dc401e02ac76155349c3f145 SHA512 1cac51cb875054763870f61a05f62ee354a03e9d1214188bf21f308556d6b581a70c23a5fd0b78d03e1014e60a8a78e0636c949b2e342ca5a593b42efa3bfc36
+EBUILD oslo-config-8.3.3.ebuild 983 BLAKE2B cf8850a9e47336d43d027cdfd26f46de2aa65b36b8defe53fcdedcf7e340645f10bb76f2c3fd5b285f0ad176315d29d750bd85aff7c323ae80531ce140e3f101 SHA512 056349f131b8c270d798714cf27a07f3a761aaf3c94323801b2220e93ba3ff7d0e4ad1ea61933429cb6a1cee8ddcd9f13801c3fb3e999ffbcd056fcb11284214
 MISC metadata.xml 695 BLAKE2B 0212d67590b4a45c15ca718cb088f52ef025b3fdf4327363d8cfafd705d06ae56cfd5ae8ce9b42bea04399398756ebcb7572495e5d470d2999a69a6e1a74369a SHA512 3ded64c073be245f2087840a098deece2ee6f4b84a7e412ee9a4c0cfbc72bbb2622dcba4912fb714dceb6abe025204212fd3c8861f68c7af3e6e8f1ba78520f1
diff --git a/dev-python/oslo-config/oslo-config-8.3.2.ebuild b/dev-python/oslo-config/oslo-config-8.3.2.ebuild
deleted file mode 100644
index bdde8c67088e..000000000000
--- a/dev-python/oslo-config/oslo-config-8.3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-config/oslo-config-8.3.3.ebuild b/dev-python/oslo-config/oslo-config-8.3.3.ebuild
index 25fa3048ec59..bdde8c67088e 100644
--- a/dev-python/oslo-config/oslo-config-8.3.3.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.3.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 698c0a3c98ce..4c08ae4abe80 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -6,5 +6,5 @@ DIST packaging-20.8.gh.tar.gz 76310 BLAKE2B f6a220bf8ed61e4ced5cdb93eac8a83310d5
 EBUILD packaging-20.4-r1.ebuild 1403 BLAKE2B 32cdfc7e75e27420dc234bbd1695b21e8b7183941ab590d6eae30d16510d93f323580c19c0ff00da78c6c352e8fd82d610dc6b5bd2f913c7d277c71126b0fc0d SHA512 9aa1b1e682839c0d23f514fd66d9436257b77c2cdcca975106e544ff057d71f84d8c52c8d108d2b996b7341669a07cbf98c64eb37754a6eeae473312d93b5a39
 EBUILD packaging-20.5.ebuild 1012 BLAKE2B 8aaa25b51d42e8ead7aca7ccc20f2fe2f42a00a152bb9cae41a1a724b41af864252e4de09e5a395294dfe6e950a789e06379cf816e2c607687747b1c451103dc SHA512 6f104ac4154b63e8715f44a43be0337e55d565eead686283b795cb5ed66e31ae32607d1039de3116a327ead44575beb22d039f93942ef0adbbda961d6c6ada2a
 EBUILD packaging-20.7.ebuild 1012 BLAKE2B 8aaa25b51d42e8ead7aca7ccc20f2fe2f42a00a152bb9cae41a1a724b41af864252e4de09e5a395294dfe6e950a789e06379cf816e2c607687747b1c451103dc SHA512 6f104ac4154b63e8715f44a43be0337e55d565eead686283b795cb5ed66e31ae32607d1039de3116a327ead44575beb22d039f93942ef0adbbda961d6c6ada2a
-EBUILD packaging-20.8.ebuild 972 BLAKE2B 56f8bf51653d85d94a700dfb4906502828a72479b0f191af36f02eb6b5d3f2c59a5159ac7a9d38b289f56babcb9cbc50df056b9a4ba16e5cb0682821c0920131 SHA512 6485864d69bb92a39ac30706b3ce906cee016b41647f9bf83cfb973214c3b1108a043f6e6304b51d92940e2615663119466963a4952bcbd788479769c9527934
+EBUILD packaging-20.8.ebuild 979 BLAKE2B 7a592c137327ed78fd4e5e275c026ee3fd86a6df9f5470a3c69c247977ffbdae6f4e8d048960950f2411c6c87a4570d8d49b6a9cda003432f74656e7e297bd19 SHA512 91ce39242d04758fe28f7a115c6c879f56abf60ee3d1ba9cd3fbc501b19529df30f9a43fef4fcf41f61f9d00ce6a6785899c0f9b35b30fdd760ea4fa179a4424
 MISC metadata.xml 390 BLAKE2B 98afec1f8a7889d12e1a44ef1ff2bf1db635818b7fcb8d86dff0d820fc8fc92920615cd5de63f35cbb6eae6c29f8d6942807f0a7bd48b320c9a0d55a7fa0de69 SHA512 d082f5d387c5d71f0f6cfca4572d4637081daa863186d8b05050738269559617b910c95de97ac3eddd41434cc528e34597125a6973b7b239734c91bb2c588235
diff --git a/dev-python/packaging/packaging-20.8.ebuild b/dev-python/packaging/packaging-20.8.ebuild
index 5ee05520d810..baebfde47304 100644
--- a/dev-python/packaging/packaging-20.8.ebuild
+++ b/dev-python/packaging/packaging-20.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-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"
+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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 71b588bdddcd..6ba1443d473a 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,9 +1,5 @@
-DIST pyfakefs-4.2.1.tar.gz 192910 BLAKE2B dd1826b8fbddb9c9f272cd6fe0a286a41dbcf1bba625cfaef22ea1f17089f6acf346c3a84e56e6ad41f501329c06539bcda72cad670481a3ad770d014ad1e93d SHA512 99ee0ece46ed457dcf98c4c59ee905e58bbfe66e4fadcc3d3d9d725c2ce7b4fae25bc3cf847c85045a828beab52f315ec2ee78e6fea4b23cfe9aaddfd49f1829
-DIST pyfakefs-4.3.0.tar.gz 194821 BLAKE2B f7deca18ad019dba12ac35bac44be339fc1eef0ef609f33b2fa8974f3bd65a25fba043f0afef0e332f9a71f5014444eb7c6e890acbfcfc9c8acb780dc88140a6 SHA512 42c6e9da0f098eeb948fbe3f1f26e8fddfb35d3156543ccc2297cc0fb971a87911a94ca925d2fd12531999fd9314b615f49688a3e9a4aef19522cd08bdabe72a
-DIST pyfakefs-4.3.1.tar.gz 194638 BLAKE2B 752fb2ec88d7468ca439e7124e26b9f111f3b3971a47062b598a0d66c9fc5d8d317716ad73648de727ad6072546fd7b02f7f3a65da45998a20d5f5f3e5999bf1 SHA512 9e1521b7c051ef984329ebe9e2003f72a6f54497dcde46b3fe1b14f282ba436dc17ebd6b8e570714eb1ed8de9f484e6bc94ece0a39985a47f7668f350b5a797f
 DIST pyfakefs-4.3.2.tar.gz 194897 BLAKE2B c3b36e280cb73c4bcd2349382eb67726c19627b0c6dc392a0f38ec7f9f001e5ddbe93734de6d177c68ea1e2213c5c7d06827e3aa12af0c7cd744ba35b8d5df5c SHA512 50479d2ac7b8622ee30c4c2f09cb3d2bdfb315b4eb61eecb37f8946f038ec9048d653250a0f58dcef55b1b8347b040ecd416f61f26ecfdf7b083801114770803
-EBUILD pyfakefs-4.2.1.ebuild 690 BLAKE2B ff030a1f00ded2adfc8b128f2dfadde2d02dcdf8c2c5535c2d67c91c21ec07874993e9e6e772ae9fc5af8f4b387b4fa2e1b13e9da0e2af7e33e3d18728a0f6b7 SHA512 e461e9dbbaf75603e855f5d236c8ee6b4b651dc6ec1cd3092a6ebcdd5e167a061ef17fe2d6652558777f765395a0e21ca1f711d5f8f9d68a5cc828f1371ba876
-EBUILD pyfakefs-4.3.0.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
-EBUILD pyfakefs-4.3.1.ebuild 698 BLAKE2B 3c3ba93d28a54eb237c8b2949a86773cd8499c5abcc972706dbeb1e2fd35c96148c4b93300f894a96571035807a51199bf220c1018a9201c111fb4aa7262bb3d SHA512 b71bca1c47aba4f7d1ba85f160fd52e35a10a8658afbd64a75738e6b7c1c391225b8f875ba138f9ed3c665d5c1ba7a9a093e689afb2a788ec8ab2b5c88f9b37e
-EBUILD pyfakefs-4.3.2.ebuild 709 BLAKE2B 9173aa57fe05213cb4d0542bcfddaab1408992cc44d3a7c25f4fc77f538f5c37de4513ca3db5cf73911a017a94575831a92f835058b0a1efb7c27b3c5af0e3fb SHA512 ca87513a5b5bc21446324e51de8e077f1417e7d4c3ab6e7bfac8534e01e325f6f2b96b14cc191e57fcc824c836b20b740dfa88bfb2d32e3455a64b8ebe4c9670
+DIST pyfakefs-4.3.3.tar.gz 194498 BLAKE2B 4ad300889e8c8462f4a237c2a12a9d93cbaaff6e9e6347e667bc366abf9705023eb1838c4291488c10a51d5209810c773edcb08c58e3759ccd9f851b17ea82e1 SHA512 e4cc3603496705216c1ea1448f835a19efa5a1429f3ecd67911ab2dc76d6754af7bb25312a6b15046355af26b8b72528acf68db50960d2eaba8bb3ef80fccaa0
+EBUILD pyfakefs-4.3.2.ebuild 701 BLAKE2B ed70c3e715ad6f3813bf69728ce276c6dc89f858fba141d7f8c1f80fbea22a4afb8eb0c91f9fbb33c8da7fb3ba53146b7ce6fbd87a461cacfbd8f68fd613300e SHA512 7c7e43001d6f864ba439f12edb45918625338bdb8a74ec6fdc8d8335fe74309c12eae866dd61edb0267504816ed5f6cc3af270c87a37d009b437f1fc83f2e921
+EBUILD pyfakefs-4.3.3.ebuild 709 BLAKE2B 9173aa57fe05213cb4d0542bcfddaab1408992cc44d3a7c25f4fc77f538f5c37de4513ca3db5cf73911a017a94575831a92f835058b0a1efb7c27b3c5af0e3fb SHA512 ca87513a5b5bc21446324e51de8e077f1417e7d4c3ab6e7bfac8534e01e325f6f2b96b14cc191e57fcc824c836b20b740dfa88bfb2d32e3455a64b8ebe4c9670
 MISC metadata.xml 394 BLAKE2B 634b3dfe1c293b5c4918de8dcee95766878982f71c1d73c169e0e5a6dc68f84485af2edeac3a4cb924b04d4f265b84be309021f9ab4a1d4b59c5aa13d5a9dfce SHA512 4320246ff77e0e68f22065ae24232541bd1a2f6793706fda02fa6b0ef89eb3b3322d224026024984ada6cca4bf468512dde648f54d8c7737830b3155531921b0
diff --git a/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.2.1.ebuild
deleted file mode 100644
index de3186579fe3..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.2.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=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.3.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.3.0.ebuild
deleted file mode 100644
index a437b0e387d6..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.3.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=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild b/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
index 687f985da695..a5365edad911 100644
--- a/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyfakefs/pyfakefs-4.3.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.3.3.ebuild
similarity index 95%
rename from dev-python/pyfakefs/pyfakefs-4.3.1.ebuild
rename to dev-python/pyfakefs/pyfakefs-4.3.3.ebuild
index a437b0e387d6..687f985da695 100644
--- a/dev-python/pyfakefs/pyfakefs-4.3.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 69180248dfa7..70a9f9ac9b9b 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,3 @@
-DIST pygit2-1.3.0.tar.gz 243399 BLAKE2B 273d678b1681bbe969282ed10af640a59d99c421d32f6d25cf7374a6b018fb52f92337929a24bd9348085fb4f359561d21b51728ce66d73a5ee7089eef9b7b4c SHA512 297c6aef27019ca540d7ec9c26da7a5e870a7e5c2e06daa1a038023c4ab32c800b2494970e41a3d576e17e1d2c33402c3116389d9e2ebe1c2def0ba529dbde71
 DIST pygit2-1.4.0.tar.gz 244586 BLAKE2B aa4c04ff22df31270a03107498abe095e99e196711a1939fe6f15d4cae18e94d72f1964850437c5e82d897ca74e951a5b877fb41154f3790c9fb6c926c6cfe0b SHA512 b6b9d5028fd63593e6ecd869735132edeeb55c1fd97664be5d0d5dac0c25f844ce0d981782fad7f47e54555ab1f7fa5e87d1ad8a76340d81e1f908ad4ea1e35a
-EBUILD pygit2-1.3.0.ebuild 998 BLAKE2B 2535188ccdc0e33810dd2f0aafe5c08fb0d316f200d11aa4f65fec6788745e363e14c1a10050cf05602a1cd4e6574c63bda3a4b72484e47f0ca201fade7299d6 SHA512 2dcefe3e96ad0330529f65d04f08e4a27ec4ddaafb084f47a5b3f304f3b80138ce5eca67a7940d6b5d17c7c5a9b377209b1f1251ba4aa2d55881ab968a97d16d
-EBUILD pygit2-1.4.0.ebuild 923 BLAKE2B e57d47ee449fdb8effa3272d5289e45380a0462d247f8fdeab201f666a8fa2cab70e798eabda43bccc22082a9486e3b422f4fa29ef9432114775872e58565f87 SHA512 3126e58ed0794e6f53adca9790e2544c1de9fe41deb20ded13fff375d7ef09254aed28b77479c8a26ba89a167483e34b89211c8144e92d38aad2ebad5472375f
+EBUILD pygit2-1.4.0.ebuild 922 BLAKE2B 3cc3ae6c29e894ffce88c0387854a58050eeac19feeda1e965b19325605b9da70c39a05e88523016e369f60bd49660c277af7a70345d8c43881b50419517b9aa SHA512 e6a35764fc922cd09e8939440beb93850afe05973d9dc52597a27458ba74b1c79021e06523f8ab4046178b1685e420d38fbcabc9fd5f829cc4b9df381d0eccf9
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-1.3.0.ebuild b/dev-python/pygit2/pygit2-1.3.0.ebuild
deleted file mode 100644
index 7152c8cc59a6..000000000000
--- a/dev-python/pygit2/pygit2-1.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,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-libs/libgit2-1.0*
-	dev-python/cached-property[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.4.0.ebuild b/dev-python/pygit2/pygit2-1.4.0.ebuild
index a76e35f6efc4..c281283ebbec 100644
--- a/dev-python/pygit2/pygit2-1.4.0.ebuild
+++ b/dev-python/pygit2/pygit2-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-libs/libgit2-1.1*
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 48451cf14b14..01f060c1744d 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,7 +1,9 @@
 DIST pyglet-1.5.10.tar.gz 6417209 BLAKE2B 2c413c111ce3d016ca23186e92b17cb6f67bb904d90ca241eb0f95372a0a9ff8915014f31294a6609e2f35072cb963b6998d791157ede2e2bf01175edeb91582 SHA512 02b3859f2805f703997d7799e324e7debe9375f6c0df211ceff2f750aa7dbbad61b6ece55fbfec111e4f47f0ee6a71881fd73a47bef794a437615ecb42d0f411
 DIST pyglet-1.5.11.tar.gz 6414606 BLAKE2B bc39a611b10a6397f31ce402d0f4be17093e5c37fdbd6bb419156cc00929fd951cfc8e309a0c2a557afba9c567f203956c6ac7fdd1c677d4a5c199c1633e86e4 SHA512 4121fcd45c8d7f500e2bcbaf85e30e39d44b9de165a818455c006964787ad9dcdbb1a670ca72e149a3574ec7c18f113166190acca9a2dec4bef4b5fde856e129
+DIST pyglet-1.5.13.tar.gz 6415241 BLAKE2B 784e387072ea7260c5fc3f0c78869e62d42a68b7ca1208318af3dad77d64d6ca8d12b03c040ce1dca8430cbab31f218c2a1782ccfcaaf3637203e1e9638488b8 SHA512 05863b187653cb82d7727d7d33a65d9907030ac97d926d6dac01301817159c31d4a301570f41ad8e2af9e0509f67008b876e7f3460f31c6d58d5548179cba4ea
 DIST pyglet-1.5.7.tar.gz 6367378 BLAKE2B 68d4aa673a7463f7da0f4ccb7f413b602f32ecc423438326fc4262a4449fe22dff25a513074611ce2c77c130dfe9cc29e44e54a95169875208731f70803f1a45 SHA512 2c2a06636b1db788241028d1ef2290a774b98721ccc92ceed2b2895bcee81d4aa72b2111896091b54531936513772505b0d43003e412735d606130ed4b08f8c9
-EBUILD pyglet-1.5.10.ebuild 1299 BLAKE2B 52d481d9b418e26b01b26c864014691245b8c09aff2cd859b5b0f7082c7c4982fc9b0ff783e4952d2a49cdf17af4c8ed9feecafa1f89ab78f3b049a1127bc6fe SHA512 17a9d5de3761944b0c311450832175b29427394b84d3e6a71f8e738140c4ca1d98f53b27ca245a37027e21a5456fbf2febad8170a2ddad16c48bc6bf9f7236ab
+EBUILD pyglet-1.5.10.ebuild 1298 BLAKE2B bcca335109c777ad48b0923f26e74ba34ca9a7ca479758bf5c1c6af61b1451f8fe2aa2ccf6038d9ece5601e7262cf067fa741f5a1688a398093af2b42fd27bea SHA512 151e695bfb853dd9d8a7a9f4324fabf2d4644d16d218b0ea0ee6f2bc8745303087f4dfcf310ec83eff8018ff7400f00901c394c05ab388049be19856b018b02c
 EBUILD pyglet-1.5.11.ebuild 1299 BLAKE2B 52d481d9b418e26b01b26c864014691245b8c09aff2cd859b5b0f7082c7c4982fc9b0ff783e4952d2a49cdf17af4c8ed9feecafa1f89ab78f3b049a1127bc6fe SHA512 17a9d5de3761944b0c311450832175b29427394b84d3e6a71f8e738140c4ca1d98f53b27ca245a37027e21a5456fbf2febad8170a2ddad16c48bc6bf9f7236ab
+EBUILD pyglet-1.5.13.ebuild 1299 BLAKE2B 52d481d9b418e26b01b26c864014691245b8c09aff2cd859b5b0f7082c7c4982fc9b0ff783e4952d2a49cdf17af4c8ed9feecafa1f89ab78f3b049a1127bc6fe SHA512 17a9d5de3761944b0c311450832175b29427394b84d3e6a71f8e738140c4ca1d98f53b27ca245a37027e21a5456fbf2febad8170a2ddad16c48bc6bf9f7236ab
 EBUILD pyglet-1.5.7-r1.ebuild 1285 BLAKE2B 58ca933e3d968262b39cc844c25738c71a82405fb966cb98b94f2a0ec6728a023f4c941d79b23a45de7200331237ad1fb0016de6f515a5ca0eb353ad6ac44faf SHA512 7e5aefbd904b868b6ee2238eb281d19e3ad3f2a84ff44a431b9d3f99956fa192a5c26b9c7c6cabcf3d9b73326502ec5d7f343fe6e37a3310e302465d54f9f39a
 MISC metadata.xml 996 BLAKE2B 74fda944aaa3954eafb31e21741f8cb599c9f8bff46c662a598cb384da9770d3160302b37ce8cbe9ddbc7dfe63c594614783afa568ab4be5e73db502fdc3a095 SHA512 a13a1aa2134de7bc7e007f81540631623c5a3fc1f5bfd4b6f7bc744eff8cc037da321292aa968184d324099dbfd87f608d7c0a2aeea90707c27aee5532a1fe15
diff --git a/dev-python/pyglet/pyglet-1.5.10.ebuild b/dev-python/pyglet/pyglet-1.5.10.ebuild
index 225581d36f34..60575f08244e 100644
--- a/dev-python/pyglet/pyglet-1.5.10.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pyglet/pyglet-1.5.13.ebuild b/dev-python/pyglet/pyglet-1.5.13.ebuild
new file mode 100644
index 000000000000..225581d36f34
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.13.ebuild
@@ -0,0 +1,62 @@
+# 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} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="http://www.pyglet.org/"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	pytest -vv tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 80e923d5552e..61bb531ad16a 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,6 +1,8 @@
 AUX pygresql-5.2-CFLAGS.patch 333 BLAKE2B caa18ab6ba4da14437637faf6cea4d27e829c4f547f9c08e33a452b1e5912a24235af823c9ea385bbd1516c0c80a08d3225e373ad64ad4d13873ff4dc5155695 SHA512 ddafaadb4ebfb68af71727f840f36800d3dd78323f8ab0324a16b50498206c8ac33c76a80f24fff7984195ed5ac0fc383bdcacb9ea334f4b47e5046864728cd0
 DIST PyGreSQL-5.2.1.tar.gz 267750 BLAKE2B 6c0d4bcfe4f01bf3214efffa1be274b4a92b5e173094e1afe217aae9a44f88d023b43a2de9d4977fb8ce28d25718cf1cd5d123e8ffc2588f2539b6c03277ec55 SHA512 b304de447c239e4737571b38f0e0761448bd4e313f5b28708aced12cf190f323b85f80d3d87e054b62733add770c7bcd33be644a4f17a96ecc0cf4ab3dba85f3
+DIST PyGreSQL-5.2.2.tar.gz 268818 BLAKE2B 4b74c5496f63208164efa10e70222b63512f3afb928bdc612f9874556ee2084b42a80ba05e9ebc6951c68c1c8a70c71320396aabb20b9d5c00d5edd46e287f3f SHA512 a88af2590a515ece19b7f64796e241c6e7b53c8aef90c6e2ae064298a4c71d44695dcf43e0e84595a704c4fdafb9abe35e1779492d3a9ad3708759215cb188a1
 DIST PyGreSQL-5.2.tar.gz 267557 BLAKE2B 92c2c0810a9b763fc2e9fec2e920ca1e21da4eb4ede5f2e20f66fd385ccc623fd9fe74075c6b995c6ea6348df76dcd723c8e4b6d83afdb53c978c02cc5220e49 SHA512 ce1cd29c714ab863dbdc7dde920f8938b115535ae3a0b54c770d7648f05011a716d604eec2d73c321fe2a408e64bcd9208c204856e5ddb0e0675ef7c076e4da7
 EBUILD pygresql-5.2.1.ebuild 719 BLAKE2B f2ed32acda8133a3c918a86d6701770db79be58dab0b8e9f7013f22cda2fc02ad9f60a1d7933933da0a37f3cf2bdccc823262bfa086c49284ebb8d4f24aa4a97 SHA512 feb40d0eb114955475bbb6417cf90a0a566fc51e590cb4af225a6dc35ede1c376ade2fba76ca8f0dbe17cee77f6bcac30c9b22d58f83d6d70f13274168e19f73
+EBUILD pygresql-5.2.2.ebuild 718 BLAKE2B 42686a9ae854937f35fb9d0fba141478188682c4d86aea8b39fbec464c9bcf51bb614779a205c1ffb17d0bb54bf4caedfed5ab8be6936831947675a4762d5fb0 SHA512 cee1ed1a8122f295d388a7af5b01c2626f3305319dc6eae41b786fb709ef2b327357ac36f9eafd4c8c6eee9e882767b5685f4d48df9fda747dc04b8ad77fce9e
 EBUILD pygresql-5.2.ebuild 716 BLAKE2B 42addf8de65496ced3dc58174f46e74b96dd154e0d192bc6c68c1e69ad23971e3ed508f496d9056ebc64c63a665a016907520c1b8ef891b87e2676729f819716 SHA512 ca0e4c3941e87211791ce994aafdf055adb243c94dbf861d22e82c2a6ae479fb9904c9ddcfb4d3c5b69aa2eebb8c1e8ce3b68dc0cc3e3b76692de55349d1cd48
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.2.2.ebuild b/dev-python/pygresql/pygresql-5.2.2.ebuild
new file mode 100644
index 000000000000..709e1ceeafe2
--- /dev/null
+++ b/dev-python/pygresql/pygresql-5.2.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+PYTHON_COMPAT=( python3_{6..9} )
+
+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/pyls-black/Manifest b/dev-python/pyls-black/Manifest
index ec78931cbf5f..5234f3047ebb 100644
--- a/dev-python/pyls-black/Manifest
+++ b/dev-python/pyls-black/Manifest
@@ -1,3 +1,3 @@
 DIST pyls-black-0.4.6-gh.tar.gz 5121 BLAKE2B fb1265d40e7c8b85d066d8d3078a60ff719992abcd84efc9d9df582d6fd7e47f211dbed004081413955524e9455218085d78f1d843769a40168ac448139e283c SHA512 e9fa3faec0fb3f2a8bcbdd4c9b8b8e6662d1bcafa88f693b09e2a7a4df8c2d35df8d8f79c50bbb33342a07cde8931e7f136136ff40879898612b13bdff7277fc
-EBUILD pyls-black-0.4.6.ebuild 674 BLAKE2B a41fd5b1d5d63ef5bfc9e653d50129b8fc8d1422fa807f71436e9492098373d879bc440349cc08e950a25c092f2a983f9f0e068b720032c6d1fb007e23b14661 SHA512 ea31936de6201b0070d70a090ed6a691d5660be965b1a40843b57f462b2d88e38c77a72c11bdee80aa3c767f6bc88632f6adefa13b797aee53b69cb323138820
+EBUILD pyls-black-0.4.6.ebuild 672 BLAKE2B bc8f2814d68463e21af47c15e8cd2cd6b5471672aea30d9e3beb0fdc78ac13f26aa58718523c87ec7c5553e73a3b77d69cda1038f6d43bd455c91741a8e91287 SHA512 583e9f27cd2f7447aa74efcac2219f9cbb41f28cbee6e89d268b5f3884b10b427b08d3ac1273417194d5f0d99dc361014b9d9faec01eb9f59d86f7ab09a90f16
 MISC metadata.xml 505 BLAKE2B 7d94d682d88b4bd10bd85d1a0462785d92bd8fb4c655bc1a8ba095ab7504fadfb95d92fa66b6a192a3e35ac0456ef06b01092999a64f490298f6feed05a2c828 SHA512 d7ffd158ced5f40d242e407994df64061691e392ccadcf186d032b5cd1ddb450c89fb09996c34109463559e70a6c59dc5a889ad2f757b1768f013d26d4a08dcc
diff --git a/dev-python/pyls-black/pyls-black-0.4.6.ebuild b/dev-python/pyls-black/pyls-black-0.4.6.ebuild
index e7e5893f323d..ba2c2f835736 100644
--- a/dev-python/pyls-black/pyls-black-0.4.6.ebuild
+++ b/dev-python/pyls-black/pyls-black-0.4.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rupert/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/python-language-server[${PYTHON_USEDEP}]
diff --git a/dev-python/pyls-spyder/Manifest b/dev-python/pyls-spyder/Manifest
index 2f522c73ad9a..18ae3f96de7f 100644
--- a/dev-python/pyls-spyder/Manifest
+++ b/dev-python/pyls-spyder/Manifest
@@ -1,5 +1,5 @@
 DIST pyls-spyder-0.1.1-gh.tar.gz 7113 BLAKE2B c504c5393527c13d06de579b3e46938dc52012902229e6859e56c3358990f72861682b7a7166658d874b501f9a797db62296d6f5ef30b25e43df73116091d9b6 SHA512 dabc2e3047b97502daaa5f939e75cf6533284bd89c33b29cbb881a3ddafd5b273ff0915645120515740e07dfb4f22c12d47db699b4744599d5edf87e41abe051
 DIST pyls-spyder-0.3.0-gh.tar.gz 8545 BLAKE2B fe2ec3ca6a4440bb9112970550a096389a0969eea9f0cdd631110c19358ac387a97902cc21ee61c8961ef2ee020689c30f7c86f6448bbb40258d730b3cf79cbe SHA512 94ce684d8c7fdb8ece003c1965a001bd745a38086f382e0185f6750edb3103998165a5e2554f065d6364409e5438272e5c256b7b756b971f61f1dd5cbcf3d503
-EBUILD pyls-spyder-0.1.1.ebuild 586 BLAKE2B f3613c7d550e5a9212856bbcca4f93f2c1a9201df4d6fb3069a6338748541615d7dbe7f6572335dea8f99f2c63cad8f2c5ef8c4d8e096a653ff9f66b56933de9 SHA512 ce8a3d2500a664e08d48a5ec517a1f10575ab14d50e96bd72ad03ac11525e5f9f3d72d78ec9decb10a3ba5a9604ef80e327d12b75f58be3d01e07badf09de7c5
+EBUILD pyls-spyder-0.1.1.ebuild 584 BLAKE2B cf117e84371af5185632dddb005291066d80306dc6f54aee0c0576fa33f024f789cb41acadf09289d6cfeadc8c5bfb39d8200a537b93b8c5dd7d077ac630ab61 SHA512 bfb1494af0ed44d6f769b649d53b58eb8b8e1a3078374c0132ff58f648986ca0d5f111292ac5da9d62f706ef1e9c098b57fa5bfceaa0e0acfedfa706017e3bd0
 EBUILD pyls-spyder-0.3.0.ebuild 595 BLAKE2B 2e4207fcf655977a4e24ce18b6d88079110fcc87b3d95e978fedc894200fb6a2492cc3ca9dd6617669551277c1ae047560d96efa2a89f7ffd0e647e3d280e0a7 SHA512 4449555861c88a6338ad9ec1f587510d666933e53386e5ae6333756b39d7efda5da4d71585ac17b57606a6fdd648ffc0e178aec52225af05201074db41cbd5b1
 MISC metadata.xml 529 BLAKE2B f03e03230b89b83cf275a96a4e3ecf6b1a9a76e44e917d8efb2fbfe58b3410b2d4427a88727e3f6d7dcce8143de6b725e1040762a2a240b5bf73d77747a00d84 SHA512 8ecf182651e9c77312d5527a7cbc28802bf99a7b6f70f20113a5aea97e76a4a5f2e056d26d55b5330c0219986c8a420f51a29d756ac400060fe73e82eb4bc770
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
index d79fa4ac8324..39adcb1cec9f 100644
--- a/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
+++ b/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/python-language-server[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/mock )"
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index 6f8e5cca8049..e77856433c1b 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1,5 +1,5 @@
 DIST pyparted-3.11.6.tar.gz 105633 BLAKE2B 8c74fb3521f94cf726365e91954c56a60bc418c0e18c3401dc525f942169b1c03ade5fa35d5053daf4a4568b373e9a8771e50c76ea5b51c2f6351ce62ed2bb21 SHA512 8c3a86efb21c212a8f227ae324896552f45568b8facdd76729f5acf15bf7d691c1b9ab9e46885e4fa4e0c4c7d60314e2abfcbff212e5dc158d27ce716dbd50fa
 DIST pyparted-3.11.7.tar.gz 105671 BLAKE2B ffe7869c7ac85f291314d0381e18ca6a732eca2cee3d31fe31a89b8b1c1c671f97a06a586f235ee67244388ab214a7e51c67951a5c1eb79fb1b448f6a004381c SHA512 147fdc45d47faaee574a7b0268a218eef49be929a147d20adf85cc0302d94e57e98e02072591ca035cad7efe164e7dd87bd1a31504f5cff8575f18d4469dc2b0
 EBUILD pyparted-3.11.6.ebuild 671 BLAKE2B 5be9c6d5cfb65c7a8a4702fe0eea20e39ebf768fb144d88e228f7646bfefe3c3b64ffd588e56f15e5cfbe24a92feb803db8cb691278ffd73e8b6a000ffb3e165 SHA512 280a9da40c537cdfc295dd0df09e9ed97f2f119eecd7555d706bd67d9b725722a32efe34970e5114c374819cb121785792f74cca92f28126c90fadffd956c222
-EBUILD pyparted-3.11.7.ebuild 675 BLAKE2B 19b994ba64efc0ed707c3f7dcefe920a323b016b780783fd7ff4edd102b54e806282bd7ce8883810b190f36bc291ab7240e30717e7cb6122df38b90499125d47 SHA512 15e0dfbf79ffe025f19cdd911ec0ecbf851d06475a268637f0319e91f2e0de7bdc8cdd5f97111fe09fa5546d4a6d93af0d5a8b06340dfa36b44117cf085cac8e
+EBUILD pyparted-3.11.7.ebuild 672 BLAKE2B fd7cb2ae2bc2b064c9b6f39f4739ff1955aa4aabc0818d1a823e0a6a205d8b28dead7f7a3c8195f72a688b66d62f3ef52ea0b3102acc791614c49b6ffb7ee099 SHA512 0f7186e43c389f7f2d95594aa1fe4a59c2da2acd5b342ce5f139137d6dc4ec5ace94edd544c24fe616f2dcb05c2346823768dcebdbf13d601b654cdaada2fb75
 MISC metadata.xml 376 BLAKE2B 6f05ffd5c5420323e7cc8a583190efdc30e16e20d38f73765b1eea2a9572c265bc3612a3218eff6544da134850bd75863cf3c155791767efd45559ac1f1c049d SHA512 afdcbcc3d388fc555d0036416b9190e8c610a78d890b817a031f18c622c80b25cb30a73d98607fa402c548d944cd82fa9f9ed7c35899e2de20b2422f99325476
diff --git a/dev-python/pyparted/pyparted-3.11.7.ebuild b/dev-python/pyparted/pyparted-3.11.7.ebuild
index 62bae7c057bb..2e7323d89b2d 100644
--- a/dev-python/pyparted/pyparted-3.11.7.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dcantrell/pyparted/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 DEPEND="
 	>=sys-block/parted-3.2
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 967aeea456f4..efd270adbe25 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,5 +1,5 @@
 DIST pyproject2setuppy-8.tar.gz 9501 BLAKE2B d0c168efa2742732710a7d967ce0783a942d4718ae2be75e6263bb560500527ee11260c9b7362d10cb059171475dc647c0bc97e284554f2e159f470e3eb7f569 SHA512 527e2de790fb02373150db834d1a007a63b71f87ae01fef1dd9fc86a51ac6cafeac28fa3f39a2d484e7a9f84549d0ba285894cf9201f3b2b2a47965be29913cc
 DIST pyproject2setuppy-9.tar.gz 9611 BLAKE2B 448e6ca468c2a5c1097e63316bf1a2da41dfc4a8dfa756553b56ebcbb66c43cce7dd57aeacce45491087b956a01b8ff2707fc5f60ada10a4f496c9c8f7c722c4 SHA512 bd337f392e3dfd686039714687bd8a57b7b946b486f5513bf603e322843a4d8f4c2fdca747e61090f00f3ed4a5284a2b182f064412a3c8e70f278a2be7551d93
 EBUILD pyproject2setuppy-8.ebuild 671 BLAKE2B cdf5334ea39ceb5493c7998264cf1eac9f259a78b739347b2727133344ba44c74d27fca18d2ac22f4ac76d3f057a6fae641734db4a034cb03b27dc048ec080a0 SHA512 33af5fa08bb93018d3eca50cb90db9a7ac866615e3435aca892417a0ec6c999914d2a8051dfe0c22ec216a776c162fbb48cbf49f668547afee395814ba63077d
-EBUILD pyproject2setuppy-9.ebuild 690 BLAKE2B 55710916fcf2a51630f8b1efd3e7472c74fb538c68591963416abad65016197859cf7cde9ce909d1ce5c8195c873b1cdee0c1f37434f7a0e678504b863cab85d SHA512 4ab71913a6b556a21ab6d16493cf86e231883fa56f3ee63fa9214abfea0329406a7bfe1725e5a328505d1176fc68d128de44b35f7b1129cf69b0e076704d9508
+EBUILD pyproject2setuppy-9.ebuild 697 BLAKE2B c99c9ba316f61305fd9839c4d2e426987169722865252b0b8165100c5bc7b2b6a32a7d11c190afab647843c192d0bdb551e1d3f6354d8451a000bd346b74cf7f SHA512 beb82f145429588c2c5e464f5e3dfff2fafc4d025c3a1df2bf8c6c244c4fcf19c2481ad14b9d0713c07606791d4ddf3b0685a08ae8ee74762367b4e54ea69b9c
 MISC metadata.xml 430 BLAKE2B 934e5a791bb16f3717ace5fa869aab4998938109ee14ca1ae0c9c378d67366060b705ff4430f3d267d33c04cf23ffa0b4c1b2654b2a95d586fc22ab4fb43f8f9 SHA512 f52d07edc973dc7665be77367cfdc37d92f27adc730a327c57374b54b60f77802b79ca5f2ebfce2c687090763224e5939274dcf4fa2555834c580cb06c32419d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
index 70458e2ac4f4..3ee2d749f83e 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index 5f0bf6d2267b..860aafa423e8 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -1,4 +1,3 @@
-AUX cve-2020-5390.patch 15871 BLAKE2B d5c129683e60d27c692669f71955bae111579c92fff19750b4c08117371020185a2925a480cabcfc3164b737a16f84447679d05d835726fb864b1c2eff3369ab SHA512 b338a795664d3d0917ca3dace6c0817ed4445e1fa720f8eb1da6c8d4a6c0fc7985495af8d82fa4994c75b1a0dd29d1048c461214f712163829079c0b94bb8f27
 DIST pysaml2-6.1.0.tar.gz 325101 BLAKE2B 254d1c57e03f13346db89ee18a885d03ce55ed6eec5649d5c764ed6bf97ff20e2a0715e5678409125737acf8fda464c331a17ebe422cc96518bdd3825cf8db05 SHA512 4b3f942a352e6e9ad8df9d3c41269d00dda9f4a71286a4030556d35e5e3946c214fa5c2942f529b1f1ee4dfc30a4d388dffa204f6bdc7614f65b8a3a37ea5ff9
 EBUILD pysaml2-6.1.0.ebuild 746 BLAKE2B fdd51d23f1f9ab6b90241fccdcabfa521eb13126248efcc67c562aecff3e4cbd7c3f2f70ee6366301d00e290e09b61066425812b4d14725bb061407ff2fe10d7 SHA512 9e7dd4b6d9071c0926bc7d5866771618e73e0ed48ad21c91df8cceb1912122acba82c302202523e82868923a23ede6e355a362567aad4ab0519813fa250d853f
 MISC metadata.xml 884 BLAKE2B 5a83139f556eca5d8f4916811413aa2702aef109b36d0bb4471fdf3e2d789f1b590c19421640738ca3bf58157d108d3b01309c802b9dd47f6f3413045184d52c SHA512 6e234688a6d56d0febe9241164abddcc00cbbb34270e633242603e1c246330696f3ca30066f6a4cbe1b679d9ae40f2ed4d170a50e73bc629ed6963312940a648
diff --git a/dev-python/pysaml2/files/cve-2020-5390.patch b/dev-python/pysaml2/files/cve-2020-5390.patch
deleted file mode 100644
index bef46808d920..000000000000
--- a/dev-python/pysaml2/files/cve-2020-5390.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 5e9d5acbcd8ae45c4e736ac521fd2df5b1c62e25 Mon Sep 17 00:00:00 2001
-From: Ivan Kanakarakis <ivan.kanak@gmail.com>
-Date: Sat, 4 Jan 2020 00:39:47 +0200
-Subject: [PATCH] Fix XML Signature Wrapping (XSW) vulnerabilities
-
-PySAML2 did not check that the signature in a SAML document is enveloped and thus
-XML signature wrapping (XSW) was effective.
-
-The signature information and the node/object that is signed can be in different places
-and thus the signature verification will succeed, but the wrong data will be used. This
-specifically affects the verification of assertions that have been signed.
-
-This was assigned CVE-2020-5390
-
-Thanks to Alexey Sintsov and Yuri Goltsev from HERE Technologies to report this.
-
-+ + + + + + + +
-
-In more detail:
-
-libxml2 follows the xmldsig-core specification. The xmldsig specification is way too
-general. saml-core reuses the xmldsig specification, but constrains it to use of
-specific facilities. The implementation of the SAML specification is responsible to
-enforce those constraints. libxml2/xmlsec1 are not aware of those constraints and thus
-process the document based on the full/general xmldsig rules.
-
-What is happening is the following:
-
-- xmldsig-core allows the signature-information and the data that was signed to be in
-  different places. This works by setting the URI attribute of the Reference element.
-  The URI attribute contains an optional identifier of the object being signed. (see
-  "4.4.3 The Reference Element" -- https://www.w3.org/TR/xmldsig-core1/#sec-Reference)
-  This identifier is actually a pointer that can be defined in many different ways; from
-  XPath expressions that need to be executed(!), to a full URL that should be fetched(!)
-  in order to recalculate the signature.
-
-- saml-core section "5.4 XML Signature Profile" defines constrains on the xmldsig-core
-  facilities. It explicitly dictates that enveloped signatures are the only signatures
-  allowed. This mean that:
-  * Assertion/RequestType/ResponseType elements must have an ID attribute
-  * signatures must have a single Reference element
-  * the Reference element must have a URI attribute
-  * the URI attribute contains an anchor
-  * the anchor points to the enclosing element's ID attribute
-
-xmlsec1 does the right thing - it follows the reference URI pointer and validates the
-assertion. But, the pointer points to an assertion in another part of the document; not
-the assertion in which the signature is embedded/enveloped. SAML processing thinks that
-the signature is fine (that's what xmlsec1 said), and gets the assertion data from the
-assertion that contains the signature - but that assertion was never validated. The
-issue is that pysaml2 does not enforce the constrains on the signature validation
-facilities of xmldsig-core, that the saml-core spec defines.
-
-The solution is simple; all we need is to make sure that assertions with signatures (1)
-contain one reference element that (2) has a URI attribute (3) that is an anchor that
-(4) points to the assertion in which the signature is embedded. If those conditions are
-met then we're good, otherwise we should fail the verification.
-
-Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>
----
- src/saml2/sigver.py          | 49 ++++++++++++++++++++++++++++++++++++
- tests/saml2_response_xsw.xml |  6 +++++
- tests/test_xsw.py            | 44 ++++++++++++++++++++++++++++++++
- 3 files changed, 99 insertions(+)
- create mode 100644 tests/saml2_response_xsw.xml
- create mode 100644 tests/test_xsw.py
-
-diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py
-index cbeca41f..c3d298a9 100644
---- a/src/saml2/sigver.py
-+++ b/src/saml2/sigver.py
-@@ -1476,6 +1476,55 @@ def _check_signature(self, decoded_xml, item, node_name=NODE_NAME, origdoc=None,
-         if not certs:
-             raise MissingKey(_issuer)
- 
-+        # saml-core section "5.4 XML Signature Profile" defines constrains on the
-+        # xmldsig-core facilities. It explicitly dictates that enveloped signatures
-+        # are the only signatures allowed. This mean that:
-+        # * Assertion/RequestType/ResponseType elements must have an ID attribute
-+        # * signatures must have a single Reference element
-+        # * the Reference element must have a URI attribute
-+        # * the URI attribute contains an anchor
-+        # * the anchor points to the enclosing element's ID attribute
-+        references = item.signature.signed_info.reference
-+        signatures_must_have_a_single_reference_element = len(references) == 1
-+        the_Reference_element_must_have_a_URI_attribute = (
-+            signatures_must_have_a_single_reference_element
-+            and hasattr(references[0], "uri")
-+        )
-+        the_URI_attribute_contains_an_anchor = (
-+            the_Reference_element_must_have_a_URI_attribute
-+            and references[0].uri.startswith("#")
-+            and len(references[0].uri) > 1
-+        )
-+        the_anchor_points_to_the_enclosing_element_ID_attribute = (
-+            the_URI_attribute_contains_an_anchor
-+            and references[0].uri == "#{id}".format(id=item.id)
-+        )
-+        validators = {
-+            "signatures must have a single reference element": (
-+                signatures_must_have_a_single_reference_element
-+            ),
-+            "the Reference element must have a URI attribute": (
-+                the_Reference_element_must_have_a_URI_attribute
-+            ),
-+            "the URI attribute contains an anchor": (
-+                the_URI_attribute_contains_an_anchor
-+            ),
-+            "the anchor points to the enclosing element ID attribute": (
-+                the_anchor_points_to_the_enclosing_element_ID_attribute
-+            ),
-+        }
-+        if not all(validators.values()):
-+            error_context = {
-+                "message": "Signature failed to meet constraints on xmldsig",
-+                "validators": validators,
-+                "item ID": item.id,
-+                "reference URI": item.signature.signed_info.reference[0].uri,
-+                "issuer": _issuer,
-+                "node name": node_name,
-+                "xml document": decoded_xml,
-+            }
-+            raise SignatureError(error_context)
-+
-         verified = False
-         last_pem_file = None
- 
-diff --git a/tests/saml2_response_xsw.xml b/tests/saml2_response_xsw.xml
-new file mode 100644
-index 00000000..3671eb48
---- /dev/null
-+++ b/tests/saml2_response_xsw.xml
-@@ -0,0 +1,6 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ns0:Response xmlns:ns0="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:ns1="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Destination="http://lingon.catalogix.se:8087/" ID="id-vqOQ72JCppXaBWnBE" InResponseTo="id12" IssueInstant="2019-12-20T12:15:16Z" Version="2.0"><ns1:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">urn:mace:example.com:saml:roland:idp</ns1:Issuer><ns0:Status><ns0:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/></ns0:Status><ns1:Assertion ID="id-SPOOFED_ASSERTION" IssueInstant="2019-12-20T12:15:16Z" Version="2.0"><ns1:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">urn:mace:example.com:saml:roland:idp</ns1:Issuer><ns2:Signature Id="Signature2"><ns2:SignedInfo><ns2:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ns2:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><ns2:Reference URI="#id-Aa9IWfDxJVIX6GQye"><ns2:Transforms><ns2:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ns2:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ns2:Transforms><ns2:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ns2:DigestValue>EWBvQUlrwQbtrAjuUXkSBAVsZ50=</ns2:DigestValue></ns2:Reference></ns2:SignedInfo><ns2:SignatureValue>m4zRgTWleMcx1dFboeiYlbiDigHWAVhHVa+GLN++ELNMFDutuzBxc3tu6okyaNQGW3leu32wzbfdpb5+3RlpGoKj2wPX570/EMJj4uw91XfXsZfpNP+5GlgNT8w/elDmBXhG/KwmSO477Imk0szKovTBMVHmo3QOd+ba//dVsJE=</ns2:SignatureValue><ns2:KeyInfo><ns2:X509Data><ns2:X509Certificate>MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBFMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJg2cms7MqjniT8Fi/XkNHZNPbNVQyMUMXE9tXOdqwYCA1cc8vQdzkihscQMXy3iPw2cMggBu6gjMTOSOxECkuvX5ZCclKr8pXAJM5cY6gVOaVO2PdTZcvDBKGbiaNefiEw5hnoZomqZGp8wHNLAUkwtH9vjqqvxyS/vclc6k2ewIDAQABo4GnMIGkMB0GA1UdDgQWBBRePsKHKYJsiojE78ZWXccK9K4aJTB1BgNVHSMEbjBsgBRePsKHKYJsiojE78ZWXccK9K4aJaFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAJrzqSSwmDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6mrPzGzk3ECbupFnqyREH3+ZPSdk=</ns2:X509Certificate></ns2:X509Data></ns2:KeyInfo></ns2:Signature><ns1:Subject><ns1:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" NameQualifier="" SPNameQualifier="id12">ANOTHER_ID</ns1:NameID><ns1:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><ns1:SubjectConfirmationData InResponseTo="id12" NotOnOrAfter="2019-12-20T12:20:16Z" Recipient="http://lingon.catalogix.se:8087/"/></ns1:SubjectConfirmation></ns1:Subject><ns1:Conditions NotBefore="2019-12-20T12:15:16Z" NotOnOrAfter="2019-12-20T12:20:16Z"><ns1:AudienceRestriction><ns1:Audience>urn:mace:example.com:saml:roland:sp</ns1:Audience></ns1:AudienceRestriction></ns1:Conditions><ns1:AuthnStatement AuthnInstant="2019-12-20T12:15:16Z" SessionIndex="id-eEhNCc5BSiesVOl8B"><ns1:AuthnContext><ns1:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocolPassword</ns1:AuthnContextClassRef><ns1:AuthenticatingAuthority>http://www.example.com/login</ns1:AuthenticatingAuthority></ns1:AuthnContext></ns1:AuthnStatement><ns1:AttributeStatement><ns1:Attribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">staff</ns1:AttributeValue><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">ADMIN</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">HACKER@gmail.com</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Derek</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="surName" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Jeter</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">shortstop</ns1:AttributeValue></ns1:Attribute></ns1:AttributeStatement></ns1:Assertion>
-+<XSW_ATTACK>
-+<ns1:Assertion ID="id-Aa9IWfDxJVIX6GQye" IssueInstant="2019-12-20T12:15:16Z" Version="2.0"><ns1:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">urn:mace:example.com:saml:roland:idp</ns1:Issuer><ns1:Subject><ns1:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" NameQualifier="" SPNameQualifier="id12">ac5b22bb8eac4a26ed07a55432a0fe0da243f6e911aa614cff402c44d7cdec36</ns1:NameID><ns1:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><ns1:SubjectConfirmationData InResponseTo="id12" NotOnOrAfter="2019-12-20T12:20:16Z" Recipient="http://lingon.catalogix.se:8087/"/></ns1:SubjectConfirmation></ns1:Subject><ns1:Conditions NotBefore="2019-12-20T12:15:16Z" NotOnOrAfter="2019-12-20T12:20:16Z"><ns1:AudienceRestriction><ns1:Audience>urn:mace:example.com:saml:roland:sp</ns1:Audience></ns1:AudienceRestriction></ns1:Conditions><ns1:AuthnStatement AuthnInstant="2019-12-20T12:15:16Z" SessionIndex="id-eEhNCc5BSiesVOl8B"><ns1:AuthnContext><ns1:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocolPassword</ns1:AuthnContextClassRef><ns1:AuthenticatingAuthority>http://www.example.com/login</ns1:AuthenticatingAuthority></ns1:AuthnContext></ns1:AuthnStatement><ns1:AttributeStatement><ns1:Attribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">staff</ns1:AttributeValue><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">member</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">foo@gmail.com</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Derek</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="surName" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Jeter</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">shortstop</ns1:AttributeValue></ns1:Attribute></ns1:AttributeStatement></ns1:Assertion>
-+</XSW_ATTACK>
-+</ns0:Response>
-diff --git a/tests/test_xsw.py b/tests/test_xsw.py
-new file mode 100644
-index 00000000..9978c4d3
---- /dev/null
-+++ b/tests/test_xsw.py
-@@ -0,0 +1,44 @@
-+from datetime import datetime
-+from unittest.mock import Mock
-+from unittest.mock import patch
-+
-+from saml2.config import config_factory
-+from saml2.response import authn_response
-+from saml2.sigver import SignatureError
-+
-+from dateutil import parser
-+
-+from pytest import raises
-+
-+from pathutils import dotname
-+from pathutils import full_path
-+
-+
-+XML_RESPONSE_XSW = full_path("saml2_response_xsw.xml")
-+
-+
-+class TestAuthnResponse:
-+    def setup_class(self):
-+        self.conf = config_factory("sp", dotname("server_conf"))
-+        self.ar = authn_response(self.conf, "http://lingon.catalogix.se:8087/")
-+
-+    @patch('saml2.response.validate_on_or_after', return_value=True)
-+    def test_verify_signed_xsw(self, mock_validate_on_or_after):
-+        self.ar.issue_instant_ok = Mock(return_value=True)
-+
-+        with open(XML_RESPONSE_XSW) as fp:
-+            xml_response = fp.read()
-+
-+        self.ar.outstanding_queries = {"id12": "http://localhost:8088/sso"}
-+        self.ar.timeslack = 10000
-+        self.ar.loads(xml_response, decode=False)
-+
-+        assert self.ar.came_from == 'http://localhost:8088/sso'
-+        assert self.ar.session_id() == "id12"
-+        assert self.ar.issuer() == 'urn:mace:example.com:saml:roland:idp'
-+
-+        with raises(SignatureError):
-+            self.ar.verify()
-+
-+        assert self.ar.ava is None
-+        assert self.ar.name_id is None
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index d2fee3a1ba9b..dfd55780263b 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,3 +1,3 @@
 DIST pysimdjson-3.1.1.tar.gz 3286141 BLAKE2B f1fc63ffcaf524f23112438a8669caf4b4ffa0190bb20e2b851f61dfae386fe02bff1746dd4e68499bdaff3420d41401424fde1332222fe49211d32e09fdcab8 SHA512 9b1080d70f06e5a6d6467769a8146f642adee2c08391a87dd86eca9b0eb7666d9fed47a83d991843b07c2b96906dbf0ccacf2425bfc3ce4cb22731e03b12122e
-EBUILD pysimdjson-3.1.1.ebuild 504 BLAKE2B 9b4a0bfd2f3f21626bb9ecf0700a50fed30cb21bb29f5f90aa80828030866652e677cdf43c74c7c156c7ef0fd4d8077f04e6ebe10eb487d6b6a0e501eb78dbb3 SHA512 f3044ca6c1027be04a77cfcfaa21771a13bc2a51689eecda526bbe8e7b487a505ff1aaf611ca6e68fc7e5b0ecfb8d5c157660bc430918681809c557c14017066
+EBUILD pysimdjson-3.1.1-r1.ebuild 512 BLAKE2B 5d1b7b256ac2286b14bbe3f040a8695f3f82d5c456947d4fc95729af052fed464aaa517674c7f6c797e3d3ce26017bbc1d70415c2bc8d6aa4cf8cc38c2ecd922 SHA512 e307ee4b6d97f44432e0b2657d04c32f6b7afd8c113bf50dc29c5f725174660f0c16f201db513dec0a41200e5be171b805c5630f6c8c99e96662ef977e04cd94
 MISC metadata.xml 322 BLAKE2B 94765d38596d2ebe4a27143373174f461b1af57ab29af679c35dbf69f45be48034ffeb424eef6ebc27e4be9e02090b587e216e7bb7f4eb6404523bd9a500435a SHA512 c88bdc79d128f98678accce553f367a1b83f7888e698a05b537387576808d9c547f52b7f963990311082ad06714e883a3da26e6f5cb93ef2b229c56a859d2fef
diff --git a/dev-python/pysimdjson/pysimdjson-3.1.1.ebuild b/dev-python/pysimdjson/pysimdjson-3.1.1-r1.ebuild
similarity index 90%
rename from dev-python/pysimdjson/pysimdjson-3.1.1.ebuild
rename to dev-python/pysimdjson/pysimdjson-3.1.1-r1.ebuild
index 276dfb899f43..83499d140ac6 100644
--- a/dev-python/pysimdjson/pysimdjson-3.1.1.ebuild
+++ b/dev-python/pysimdjson/pysimdjson-3.1.1-r1.ebuild
@@ -18,6 +18,6 @@ RDEPEND="
 	dev-libs/simdjson
 "
 BDEPEND="
-	dev-python/pybind11[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.6.1[${PYTHON_USEDEP}]
 "
 distutils_enable_tests pytest
diff --git a/dev-python/pytaglib/Manifest b/dev-python/pytaglib/Manifest
index 00220b6a3c93..010ba93dc57b 100644
--- a/dev-python/pytaglib/Manifest
+++ b/dev-python/pytaglib/Manifest
@@ -1,3 +1,3 @@
 DIST pytaglib-1.4.6.tar.gz 467771 BLAKE2B ad0237829d203cc3fecf90c8d1d4ce6a98702afa2a6e6d51e3d3dd6a933c31e3c9f7bc9c4d5efa6eea33e630b3213651ed5afdc07db1cba058a9036ddf459ab4 SHA512 4b438759440790b3c850cf165b553f7e6066bf0064e041cca3e46831046b12a87decd4429772ea0c50e1b27cbbd2c82ba709361bc01aa2e8ec3064458aeae0ff
-EBUILD pytaglib-1.4.6.ebuild 446 BLAKE2B c3ae25bfd77d209a3632cfdd6a7b602f84378f7a672d4373cf88ca33a92e94770429b1d71d52f960241dc9e80cce5ad3e16e9eeac05682029a2a87f70630d085 SHA512 d39b1d9cec9cfe3ff7811bea6f0b31be07bc20837da378356e6363eda5db5eb1a36f300ca40c674a9ad32c37f2a3bd38ad4cad1834e9e2c63f622eec3f38e843
+EBUILD pytaglib-1.4.6.ebuild 451 BLAKE2B f001110c30a302f9375d9f449e95f79f2a80a30478e4a9c2959ac94b41eeb3129f89bf9b28a3355bbfbd5cf38d5271af24c976c225ac3d5664ee3a83fb297ab5 SHA512 5b84f9b8652128f41d2aea22ecbc92088d2cb3b8da12fc095f0578356a6a37a6438c21de7f14def12fbfe00c177f517501a27509c75cd654ff6fb3f414eb9f01
 MISC metadata.xml 381 BLAKE2B 7479c1caaec26f8428bdb07a20018a66fa00bf3ba2d6cf9c0d204834ab5450536d5c21f4e0266606041ec52408d02811438adc085e0c02d5650b2bc00381083d SHA512 a278b1b37ec3a259ffaeeca9657b99e09c243b27f4105f8d66fef120a6cdc4a2594ece6b9a381a7062a94d91836e17ddb0fcf35170c2696918ff3bece944a308
diff --git a/dev-python/pytaglib/pytaglib-1.4.6.ebuild b/dev-python/pytaglib/pytaglib-1.4.6.ebuild
index b50473ecbfce..dc984032ab9d 100644
--- a/dev-python/pytaglib/pytaglib-1.4.6.ebuild
+++ b/dev-python/pytaglib/pytaglib-1.4.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/supermihi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="media-libs/taglib"
diff --git a/dev-python/pytest-catchlog/Manifest b/dev-python/pytest-catchlog/Manifest
deleted file mode 100644
index 2d53cdb31a08..000000000000
--- a/dev-python/pytest-catchlog/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-catchlog-1.2.2.zip 18028 BLAKE2B aecc020f34010f20ada7a65b069b5f6de79de301dffd765a0f395127582a90e7913057332a760de38e20f273f0b1ff6dd5afb39f5b3ee1d1e2f2f1e4187eb252 SHA512 bbeeb7213898844a7956712992ddaca1e28c52fc5712339b9730f181a124af5ec90b5460981066638658246da4321840a7583ee14eec7c0482e069e2a824d031
-EBUILD pytest-catchlog-1.2.2.ebuild 796 BLAKE2B 79e00c511c1cdbabb67f4de085f82f393839d91552b4330d5668cdf2bdc29c9ace6943577b2c419e1b1c6781fc7b9fd784890a32ae3b1baadc1ef27982d4369b SHA512 8f65a32e1dfa5ab23f4a47add3b62d19ebc9987a23999b2f8cb7e8166618c15606ab4697765eebda75cbdb297ebc5021f70127c1c6220d31e865cfa95832f71c
-MISC metadata.xml 384 BLAKE2B 0dff6cbe91087adee6e5fba8d8d1e38ad51f94d97808c62d7e68844f5eb9097ce4fa22bd7a2e19456836721880fdf4e54d4abab42fc9c1285d6fdf5bc761a27c SHA512 2a49b6a72107bd42dbb524a060c14a2dafc1172ea5d21427f22589f43f7cf728e0b3d843f59c962bcd8c6a072663ab842606d13827ff9803d1a016da5c09f741
diff --git a/dev-python/pytest-catchlog/metadata.xml b/dev-python/pytest-catchlog/metadata.xml
deleted file mode 100644
index ebb00878d434..000000000000
--- a/dev-python/pytest-catchlog/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>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pytest-catchlog</remote-id>
-		<remote-id type="github">eisensheng/pytest-catchlog</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
deleted file mode 100644
index 846c148487f2..000000000000
--- a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin to catch log messages, fork of pytest-capturelog"
-HOMEPAGE="https://pypi.org/project/pytest-catchlog/ https://github.com/eisensheng/pytest-catchlog"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-python/py-1.1.1[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${COMMON_DEPEND}
-		>=dev-python/pytest-2.7.1[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!dev-python/pytest-capturelog"
-
-python_test() {
-	PYTEST_PLUGINS=${PN/-/_} py.test -v -v test_pytest_catchlog.py || die
-}
diff --git a/dev-python/pytest-faulthandler/Manifest b/dev-python/pytest-faulthandler/Manifest
index ddbe19bab376..acd874edc4ff 100644
--- a/dev-python/pytest-faulthandler/Manifest
+++ b/dev-python/pytest-faulthandler/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-faulthandler-1.6.0.tar.gz 6656 BLAKE2B 0fe66827e09c6b566ac6a9aa3fd4da03f0f5c4ea1e8601b16ed1a211c33150bcc0eaac5b47786040f571ceb266300bcb5142e2a8d977aeb69f89bd0ecefec4c3 SHA512 23146b1c0965e66ac201cae82192f3833daad2563f2177d916050df14b532a3eb78f2dd3b888cec3d28121b334ee86c9b762c5aadb8fb624c9a4288fbad693a5
 DIST pytest-faulthandler-2.0.1.tar.gz 3629 BLAKE2B f66b6989673b179b3ad3f583b9e7b9615b08e1e062f06969f37bd8a9a57e58bd0207544b0c11aa4a9d03f4db40a125bbbe1924160b2bdcb2c0c589de07281570 SHA512 184b4228693db0f15fdcf250f09c3ee9ef4767e744af9000ec46876f0c68e17434a6d1e25c7d59f610b2baa659d7af5a784cbf0e5e29b105f48d50d00cb1a7ca
-EBUILD pytest-faulthandler-1.6.0.ebuild 749 BLAKE2B 0d9ae05e1d7a4f402a07bf2e088de23bdea5c42dc9c1a78c2c93ca8aee4467e47828ffabfef72a0f0e47c873a08d4c59faa554109c85c5fcd59db53034670124 SHA512 25e7f0d34e4ebdc88828dce669c8a00d06b18da4427ea5802a4f206c6bc1f5c08c1c72c5369cb28d6eb6887ec5e748a9d0228c6c5ab724b659edfd06f5674d1f
-EBUILD pytest-faulthandler-2.0.1.ebuild 508 BLAKE2B ca48afbf9fd9a646b51c9bfa4146d8297d67bf9b1eee3c5f671d1df5f561056cb0b18e9c042a751c4de43e25a76fcb30e782bdadbaae399e48df4441f7b0d62f SHA512 7ca9d022cdca8a6749d5068ccc5ba8e5671a32949fc4ab89e273f36336384db9c276550c6e049bb23619ef26567607bf4287680ebd8c7e5821d9e84212a6be8a
+EBUILD pytest-faulthandler-1.6.0.ebuild 748 BLAKE2B 1ed59d2a536e18a3daaecf25eabbd2cc6b4817f61111a16056058d3a88a4cb70cc13e2c4e740c71645729e6d254e27a3727f592c27953b4f6d6277122b9e19f4 SHA512 b94849df122b91a2aaa1560fc5526eb753a6d6f575aa18cced216031016e4ce244240b547aea79c3eeda3e85cdc9724cd1787cde0963b1b34a6da71eded956ca
+EBUILD pytest-faulthandler-2.0.1.ebuild 507 BLAKE2B 033f2e659b969ec735326ebf98da66c7081a504f5f029ddcdf2e360904f80f083a0c48dbb1235e2ca3e1e44905ce269f48115113f0348aa3929a12e84e85d4ca SHA512 6a0598dd9aa90c279136dcc5d3b0a22bfc401a0045a772bbbfe59ee66ef9e932f2235ad9c44caf5dd9abf666a0cdb31ddd4f7b8f6417e856c9722c0a87dcc3dd
 MISC metadata.xml 457 BLAKE2B b60877a1c09f68aa69b75c8386ce1b8a338f91bcf54e875cfd45fabbcb4b254d1702c58fee5d2144d424bf890e57a2c9814c517670dd6bb430f3ace6ffde3ca5 SHA512 dfdf0734d59cf307da8c45c92b13831b5375569bca715c7021af1e932aa37a1c21810827184f3e78c93e5bcfa7a2c10639ea96219f595a7e7f5b68243f52aed8
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
index 79a8fe429c9e..c2ef1ebeba08 100644
--- a/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
+++ b/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
index 38021a87f44e..952c64b46b07 100644
--- a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
+++ b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-faulthandler/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 1a549131c7cc..c93bfc374782 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -5,5 +5,6 @@ DIST pytest-xdist-2.1.0.tar.gz 66332 BLAKE2B ac3c19a32bb9153537edfcf55bc65601166
 DIST pytest-xdist-2.2.0.tar.gz 64781 BLAKE2B 17287c28f31c42c6a8fe3622d4ba920a530e0ced3bc99cffd8f9de91c3498cc2a3b654cc32bd5b09ee8ec6c1f64226aec736acafd73397be2eb34bd3d192bb46 SHA512 2027f8512fbd6cb68ab36eb774b9d8b7e855c181733b884f394d0e84994926b4fe6158dbd55808328b262497036f101e71cb86553340eba0031d654f34541689
 EBUILD pytest-xdist-1.34.0-r1.ebuild 1036 BLAKE2B f576f44fdb55876e9cf7ccaec9ce5ffeede2095111a48f2455da590cc4c053ffac094b21baad142dc9ed54c654af423b29c4f7719dd32ff49da2d2f149e666d3 SHA512 3dc96e04f982a62f24f9ab9b2748dbd1a97c486ae3feee09b2e6fbd1ae4af6910455c456537453fa48d3cb85e03ac09acd7d26512a054e3aff83b5dc28591f62
 EBUILD pytest-xdist-2.1.0.ebuild 1147 BLAKE2B 5f8b2db3dda86e53857ae6155e4c13ec868f744b9113c012ee961cd651584f010125d3ae3539deb5b3bab106397211cea17de81f8c506e9d1fc7e2cc50a4f7b7 SHA512 c9ac3c5c1d0e4d728e0edaa5ae122248a0c6d7ef426573e50274385b0ccca14feb3dc4a1112e00f11a23bf8529a036430b8f239cfde386d0c9cc407dd19ba5a4
+EBUILD pytest-xdist-2.2.0-r1.ebuild 921 BLAKE2B e91a5ef5c7c93f08c1f404aa9af3ff86067eefcbc1ae82fb93d5a5616fb1b8839d4a1276785202d76a79e9b309e8ec467b995997a5a03b283721e8ac035d38ba SHA512 a4366d34aff46ca3508eb69159f67399e78a3f86589011ef80ac1785cda7529c48bdcbf1b70bdf9f71797ecaa140a459a54fcac09dfcee262424edf159154bb7
 EBUILD pytest-xdist-2.2.0.ebuild 917 BLAKE2B c19d098863698507d64abf3724e0de9e411ed797f30e75d3d3e6be0c087830c1d54305b04d2e6e15175fecc25020a26957f7472203d33303619d1e4bfd39a4c2 SHA512 2af3e8f5fae4fc3a1a8b9ab51c7ac9f9fe1d7a4e05b9f6e03d1a9f067e840c1d18d551f13b192e041566d4b05a82318735be746eaff728bf0c2ca76b85d2e8b3
 MISC metadata.xml 402 BLAKE2B 9e24660b4146f94ecdf375e3bd89a9ab01157ab7c7e9b37fa183eaad12edfbb6574ecef4a98e6079b3dd81e6614b5eb23b0bfd69c9468abde7bbc073e8ef44b4 SHA512 7fbab209b81bba0684b9dad109dc7ba64f9c496e5ad69fcbc659f9361aa131f6779a5419a54112b4ff1c2a63a9deef5f36791551165b1b4b7219c7a00fe93060
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..deaa5ddb4ecb
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+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 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# pytest-xdist >= 2 fails with pytest < 6
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-services-conflict.patch
+)
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 766607d9f099..8016fa680f29 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,3 +1,3 @@
 DIST python-bugzilla-3.0.2.tar.gz 115324 BLAKE2B 3f64af96bf61d16e720338055391b187f53a968488535e76a5d6e56817030fc1c45f824ed27424b3e7440dc03759e77bcb8d417fa2278aa611b995bea2775f7a SHA512 c4fb79c9ca4d813a5dd9573e9a300aa01ea713fa11d43e2ee7ca13efb4720fed14fff339e9cc1b756505f43348768f0fdaaa8ae0b370640ff70e402f852e9b1a
-EBUILD python-bugzilla-3.0.2.ebuild 681 BLAKE2B 08a923ee9456774edc52255ac77f240a3a118d4d1d1b5b20cb5921d5133e5db88a81484ba561a67cff5cf4a2660d9a3de35f407021c0b6c3d4b32363794c2f4a SHA512 9fe24ff129a7b8fc92619cff76af5b143675a6c9c980556e8a7ca3e8c0745e0a460f8b2142ecc8dbf54aec671463cc5d9559f6311cc49636f829c22e64c94eaa
+EBUILD python-bugzilla-3.0.2.ebuild 679 BLAKE2B ea1a48cfcd6c80d1ead275b661866ff640f3a897d8d3cc8adf10e7af0b681a83441917a5c05e20d9c0dbdd15615624dd34ec95e19f3ca6434975ec163b4106df SHA512 c762afc66c7e1a7ceed0350172714bb5037a3ec4d1a6a3b75dfb0e01d333b24b2f8fbb1fe6e2bfdd5d28d114b19415bcfa3381800ad200ece7ef25936e0e9478
 MISC metadata.xml 661 BLAKE2B 71e2d61d2c3f6f68dc260f2849bcc6cc444bd1eae0ed95e0e5312ea6b362e7de644bc18573d83bde770511174f42b79d04478c8a0ab49622e66deb4d06059535 SHA512 0b31da040d6c68a84d20c171f614fecee1ebc2a01be1c6fc5480774d9ba4e47c7d8dbcb2b58ff8e2dcd56bf96a8e9b6181960173ede6e73bc9eb2355f2945ca3
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
index f997f2f1be61..3a1e491a2fec 100644
--- a/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
 HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index 95773d7104fa..e6abc11a85b2 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,7 +1,5 @@
-DIST python-language-server-0.35.1.tar.gz 72944 BLAKE2B fe469e5365dec4a2192a2ca2f75fc9f05476434c0f6db26d851521149053455b256678ed98c5f1209d30b262808b615a3f7ac77fb604adf1455203e40f93c96f SHA512 278f281c8c82729ad60db2785b3f4b64568de529edb7a6f1b5683d09838ea43ed79182c50e42210e766b9a3f3c10b0c0256121b9925803c45f9e948f144ca994
 DIST python-language-server-0.36.1.tar.gz 74524 BLAKE2B 3337bf4c91204302b26b2496bc79ae6e0c18143f89ef97861dd91760b27406eba8fc9895a2f00c5c2de3a990eeb8ba29ba10319262466a42b1fb362af809060f SHA512 4a8150cf1334e9b2085e9b4ca7165404f30127339bd0fe8db229924c67933bfcd7827a875136b1694a82d4f447255862df116bc6d74a51df8e1ed82a6875914b
 DIST python-language-server-0.36.2.tar.gz 74499 BLAKE2B 0bf950e236f8f898c3158afc2b3355948340639b607f474654b0334d484170a210b6e81c7508f12368223ae9915ccf19f76a1bcde41503230d8c008ba0818b47 SHA512 ee909d9332ef76c616d727ebfa36e80fd03ab57df8fc57265de21f0105cc0b64a518b2a8a582f88364d03a7d2a66e1030bcf5b3452ad3a891a3141da9b338373
-EBUILD python-language-server-0.35.1-r1.ebuild 2443 BLAKE2B 7ec56114275d77df6d65dda131a77a279c479c905b31d743463c7bf0d48feab6c32727ee877adcb051160853cc9dfa9b40afe8f598290585bf96ce6b35110b27 SHA512 36bfd243fa011f84b4f16934c56c9edb64082dbeea301322c82d572784835b907cba2369914945a913eac99c5a98b8bf778602c63be7f0da1b5d6ec8e969214b
-EBUILD python-language-server-0.36.1.ebuild 2445 BLAKE2B f089cfc85880f3cbdf6a8dd8fa81efa9d4bb452eccc60c9f86fd2e7784cb1fc40f324674a6e1136460f8b70de5bd74dbc8dad644b73250bd142131689f1e0a80 SHA512 717d73489e00c8d7e63470fc0914d4c65ad446cc7eb500f3f91aaee5cf194b0158c2ae31e0e615a18074fb55b3ab22a038af08db945b71980ea2495d9130431f
+EBUILD python-language-server-0.36.1.ebuild 2443 BLAKE2B c82ec3e91e366639451bda6774bdc6589b5eaed525d392e10f08c194a33bd687cabe878ff31faba80fe4bcf297f1818082090fd73bbd728a2cb819433e7b8f4d SHA512 d4d6b63f985d552d68974e8509c4a16715ea752524ab12c95b92a3036ffedb813eb8ae185bc764c01a99c802f1643696f22a12d3f8c6528d2eb4e7e69cdceeac
 EBUILD python-language-server-0.36.2.ebuild 2444 BLAKE2B fb960ed5cb8530f1c1dfd716e617ff777a71da1be6da802695d750a662f456e3d8a313547f80ed7229f60457652a686001d6e323f2c80f5432a63c88a975d326 SHA512 bbe8f8d58acb509b0859aed43b285eadd8f54b262241a5ce4b55c6fc34b5155d214604c2d91b170698a9742e27154bbd3ccd2b2d3736de87ddbd5d9e19f6d72f
 MISC metadata.xml 460 BLAKE2B f8024f798dd5825225570df7851186a542dcff8530c85b10a95b8caaaea6f045a0a5093a71d588a1d04239387f0c079f1e8ce8c388fbedc5062569dda024a651 SHA512 f7a2a7720c9b600dc8150e7cb77e5db7514b3e991614b456af2ca0f7269d31caeba69137a5a4583cc892ea66cc62e4ea8de7fc0d8844144aed081d0cf53f72fc
diff --git a/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild b/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild
deleted file mode 100644
index 448f19adc85a..000000000000
--- a/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild
+++ /dev/null
@@ -1,70 +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 optfeature
-
-DESCRIPTION="An implementation of the Language Server Protocol for Python"
-HOMEPAGE="https://github.com/palantir/python-language-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/autopep8[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-		<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-)"
-
-RDEPEND="
-	>=dev-python/jedi-0.17.0[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.18.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	>=dev-python/python-jsonrpc-server-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ujson-3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	elog "To get additional features, optional runtime dependencies may be installed:"
-	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-language-server/python-language-server-0.36.1.ebuild b/dev-python/python-language-server/python-language-server-0.36.1.ebuild
index 532e9b34cd45..7a34f6296f50 100644
--- a/dev-python/python-language-server/python-language-server-0.36.1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.36.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 2221da29a29f..a0dce20f03d1 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,5 +1,3 @@
-DIST redis-py-3.3.11.tar.gz 131072 BLAKE2B 6becafba3da22bae796a4a9ba55d11a61d9ed1a8b693a734d4ef3f0e463c0c39a05c01546225f69eb36a788779d6e45d0136e1a6d6856ec63c3dd07994b5db9a SHA512 a32327fcebc6242367c0eda6c6dcd1a15d5d575527af2e9de0d76e05bc4afc7402566d9254e467663b81907a310731af3041236b6b135f3b8ff1429a502c1000
 DIST redis-py-3.5.3.tar.gz 141112 BLAKE2B b953d553a3cfa2d6ba6f5aa35dfaf93865acbfad0e901a96082c3b1c027dc23b6ceedde185f24e86772522fbbf4f0a4d18e115a6b40aff6a65450bbe397d5c07 SHA512 eae6ac6b3e0f1366a9c29e5e2d9a5210e4627e62e3006159b1c290f36cd9c1c2c12cafe0944f7a010e04632b517874f230aa9411491993b7ecf2080546217206
-EBUILD redis-py-3.3.11.ebuild 1393 BLAKE2B b3244f35e3790598dc17844595469ffa01c0e44fa7e0297292e7774a283e512ce9a4631d303584f0c9d7e66cc06bba2d675110d3170f119cb944132ab31c00e5 SHA512 0fb4dbc97a36538698f8754a43b42d72263bd8aea5e3250de38c803030d3fe5a3534d7ff6bd2c58a739fc831994a0c1eb07e8d3140bf8b1e03fca1a363cfa1fc
 EBUILD redis-py-3.5.3.ebuild 1723 BLAKE2B d96b22278935e59af6af816ea818f29592bcb3ae16232dd845b1d991eeb74cfb12482c8053ab7deda556d5a8d2854b89a7a9b550b9958c7cbffbdc84a1887cc3 SHA512 55588bd699a8d7836bf32f426dfcb1e7840c394f01435ec3f691ffa1f5a03bbf78ab567c9959777cd59ff03d98ecdd908fd9c2aca6fbeb1987d01acf0f3ac825
 MISC metadata.xml 536 BLAKE2B e146a8713662d8d635cf9e0927223bb427cbb4f684d7b484d3c005e84a7b961f587b7e31123d27ea8be7ac7ce83890c54a670b6d1062f221bacc496229f798ab SHA512 c651a0f6dfab0e857e04ba15924937a42d74c913cc82a1d8f46a0641f6e4fe85315da1a76cb1bf3a8ba3d4a3ee6649872af221b7c1196100cde107d9454c5dd0
diff --git a/dev-python/redis-py/redis-py-3.3.11.ebuild b/dev-python/redis-py/redis-py-3.3.11.ebuild
deleted file mode 100644
index ef36d2f03060..000000000000
--- a/dev-python/redis-py/redis-py-3.3.11.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="redis"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="https://github.com/andymccurdy/redis-py"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.7.0[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Make sure that tests will be used from BUILD_DIR rather than cwd.
-	mv tests tests-hidden || die
-
-	# Correct local import patch syntax
-	sed \
-		-e 's:from .conftest:from conftest:' \
-		-e 's:from .test_pubsub:from test_pubsub:' \
-		-i tests-hidden/test_*.py \
-		|| die
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use test; then
-		cp -r tests-hidden "${BUILD_DIR}"/tests || die
-	fi
-}
-
-python_test() {
-	local sock="${T}/redis.sock"
-
-	"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
-		daemonize yes
-		pidfile "${T}/redis.pid"
-		unixsocket ${sock}
-		EOF
-
-	PYTHONPATH="${S}:${S}/tests-hidden"
-	esetup.py test --verbose
-	kill $(<"${T}/redis.pid")
-}
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index 8d06bc2a653d..1593ddb3424b 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,5 +1,5 @@
 DIST SecretStorage-3.2.0.tar.gz 19311 BLAKE2B 06c3d6137d814f6c2f0cd35927b84c33e09d3c934e4dabfefaa682f3b220045b223aaf06ec970ccc0d39a7388cf13579338299136d13ad2c1b57bf064c278096 SHA512 668f3847f573e1756ffa3a38c278e6d4895223553830d49969e979003d04ca04fb5eaf8dfcc616086a6020f6a73fbe71f7041d4c4ee574205f00fbde945298e9
 DIST SecretStorage-3.3.0.tar.gz 19352 BLAKE2B 8e870d4e95b585f4c5e78d9b11327f21ff909b746f035115bd75bde499f2161c0e1ab3640b3861fc54af67dd7d305f794a855430389c207bfef129f7c0439a9e SHA512 d33c11b98824d214eb67c5b11a7fe0d14af084edfebc1d83204bcfd167258fbc07be8c1de8824ec984d83d07bfd66271c44f751784429e574cb240b5add70e16
 EBUILD secretstorage-3.2.0.ebuild 1138 BLAKE2B 6089e6ecce166476afeea659d97855b350695e441b101f54096f98ee8f024e29bc45de8257fd9f13dcf027306d1f61ab12b25c0b07cb4457ce611ae84a009bf8 SHA512 cfaf8a6fd4b444db0b6ce6952ac395eac0240f90e8bef9abe824e9065109d2f48b2d275a79729416311bedc603555c9ecc3ad42401ef90f6230b94b1b6b6a608
-EBUILD secretstorage-3.3.0.ebuild 1128 BLAKE2B 6c2299b00acaff6bda5b243770324ab8b15116cb9b8b39c4b0edb1ad1c7e7599e0ee1cb59ed58b73054abf3b6dade7d4324bf3412cbb7d63ca329112653c1bbe SHA512 8ee5d2130d873afa15fcc64698b7e03632fbe4a592d78440dcef4a8213ea8fd39dde0e4b0dedac1a808475297c76290140b51e769fa5e920394f5524dd424421
+EBUILD secretstorage-3.3.0.ebuild 1134 BLAKE2B b4c2cb8f66999e56afb0ac855e61c2b5191abcc2177499f74863743c314f703b9fdbbac7ebb1425d9dd12bf48d0ba62c97b98fc3c3a4d561ab80ba8563cf66ae SHA512 5ba624de1d12ed25eb1b65e97b8f2fe6c4180064238f4efca0101b2a538edfec891c8b315e4f57982590c152ca64d8d3eba5f49b953439c6bc18c9b2060ce5eb
 MISC metadata.xml 401 BLAKE2B dd985b75846d20aaa47a4c419e44ff481bcfe95b0eebd1c6c8c66e8d75561f6e583c188cb16e1adf6ee35f2f7aa430f5426215d0ba68f5bab5e3a501a4787efa SHA512 75758f0d9498d427aa39ce1c7ddcefdbd08de06a6b5a2bf7df94f6571ac0d2d3c7aa3dea0ed467179bdc6763704ddd5446ad004abc8618794222e51d9502ccb4
diff --git a/dev-python/secretstorage/secretstorage-3.3.0.ebuild b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
index bb8809d131fb..e2d2a3457322 100644
--- a/dev-python/secretstorage/secretstorage-3.3.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index c3ef332fb2b0..a12d4df0b1f7 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -3,5 +3,5 @@ DIST sphinx-gallery-0.8.1.tar.gz 6502920 BLAKE2B 35f6bfe6039910518c21dadcdb7d814
 DIST sphinx-gallery-0.8.2.tar.gz 6530210 BLAKE2B ba1500b9870d89c686dd1afbcab4797e15944cbda4d8d2faf02bb65435fa4208bf7dfae70285c920ad2f3b82bc085b06629fb3d2807462f92e75be91ef1e81a8 SHA512 52dfcf320d1e53b2ee985482af5cee63582b26aa6f3969f2d83e6ffb9503712f5d1a865c849c4b2111f7fd4349cefb158874d8faa323e4e7d73bf547a26f3a93
 EBUILD sphinx-gallery-0.3.1-r1.ebuild 713 BLAKE2B e698e727864dfd0118b6847b76c756fea6cb21edab7a28941e082f466d7808d6d922e3d73699573067f9e23f71032305e3a935892701743eafa39f0e1db3ec88 SHA512 b581594ac4db20310940ddc069e044b30b75ace4e723f6df106fc97da0e63dde1c6c9d1fc34612e713b4024cb19f4f7420575a36641aa36cf5cacdfb10880c3f
 EBUILD sphinx-gallery-0.8.1.ebuild 1081 BLAKE2B 63f9d06fc42aefe283c0d309bb8d9fb123651a89f95b018e28e2b3a553e538b66242ab0865ebf9f62d77bf7fb60713ac55ea7e4069b0b503f06eb74d35a0c83c SHA512 4a2143dc1c90b769103d5f1e24c769ec66ee146c0af704ba4980320150dcf5379f51ac3413088b0e51a4ea2fe9803370cf58826392462e08ab1be049935a62a6
-EBUILD sphinx-gallery-0.8.2.ebuild 1081 BLAKE2B 63f9d06fc42aefe283c0d309bb8d9fb123651a89f95b018e28e2b3a553e538b66242ab0865ebf9f62d77bf7fb60713ac55ea7e4069b0b503f06eb74d35a0c83c SHA512 4a2143dc1c90b769103d5f1e24c769ec66ee146c0af704ba4980320150dcf5379f51ac3413088b0e51a4ea2fe9803370cf58826392462e08ab1be049935a62a6
+EBUILD sphinx-gallery-0.8.2.ebuild 1086 BLAKE2B 23d9e4b1f784bb8eb9a613e42517a1b095612712800979f06b1a33bbb2a2ffef33581a3170d799660baf797f114dabc22cbcda5b5b75f443133a50360a1a871b SHA512 9f0ceb6d02550f2c94540e34a310b6deb821e28f35ece836399de6747c04f7ebf1dbb9c9a716c0f7a094f228feaf915ba32d4db93219684a141124c0bb9ba1bd
 MISC metadata.xml 423 BLAKE2B f19c62636f116f7d1864c30fba6d99d11759e425b2395bc8f0444c7fe6b1f5092bad3af576e9e9e5ff06e789a3e60e5c98bd87852b8f8670bbba93df4f632acb SHA512 377d09b8209490eb7b591abd00b3e6a077df956acd576844424cb022ba7948298f8ed36919b2903718d9a44b7aec2877b00b1e6f272f4768144772883a6ad8c4
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
index 02a760490661..a0c5a9d6ec9b 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 7b9401aa1631..4cd20f08f3a4 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -2,7 +2,9 @@ AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe8
 DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da4aea10ee18ecae658a69a9bb797f83b0d11b41b8405bf18b2472ea7fd501bea85382c20c5f2a9d5b14a032428 SHA512 cd35b7ebdf4eb41fb3a58706333ca4328fbf9b37999ad1bcc751f9769f0a294464e4def019a403fcd2204ca963ef641c35c957a4145eb50af07573d21df8c74d
 DIST Sphinx-3.2.1.tar.gz 5970067 BLAKE2B 6158d31390c9b07aa3abcdc4eb7ed827cf2160192a2c53ad845f07d5027cc4bd65264ea1114e78e06f9652a8788a8d0e992a8988382787a05bf507a73618cd96 SHA512 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb
 DIST Sphinx-3.3.1.tar.gz 5979919 BLAKE2B 4eb9d8c9dccfd83690252ad6be05a3e69006e1e801bb0b37b77fb6ccf998f3a2fd99a90eba890cfb2baa5545ac0c2734fcd72d602fc2d1091e6754337f241b34 SHA512 bb1fb0780b741c0162ca014cb996dcdaac06985d14b6cc645a835679d7cf2680912784a815a027caf3fe902f721f9707bc9e9daaaf2c2d43051d31fe00584f78
+DIST Sphinx-3.4.0.tar.gz 5996932 BLAKE2B 9765d076b7b4738c3d4676618c69d401c49c5f5994f0daf0d04d02ce8c74a8084242910a821333b9233636a195df801f978bf43fbd4d323ad7e9f3651ef33b6e SHA512 49fe0aea70c244416bd26141271074d0f04dd69a8fa37be6d3f6cc3e5e98d4b64fa83ac3bbb80b0b37e8ea05d06bcc5f9891ddc00682e1c3c14130f48a831971
 EBUILD sphinx-2.4.4.ebuild 3644 BLAKE2B 28df6a37d7fab6255e893501fbc4a45f427f1928f9e77420806f8eb2bcc2b23f05d2d5eb2b9a04258913555f1401c94c968811b270f4c3a0085340bd7e334ff5 SHA512 f6332488785a0c6795348b76db72a80e3bfc839a3ded793e12ae185941ebbba062f91c10f7dc8aca111bb951f62dc8f86fdd946a80e7253dbd14735dd5d6648c
 EBUILD sphinx-3.2.1.ebuild 4828 BLAKE2B 7b7b7103673f03d554c61924c50bd1bed09dfb78cc7b3d23eaa6e3c0b2380b18ee7b806063e920d34da3c3ff5b9d03379622830f67f409c98c29e52eccf9bcde SHA512 d18730f233d138a351e6e99da00d9ce289dd7decf98a5ce365055dc9d200b0c0360df25a6a7873b65c9b9efa22790688c0351eb30ec35f4ff4270889766b8c82
 EBUILD sphinx-3.3.1.ebuild 4837 BLAKE2B 28c764dcd0dc3e2c730280a379bfaa0ebc10a2e3ded11e42a4fa9923784f60015cdb33cdc89e815c4e221cb832719995928376c9af879bd35460db53be3183fe SHA512 9c52b6e44aeac8f8917eaff0609d54bd32e5b588bba03c341868196bb93f9e0dea80c97f041b31161b5aaf01de901a62c1a3062ee795483ada5a010b725613e2
+EBUILD sphinx-3.4.0.ebuild 4209 BLAKE2B a1206630139734070e21e86c5a8514cd0ce68d5145cb9c7c8f1a8786dc5fe07f1c45214f78118921b9bee50adf7b255a0e72010d907fa99f0154323393c48427 SHA512 f79d455b04e553445060f2123955ac4b1999eb40b2e4695dea810076bbc807965433d2d9c11ac53b26569f771ffb93edc9280c212ac3f523a7bcab690b6dfc49
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/sphinx-3.4.0.ebuild b/dev-python/sphinx/sphinx-3.4.0.ebuild
new file mode 100644
index 000000000000..f99a4152883e
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.4.0.ebuild
@@ -0,0 +1,128 @@
+# 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..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+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"
+IUSE="doc latex test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/snowballstemmer[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		${RDEPEND}
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_build_latex.py::test_latex_images
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment_py36
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 3225197fa520..cad8b4f559a3 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,3 +1,5 @@
 DIST spyder-kernels-1.10.0-gh.tar.gz 77416 BLAKE2B 0d3e3f8228d2a76174e8d7c64a55c9fda384961065673b1b6b64591f476e8932c5dc3fe253b67d94135688b8d346828f88800bdc3bb0b83450d51669218f98b3 SHA512 59a66d9f6c9b53a2cb058e1c493535ee18c3965a62d6ff728cc0f9544c35fbdf56f18024c778c242802f961259231e153cdcd98c867bec84a80ca3541dbcf455
+DIST spyder-kernels-1.10.1-gh.tar.gz 78055 BLAKE2B 51b087d44ef91bc79b10edb12054a2dd6d950b43f39f783f91be4a7681d40c1aa777514517d3b8e9de6fa8c03dbd23ec7a0c46dd9901102bcd06107af51f960d SHA512 f7504691143aff043e39bcab479d1aa76e5814670e081472dde719936f840b3f5e7812575fd829b34301ccdf7f1cd32afb705d37ee452f3e3a691e12bb57965a
 EBUILD spyder-kernels-1.10.0.ebuild 1236 BLAKE2B 7c1d4a27dc1538e24f72139f4e28324c6abfc995395da615b37db9eaba7e62db6366c990fa954093213c8109460669411b9f0c0dcb29351339aa6226e1df1b3c SHA512 de0cbc3b385b2e785d9e33a835ce700008b1f61ef1373bdcca5412ccd5b9cbbb5670960b1b5c996a7019ad194a55217b4d74200e19d3eb8cf0bda24883284fb8
-MISC metadata.xml 535 BLAKE2B 48c4e591e65dd5ae7180c4834379783b32a9cde2c899531252e7eedb990291399d33eba01c4bba9137ab6f426bcb7a5b443812094b9fa84fc9e8102b8c44db72 SHA512 d0c67672928b7aa931f8b50ef75ba7bb60c2531e6fa8285cd1e3aa2817f60286274b35dd6814409b6366a23bebbd8572a2c5ca4376ea34a74e92dee4bf66e202
+EBUILD spyder-kernels-1.10.1.ebuild 1340 BLAKE2B c86fa76fe0f0043f4d8bfb1bdab61fa52e598c9b33a7135aa9dda56fb1b7f467c0b313cecf508e7ae1fc3a85cdebfcd4c08a17416f171f14c81dfd3a0a00cfe6 SHA512 98892df16bc92e9346cd5457ddebf057713a463b176a7e4dea25929740dd1460f0c22125d1d2d1a2e0cbe3d733dee3d5bf63d561790700747f3a601c8c247363
+MISC metadata.xml 642 BLAKE2B 4d1ec2e5bdbe47e459f37b32953c64c302bcf82e3aa97c8d166c17f6f2bacc4382ed5e74606487e09f2db30230bf90162191aab58f2b8aad3431d3cbfb56339f SHA512 567aaede7b3c5ae9a0dfdfb80f742fa41a96576e48498729b3dcf2366daccd9f9f2bcf3417485aacbfba9bd4fd3cefc59b0126dfc885179413ee194dea0d2cbf
diff --git a/dev-python/spyder-kernels/metadata.xml b/dev-python/spyder-kernels/metadata.xml
index 39b4f66c4ef3..5edfa984aa8a 100644
--- a/dev-python/spyder-kernels/metadata.xml
+++ b/dev-python/spyder-kernels/metadata.xml
@@ -13,4 +13,8 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild
new file mode 100644
index 000000000000..59557f004734
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# requires dask[distributed] while we last-rited distributed
+	sed -i -e 's:test_dask_multiprocessing:_&:' \
+				spyder_kernels/console/tests/test_console_kernel.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 26273b86a19b..3a4289773a37 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -2,7 +2,9 @@ AUX sqlalchemy-1.3.20-pypy3.patch 7321 BLAKE2B 706ff7da1f25a667784f462effb85593e
 DIST SQLAlchemy-1.3.17.tar.gz 5979141 BLAKE2B f0fa46493461f532ebca9420fc9f49a2c04af888aa99653946a5bb563d40b8bb714a03301300ebb80cca76a99f8226ddfcde4216e8fc2593d3a161b5072276ab SHA512 6f6d54b9018ece6c289f28a3a41ffb1b2216206edee08c49f387e9f30740969dfe0f8272654ce4efca159a2a6619e76c41b2ad2b10c391cdd64681ac17d0bc79
 DIST SQLAlchemy-1.3.20.tar.gz 6264898 BLAKE2B 4c386eff56c2f9ec7ef467e3bc0032629582a970707dc11e3744fe3903d9cb18457f5e0be4dc9c20727b5733f158e031bf8b40f586dadb8f4ab8d0cae3cf7398 SHA512 29c52ada1a66f906ed2563df2ab093eceb7c09de45749c96031f30a1512d20b1d698e00640c777169ef3db99ab012151770a3daea45a51df934269b554ff4b28
 DIST SQLAlchemy-1.3.21.tar.gz 6297278 BLAKE2B 39bd440eec25adc3ec81eaf55d2b97ecb328da4fd6e78dca17a94548a34336a8ef01a1dd0b4565794f4647d3bb4a98803873990c2e0df865216ed57fbe67ba1c SHA512 50ea60b849e6f043507728482dc1a90faea853c3fb16affe1d68197903578cb31f26b3543f4671be6aec2a705343193bfa7579e8d417e74c92ee104af4fba753
+DIST SQLAlchemy-1.3.22.tar.gz 6300186 BLAKE2B 5b788ddadef0b68f440c5c7584320dd0a71d43e288febf0cb35c4683052be0f46174ac17b7c8b22ad0461f1e5f55ef5e6dbb149c49d727c3b42b49f48eb7589d SHA512 5e43af97dd93af8174f14575c8238a72153afa4dbe56503cf934de9f783ea15ad27b25523c147191bd2ec89e25baafab5f5d9c34a29f71eaf4e2de49af5bb887
 EBUILD sqlalchemy-1.3.17.ebuild 1438 BLAKE2B 41cd72c3c3da041fb78c9ffc1a7a4f563f91b38f2afffeb2a588d0d75bf4c717b3b403f73f9ebe2c8ec0a1855ad186c97a821381065233795c2542756c44e97c SHA512 07af350845a8bfd22f12d509f4281e893298e73fd54ae39d67ac350d5c60d254f4e059351ae6e6dedfa8729dc2fb67d521c24453e8181444586ee0c9704ebd98
 EBUILD sqlalchemy-1.3.20.ebuild 1892 BLAKE2B f8d26899591138928942c4974a67ef9bcd49b32237bf1b05205ee1ff777f6cf692430375889fe59168cf8cb8bc97e380b390bce63ee3abc74edcd41f20e41e79 SHA512 d454181ebeca4e6fde6973e84d50c79a21f87290d68540b698bd53ba0daecf5ab71670fa3d1fd0aabab3212f295ad1b7ffd397f1ce057d775557ccb35b04546c
 EBUILD sqlalchemy-1.3.21.ebuild 1912 BLAKE2B 9ded6ad4bf9b928dd43dcd0f21440f8ad54779f5b2333307858b7e3556bf82c9f2747dde8368dedf40636b4b75c4223dfe6f14396d6861c435412556ff885782 SHA512 14bb861d1660ade094b9005fd9ade3ed1b7d1da6891bc3bccdd890826e33be0bb57e9e9eb34f6355631105cf387ffc78f896224fd1da2cc948020e1727ebc902
+EBUILD sqlalchemy-1.3.22.ebuild 1912 BLAKE2B 9ded6ad4bf9b928dd43dcd0f21440f8ad54779f5b2333307858b7e3556bf82c9f2747dde8368dedf40636b4b75c4223dfe6f14396d6861c435412556ff885782 SHA512 14bb861d1660ade094b9005fd9ade3ed1b7d1da6891bc3bccdd890826e33be0bb57e9e9eb34f6355631105cf387ffc78f896224fd1da2cc948020e1727ebc902
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
new file mode 100644
index 000000000000..61033328f457
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+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"
+IUSE="examples +sqlite test"
+
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# Ported part of those commits to fix failing tests:
+	# https://github.com/sqlalchemy/sqlalchemy/commit/c68f9fb87868c45fcadcc942ce4a35f10ff2f7ea
+	# https://github.com/sqlalchemy/sqlalchemy/commit/a9b068ae564e5e775e312373088545b75aeaa1b0
+	# https://github.com/sqlalchemy/sqlalchemy/commit/9e31fc74089cf565df5f275d22eb8ae5414d6e45
+	"${FILESDIR}/sqlalchemy-1.3.20-pypy3.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Use all CPUs with pytest-xdist
+	pytest -n auto -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index fad242e301e6..91422be6477b 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,7 +1,5 @@
 DIST sympy-1.6.2.tar.gz 6811705 BLAKE2B 4cd894d28bedc986acc8ef67aa60f82e0899c2ed028658a8f340d7538b890e0ed380b3614a464eb58d71873b29b0795508b4556bb8115bf0c108336ef1e4cca3 SHA512 e16a1d85aba438e4248bac48a163ea1827e2cee57c28f7670ed19cc69d4c08d6796d62f79d245e269d75765b8f7ff4f4ca2841f98534e136ceeb5d3f7a5d252a
 DIST sympy-1.7.1.tar.gz 6974183 BLAKE2B 4bd8c9d60c46b05a7fc6c622667858fe17d25798756dbe967ce19abc8047263fe540f332e39418e877852c0565270377bd01fea7e65aa35ed4e03079bc130805 SHA512 eb9387bb9c632203af650279f896427556725b7496c00d8dfe97b7476beedbbee5714659f7fb44b4fa986c9567cdcaefcc19401d63e1ca0e9a6c7317855440ea
-DIST sympy-1.7.tar.gz 6969594 BLAKE2B c4ebd395e50f589dba2d01bf50a1a9cd7fb34e95e2b8632a64df5fe1a6625889c4e161b8a22aa815857cc3eb0d502f03ec8d9de694f369aaca7e573a2fab03ee SHA512 f7bdaff7432436dc888e56d4b56d023c8da5cfb54dfa6955cf7999acceedfd5175f910fb9b3c5776145f3dc3036f78e66813cdba4201be854dfa2c5c9f4e9f4d
 EBUILD sympy-1.6.2.ebuild 1780 BLAKE2B 404531e83f627b752b63d45ac3c818ea89e14a87fb29da361b194f4049702bb5d769acbc7328c71f16996effe2acdb02dfb21196a30537b95ce56b3200f89097 SHA512 6b74c0a2deddd0f1e37a03e1476ab6a7e23e293aea223dbe7c24590260fec01853ee24e2e539f618f2dd48274df4ec3265a4f9f147c46cea34837a83e29adadb
 EBUILD sympy-1.7.1.ebuild 1812 BLAKE2B b8cace9a744fed3be5f8eb414f61468bd5a8271043c373db95b10318f503315c3c5f188fca60cad495612330977d34c812abe59b7fe88415a51f37948cbd3f6e SHA512 96788670d5ce9dbbf44bad6c6238aa62e88a044fc2625ab4042cbed25891894d12d1e48fa871649046a0bda6a858bdf82e6162917197143bec7e63ee8f1f3bc6
-EBUILD sympy-1.7.ebuild 1807 BLAKE2B 89063c9f31803b814ef1470aff98e39095bf1e10e35fd6986d0d5b575a2c08424267a94f69c4f61c29d1f3a82f858176fbac92c99396e33f823ae46769304c2d SHA512 18856cb7c3288064d426cabf3e20ad9c646f934de1a530a52bf5c4244181dfa2b2680789bdf579106c9b210843a96446c89e1e171e7110b2fcb4a148bb5f908d
 MISC metadata.xml 1607 BLAKE2B cb7e15ad95ed4b47eff7399fe726815cf66ef40bf0af31f31d423aa808bc4f3386756e2a8e98fdf584113d6923edb47a91f39effb08013b5865608e2ca29f3b4 SHA512 198aa6343d446bb348a827b48097055ad709bb6bba22cf9bc3eca9d28fd71d450acad47bfa14fce403dd5d4bbff584bd78407f3859ea4aef918e4768af685c7e
diff --git a/dev-python/sympy/sympy-1.7.ebuild b/dev-python/sympy/sympy-1.7.ebuild
deleted file mode 100644
index fd39817141d0..000000000000
--- a/dev-python/sympy/sympy-1.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://sympy.org"
-SRC_URI="https://github.com/sympy/sympy/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
-"
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" setup.py test || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.md )
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
index b31b7549c0d0..206016ee0b88 100644
--- a/dev-python/threadpoolctl/Manifest
+++ b/dev-python/threadpoolctl/Manifest
@@ -1,3 +1,3 @@
 DIST threadpoolctl-2.1.0.tar.gz 25255 BLAKE2B 3afa8e8c44567d3833dee89e761b2f384129c386c5c5b9d8084c1b301f007be7f461f1ef99738e06551f793feefa5c312dce1d608e7012215fd759866a52e2d4 SHA512 09b745b0d164bf3fc4f293bd92f1fd2e02180ec538bf3da1cdb986e31d9336ba3e1301aede72f53700d00298bae7b91b4ec8fa3212accb4cde6c3f5f88ff5c62
-EBUILD threadpoolctl-2.1.0.ebuild 624 BLAKE2B b20bd5be36f4699bcd4064182981ebdd9e50481dfcfd894424b0ccb85dc5d9814b04b0c1b969ecaa0073573cd3446c54b459d5ecda7876673ccb0d4bcb2e8698 SHA512 07f918ec9401b26b6edd769891c995728762c8bf21bf6dca704b7d6b5bda6a4b37628a0dbdc7d84880775499656ede6423ddb3d4711e9314e3f657d88eb9dd00
+EBUILD threadpoolctl-2.1.0.ebuild 629 BLAKE2B ea47338d814146e327a291cdd497e1be95741c655866a4b452c97fd29fd5067cc3147513df4e7ba5cdea6616f58c11df0c709672295159168da6819b5f0a376a SHA512 dd6a135ab08f37a0e42860dd93d4c956ade69ab7bff95a9d77d97ec6086735d79662f794245100a9efea33074185062dbaf303eca09f5342a8e71ab30df35df1
 MISC metadata.xml 428 BLAKE2B 5021cc6c0dd7953c65d3b4f156fc8ad9b8fe51480f5a77678c0ccf8983fd4dc815e11fc91e12d2c70454cbf92237033945beba1489d23a263952efe8880ccfa6 SHA512 4de57c2178b26934e745c96f0daeac26a7323a07641104f5d1bcb7095281bdf5e390c721ad1d68513caa00e41e4c8e0d506c3ee3c4488b25f22ccb21c2d74897
diff --git a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
index 240c240bb9d2..9d144e9dcb06 100644
--- a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
+++ b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
index e0e520e7908e..9e0130f549ee 100644
--- a/dev-python/three-merge/Manifest
+++ b/dev-python/three-merge/Manifest
@@ -1,3 +1,3 @@
 DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
-EBUILD three-merge-0.1.1.ebuild 662 BLAKE2B d3d5d621f3857ac130103bdc3b2088d26045b454429eb4165386f265d5fed72613f2be64c6c13f0832fcea4c9fc3764ed62849488fedf475efb2d14f410a491d SHA512 80a4c044dd872c8d39e25042660c3e650b072c13fea1a49e60fe68f4a266f32bc97442063ad069b7c94508609a40f3c06ea286fb7b372115a1556845cbf7f9ad
+EBUILD three-merge-0.1.1.ebuild 660 BLAKE2B 25f2171f6f80354c16dab87bb230a3eb9765be8871cacb3a3c4712e83c763024ec0e40cf8f193382041670365693d39198f5624821c48ae3eb3fa596188c4c3b SHA512 f7f6e6a1c5d43cc8cf005efd2e63cf20a078f1a8438bee9ef0be62be77aac993e5fa8eddc26d032ec34077edc67ed2cd216cc8ebe10e4d5d203313214a13e298
 MISC metadata.xml 529 BLAKE2B f84df808d5dd8ba2116da158d589a55f571fdd4641c31b8ae077b6f7550c10c02666eb9e65e51ab929cf8e149decc368901ad2229506d172c8b9a672fab589ff SHA512 e424e78bc3d309ec12147a05a250b58b1e6468940b6b417e01b1b74705762f63dc3ded2f880eb4f1b5a066aaff70ef5dd12c4546a83e1fca60561b0e23293984
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
index a6dd1a854807..deba595b0fe6 100644
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 8b90df44eb96..732c64a53472 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,3 @@
 DIST trustme-0.6.0.tar.gz 24062 BLAKE2B 77f72ab225653e5cd4fdf57b22c4a227e7f186370cfca795df57b5f3c1acdd72b920c0a4ed8364bf2ab4b367a8cda71550d9ff801d6e864eac9ecdef91d947dc SHA512 9fda58320f2055d2c23369d2df213994cafd9af7b7eb3933162bbe09a81abd7a9cd2b2e7cae43b25d40d20311213d8a1c13155b61498b848a2850d22fa1e1418
-EBUILD trustme-0.6.0-r1.ebuild 765 BLAKE2B 91aba74fea2a55d103546b9d279288117559329e2129f4e7710c97f40009f5de17e2371248d77807a20499c6c2fb80aab4734ced641e07cc213ab5fe4d5858d8 SHA512 a4eff14f11bdf5e4dfe76d63c170c20ade185a4129aa4a534fe12ac306fa2ad1c0a749048b1c03b2c2e51026f3cdee35ea20071fa0c553d79d787f35ceca2158
+EBUILD trustme-0.6.0-r1.ebuild 859 BLAKE2B e5442c2948616ed4c68306c66abb29ba3c21ee057d7ed50268350ccd261b676084ed89b8ea1ae156ac31d53c08f4e854f525f22622fd6b9087338aea736ad57e SHA512 0e6fd1fef5defb24625ead8f85baaf3ae53d4c96ee833a76909de1f34c25c05756c1fd2a64940d51250873a54887f28020ba480d8bc3c413d6326d4dde407082
 MISC metadata.xml 443 BLAKE2B 8f591132e3a9478741063502a0da9709ba07974432fd9b008c59aee122f234b11b44c29b78b7f69600d7b385701c4c909b98472a7eb3d1a6cf5908acb436727f SHA512 38a7f228253d556064d94478e0e10ccf526368cff06f7201b82911f404e5e6d83a54b2658f6f241b8a8d1d600899dda9588023cb38fda828d94c6983add0f7f2
diff --git a/dev-python/trustme/trustme-0.6.0-r1.ebuild b/dev-python/trustme/trustme-0.6.0-r1.ebuild
index 2e969925fdb1..bbfbf63613bf 100644
--- a/dev-python/trustme/trustme-0.6.0-r1.ebuild
+++ b/dev-python/trustme/trustme-0.6.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index e5e5025245b1..9e1a825d7541 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1,3 +1,5 @@
+DIST txaio-20.12.1.tar.gz 53200 BLAKE2B 0bbcf8a64fec668c2cf128a390779ca81033d0f43f02a341c46fc392254ff011df13a1456757e86dc5c4c15f18468698f4da85cc830fb2e52e4e620f7a8767ee SHA512 efde6115b8eccba94dce736fffe49f280ff49e9738f3299578cf41641c3b6f1deb5b1c0f0c8c6fbf85c8d8adbdc2d3f67aa256335d63a5977ac0bfacc98f909c
 DIST txaio-20.4.1.tar.gz 52580 BLAKE2B 28d745eb9e8a0df1ca8748ce455eb122e240505f31464fcc0e66bafcefa8a01a356e44a46d9a5a1b1c670df46ca0c2ea9e66d29436bf2668e5614c5aa8726cee SHA512 da0269d13d72f4ea14f2e67585cdb74ec5105884c31d81157fb85e92d4eb935b1c13eb1222bd5ecd57a8caa36008cf49de85321e7b67e94159330e1d592d42c4
+EBUILD txaio-20.12.1.ebuild 867 BLAKE2B ab74ce109414d325c6b93341a42a82b79acb5b1cb26809d9e414e5b7093e7c6d5e18ad5a0b569985dae1ea64a44e3d3cff0fd581751a31c5c107d76ec59b330a SHA512 d2719b71993f213ad55df85dca8d36392be0ba4dd89d35bc8996bc8cb665bcad84df4491e083a686628b560cf1580b44ad567ddd4708c71b5400febffad49df8
 EBUILD txaio-20.4.1.ebuild 1248 BLAKE2B 97bd4fb4d67b25f5c7354ad2db0cf455e45dbcc09a5a60b78de6607069597a237f9a1c4af5254c0871dacb11d84036f803655befef85e2de26bb331b521099d8 SHA512 79466def4ee99c900e3e89ef7fc1462c5f5db19f92802efdb3961fb89930604d54362a3decc835cf01712edf9a38c67c044a5389dba5c2f074dcd625f87d4c53
-MISC metadata.xml 492 BLAKE2B 5a30e6aeef4fe8e51cc945db2433d0154cad032923fb596c7723ea85c0e26097a55367c7f7aad898f8e92d7e0bc25cc8e15f846e2e620c956df7918a821c35ba SHA512 789bd30cb7a9467c4fa2b4495294b2c17fc8ac5e62cfe94b44d942e73a4cf76674b65866607c7a6767ceb6ea92f8dbde7dcd2c02b83829d2e82219c6aa5e4c38
+MISC metadata.xml 593 BLAKE2B 35381e8ffc7b26577752e5b659d76fe07e6680518231665285029e817502653f681ed15c352981e999d251e5ece41d0b3fb6bd7e1bfc22464a5a1f1189705101 SHA512 0c84e60ef241789017983d1cea79bf429c48549ab0d0447bed2cb90dca619fb1a469490734a0eb75392cf12c9dbaefda1563fd30e65dbd1a22eeebb9e9d0ccc3
diff --git a/dev-python/txaio/metadata.xml b/dev-python/txaio/metadata.xml
index e8669e1d3fa0..55194dea6135 100644
--- a/dev-python/txaio/metadata.xml
+++ b/dev-python/txaio/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>autobahnws@googlegroups.com</email>
diff --git a/dev-python/txaio/txaio-20.12.1.ebuild b/dev-python/txaio/txaio-20.12.1.ebuild
new file mode 100644
index 000000000000..b2b1b45835a2
--- /dev/null
+++ b/dev-python/txaio/txaio-20.12.1.ebuild
@@ -0,0 +1,33 @@
+# 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="Compatibility API between asyncio/Twisted/Trollius"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_sphinx docs \
+	'>=dev-python/sphinxcontrib-spelling-2.1.2' \
+	'>=dev-python/sphinx_rtd_theme-0.1.9'
+distutils_enable_tests pytest
+
+BDEPEND="
+	test? (
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	default_src_prepare
+	# Take out failing tests known to pass when run manually
+	# we certainly don't need to test "python setup.py sdist" here
+	rm "${S}/test/test_packaging.py" || die
+}
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index 8e2091d84708..afe4305cef5b 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,5 +1,5 @@
-DIST Unidecode-0.04.21.tar.gz 205931 BLAKE2B 701afb86b89fc17a8eb9c769b4be1d08a30f0b44881597735478108d8121f57e2539a8209b9aef9c90f5aa8cc9f9dc76bea837d9b2ebad502a840c37628ed5ff SHA512 33fc546b3eefc4ba5feee90d584e49ccd81dd0ae00671f7e44f43cc3dc8a458b86ed6dbfacba6dac7539112408137fc1db6329cc42f31ee250755d841c7c29c2
 DIST Unidecode-1.1.1.tar.gz 212151 BLAKE2B 9884f89bb45c7c99569d42e0b287731638b8b1b697afab2c812b56340c6bd12dc3214b42177554f1b0aa214ce1b73fe1f05208ac6fc33d1949ed1200e42914ab SHA512 5474f04be843ed94ddceb1a7e5f1ca986ee5f2e88ee35bd9347784c7a11b51e1d94d61e1a2a10dd2e71b3587c5b7b76717756f6cf4e2446d83222178c2360696
-EBUILD unidecode-0.04.21.ebuild 579 BLAKE2B 90e5530f98d6d38e0ded1d875e169b595cc6cef4fb34b2c5a03d7e94678514065ea7d4a8b5522b3a864f991c14c30c763b7d4762b1091283829a8d787f96845c SHA512 24a952df312877e5785302d1e17b8e2bd6d1bfa2e9cd48e760ad4b5cf344ff043056a70e6b3f415880529b788b4a1ba35fb50e9287789a1ea14a2d1dd5c97fd7
+DIST Unidecode-1.1.2.tar.gz 213644 BLAKE2B c4a9ecb441eb05800d931ccd43843d19ae07f74829d43bc3c24462955e8872f4edf4bb9b3909fc5155b13676b8d255848cdd90772a88cd453152ca13af0d3fab SHA512 8ee45ae05064612638ecbaa4eb74759580e5ea5cba9f3116b8e63db4af13affc266c7a07aaefbbd70b50ead7e483a72d7676c64e20b5bee2a6ba831aaccd6748
 EBUILD unidecode-1.1.1.ebuild 581 BLAKE2B 034ad186c81dc6763c3262846a39dfe7e660a89578983133f3b16021af74aa90d7eb79ab4c40555f3a1437fab203074a1682b10a96fc43a689a873ec32e7f198 SHA512 1b121dbda93fcd818afdfc629a6b154573bc5ca65787f623093adf28bd393cb45a46ca828b8c39be7b080851523523f4d3cc043e01848bcc5351f9b0f52e6d13
+EBUILD unidecode-1.1.2.ebuild 589 BLAKE2B dcdf45809a8814e53481dc32ab1199b14dc3c8c5eeee6efb156ea11cc4d7688e455322f0c0e45db0c228474309c820067ac494641ad039718744b490d8cd7670 SHA512 1bea49afb6b70ca18c4dd1c3c600fa2aca2c92124e1d8e703f8ecfb2863cbb32dd10bb036100e9f2b4415ffe6422196139c3e9990f63964fc6fdadbfd4ab1293
 MISC metadata.xml 446 BLAKE2B 7a9fc2448eec29f2f2f3a7d068677800e749a88690a1291e74de3202f9ebb1ddba62486bddd77faa989028826cc5e055a7b10f32fc08cc4e50fd4f68b3fa3c80 SHA512 51b70c9aa1cf8fe9a094c80bb6c0895882661804af4e9becb0c37bd85852df37303988d5c3313e17839f99ae1cbec7d866d72c5c39d31a941f2b9aa5a8e1dd0c
diff --git a/dev-python/unidecode/unidecode-0.04.21.ebuild b/dev-python/unidecode/unidecode-1.1.2.ebuild
similarity index 55%
rename from dev-python/unidecode/unidecode-0.04.21.ebuild
rename to dev-python/unidecode/unidecode-1.1.2.ebuild
index 151b74730c29..fe98ac54f6e8 100644
--- a/dev-python/unidecode/unidecode-0.04.21.ebuild
+++ b/dev-python/unidecode/unidecode-1.1.2.ebuild
@@ -1,27 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
-
-MY_PN=Unidecode
-MY_P=${MY_PN}-${PV}
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE="wide-unicode(+)"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
+MY_P=Unidecode-${PV}
 DESCRIPTION="Module providing ASCII transliterations of Unicode text"
 HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index ba86a233ac6d..06d8d7ea179f 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -7,6 +7,6 @@ EBUILD urllib3-1.24.2-r1.ebuild 1703 BLAKE2B e1804f51aa6a97428113bf331bae402b83a
 EBUILD urllib3-1.25.11.ebuild 1881 BLAKE2B f2a921171089005271e27668bd1c48f67443dbe116319da9f43fec2b235045b5ed5ebd5f4349aa0c48e0f45f9b11b7ffde5a1ecfcb8d1c675b2ca95cd578c8cf SHA512 11762392c093a018d44cdfe6b31ae885614e326e61f81461cc22da982d1b98713fbf9597c20dad9ca8b04fb7568c8aa1e1abdabeb542abe9ebe13c8f565a2440
 EBUILD urllib3-1.26.0.ebuild 1890 BLAKE2B a25bbbeb8323df1d49b70a64693cae36153a7d7b8a1c146fe3f61db1fc402ec2ee119ca98da4c7d564c2956b3b1bd9c8efa55a86c84d5351397e64e0c737059c SHA512 40d5958b457670f4e37daa87276ff82a83feeb3cd611fc0b847960c3a339ca3d1860dfeac9fc00628eb2e63e09827a7b022e85f1685419d7e46184689a5465d0
 EBUILD urllib3-1.26.1.ebuild 1890 BLAKE2B a25bbbeb8323df1d49b70a64693cae36153a7d7b8a1c146fe3f61db1fc402ec2ee119ca98da4c7d564c2956b3b1bd9c8efa55a86c84d5351397e64e0c737059c SHA512 40d5958b457670f4e37daa87276ff82a83feeb3cd611fc0b847960c3a339ca3d1860dfeac9fc00628eb2e63e09827a7b022e85f1685419d7e46184689a5465d0
-EBUILD urllib3-1.26.2-r1.ebuild 1825 BLAKE2B a3bc60046df89ddfc65f3beefa400a03c8b4d01bf9c8b95defea674e5637469323e8310b2cd893973bc13ed3d97cf42076a2a6f07e8e15a9cc53f618ee46d885 SHA512 1393694dd64fd19f4b823cbad68027e65a96402c425ae2c818a74f1b4b466af48f0450a73711f30e6c90aba2e4eb2e5394341ecd7f95aea99e9c903a7ff86d6a
+EBUILD urllib3-1.26.2-r1.ebuild 1919 BLAKE2B 8a4ac97c33cff6a0d84d60f6c2bb07df1c3a90b20adb983ac4e8c3e870ada7071c791da61cc65d50df20496a28456bbd57c1666f3190aa4b893a0cc6e4ba3909 SHA512 bcfa660cd355ea9ced630dfc18ade5017979e902accd25068ec7f41112b37c1d8ebf3511e5a6cf8eac6735142b512c109ab9cfc919cb34e74b1bc557eba4af4f
 EBUILD urllib3-1.26.2.ebuild 1828 BLAKE2B 3a27af42833ea21292351a0d1fb903f5a5da4d270028a2ea5034932e416b4b6c1eee05b3f73515c5b8635d7154f4829c23fb1e45a1379e0005470db96e593cb8 SHA512 89b717a8434b6833994381b095ece61ae7cd89cfa70c68441ae3119cc1c277f6718903f19c6ae36fb8ed3bce40dd308a81e28edff90ba78ba46385bea079d1f5
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
index 2345ae630e33..731474121952 100644
--- a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index e49d667d3b44..6132abce0da5 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -6,5 +6,5 @@ DIST virtualenv-20.1.0.tar.gz 8284462 BLAKE2B 4356c9c49f7bd2dbb6cf8998be5cd39708
 DIST virtualenv-20.2.1.tar.gz 8286055 BLAKE2B da77c51b352e979f05515107df49101a70f97da01862ae92aff0e185065edf1d6d517ee68057f1f2efe5ee999dd9dec24c0f2967b1f10130b446e83e478ccbd1 SHA512 e7877a9766bc47f47a07219258201ad8457ca587a04d61119a0516da43016dda4b5cfeaf725dd0b06f1f896ac8af0f3d7a2ceed3d3f35ac7a4b6ecc607c84118
 EBUILD virtualenv-16.7.10-r1.ebuild 1959 BLAKE2B 90c31ff96e46d24169602a0f034bf02f0d5fcc4132b1ef12a06226580ed2737398c889a0f752cd14c99f310a72642664aacc27024a65840a8541e580ef601deb SHA512 ab7f3e64008dc6320e2d0a280087b7ae26f934eaa7d571e2f8e01c4e21db7356476fd002918b6217bb52827f22bcd6f8e527e53c1011824d8d32be99c452bec8
 EBUILD virtualenv-20.1.0.ebuild 2561 BLAKE2B ec380a7e74f591487018c4c6a52aa2913fa3569dd8773f0a825c474465ec8f8eb043cc6cd11627d16235a53021980798fd504d37e40df557594e433c27489843 SHA512 f238950a65644f6898d49085f99a7eefb57d7a9ecaf9fdb0ccbf727e5c3076f157fc0bfbf2574850e5a3eb8ec1aed50390e648eb199aa3d8dacb34ddc5e5c51a
-EBUILD virtualenv-20.2.1.ebuild 2587 BLAKE2B c795e89a5941719e89c36fb53f81caefd75d817433f3350361bafbf97e8b2137beea69cfb11b7ba52e79d4b2f8ad6f1817b55e310a9fcae3af6c94d56bb8bbf5 SHA512 4a697225235e885fc515f89c4265c02787e6a03f84b8df873e83565a947054c2daa92e78a10b444b38c8facafe1d36afdefcca279f0d6e35ba047d9b090b59a0
+EBUILD virtualenv-20.2.1.ebuild 2594 BLAKE2B 187dc3590dbb7444e4767c0c74dde8ae694aaff4d09d36d8068aac1af708b6a55986a00be2c00559f8eb8380cd30f32ee68279542b425e579a07f4facf6d643e SHA512 5110935f92b0b6d1ea6ab93c5b5908ed7ef456493d88b2eba77917afe587e0e3033c6828d7d10f81a2f6367eab7188b7af4f8db2c4ed74b6ca40a79c037d2fd4
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.2.1.ebuild b/dev-python/virtualenv/virtualenv-20.2.1.ebuild
index 8efb70db5007..c1fa5db5d6ae 100644
--- a/dev-python/virtualenv/virtualenv-20.2.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 7f94b69cb089..b0bc54585343 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -3,9 +3,11 @@ DIST watchdog-0.10.4.tar.gz 90303 BLAKE2B 0c057fe35383deaa6b7a66c24c07b2260153e9
 DIST watchdog-0.10.5.tar.gz 91432 BLAKE2B 0f10a94edf4cb79d68b83f0cc6eebc1eae9a00a0fd7b8164977a2511b952b6dda9d0b26404ef316a57524f948eb6676a5da65bb711530f64a4a37ab82576b9a9 SHA512 b107fe23b123360ba8ad049576bdbbb40061c70157bee0663bcf9ee9a9a9f65b95234540a477ba9ae6d617199ca1d77fe30b3b9dc4868bfef08a6b9099d6fe51
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
 DIST watchdog-1.0.0.tar.gz 89861 BLAKE2B 79734397fc91e3c733fd28e8c607c07265230f8e7949b07e4236e4fe38af48cd0f758270990b384ccee88bc88311291cc3758f29296edda2dff06dc757d6d492 SHA512 e89f34aba7547022a48ff16e36e6a2eea340e80a4b1e1f8657d4e70d4a451ac43351aafc76978fb4241c583df11c2dd6c53cb1a03c43c2734f4a8a07d5b2604f
+DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
 EBUILD watchdog-0.10.3.ebuild 888 BLAKE2B 169d7d993f614971d0e2a6c5e520888a905482316b6da86fc3e67dcdcda6316e1c8b882c94c3a92dab54baaaa059dfbda3273b1c53e4c12075cb6ce394f2cc75 SHA512 8d28216095da4299398546f1bb0b689c099deda89a191cced12938efbf059cd05a93f3a8f6b50a7dc16d27c9237cf29fed15ca7032fbb4248021859de269182e
 EBUILD watchdog-0.10.4.ebuild 1022 BLAKE2B cd874ee4aac68a46c9103e478609755737fd08bc0bac6aca82394663011b515a4f07d7e281673bcc273d253282069f16161db6b5ff906bd6dbf7aa39df81010d SHA512 3f2a4892632e4b4173a27c27d2235394874cdf05ef158b47d8f5a2f646747fed2d393097ad6ede2b19489aa1b32c07909e1f3ff73c84bba5f9f5e60c2f3e4396
 EBUILD watchdog-0.10.5.ebuild 1022 BLAKE2B cd874ee4aac68a46c9103e478609755737fd08bc0bac6aca82394663011b515a4f07d7e281673bcc273d253282069f16161db6b5ff906bd6dbf7aa39df81010d SHA512 3f2a4892632e4b4173a27c27d2235394874cdf05ef158b47d8f5a2f646747fed2d393097ad6ede2b19489aa1b32c07909e1f3ff73c84bba5f9f5e60c2f3e4396
 EBUILD watchdog-0.8.3-r2.ebuild 866 BLAKE2B da2e726c073a1a91556f91aa35e61fdeb7314a414a2f144d4b16e0e4e9c2a14160f69641fbebb0fc257fd4f49eaf833da54b195c668eab2fa11818b82df25b7e SHA512 aceffd14697d54e2014bce38222d59d02a9321eb2388dc7e1d8bdf94369e3834a80de27efc121db2229f5a28d1eb363458a00fd2fe3a2f55c820f81b387de457
 EBUILD watchdog-1.0.0.ebuild 982 BLAKE2B a66951e4b2839a12b87699dfbea438ef864e27ba2e74da619d74dcc4c365e6ef0cbb6fd0b9ee50f69ee5c784db5d7aa8a8f08a7b79de175215e30675072abdbf SHA512 0baa9dcdf57b8acaf3de940b4518931b0d423584e3689f7dff172200a35d744f952cfb0bba888fe2ddd195f1d0ef9bb63e44ad857c26deb69a38aaee465aa164
+EBUILD watchdog-1.0.2.ebuild 982 BLAKE2B a66951e4b2839a12b87699dfbea438ef864e27ba2e74da619d74dcc4c365e6ef0cbb6fd0b9ee50f69ee5c784db5d7aa8a8f08a7b79de175215e30675072abdbf SHA512 0baa9dcdf57b8acaf3de940b4518931b0d423584e3689f7dff172200a35d744f952cfb0bba888fe2ddd195f1d0ef9bb63e44ad857c26deb69a38aaee465aa164
 MISC metadata.xml 409 BLAKE2B 066a5f62332bfdbd1ee84be547214935022d96e8f51d270302fb891d8c9e438141bc4d42cda84cdf02ec65e80c5ad5dbdc8aaeffbf777bb7ee9b153c95cfdfa7 SHA512 dc751fd76505ab72f2e58c28fef326745ee464749e3640510679e852af6752906312f3d8c82b3b0220a120e0112c96e83d62738321a3bc7b71fd6aee803fea9a
diff --git a/dev-python/watchdog/watchdog-1.0.2.ebuild b/dev-python/watchdog/watchdog-1.0.2.ebuild
new file mode 100644
index 000000000000..fd006a578472
--- /dev/null
+++ b/dev-python/watchdog/watchdog-1.0.2.ebuild
@@ -0,0 +1,39 @@
+# 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} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	# broken when django is installed
+	sed -i -e 's:test_eventlet_monkey_patching:_&:' \
+		tests/test_skip_repeats_queue.py || die
+	default
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 087358269b57..63c58513ef3a 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,3 +1,3 @@
 DIST websockets-8.1-src.tar.gz 156472 BLAKE2B 6cb5eec8276f7ef7172048eba6157560f42cec28acacc1a0a2f426ea1cab9a04029ebb1f8285b1aa2862c30aac8f2af81ef85d4dba8e53e267b665b718e01d5a SHA512 d245702574cf513da54bfc0ca10768558cd4e5017ecf8cb647f4b9176561192a3ace64edfc5c6f735664bf1b6136aa0bb9828114478f92d2c051e3109a218c12
-EBUILD websockets-8.1.ebuild 453 BLAKE2B 6017d2aaca566701b7d2094fd6a19861114c82790a18e2e7b0451fb343466f137fc82911628458489733414179614657cffc79d1cef5778aebcbacefc7d6897a SHA512 190f8da4dbb88f977fb6d792f15d708ac44efddac27c19e98ae226144023a99ed2ba96683c86776e58a69a12199885e57e5f8aa91333a6861f634c39389859d8
+EBUILD websockets-8.1.ebuild 463 BLAKE2B afd610123c9422791f1b2ffbe7d747ec114d93f990d394bc0ea7229317577332e1ba60107289bc8a0834e5b7caf72a050452b974144998659c1bf53e5da28189 SHA512 7dfee3e78ea7d477773957cae7b4df78d7ba393fd24b7e477b9670acc512578470c77bcd511aa7e11ecb462e91a19a81c39e651f01957fb62bc5f9bea36d1338
 MISC metadata.xml 386 BLAKE2B b7595dce278a7ae3d0f491ebef0abd2d9a84827b4ddbef8ab3ed16e21128713408f66295566b8fbae235b5446f5eba6ebc412e39bb37d86e19fc2fd2b2d34bad SHA512 e007ee258a91392d5fa3cec67a0e1efebb4f3a4a9e3a4ee40a0f76dcd8bf3b1b9089f2ddfb52939a76cad42dc63662e2c365406b867641d3503f6437c3213531
diff --git a/dev-python/websockets/websockets-8.1.ebuild b/dev-python/websockets/websockets-8.1.ebuild
index 074ac905ba2c..4d5aaa0edf2d 100644
--- a/dev-python/websockets/websockets-8.1.ebuild
+++ b/dev-python/websockets/websockets-8.1.ebuild
@@ -14,4 +14,4 @@ SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
diff --git a/dev-python/whatever/Manifest b/dev-python/whatever/Manifest
new file mode 100644
index 000000000000..0da93d6db2af
--- /dev/null
+++ b/dev-python/whatever/Manifest
@@ -0,0 +1,3 @@
+DIST whatever-0.6.tar.gz 4748 BLAKE2B c0a8b3bff715b61744ca5094c234c24558882d00b0dd8c375b90deef9d68155997cb97fb94435cb6dcfa0ba4674ce61fd6d030dd338409e8aaa5686c3bf9f3b1 SHA512 acdc145b81423908fd2d80bf0e8a0c02bad3a6156ec5a7724cf10b0f447c14354c34ac4ffa4e5a26788a79ce2a6b7bd65bb0ea281a6d8919dacd9a24ee1cde2d
+EBUILD whatever-0.6.ebuild 442 BLAKE2B 15b16324244bdd14db1841e6e5d2817e826286adf9221f29e8032539d04ba75495b117cfa95b6ff45528c7eede9f62779496b475901c6bd58776e391ce55d747 SHA512 386328a87f5e01f0ef4da540bfef9b43c14b18728e781257faacf26ffe3c437a63b9f0392ebb125cde025318cdafc7bafacd50bb86c03b7fe5d2d1a723506825
+MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
diff --git a/sys-libs/libkudzu/metadata.xml b/dev-python/whatever/metadata.xml
similarity index 54%
rename from sys-libs/libkudzu/metadata.xml
rename to dev-python/whatever/metadata.xml
index 06ddf117247b..d0e866f244f8 100644
--- a/sys-libs/libkudzu/metadata.xml
+++ b/dev-python/whatever/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>releng@gentoo.org</email>
-	<name>Gentoo Release Engineering</name>
-</maintainer>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/whatever/whatever-0.6.ebuild b/dev-python/whatever/whatever-0.6.ebuild
new file mode 100644
index 000000000000..de60a47ae9a5
--- /dev/null
+++ b/dev-python/whatever/whatever-0.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of fancy functional tools focused on practicality"
+HOMEPAGE="https://github.com/Suor/whatever"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index 8f7161ae9e1f..d84875c9ebe9 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1,3 +1,3 @@
 DIST zstd-1.4.5.1.tar.gz 483105 BLAKE2B 5edd7d2c7cb26817d2a7f30536373d19a6939140dea3fb93589ff45495d51afbd1e98c4f73145869dd8a72a35c0e7543a7a21d688771746485b4dd275933dff8 SHA512 f27e255bc66798b2227d39eaa7648803e7753556b522d3dc37e82413f01dcff44b05f652c210e9832077876bd954a3abdad5ed1823f5f50217b83159bbaf896d
-EBUILD zstd-1.4.5.1.ebuild 504 BLAKE2B ec7972871accc075a2f5127c619a26d49b7c77bf99f1696fa3371b12bf24109f5d701af1ca50af53d74a5a4263af143bb0528b2ff4722371627410d88a4951a5 SHA512 e8d99e6e831ed28f1e6ab5bdc1f54dacbcf7bf297890c223ce22fdc5a243f4071ef7dd619fb85e2b91f31d61fc9e116c9066964af8b5a6a9ff7cb999995db76d
+EBUILD zstd-1.4.5.1.ebuild 502 BLAKE2B 330d0c05f2c35eb7422d4b92be2d0e920d6e1704a8e26057393ab2fad569b53cc4cf01244f9c0c9b96c2721ee3d831d3c262e31a14380114bb2a45bda9b85720 SHA512 65847d6a6201316302caed5e58ba775919e043a284809d1a4425c6930548272c8e060eb5f4de44b29147be66314513017ee8eed0a5fd0dcc419af337ffa3ac6a
 MISC metadata.xml 471 BLAKE2B f0cd6f693de2e397210dad0fe868504d4c294e927a00298a647610cf7eb187572c0075db9bfe75de62e3ed6f94d044d17289de9fa88e9638fbb53fcc3050e662 SHA512 dec7b96d32fa16496415df81c5242ab338f4b09371c3206b315792b75bec1c1e823919de9290ef198e117fa7433ea90d6e6c2a2c3a5ffcd7bf1c1638d4f72194
diff --git a/dev-python/zstd/zstd-1.4.5.1.ebuild b/dev-python/zstd/zstd-1.4.5.1.ebuild
index 2e3bf7744bbb..e06587558dad 100644
--- a/dev-python/zstd/zstd-1.4.5.1.ebuild
+++ b/dev-python/zstd/zstd-1.4.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	app-arch/zstd
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 0b377441163f..83953d20e2c2 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 0d5aa44d9588..64bb37bd5e49 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca337304
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD actioncable-5.2.4.3.ebuild 950 BLAKE2B 4bc67ba04c5c89eec6a4afdd44984afbd8804663a56782cdf253f145af8ea3b45caee2d38e504eb06a83ef125fb9c232a7a914c2c5bfa6847ead294afb814b14 SHA512 8c82ff547b539b6f06874178cfadb119d573b53e3d7632f6d0e3ca651edc217bc5083d7460f13e28bcf1bd751a2684740e8723073721392f819ed58c3a31a011
 EBUILD actioncable-5.2.4.4.ebuild 950 BLAKE2B 4bc67ba04c5c89eec6a4afdd44984afbd8804663a56782cdf253f145af8ea3b45caee2d38e504eb06a83ef125fb9c232a7a914c2c5bfa6847ead294afb814b14 SHA512 8c82ff547b539b6f06874178cfadb119d573b53e3d7632f6d0e3ca651edc217bc5083d7460f13e28bcf1bd751a2684740e8723073721392f819ed58c3a31a011
-EBUILD actioncable-6.0.3.4.ebuild 923 BLAKE2B 98c5fd05b489181f579430984ad50c31df2cb639199d399be21a7abdef9b7c7dfd79512b5811b03fc6c075a0df6eb2475d4ea00c9465864ae64f334fd5134196 SHA512 4fdda8df5f99493812de3eb83e8abee9228b7f003c76e47273844940132754d2532e6ad2d32cac21490930c127b3ca7cc28c3dea34074b8b9c61561233d1c629
+EBUILD actioncable-6.0.3.4.ebuild 935 BLAKE2B 1f54c3a4bb9bc0047c76387b467e9808f684c351703f6423b26f0723557d129276c7dd818e81d0c9351c5afdc85fe93ab872341f618084bb1d69f0057668b732 SHA512 bef35598afdd62e8e64e2085478977ae9881abad65fc17cfc9d7b7393156621aa6488b6c9792a54063a81954d9dbec864416fff2f914a1e77c28958db1a73012
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actioncable/actioncable-6.0.3.4.ebuild b/dev-ruby/actioncable/actioncable-6.0.3.4.ebuild
index 00434362e33e..faaa968abb19 100644
--- a/dev-ruby/actioncable/actioncable-6.0.3.4.ebuild
+++ b/dev-ruby/actioncable/actioncable-6.0.3.4.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index a436ff820b05..41143e110141 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,3 +1,3 @@
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
-EBUILD actionmailbox-6.0.3.4.ebuild 1699 BLAKE2B dd3e90bf5ec06b80ea5f7d58e014fbab76dc5febbb9ad14bac7d9555a4a41bc6feba57ddf113011760ceb4d919053068f35cd895930e32cb9a361b61d7edc774 SHA512 d807966eaed11f03f2fd74824ebe7512c70446ec1b45a89eb4f90752aa6a59c3f1f614868dce1a2a15f49a2ec21df8d5bddcb7e3550155b04a88806f63249ef5
+EBUILD actionmailbox-6.0.3.4.ebuild 1711 BLAKE2B 7675bfd3a16ecb41df77502335bf94672c2694b4371f5885b079f2e5b7a495966651586900cac98a47d05ce9986e39f4c58f45d02e4f288254e2503ada053465 SHA512 0d16c0130f6b9c86310d5315cd6b6670461440f1a03fdeb82004bcc87464fb76b8d07440396777702de13adce989d716a7b1fd189eedbb82d1fa0f4cfc0ffc48
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild
index fda0608d401c..fd3658a8e9ac 100644
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index f8e18f4c53ab..8ea676d6a686 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca337304
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD actionmailer-5.2.4.3.ebuild 1419 BLAKE2B a2e2a40e32353b81292a491c6b91866eb88366f381d2b1bcd2647dc448efd92a3e0f3157e01dac1e38490f3afff3645fd2628087d4cb8b638cd11b418771b60d SHA512 558320f005e232aabed034c69b83d3690ee60384ed92d7be05dab758782631aa0354944b3da77c79af0d53387cdc784d49c6d61ba1c5738b92fe73f501f573d9
 EBUILD actionmailer-5.2.4.4.ebuild 1419 BLAKE2B a2e2a40e32353b81292a491c6b91866eb88366f381d2b1bcd2647dc448efd92a3e0f3157e01dac1e38490f3afff3645fd2628087d4cb8b638cd11b418771b60d SHA512 558320f005e232aabed034c69b83d3690ee60384ed92d7be05dab758782631aa0354944b3da77c79af0d53387cdc784d49c6d61ba1c5738b92fe73f501f573d9
-EBUILD actionmailer-6.0.3.4.ebuild 1249 BLAKE2B a494099c8b1dfdb56936daf22ae96348c82e403cdee4d3e754ef6980f22c39b71b60083d847b9ae815e4e93511ca2118a108cd7bbc0d64ea71a8464f24a3544e SHA512 6977bd20b5097410aa6d46258e75022ba5fc3095a796029bc3a6d0942d509b9009b38e2d6a0e41f477049365cd26d9472445ff864b51d85b516ac7f3eb2a4ffd
+EBUILD actionmailer-6.0.3.4.ebuild 1261 BLAKE2B 639cd68172bd463ec4fc7a117e2e16fa689b6cea31b2eb6c0e2531417210a7b194ac24029f30e98a93729e7585190b2c09b463c9281816e4a786fb401f9ff1ce SHA512 2fb0ed3be14544ba32641c52571f36a5772b274984e1a403312bbcf28ca3f284b350d56c1d14b275f1cc4ff78881ee2c5cf9cdb2913d91ebd117651fca8d1b74
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild
index 9de7bbb7b27e..c2daab5cc5cd 100644
--- a/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index d6906d9127a7..4a34a3aa01ea 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca337304
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD actionpack-5.2.4.3-r1.ebuild 2268 BLAKE2B f3ecf79de396092c66fdc725f7b1b0d52586668b909a86efc1dedd92bb22fb3bb4a64ab0d5890f78d741c89dc265ef9bbf17a165e1fddffb0467e5fd5ce7ccbb SHA512 d7fa7356f01699f7c8535125928853965d900df6326892df060f6bba4d51af6e68ccfa70a35dc8bc1cf779ca67a71d047a0bf10e6340bc7a1fd5f6bbb58dcda4
 EBUILD actionpack-5.2.4.4.ebuild 2268 BLAKE2B f3ecf79de396092c66fdc725f7b1b0d52586668b909a86efc1dedd92bb22fb3bb4a64ab0d5890f78d741c89dc265ef9bbf17a165e1fddffb0467e5fd5ce7ccbb SHA512 d7fa7356f01699f7c8535125928853965d900df6326892df060f6bba4d51af6e68ccfa70a35dc8bc1cf779ca67a71d047a0bf10e6340bc7a1fd5f6bbb58dcda4
-EBUILD actionpack-6.0.3.4.ebuild 1855 BLAKE2B 85c5a127fc6499c35ca8e3af28dce3de197cc376db960355f396bfab0acd81c3b7ef51c26c3417c2f33cd5344619f8174358e28ec79dd6677def4b130657c48a SHA512 302d8500e00873b9d9825356f2c55523c1b455f6ed2fb9ad8ae11b8ea89cdfc8fbf438c16389b555d80eeeea89b3d48eb63639431d3c3b8f5afb972b2b27e0a1
+EBUILD actionpack-6.0.3.4.ebuild 1867 BLAKE2B e23587cf2bec7b8fff7f8f8fa217fba7eae6f2955f44501c88795094569c12bc6be1a54600108ca2dacceb97edd7eb16983ea034d0c5231548cb322204436d85 SHA512 096ceb76f013fabdd05136d83eac3652ec7d771d8b2965f2081d84002e5a02dd38bee2b39c50b38ccc5798ac289e5a36b908a94f6b84f62f80a537c4cdafb7eb
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
index b9f96b9946de..e2f269cbd09b 100644
--- a/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 9c439cf9792a..aaffb226e9e2 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,3 +1,3 @@
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
-EBUILD actiontext-6.0.3.4.ebuild 1652 BLAKE2B bebaa44dd837ad2ec43f67f37960ff250856253d928f0b5ac2943bd58757a249378c082bd83785a1228cba51f1699624adbc0681dde11b4003eceebe5257fec6 SHA512 f6b177b8193cf608643e619f0c5373b971ef287d85a66ecf2c8e4180cd0664a8452343afc6e07d61488ff4dbe2f135fd56f7653c45980706cb5ac0e97fb47e59
+EBUILD actiontext-6.0.3.4.ebuild 1664 BLAKE2B adfdfe74307d82098e12613d9c0a138974b5627f5e3091b5ee57423f548120bde4f2260de3e05308d8d71572e5acec440300b79ae8320e58d30895619492f6b5 SHA512 4233419cf739f9bca09aefe31aaa9d68cd1ca2ae88311fe29367c659ce83aac2352105155bad713d1e810a1caea1622b8edd3ecaddf5f75a247830684349b064
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild
index a228d2e2d075..e7b85321deae 100644
--- a/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild
+++ b/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index b12d25763aa8..13e122800b2e 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -4,5 +4,5 @@ DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c
 EBUILD actionview-5.2.4.3-r1.ebuild 1956 BLAKE2B 909175946e12cbe49620f7791ebce270c0e9815368941f1f9a12cf481d5c2d505a515fd57e7c36c211bacbbd133f1f5b3d5fdcb5fdf831a61c1be0063087e59b SHA512 7d6a55945a2080120c4fa47f1e37f552701321c9fbd1007a45404d62afca15e5383cf141df3f905ca5f37e6baef3005ee1d527ad3440957a5184f945acd0851e
 EBUILD actionview-5.2.4.3.ebuild 1895 BLAKE2B 411ae4e3059ee9cd7634be51eda0fe3de03609fc2e02c9757de3bb0bc209b1167555e62590216050a9143b2fe9a5b98adfdb866b2b172594eb0884bbb050b314 SHA512 ef2e2dd6eb2b442bc7ab850219fb35c4a33782904c0af25535745d540edfaae1b1196455a950fbbb239e9cd667d0c31524248156f85204a71bd121c8b4f68c88
 EBUILD actionview-5.2.4.4.ebuild 1955 BLAKE2B 31cdabf3746e0c736eb193abb24540b17071cb2b779cd97618916d63ba3be85efda270f4e90d90f73bf480aa0cbe6d1a170c28d0804d9eefce64a403d757b716 SHA512 7b0dfc60f0fe2a8c35fa4735b7e21f9063976d617942000b1eef0f85dd9db51aaee332a0aa0bc8f7c2eb5063022403fa25716cc38e6e0b4cb9608ad97fcf8482
-EBUILD actionview-6.0.3.4.ebuild 2120 BLAKE2B ea715d222ecef835a5d545d6ec6227b1569a42050534d82829ab0f1206a328d914faa394d037f1d42e8aadbaa18f8df8b7b9fb46c2abd85e3c5eaacee04fed65 SHA512 667abd20fb2dbe1e6115d80c805fc4a93e2047ca28b6406934ad185af3c806457d8bba08a211c73ff03a0ce12236a5c20a2de31bb5acbd11a031e26422858838
+EBUILD actionview-6.0.3.4.ebuild 2132 BLAKE2B 21c3e39358fbd2c59190fd7b2982399a1eef44925b51ffd824ee5c9b0d908dd69b78d064e8f36f3d1f841adbcadee0ee0f97197c6ab1f6bf3d90e713b628d74d SHA512 fff381e72739f558b5246668c8334d4a648249a4b9f7cf569a11bd0ee16fd3152cb0b8f45782c7d2882ee01f54d64b14c338922478ede621a2e193a07700c171
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-6.0.3.4.ebuild b/dev-ruby/actionview/actionview-6.0.3.4.ebuild
index a6b9c0c833ab..74c367a3ec9d 100644
--- a/dev-ruby/actionview/actionview-6.0.3.4.ebuild
+++ b/dev-ruby/actionview/actionview-6.0.3.4.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 6df8a877b150..9c76681453d4 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca337304
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD activejob-5.2.4.3.ebuild 1095 BLAKE2B cd3e908ec77f73c6894055938e54655ecc7a064a94ebb32490b2f6843e4bc56a3b33ac80f0b2e26213efb8f956400e7b372681f249c5409d5f6f56a9fd159351 SHA512 1229672d7bf9db8cc21098ee930cf976a776b43b7c97f9a4259fd103e8e4ef8b44fee906690ae47e9428302e7538b772ef50485df897bdd4feda969c4858e336
 EBUILD activejob-5.2.4.4.ebuild 1095 BLAKE2B cd3e908ec77f73c6894055938e54655ecc7a064a94ebb32490b2f6843e4bc56a3b33ac80f0b2e26213efb8f956400e7b372681f249c5409d5f6f56a9fd159351 SHA512 1229672d7bf9db8cc21098ee930cf976a776b43b7c97f9a4259fd103e8e4ef8b44fee906690ae47e9428302e7538b772ef50485df897bdd4feda969c4858e336
-EBUILD activejob-6.0.3.4.ebuild 1131 BLAKE2B 1f8727feaaea67a7ed48c9ac88629b71f7ddc21222a1b0d425a90021e9963fc1a96cd701e8bc13649e3533cc38ced2afdf2fb7ae0a72fb8bfe7bd6d075995a7e SHA512 5893ead1d458b7076950d536af4cbd7998a353432f16a2bfeabd5cac2cb44f25140dc706624dc7656008f178ffa4d4f15629e2592d331e6ca4bcfa14e84df1aa
+EBUILD activejob-6.0.3.4.ebuild 1143 BLAKE2B 1dad689e71743f63c8c6a5c7cea7ef574e3a4ba4238baf12c5abef85abbf033c332b3a6a3a6396096ba19d0fe8489ad7811b28ed6427b85535b369d708e5353b SHA512 63062315498ff7c8452ecf233354835c0cd5037b98fb07304f99a7f5f8daaaf7db5167fa3e84756b99ec9a5988c04388d669b577e17debeda4dcc952630b3f46
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-6.0.3.4.ebuild b/dev-ruby/activejob/activejob-6.0.3.4.ebuild
index 8bb3a8112946..d7cb080da0a2 100644
--- a/dev-ruby/activejob/activejob-6.0.3.4.ebuild
+++ b/dev-ruby/activejob/activejob-6.0.3.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 8d7cde815788..80a434032149 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca337304
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD activemodel-5.2.4.3.ebuild 1040 BLAKE2B 8c464ea18bbb1ec9297fa0e95812a5857bbb1094115b5f556d2e010783d960518e1f7baeb905ff294e647117fd54bbdc402def3ed3e88cfd4420bde1854db72d SHA512 fe53836eac85fa0d2e567c597f60df351b1efe879936978fcee1c6437e290f1386a5b9ac424f0871e42520e5e0dbb65329f7e8298d841e58d68bdce15cc71fac
 EBUILD activemodel-5.2.4.4.ebuild 1040 BLAKE2B 8c464ea18bbb1ec9297fa0e95812a5857bbb1094115b5f556d2e010783d960518e1f7baeb905ff294e647117fd54bbdc402def3ed3e88cfd4420bde1854db72d SHA512 fe53836eac85fa0d2e567c597f60df351b1efe879936978fcee1c6437e290f1386a5b9ac424f0871e42520e5e0dbb65329f7e8298d841e58d68bdce15cc71fac
-EBUILD activemodel-6.0.3.4.ebuild 958 BLAKE2B e82f8f658447c3a704fd3987182fc70432b80144bb85fca2221631b1bf752446817ed765bfd03d6e0dbabeb66c11bdb4d66e79bef6522100c31abe88b77ca09a SHA512 2c2d494285e1c9678ffca4dd3f160bfa8c56714743b4cc96bf83e1445814c32ce93894d2c4beeb9900742afba931aa97e4c1d49d385123f96fb45b4dce546fba
+EBUILD activemodel-6.0.3.4.ebuild 970 BLAKE2B f7e765c06ae3ef992fc431e9b8c86341aee4a77a1e62c7a038702a4248528b7e70b07072124749529d6a4dc4e2daf913d2a5d15a719eb8b5ecd781fad5cdc6b6 SHA512 53251bfa945a2abcff8c2d8f7e1bedd5b3faaec7cd782565f9a0ce203f67222160b1dcef81d651e5e55d6ed6fc55d12fc71936b05963a932747ec77998579c4b
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild b/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild
index 1494c493a78d..c4575caa6a5d 100644
--- a/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild
+++ b/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index abe0a3698238..f25a7ff96e74 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca337304
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD activerecord-5.2.4.3.ebuild 2953 BLAKE2B b639e12fb2c32c68d24d9d998896a4c3027700f52a25ebf13e712bf90a5006464d2772c65a6ee0df1375ba4ccfd1e87662020015a93dc6ca86560aeca56a489f SHA512 05ca145d46752de84124f2e1dd473f35101f28ca46814a4d87b29813c0d5185485fbdf53ab205a482e54e3245029e5357e9340c6090a4b515d979a4d59a41bf0
 EBUILD activerecord-5.2.4.4.ebuild 2953 BLAKE2B b639e12fb2c32c68d24d9d998896a4c3027700f52a25ebf13e712bf90a5006464d2772c65a6ee0df1375ba4ccfd1e87662020015a93dc6ca86560aeca56a489f SHA512 05ca145d46752de84124f2e1dd473f35101f28ca46814a4d87b29813c0d5185485fbdf53ab205a482e54e3245029e5357e9340c6090a4b515d979a4d59a41bf0
-EBUILD activerecord-6.0.3.4.ebuild 3062 BLAKE2B 10a2bd53e4ac5910695b27e9f6cb63adaa5964ce68337aa08d812c2a5e3ac582548fc2ebcdc75bcb18dac9e4a4db98a320b36f3c03c3e343f8cb15c8eec40d96 SHA512 9602513ec7f136e965aa23aca87f19f68c3db6af9d0fe26f2527701011459f5938b0efee7d4b107ff0a2ef1361b704ff71c4eeb17023e43797da8b383388c58f
+EBUILD activerecord-6.0.3.4.ebuild 3074 BLAKE2B cc502eefb9493230acf071e157bbe5b9e21d475f59c7495e328800e50cf08218d62587e3b01ba4f1227f4ce9c21aaab8fc428ef3b058c3aeec617256842ff671 SHA512 df8d5b46874e5238a6f81141a7900d86b87e2e60cc54fa32c21110c43b803b3c79d7072e5345cb6d4297d098ea5608bef38dacc81c7e36d7424a40f06dbc6201
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild
index 1194b35b4808..5956e5555c2a 100644
--- a/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index a2155ffaab26..4ab973b64ad8 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca337304
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD activestorage-5.2.4.3.ebuild 1970 BLAKE2B f0cc15b0b78d783b2c85c838959156bfac4979be631db2a7f40b177b5b08b626da65d7d504e9bdae3dc5c42dfd06a152ccfe919e63fe030760d8c530af84d523 SHA512 ceb0fd466449abb1070b94011868a44a14330e07dadd87cb0fa7e0604e152fe572d03023b460d13780a4618b88864a7d67df56f45bdeb77963feed2f18ff065b
 EBUILD activestorage-5.2.4.4.ebuild 1970 BLAKE2B f0cc15b0b78d783b2c85c838959156bfac4979be631db2a7f40b177b5b08b626da65d7d504e9bdae3dc5c42dfd06a152ccfe919e63fe030760d8c530af84d523 SHA512 ceb0fd466449abb1070b94011868a44a14330e07dadd87cb0fa7e0604e152fe572d03023b460d13780a4618b88864a7d67df56f45bdeb77963feed2f18ff065b
-EBUILD activestorage-6.0.3.4.ebuild 2014 BLAKE2B b0fc70b785cf810ede31ba404d74cb1d30a5008ec868b04d3b3c216aca9baab6614cc4db5fcb388436b46ada45c056c9f8357981a6350130af5ccc281a000d85 SHA512 5ad69b497494e8fcebeaf355be62fb5a9230718dce95c0b2587b0cdd04e1d84b690909e543fed93e830cc0311e3d2cd39144194c427383a1d39dffe4e9dc7db5
+EBUILD activestorage-6.0.3.4.ebuild 2026 BLAKE2B fd9857b4ff0c70660b70c69116b1e83b56167eb19656f15c220f4ae15a02b093f3f26091fe446dba4c99538c33651d98c24cd33056f38e25b505d5c41d08718e SHA512 de586463bbf72e68bb7bbcca46e89d469a897ff9e56e141a3f9eb71a2bf4299760e6539893ecc829a5e9a20266e505ccbf847d9d0a5ed8a855da9e9bf1323b80
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
index 6181b336ee05..945b8395dccf 100644
--- a/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 28ca481e6ea0..6b764e74cbdc 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -3,6 +3,6 @@ DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca337304
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD activesupport-5.2.4.3.ebuild 2523 BLAKE2B 7cef7564cbc0c057d76cf74f4dd5382a738ea204f1dadf0367fa70e30f6e8f002e252c446bbd342352e476f98623b534db00734dc4658c68145c51ad1d30b945 SHA512 158df77044882eb0fdbfdf7fb0349d74812187cc668fff6af4f44f7ee2ffbb31e1076569f19125048baec407ef6797b35ac21cdce52325a92d1feff3b0bc7922
 EBUILD activesupport-5.2.4.4.ebuild 2523 BLAKE2B 7cef7564cbc0c057d76cf74f4dd5382a738ea204f1dadf0367fa70e30f6e8f002e252c446bbd342352e476f98623b534db00734dc4658c68145c51ad1d30b945 SHA512 158df77044882eb0fdbfdf7fb0349d74812187cc668fff6af4f44f7ee2ffbb31e1076569f19125048baec407ef6797b35ac21cdce52325a92d1feff3b0bc7922
-EBUILD activesupport-6.0.3.4-r1.ebuild 2515 BLAKE2B a41e0a2dca7478f124e82c68530194cb74abc0a088e436f1f4dc5a577849d0c29b3d17c6224be9cfad6632a74046d65418bdd597b5fb2ab61a476befeca3ff19 SHA512 cfbee85437a752c29e7ad24c2ea74c7e25472d2b6ea67703a92f8aa12e8a31849eadf49a43ef0c69b0e8216adb4a05ba0d62dd9d5616a270cb2d8017200d0476
+EBUILD activesupport-6.0.3.4-r1.ebuild 2527 BLAKE2B 27ab01053d5e704b61c7bafcd4dd49df749edea936ebd1911e731684d7115a3bc0b2b7f9232220f7bd34095087f4e469996184b716204c2d53ae42ab13fd7b33 SHA512 618ed158df08cefdc1b5dd634b736beef357c66ef6cffa7286ab18206f53c0b6bd0acb68935927256392fbee52530ff7508b02e717cc6f9026b667003987e6a5
 EBUILD activesupport-6.0.3.4.ebuild 2517 BLAKE2B d138806cbe294858b40360af25615ead52a0ed7f1eadb77ccaf6344f18b8616365f19d1548e5fe5a5748700ad9e75c34123421ebf9d57892331aa0174b8bc9b2 SHA512 30d49e2ab7c3334bdf253d4c9f866937e493d693f43d7a450c2103156baab04a918dcdfee67db159002841db3979f0e9a9ab898ad75eba6e4518a1a629e6b942
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild
index 83895aef0e7e..a688f36aa364 100644
--- a/dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index c614e708dfcd..ca3233ca9f01 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -5,5 +5,5 @@ DIST capybara-3.34.0.gem 369664 BLAKE2B 4f55388b809e5d808f4cc3a45690eedc86d2bacd
 EBUILD capybara-3.31.0.ebuild 1789 BLAKE2B 0144d4405f871d24f715b1ee0e8e6797b37178939ad921f64d83e033256aa8228900ace9df68358e1d1222ff0ae7adcae830e8cd9e8b6d4a5f521224c618ed71 SHA512 502598533960c4d2fb06e8bec9859067246321ea625c1961c7ef115c44664b3f9b533cedb6c630c9c7dd5093cf873e0d16ea80d3d2d704db950e22bd9a980601
 EBUILD capybara-3.32.2.ebuild 1789 BLAKE2B 0144d4405f871d24f715b1ee0e8e6797b37178939ad921f64d83e033256aa8228900ace9df68358e1d1222ff0ae7adcae830e8cd9e8b6d4a5f521224c618ed71 SHA512 502598533960c4d2fb06e8bec9859067246321ea625c1961c7ef115c44664b3f9b533cedb6c630c9c7dd5093cf873e0d16ea80d3d2d704db950e22bd9a980601
 EBUILD capybara-3.33.0.ebuild 1783 BLAKE2B c9be1ebcbae6b2141e9c0f967d92284c736c57046a30eee07705567e16aa065033ee307ad722aafe07bbe8080e9bb56636f16b0596d8b7a03c48dfc4a091bb0e SHA512 83c5ba82043668977392824b28125859ccaf75fef8cd4dcf829cb163c09b3f5e7603def865ba66dcd2a5a88b7016146e819ab6df58316df11269f463bb95c92c
-EBUILD capybara-3.34.0.ebuild 1783 BLAKE2B c9be1ebcbae6b2141e9c0f967d92284c736c57046a30eee07705567e16aa065033ee307ad722aafe07bbe8080e9bb56636f16b0596d8b7a03c48dfc4a091bb0e SHA512 83c5ba82043668977392824b28125859ccaf75fef8cd4dcf829cb163c09b3f5e7603def865ba66dcd2a5a88b7016146e819ab6df58316df11269f463bb95c92c
+EBUILD capybara-3.34.0.ebuild 1795 BLAKE2B f58693cdc2d74c42a46497a13691fba12c1bb909ed6ee5d62bab41651acf2c39bcc0ca80f361861cb838299228f849be80efe3407b979c2010893e854df7571a SHA512 fe7d6b9ddbc73e9c2d884c7942584596a7d010183e85747c250170d32dc6e3c4065a40a0cf83e3cca04bb18e994d1347550106f8d1533287bb1ded850db1f9ac
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.34.0.ebuild b/dev-ruby/capybara/capybara-3.34.0.ebuild
index b0688ebe995b..00ff91a83b97 100644
--- a/dev-ruby/capybara/capybara-3.34.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.34.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 16af7477f96f..c9b60862102e 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -2,5 +2,5 @@ DIST dalli-2.7.10.tar.gz 52106 BLAKE2B 0531247c1d615acd7d1124b8aceb5635088b55e5a
 DIST dalli-2.7.11.tar.gz 52341 BLAKE2B 5b3a2bc57f4b0e3a9ac0d24ffa3bba89ea38665ac08ef3d7760fa6ce74db21d323a18e74a4f3009165364332731d7c6890df36c68409afbe21d3ac096275f028 SHA512 8f299a19d95293370564b6337bbdfeb32d928e0a95bf5f5df962ea20b039f4765da1797513ca96cabf93309484575481a02fb1e0c6d227f74c81fc72f95be22a
 EBUILD dalli-2.7.10-r1.ebuild 1569 BLAKE2B c338dcbfcc866ef1c188d76e1b23c9c3818f7743794b0cd2d0853ab6694b9b2ee7c7d1309dd0a57ed1ae18158a57f082311ecb3603dd12ccca344135623d2b51 SHA512 39989fb31d37a878773ee056dbc3ae9bb4415c92201d14aa4778076ec7540a55f9498fe525859d4239c8671c6d16e347b35b99b5dd3b8119d364638217482dab
 EBUILD dalli-2.7.10.ebuild 1578 BLAKE2B aa257dd54dfd71304c5bf60d8373252466770d027a72bbb1c42af5e2c2593bc018c124208b8d78219ad3d6cd9ab6506117282bfc04e6922ff05dfede2a82ebe3 SHA512 0ce0ba0d10409a0531257e5f314c84b18839a0823941c0b5e36020cfdf55243002f98eb4cd4de64806e182c3f7a4559c5462e84727e6346c63f81476911a3162
-EBUILD dalli-2.7.11.ebuild 1563 BLAKE2B 3215a1299bcd782f20ced36ac97ba9ea0eee377926f8229e2b6135cf04f53fe6a7982b20352e4d361d036a85988892f576af7af2001dbd8372f0bafcc38016bc SHA512 9e917a78f87bbc8f80e56a6de8d6f79a73f385bc51d2181c1f681da18f3fc934021ca5913c61613577f16468ea57aa0af00f613ebc031b9514fbaf3dbcbc42e8
+EBUILD dalli-2.7.11.ebuild 1575 BLAKE2B 4f3f039c7aecef10166a75fac7737b6333a5ab453024cb08b2122e2d1dc1b75c9da290f9d2b6ef57b7afe2a72901421a82c5ac334d7b4566b34471200beebde1 SHA512 2d32d3b7f32669a571b7a52b09f42409972df0454ce344622e5b9ccee822f31d2d715a506c787cec76aec32b82e2b3babfea6208909e358238c67b2938786544
 MISC metadata.xml 346 BLAKE2B e34b47009de19ff810f3c3893517533730fa09cc4713b5fb8ebc05011004e17466ca0a6e6df307e5748003a7b4c83691d28ca0d80b423f6f870c4f7fc9be88eb SHA512 22b3ca0c5024974556840a2cf47ffa0dac63b6a4573d2ca6244c3ec9231b1c8321c7f544bc979882a6bb6ca37545b8ccf4612ce9ffd1ab34521b24e896f57e41
diff --git a/dev-ruby/dalli/dalli-2.7.11.ebuild b/dev-ruby/dalli/dalli-2.7.11.ebuild
index a8a2a8ccf9e1..4dc53f6b7530 100644
--- a/dev-ruby/dalli/dalli-2.7.11.ebuild
+++ b/dev-ruby/dalli/dalli-2.7.11.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/petergoldstein/dalli"
 SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4 )"
diff --git a/dev-ruby/docile/Manifest b/dev-ruby/docile/Manifest
index b276792ea0ed..b21b55d56d1e 100644
--- a/dev-ruby/docile/Manifest
+++ b/dev-ruby/docile/Manifest
@@ -1,3 +1,5 @@
 DIST docile-1.3.2.tar.gz 14684 BLAKE2B f24ce3ae857d249ce2fc32bcefa505b272327962755e000e51dd13531ad81a039c1da0e97774752cc03444fc3f44fa12212bbe61ff7886ebf5d44076785db3df SHA512 6bba8e8855e43acc3ad314ca500896b861865e4470618f98e720a11a26e226e30d8748096638027e213eeb54838fd1c3b2c9749701476d26cf8bc55c82c4f3ce
+DIST docile-1.3.3.tar.gz 15752 BLAKE2B 290af9553aba4b8b6ab058a1b1dbc4a36e840b3dc11e97db08408230679ab1095a5f6c03b133d9c02d2c1c9be75cf4d5cfa525bf5bd3c0705993df975ef152f3 SHA512 64e4f45616135f2089ecdb7282b7d1bed61cc5a1c8fa37e5ea70d8141d364760c62e06c650359d9cc107088fcfe4837d6bf35b492bd81c0207b037aa67d1d114
 EBUILD docile-1.3.2.ebuild 776 BLAKE2B d1166b8e13c3f3c9216b60d767453c11c95201f8ed4b3c55a16060de9e8790430ad273c8fb818c2df8bc9ff9d64dce909a71ac50b33bc4c443702ad8ccf3d4e3 SHA512 7cfc0fc2d24ca5d037c525c28f0e1f7c7253fec41b95309e9fc7198dac323c51b64ae3c1e428f0a5d6d76c88fe4cb860c48f559419552fa5dc1b970d8c50c3f3
+EBUILD docile-1.3.3.ebuild 738 BLAKE2B c9d5f42d5c1f38f15ef7f7193eb11da1524a8fc77749dbbaa8ae9569d9f67e1d7b1807bc240091c1a2e583097f812e3f74536ec796a8811b1e0d49aac412d328 SHA512 eefa4c0445f9e3fd3c338b2e79ec7bbbffb7211cabcf773a834dea2dc02b084dd783f7dac8271864f0e458ee88feec5d5a97c41c794935389f602f133fff1f42
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/docile/docile-1.3.3.ebuild b/dev-ruby/docile/docile-1.3.3.ebuild
new file mode 100644
index 000000000000..41f1cd91fffe
--- /dev/null
+++ b/dev-ruby/docile/docile-1.3.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
+
+RUBY_FAKEGEM_GEMSPEC="docile.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Turns any Ruby object into a DSL"
+HOMEPAGE="https://ms-ati.github.io/docile/"
+SRC_URI="https://github.com/ms-ati/docile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/require \"github\/markup\"/d' Rakefile || die
+	sed -i -e '/^unless on/,/^end/ s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 012136e1f897..c94cd5e37ed8 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,8 +1,6 @@
 AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea8bc3346ea95df5d6b3d925a6373153460699e9075017fb43640b714f025c5f8a2167e0742bfffc20dcf886b5e0f6bdabab181a07a7fb SHA512 72192b75ae6d084d0e47ec6a7f4d0817dafd0623269d16cebcb5615d8df0efc891176d0cf246f41dd0f2180d54b8cc94ee596295787fbdb3ca83d0cd41380e89
 AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
-DIST facter-3.14.13.tar.gz 407204 BLAKE2B 12019c20284eb2a62fb65f2ab09246b98708b1aecb485700c2074865d02bb836f140802ad3b54f28c90fdd225b72e9216d21fb57dc0d82b8b3854607d5ba0eb7 SHA512 62910dc71aff0a0b0ef1ece054e0d1eea095c65ca6a34e17331aea943e217baa1a12bba1176143b652bb322195248a4aab1379eb69d6be419b73eb6ae3a8afac
 DIST facter-3.14.14.tar.gz 407276 BLAKE2B 5f911581773ef9a19ee42b5ed64114e2519ff88e024490d74bf9b1e777221d92d3ed502c8e6a0df573a5390fca323fcf0bcfdce6aeed25826c84efb3971307a5 SHA512 22e0ff0a9280be129f7587e24109f76f34660d99086378dd7e9ccc004c08a4fa5dd6f9ba50957c146ea40e26344ee87dbafd45b885f8f576192b6e572b084af7
-EBUILD facter-3.14.13.ebuild 2138 BLAKE2B da159d7ebc68d3587a29befc35742729e938c63fa176ed924daebd564efbc839be7a3e6f7f929d2222da71cd70de684d4f257f4da3d00de9ba3c73d7910d028d SHA512 71012baae5a2c15c3228004cab2202c59343b5b704aad7e37f89285db826c38a2695acd032bb5451a2d46db90779c509acf1df7cf40b8b420dbb4d7f5e793c1b
 EBUILD facter-3.14.14.ebuild 2138 BLAKE2B da159d7ebc68d3587a29befc35742729e938c63fa176ed924daebd564efbc839be7a3e6f7f929d2222da71cd70de684d4f257f4da3d00de9ba3c73d7910d028d SHA512 71012baae5a2c15c3228004cab2202c59343b5b704aad7e37f89285db826c38a2695acd032bb5451a2d46db90779c509acf1df7cf40b8b420dbb4d7f5e793c1b
 EBUILD facter-9999.ebuild 2490 BLAKE2B 9c480e951320b78a43aac1c436d5008d3461de4a62f73f76e7ae6a1eb62d5ac0b4af8f58b2fe25738c892e68d3c014be43f0ac79a8ccfc065c0f1485dbc03428 SHA512 41a5ca3bbbbfb9e5c94271490e7d9a9a1a99ca76b9c3c3ccf5b9ac6b3da005101063ad9b6e3ae8c53e9335c1d55e8b3f8f528f1b759b85a40f6251217b8a7e76
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.14.13.ebuild b/dev-ruby/facter/facter-3.14.13.ebuild
deleted file mode 100644
index f2b40c9e3b70..000000000000
--- a/dev-ruby/facter/facter-3.14.13.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils eutils ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
-	EGIT_BRANCH="master"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
-
-RDEPEND="
-	>=dev-cpp/cpp-hocon-0.2.1:=
-	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:0=
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	dev-libs/boost:=[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-DEPEND="${RDEPEND}"
-
-# restore ${S} and override all phases exported by ruby-ng.eclass
-S="${WORKDIR}/${P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
-	# be explicit about the version of rspec we test with
-	"${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
-)
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-each_ruby_configure() {
-	# hack for correct calculation of relative path from facter.rb to
-	# libfacter.so
-	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
-}
-
-src_configure() {
-	ruby-ng_src_configure
-
-	local mycmakeargs=(
-		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
-		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	addpredict /proc/self/oom_score_adj
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/fuubar/Manifest b/dev-ruby/fuubar/Manifest
index b909098931c9..bcf6515dc6c0 100644
--- a/dev-ruby/fuubar/Manifest
+++ b/dev-ruby/fuubar/Manifest
@@ -1,4 +1,4 @@
 DIST fuubar-2.5.0.tar.gz 32763 BLAKE2B 841f85cc867a8215e00f720f2ffc25aaa5444ee6536cd17663b789d7a947e957987f3b60659828d310c0fd816abfedd9c7ef90effe37b6f847ac119a41f134a1 SHA512 c0ad302516a7eb7df2b574c038068298aece8bc1606adcb81c53bba1f0315a774dd65f5c742586ef2b7f188bc01ea94e0c5a3eb8b3c5f225ad76027340165453
-EBUILD fuubar-2.5.0-r1.ebuild 842 BLAKE2B 3f0ceced8f5e8282c300927e37d9058c4ac807c95fd8d47ad792e58c3e5a7fe778cbb85b3de8abc2d35f364dce5c6d669232b99baf9d5abb258dae93d2a53050 SHA512 6d1e4ba27a67aa7028a5bb1828d65406ce61bc3de4a934bc4d90444deca1638a0fe16664f24790db1eb04aa1d1a25dd590a622590f90489e25c7ebb92d7b616c
+EBUILD fuubar-2.5.0-r1.ebuild 854 BLAKE2B f3512f03631666e524a72a77fd3ae839b98e7c36d2b720d8fa995a0548a487ef65589deda27daa7d9f9212a7d3d2e964aca76ff2d10d28de22f656663b068d02 SHA512 bb236747270251877baab7cafbaed179d6f11d173d68abada06eee0d4d40c3f634162ff79541f4afcdb10b200e51dcd0cd74c46e5aef620989d8b92794fa0adb
 EBUILD fuubar-2.5.0.ebuild 848 BLAKE2B c18b4f0c3a5164bc0d3e5942b6b9b3ba06a7747ca3b543d003357308e1647f5d4119a7f6646b866e73e28cbce7ca251f2989559df8466b068bdaaa52a7f1534f SHA512 132cf88e8d016c6ea7ec9a64f2a15d3077520eb920a7fe61ddbd56158e067534ab4877a3727c431212f9ab460799688cd886f5cbb8b96aecef04a5eaa43cd5b9
 MISC metadata.xml 349 BLAKE2B a394e14e59c6aff0211e2b84c89f5d12b862cf44d604c6dec72d80ac8b52c6ad2333069fb04fd257d0d761283bd4aa041ff716f34576f46e455d075ce2ea2fab SHA512 0c974aa96afd7eab91e27ea72859e709fd5d8691055a06b57e2267e2ee36904b3f4b92b1b0d24659015f303017298cbb4373f225471a6350551d3d85574930f7
diff --git a/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild b/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
index 1e4900265628..c1bf1e743cc7 100644
--- a/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
+++ b/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/thekompanee/fuubar/archive/releases/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="${PN}-releases-v${PV}"
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index 4fd8faa4ae72..ff523f53a167 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,4 +1,4 @@
 DIST globalid-0.4.2.tar.gz 18669 BLAKE2B 7773362a16f5e3d0fec2a45e9bc768b5f22072d148bc77289c6841f24e4187f88b34bb9134f3ac086390bea5664d4cfa4281d96b0b8a3750e09e461350a0a50a SHA512 2f101601e36fdb6ba912652bbcc78a0561e0233c58d481dacbddd250ed39a1fa68a9b9c1cdadbdc708ac3147f64475fd6b68562d1ebab376fd2a517c93a23e49
-EBUILD globalid-0.4.2-r1.ebuild 759 BLAKE2B 6e6c7901509e33008b59368ec429e0a8718e898f82faa12553f362c0dc8f86b10c6cd54cabfa3f6e413fd275f71bf61df3292c50cfc3448fd82fd296794a37d4 SHA512 35c6086e3e9b945c575263e8c26404d39b4e0867943267454ea2e02c0e7067bb8ad077528480447c09049a4716ca4ab1c5a2162b15296f6bb1d50b0b83bdfc17
+EBUILD globalid-0.4.2-r1.ebuild 771 BLAKE2B 1cbb9c4519c92b261ac79a4724e0486673d1d8612be7fa99ddd9ae3433e1efc6d42f9bf3bc4bc7cc52b14417222ef57d9576aef66ba627e92ed6cb0a40bdca0c SHA512 811b75c6fe582e7bd0dae989064370e53c871809ac6b2560f3ca0911854044d7b629a5fe24354003fbddb2b4ef12ac5aedc1aef0ece4b6feb267f084901b7568
 EBUILD globalid-0.4.2.ebuild 774 BLAKE2B 7141669a7747eaa4b73074a8a6bba1154ed997c8691bae1dcc33dbd6fcebad74baf98861884abd9d76a6819e806fe5907e245eeb0d6d89cc6ad5aa4d520b0827 SHA512 87db6271ebb3ff86096dca8a0b650c981261d05cd0c79fb4f06c74f509ce82f3c53d13b836877575361a79074d51bd81de81ee483aadf8692b186f72240ac582
 MISC metadata.xml 340 BLAKE2B c8aa9febd2a1238630c8d42d1670d1333a9c9b8ad8a1195bc49518b4b90e0c5238e8d3859a71a304629c8931b7fa286f805b4eabd1b0782263c689888d168546 SHA512 31207f04b56e2be06ebe5367d496e8f7e9c73732cd0fa852d19bb49cfdb7b53ff30d23131a53ec9a9ca8c7aee8f8d0b4d74cd896c7e407a8b6aead17f06e106e
diff --git a/dev-ruby/globalid/globalid-0.4.2-r1.ebuild b/dev-ruby/globalid/globalid-0.4.2-r1.ebuild
index 8f763248a10f..4ecccd164ba0 100644
--- a/dev-ruby/globalid/globalid-0.4.2-r1.ebuild
+++ b/dev-ruby/globalid/globalid-0.4.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index 790b9cf03cbc..44851cdd5365 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -5,6 +5,6 @@ DIST hashie-4.1.0.tar.gz 86972 BLAKE2B 33979037db67f8a7f20ae85e3db6e8b5415b9b265
 EBUILD hashie-2.1.2-r1.ebuild 736 BLAKE2B d54f1f1d5cf059d17af6bbd20c229cb8cf28cc2cd2a62a4ee6e42200f76c16393e0b1f2927fec47c485a5e144211dd8ed9ee790c73dee30fa93ab865b79bb084 SHA512 650393587f133232d8bc304fd1783d19c8eb6f9baab5e5efb3b3619b957f69dab9b46c90d8c7622519a2b3ba3e06c4496c2074079dedad14a768a36789acc1fb
 EBUILD hashie-3.6.0.ebuild 1286 BLAKE2B a7c43fbdad7d52bf2ab56e1f4eccac9c894eb3da2b932ec6e3f6af0c75ed9338e473c05a242acb32a32fd607057ea7aaf99b2b8f696cb795e3224bdca231aeb4 SHA512 96c3c718ebf37a8b99178e052936ad6c78fd7f3fb7581c35f6653ae36d8d8be0f122da3ea509e2f17289827909203fc52376d26a80297b397d07b432a4e72bd5
 EBUILD hashie-4.0.0.ebuild 1411 BLAKE2B c6b1723aaae76f7265e3e18ae5ebc3e5e00be1ce8e2378c881092d415aa64a6f75c6cde0daa3c3051210b5f1813014e99310ecfc77ac9f47237705817820340b SHA512 e12e0593a6ea70686708687323966a8f536bea783c7262c6696af67ce12e1e242a9e7825c44e23921f8995a3c1cfd53a92cefb3fcf470353c2ef66617d0b3860
-EBUILD hashie-4.1.0-r1.ebuild 1422 BLAKE2B 01cdfd2a931ba534fd537f89b87ee8f5a1b2a468da9ef5830c00194e2085f51b23b2bd4b75b296ac91c2066d819e1824a13cb45c1a4634cea4deb2a5152b2422 SHA512 67a15340eabe572e981aa50b49b864abb243c150dae09327c58018316ccfb346cec75a37602c7ba21e92e56b8e71f8c4f46e340bb5a2eff237965924001ad309
+EBUILD hashie-4.1.0-r1.ebuild 1434 BLAKE2B d9b3f9ee64b4b956d6224803f0d77f704d954c7fa2e86c915486afdcde2debc1f0d369da7f0e2bd4b870219b895702d11755a34ee58c9b5fb516b869c4458fb4 SHA512 231181de5fcd5eff3061dbe0e9fce63bc1cc7cfb101040f4e59bad9f6a33e3275027ee48adb9cb090bb7686ef12c313f05444fa4d48b433852947d4e92a48854
 EBUILD hashie-4.1.0.ebuild 1427 BLAKE2B a24c92707fcca20b13cd200dc262ad5898fb220d85a7104400849b47408978ef7335dfe0eb87d593ef30b7866930c0f4f9987b7946812b515ec05c90c4eeaa2d SHA512 773bb1d904af1ef1b1df27d59871c006320587f34639ffc606f15c705c0e537dcf7731a4edfbdfb5090e1e07ad4819440f9aad5f0b1b79743ecd565d400d22e7
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/hashie/hashie-4.1.0-r1.ebuild b/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
index 9f66fbf88a1c..45813a6672e2 100644
--- a/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
+++ b/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/activesupport )"
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 180e6a1c8f92..f2534fdf8e1e 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -6,5 +6,5 @@ DIST i18n-1.8.5.tar.gz 67840 BLAKE2B 977bfd086c83f86a47413a5d332f09ee521fc269f4e
 EBUILD i18n-0.7.0-r3.ebuild 1625 BLAKE2B 047cb266a12b698343260e0ff2d2448a95005493672a1e2bad7423c8c69b08c02b596d633864db0fe301c8afb1e82031feee602765bf1c97ee7472e60c72c0f1 SHA512 6427eac2d7f85ebd7d1060d565899a976da63229cf3567b01fdf0357e22b5cc185c6e200b0d2fe219589b031c5377706136dbec7d64c1ba8f5559014f687c91a
 EBUILD i18n-1.7.1.ebuild 1523 BLAKE2B 7b24be876aedd1d5dfeb970f4a407c8aac2099bf521c4ba648e86d6bf1b3adb69405c0d22c34cde7cced16923938d65c0e1f724e98ec56332a6469a2d2c37306 SHA512 61ea946437e2a930ed644be7c84417420e2334819244295deda685440cb5c3dee02becc3f43e5bdef82c29531b8458f7a0baa210e7d4f0051a99795f19c7304e
 EBUILD i18n-1.8.2.ebuild 1524 BLAKE2B 2609711dedf31dff84450a9e28ef7e6a341b4880d96a6320245a7375d340ae33cb126f55c3b0ed9472eb279fd8c24e96774e3d7e69af9d9352559825e1994721 SHA512 0c24dcd977f4344202e53ebd991ab9de6d00247b85d8d56c2a72959bba8a22ebe3c313ed93627dabd6dd8c6de0eb078bcf02b24f71892b5664593c3e17d63d8b
-EBUILD i18n-1.8.5.ebuild 1553 BLAKE2B 3cbb2e7d2361aa5547d1e9a2d0017fcd1c27cd602bc91bceaf0361f55a5db225c8ca4ad89c27768ec1e786e3cfefbbbaa3f6b38297638431d5f1580ac214b478 SHA512 0cccee505dfc87a589c8f369973be3ec6548029e69f2b0f6b545eaa447b4ea08520d25fe04001ff2fc603b179c4b1de4a604e15c4f733e9c01c58a69f4b93091
+EBUILD i18n-1.8.5.ebuild 1565 BLAKE2B fe82f1001a5c6a8ce74de7b50eed8e4bd8291cbf3999096ee567702ec9436bb386f22a81ab565bd922e8adefd947454e1263d0727b852c74d8498df9fcd0ce23 SHA512 3a2c1e3876241ef0e793de794ea059b507ab1a6f8829d6c452a7bcd5ef5e4da115ce5cd3748c9194b3dcdc735e98b1f59b997969d3ab174e93b49ba9fa58b61d
 MISC metadata.xml 340 BLAKE2B fd50e1569f22c70ba423cfd181cdfbad5348aed4ffc751ff04d38db0e3c64ec0e3d7501fd134401337337549509f7501a23e36b8a9bdd99a18a374885f8c8596 SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64
diff --git a/dev-ruby/i18n/i18n-1.8.5.ebuild b/dev-ruby/i18n/i18n-1.8.5.ebuild
index 80d623083010..f25448dde879 100644
--- a/dev-ruby/i18n/i18n-1.8.5.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
diff --git a/dev-ruby/image_processing/Manifest b/dev-ruby/image_processing/Manifest
index b77648316354..8bf2766f7271 100644
--- a/dev-ruby/image_processing/Manifest
+++ b/dev-ruby/image_processing/Manifest
@@ -5,5 +5,5 @@ DIST image_processing-1.12.1.tar.gz 986447 BLAKE2B cd3fa67c7f9890835d86fe669c5aa
 EBUILD image_processing-1.10.3.ebuild 1253 BLAKE2B 248f68b3a1571a435b03fb742b43b1b431749676d39785a9bdc96444e5d77fa9a54b11d7dd23f6a538eb2172b9fe47706fb5a029c073175d375878933f59aacb SHA512 dffc1d21f2788bcd53afb71b8b776dff7766196b3b379e49c4aa3e1ec3852066ba5239c72f561c0064ba11916d061f51be0d7a235ea4bd18c1caada3d99e0cbf
 EBUILD image_processing-1.11.0.ebuild 1253 BLAKE2B 248f68b3a1571a435b03fb742b43b1b431749676d39785a9bdc96444e5d77fa9a54b11d7dd23f6a538eb2172b9fe47706fb5a029c073175d375878933f59aacb SHA512 dffc1d21f2788bcd53afb71b8b776dff7766196b3b379e49c4aa3e1ec3852066ba5239c72f561c0064ba11916d061f51be0d7a235ea4bd18c1caada3d99e0cbf
 EBUILD image_processing-1.12.0.ebuild 1258 BLAKE2B 27f9318f386cec54e81ee9ff490523b660e0db89f6fe3a58780668d54258bf57b18beb85fbd1025aa86d7206239ab1d332007e46513018625003e26efe3e75db SHA512 f556b8e5055262261cdd1ec35f472843d26c8fcebd2e5ebb7d2c1733e0b47da7a7ef2ff45517406c201929c83c5d6181db6527dac36a6b08c6b6352d2bf3cd98
-EBUILD image_processing-1.12.1.ebuild 1258 BLAKE2B 27f9318f386cec54e81ee9ff490523b660e0db89f6fe3a58780668d54258bf57b18beb85fbd1025aa86d7206239ab1d332007e46513018625003e26efe3e75db SHA512 f556b8e5055262261cdd1ec35f472843d26c8fcebd2e5ebb7d2c1733e0b47da7a7ef2ff45517406c201929c83c5d6181db6527dac36a6b08c6b6352d2bf3cd98
+EBUILD image_processing-1.12.1.ebuild 1270 BLAKE2B b49a38c2765b859bb4b942afe57c85ea6a4b55e2a133c9146141fce1a44b052c060c7e62cbc34b21835f2db306a1f8b788d1d2f4a5d3ac0726be020375b11e3d SHA512 495d1822e35103c79e026c4c3aae1fe658101780479e97fb4c6a66a08410725f2dfd83f7817ef73b267c617d3a050219e9bd6cb53b97f5f4c805fd3922355f6a
 MISC metadata.xml 348 BLAKE2B e9ff7002a69662a1f143cd31bf22379fa85f2548c0b1ca4b3e57e833d1f0090323b1e239f4ae53477effa8641a8435049a2835b2f054e90a06bfecd1c72ac536 SHA512 1fb1b17616eb7f7f083461e60823fecdbefeadfe1c3728a7e1ff381a453998164de3a0d64daf3714f079cbb456fba78acd9e09bafc73d2b562b75c5cf2064e96
diff --git a/dev-ruby/image_processing/image_processing-1.12.1.ebuild b/dev-ruby/image_processing/image_processing-1.12.1.ebuild
index b5cac1d48840..2ce41c80f42e 100644
--- a/dev-ruby/image_processing/image_processing-1.12.1.ebuild
+++ b/dev-ruby/image_processing/image_processing-1.12.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/janko/image_processing/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+=" test? ( media-gfx/imagemagick[jpeg,png,tiff] )"
diff --git a/dev-ruby/launchy/Manifest b/dev-ruby/launchy/Manifest
index fb328166fffd..5a090f46aaad 100644
--- a/dev-ruby/launchy/Manifest
+++ b/dev-ruby/launchy/Manifest
@@ -2,5 +2,5 @@ AUX launchy-2.4.2-drop-failing-test.patch 1033 BLAKE2B 77de99bf447ca68eb16bc1030
 DIST launchy-2.4.3.gem 29184 BLAKE2B d6e8e26f37a811fc994ee762791ea9ddb424dc99d23790905f80416734677535aa8b2087eab233dc1535556c240f260c5995185e10642cd682bbe508e3e30654 SHA512 7c3e0377c9a310b2e7a4d1544b4790f6f959d24b6aba91660e979eb943f4bee641e0b5a44687b693ffe99304ceb96a9a6cf9fed142e231af01135bd2b73321d6
 DIST launchy-2.5.0.gem 30208 BLAKE2B 30719f97fdf1bca8a66eb113992c8714103a7fe87262c3677a0fa64b58070593bcbdba7357b81e5bada9e8a143e6601e28ef2d2730f0028fdaecefad23156fd8 SHA512 d80811009155d9cea6a2e69b5f7482aaec7d0bf23ecca4cbe72e440fb4eae1c38bc5904e863998f1966c7a99b98bad1f4456cec1cb076f96f5a99b835448b39f
 EBUILD launchy-2.4.3-r2.ebuild 1098 BLAKE2B 75dd785ed55971e0184afa0128dd38ef722fd3d30cb11ad0d490f370ea39ba0bc2153fc91c91c97ee21a6f19052b0e5ce89b6bb7a44381c2ba1f20325e508a64 SHA512 c954f1f045b0c18e25a204ddaa15e1f6e137b80cf1e0b7db0c91b87ddb5a8bc53aca0f0b919a8f6854520851187535329ffeb6f21544c05f147bad6155808c3a
-EBUILD launchy-2.5.0.ebuild 978 BLAKE2B 45ebd897a57b034d2f49051e54b947554310aff4c67a64f96d28936801aa19482e98cfa63ca69784459cb3f0cf7aefa6b1933bc000a25c363e62e92896b7d04e SHA512 9267faa4fa1a7c2e4f767794745a39558c78bf0882a7a2b62f785a7224449da5dd0d0267c5a61873b6968bfc861b70fae506ee8578f3768a3cfea29f57580472
+EBUILD launchy-2.5.0.ebuild 990 BLAKE2B 019ae492d56b02799d0002c8a4de74939a316a90800dc50e1fe2225a87afa9dd9cf5986caf646e7ac7b520987951c4b65cca4ed475f4af6b0ed9f3a6a4f0e356 SHA512 338e0d6b709920e77f6cec7bdebca5e5804adba7e5cccdfae386e9615ed7308492e54a164742b6186dfaf7d563750f22f56b8f6ed7167018d71116d50cc49796
 MISC metadata.xml 339 BLAKE2B c85b0f849da61909275e94498530be54787a75c970cc607b0f6ac006f67bafeaa459c7704a92a22622e63912fb07f186e3a6e743df8e34ade2d55f56e2c63225 SHA512 bef54e2c7dcd8eb6a6e353b29380cfc53e842a729b584b6a6f6cd423651f390fb8005941c18c005bece74b3de4e68a0201b59151970badf3280e479e9f5e9ec3
diff --git a/dev-ruby/launchy/launchy-2.5.0.ebuild b/dev-ruby/launchy/launchy-2.5.0.ebuild
index 8cf4802c944a..62ac53250ba4 100644
--- a/dev-ruby/launchy/launchy-2.5.0.ebuild
+++ b/dev-ruby/launchy/launchy-2.5.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/copiousfreetime/launchy"
 LICENSE="ISC"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/addressable-2.7"
diff --git a/dev-ruby/minispec-metadata/Manifest b/dev-ruby/minispec-metadata/Manifest
index 129ec67bc5c7..fbd99846872e 100644
--- a/dev-ruby/minispec-metadata/Manifest
+++ b/dev-ruby/minispec-metadata/Manifest
@@ -1,3 +1,3 @@
 DIST minispec-metadata-3.3.1.gem 12288 BLAKE2B fe8b921d7c2927cdd413da29b4953482b8b673c3ad0e997d2fb4f5b1f212e46c1597125378524213a4929fa3db5e6dc75a56a0e42f478cfa0000332b6e1b9073 SHA512 54d08b96f39e3fa7fbffcc4fdb5ef22725af1e3eada333d8a5963304d2d736cb2a6be7166a70a5ae893029fb920a0541d93f0bd7a2e3c51066536a3c02567b75
-EBUILD minispec-metadata-3.3.1.ebuild 550 BLAKE2B 335c85e5c804f87b3393122ea2bfbfd954fb087c0f692cec44636b3cb2e22765fa4fed99288948e7c5a6b6440a94ca8a73d4ed82cb4d599088b4ccfbcc35d205 SHA512 2c677ae6a16f5dffd3eb2addf9b6c26dcf87e7a32fde78be3f758d51dc17e269cc84bf558f1c596cd30ee05b9f03595b3c2a73ea97518a7fa367cc189390ed2d
+EBUILD minispec-metadata-3.3.1.ebuild 562 BLAKE2B fa0018471192c954985dd849b783d79e0c22559f54981759e3ff2d72f6808fb076c0716822ae431f5c6f62c8ea9e647e342340bfdb91fdd8f28783ab28ba6c34 SHA512 32798cb68078c2cac3b5057075508f776e95c82d463e2bea31d159bf0d6c071992bd783b5cb902d14c57044c4bbb71032a472ff1170af4622e5166d02ffc74b1
 MISC metadata.xml 357 BLAKE2B cb7f5883ddf8a050351c3204d9dc3360b556e5214d1a4c29e992977ea9b4649e908f3042c6e8a2e32c40859e1d10c7895b82af7152d8083eda4f039959c2c0e5 SHA512 f639feda224ab962418eb8dbf811bd389cb370a638ca549e4ead958daf36d5561ba739cfccd537acb8d44096193a057419abb90ee78023fad300e2ac8653a86e
diff --git a/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild b/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
index 7c1a496e7957..7e8bf819e44c 100644
--- a/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
+++ b/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/ordinaryzelig/minispec-metadata"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/minitest"
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 704b257cb70e..00778ab099ae 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,7 +1,5 @@
-DIST multi_json-1.13.1.tar.gz 26098 BLAKE2B e82a08a747a092a9094cd7b35b4f933b5ac922a01f45a51b215ca9c4cdb9a083a4808d4bbe67a147ecb57e0b7b7e313c3d896f8cd80c79338c24abc3b90a09f9 SHA512 7c98392bd1c909fcc05249a02a010b561bf6c2d812ae42413d6e8dafa62926d8cb76226ded4c61558a00e5fa531ba33b6f4ef562648c52ba9b552ff7b7e27682
 DIST multi_json-1.14.1.tar.gz 24713 BLAKE2B 188d0fa3bf7a46a6cf4a5aa1d613523b4da3dee5061a5288146d1a367835b255f103dec265da9a218dd6dd21ecb38a7ce35d16a758ac7754b440f52c25f0b703 SHA512 19e2b6704a8ed39b8714da449c8961e740198772718ddba3d3b651f71f2b7d8c2c198d9cc16fe290f1df7b1e54d029c01147fdc431a8d2763944a4de802b89d9
 DIST multi_json-1.15.0.tar.gz 24932 BLAKE2B c99c5c6b152c91dedc38fd24f8697f918064c603bfd72c55213f3ac8afd14d3c0ba31b7c3fb91c9998fcc8a5386f41a6983c53b40119558b99194ba58c06cc91 SHA512 55c873e45cdc59e75823aa031eb6d792cb9dc744b13a682fc279a8375b925db7a984256d61aa5454795a59722794a774a0ed5b6bf518db253152f4af67f46dea
-EBUILD multi_json-1.13.1.ebuild 1909 BLAKE2B f62c99b3440fbd7ed45e9a549e9e83aea7598c89a64182c6db3869b42fb2c70605f8ece22e3357cabef7f39e25dc9208b734c3fbdcecf902c1342b065db30786 SHA512 1c056af470853ff954801e20a048c64bf2fffc3cd1b25b06374194569ff6004d531373503c0e3d1057dac54c4ecf219304f1f9bbdf5ea45abc1b36e14a34f0ba
 EBUILD multi_json-1.14.1.ebuild 1967 BLAKE2B 20b40ce152a90a7d5a0d70c29e18a6a81c2bcbf9a30f0b0f6ab045ecfdc0f7afc19d95f63be2601d8ea3abe44211b59e707f4842db11927f1f21ae3790bba3dc SHA512 ca8d00813f96754d5e3f0d85d7cf0195e335bd2794dc2ccb30cf2cb321e40c0861b6dd47a25335ca8407d1ec3372939a908ac3eca6eda89193f861f1dd912ea4
 EBUILD multi_json-1.15.0.ebuild 1968 BLAKE2B 641843d31c77760261e556a6e8277ca1c64e1400027eeb0ceb2a3243f3f99d5eb4a397637154aee891a40aa4bfdae801343be39b77af82f928756d1a2ac96227 SHA512 ff7a796705cb587ecc1ecb9f2bccbb6f974cdf4f9c01cd54900891e2ffa5ff58d816df4a9457733ef877303317a4b9537f85dfc26639e7a6dc785ce0903fd2a2
 MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.13.1.ebuild b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
deleted file mode 100644
index 7a506ac265ed..000000000000
--- a/dev-ruby/multi_json/multi_json-1.13.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=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A gem to provide swappable JSON backends"
-HOMEPAGE="https://github.com/intridea/multi_json"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )"
-
-ruby_add_bdepend "doc? ( dev-ruby/rspec:3 dev-ruby/yard )"
-
-ruby_add_bdepend "test? ( dev-ruby/json
-	dev-ruby/yajl-ruby )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler."
-
-	# Remove unimportant rspec options not supported by rspec 2.6.
-	rm .rspec || die
-
-	# Remove specs specific to oj since we don't package oj yet.
-	sed -i -e '/defaults to the best available gem/,/^  end/ s:^:#:' \
-		-e '/Oj does not create symbols on parse/,/^    end/ s:^:#:' \
-		-e '/with Oj.default_settings/,/^    end/ s:^:#:' \
-		-e '/using one-shot parser/,/^  end/ s:^:#:' \
-		spec/multi_json_spec.rb
-
-	# Avoid simplecov which only works with ruby 1.9
-	sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die
-
-	# Remove unpackaged and for our purposes unneeded coveralls
-	sed -i -e '/coveralls/d' spec/spec_helper.rb || die
-
-	# Avoid testing unpackaged adapters
-	rm spec/{gson,jr_jackson,oj}_adapter_spec.rb || die
-}
-
-each_ruby_test() {
-	for t in spec/*_spec.rb; do
-		${RUBY} -S rspec-3 ${t} || die
-	done
-}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 2aeb9fc328f5..e7e53d4bbf13 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,5 +1,7 @@
 DIST puppetdb-termini_6.12.0-1stretch_all.deb 21290 BLAKE2B 11bc0a316517190162e7e4e5a2ce05bc880ef8412bfcf5fb66ec68545bd7779e217d5d5e75ab79f24fc6b2f68e1a962262704efb8833fdce84288d060245b898 SHA512 a742825e9f9bacf5726814474b7812393d1a51c50fd710d771c10a9e23c874a465c6859fc17485b66a2c4114ac170f2f25c5ce1be6684ff18f5da31dc9ef0744
 DIST puppetdb-termini_6.13.0-1stretch_all.deb 21296 BLAKE2B 6ef6f82047f293b854e1b0d6db2933e18bc922225d1bb7fe4a3d03d2dbe5da00cdb68e7e3ac35097f466ee21de5a7ed584606684a52c088a9e31abe9fe11d7cf SHA512 bbcf8d2ed996925ead0add6899b266ca9308b01cc12d0dfa6f61956e801a092abf5a01ae4647bf96778f9fe0fa95e17bfae0a3b30576346093651141c1982ebf
+DIST puppetdb-termini_7.0.1-1stretch_all.deb 21154 BLAKE2B 6b64de09d6b6c76395f79acda6322c4221cf58efb03442faee697736faa3fbfc0d3e4e0c0f318a3374a5b6b6844312a469656d3e31a5534f484c568d9d5e7fe1 SHA512 29b0e380d3e62bb714838c7e4dac0e296c69297bd4e4a4097ba006f846eb4166051d0c76195afb0a661e6e34726acbcc858e7897128f1bbe14b99a4ea44a9ff3
 EBUILD puppetdb-termini-6.12.0.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
 EBUILD puppetdb-termini-6.13.0.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
+EBUILD puppetdb-termini-7.0.1.ebuild 665 BLAKE2B 611933cbf3ad90f8e6f11c4b3460d9946519c30ff57b0132d0de9cfab7d243365ab4a3deb10643df19b79cb2bbef878347614e3798544f2494e75f786d8e934b SHA512 613eee0dfa30b09fe2659dd2775d8f1c0f334d5304d153d7965342c0dc610f1402b6e34b60078078d852d031e2b67cc8ef59d952c266caf10bda6dfa5eaa2603
 MISC metadata.xml 366 BLAKE2B f03ce821e0baae11d699365e190751fd1c9d233935e46d31ed9f19105ce6b66b1c4ef56697f5e5581022261e4b45bacd4f04368c3e6f74a12b15ee4dabecf869 SHA512 96ba26c725e5fd36269acc3556a7ad6b89d26010e376ff76cffd2a99481b2d3c9c76595f5ee4cba585c3dd7ac76e121aa4f7fbc0efa80d760748e9f81c998655
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
new file mode 100644
index 000000000000..a7f2b53b2dde
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit unpacker
+
+DESCRIPTION="Library needed to connect puppet to puppetdb"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=""
+DEPEND+=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
+	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
+}
diff --git a/dev-ruby/rails-dom-testing/Manifest b/dev-ruby/rails-dom-testing/Manifest
index 118ab3a3045e..10270df96724 100644
--- a/dev-ruby/rails-dom-testing/Manifest
+++ b/dev-ruby/rails-dom-testing/Manifest
@@ -1,4 +1,4 @@
 DIST rails-dom-testing-2.0.3.gem 14336 BLAKE2B 8740433474e88a7cb5be14b4357dd0b69d45a39972136cfe9a4d695d2478b5b535e2b407eb0acc9ec3abd633cb1f8591a634abe6eacd8ec38bba865ad32ed92e SHA512 910549bd42e6651b7160af0a4aaffbbdeaee829aa7c3f3552a73ba985ef1230d5586f5bf723018f2cd8c6d5c6238d045a8f3e686704b6989e5a56664061f6c72
-EBUILD rails-dom-testing-2.0.3-r1.ebuild 651 BLAKE2B fe79dbcdb440b568e8780aaeca2560654c460279e35a16355e4b1bc6451f3be118c590db301f1421c392af3a42683c1c90a89a2e7a3304d64c67214a31983283 SHA512 e5039f3ba742fe26d588cc46f4857f7f713bb763e1696cc41f9c3136b1b42f81129e4ea5b1ce50337b227d056c242a53f81a44becfc8fdcd637ae667dc07c8e3
+EBUILD rails-dom-testing-2.0.3-r1.ebuild 663 BLAKE2B 83584f644f17bf07f1cde61c2b6385ea7c1c38a5fdf536897acc0e08216b8287bd114bab80172bd378e17c1755e546182fbdb06f659273286f2db1e87210fb53 SHA512 55873c9264bbd7942c84917ea068ef2f1e9b0e2b0d02a73fc820f2035d345472c8c2342e3943ad67cabf65ff4f05767ddbd3d8ff4ccb2166b42a296c8d1212aa
 EBUILD rails-dom-testing-2.0.3.ebuild 662 BLAKE2B cede5ce79ab7f0094f1610fabb1b57548de8bdf835f8a11529fe9f4858b93a52d4e55883c725916de14e0cd2bb8b7b78c8423fc54cbb0bb6b7d8dab07ff4560e SHA512 abb8090adc6c48d2b86eaa7c7ae47f99e53d36e74ac3afafdbaa4b5a898a1610388b9991e97b39aec715c71c30ce0af7927887dd1a5e1667c87d970e075b3a6a
 MISC metadata.xml 350 BLAKE2B 1c2caa318832438e9f00f976edbb95493e9313ecbc0b481cb1ebcbdcac1bd9068eddf8ef6e7becde15efef1e33c6a83a5dcb9b5e20863a6081f10faac65d55a3 SHA512 a0ed76fb694f21c179472ddc7081b3114f9762c65b98cccb47c419dd7626701cbc111205dce3976d54f0fe5811a256da4edd2862bbf075aa62dcc8cd4fbcf21b
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
index e5f104823864..ef731c8a8e82 100644
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
+++ b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/rails-html-sanitizer/Manifest b/dev-ruby/rails-html-sanitizer/Manifest
index d2abbab3987b..ea0e5bcdbc09 100644
--- a/dev-ruby/rails-html-sanitizer/Manifest
+++ b/dev-ruby/rails-html-sanitizer/Manifest
@@ -1,6 +1,6 @@
 DIST rails-html-sanitizer-1.2.0.gem 16384 BLAKE2B f5a5ededf15c199b59dfcd7b2da234f766cd46cf46834b458940d7b68fe27dd97602a6a673d8c0f700cf9c593a8375c97e74da0ac0db355af93bf951540ac368 SHA512 efe006ad2857a21d466375f630fe269cceb78aa467d91cdf193ec5eab8fdb0d58443696989b920840f6aafcb9ddfa6a72972f0e09456b2aa57018d86791cc38f
 DIST rails-html-sanitizer-1.3.0.gem 16384 BLAKE2B ae0b9acfd4ffc53b84b92cb42c149022312112f90d64866de916be2b91b680ecfbbdc94d278626c992cc90b0061705c11c9a604f6d9e91092e1117e40e003e6d SHA512 01d67f750ffc6ac857e4dc47b77d66e02acc4488f353af97e2fc367590fe85107b631aaf8b32f61f9e1f375c93e1b24fbf966f738e35483f5174880a0ffe5ddb
 EBUILD rails-html-sanitizer-1.2.0.ebuild 865 BLAKE2B 2477b5130ed28b474b8744367a486978ed7accf37f79cadaa35fced9884d1bb538c94b145a633ddbbf046ceafec23ca70d4aea1fc6668d967c2ad3a0bff3cd59 SHA512 d4e61578e156fbb01699a1512cb13ca922f7db0f1597853b74be2ca96dc84be19e01e7b44ff946db34bdf1a645b2fd4dafd058c704961bc79d592d742e8659bf
-EBUILD rails-html-sanitizer-1.3.0-r1.ebuild 865 BLAKE2B 9c4c7ef4725ad4b9488784300194593bb0d69ea66c4907966b988876bc5c767d4cba05035ac2c0154b229bd8abf6c2f3326610d1edb8df20a8ea999bb60a841d SHA512 9fc8190a6a7c21e32d5393c6ef2a98b5987781977f4a5648149855b422dd97c594282f834901b7c6de68b1ec3353d9c42750d61c60375ba934675a184bc39739
+EBUILD rails-html-sanitizer-1.3.0-r1.ebuild 877 BLAKE2B 2bc799214a4ce012915610d1841cca4a0546e09acf63a53dd6b61487fe203855f80f596ed5681cd7e633e84aa7517fdd1fd3e001eb49aa68fbac00f91d3beb4b SHA512 f12689e221ded779f61a170de97adee0e921d5a9d2b0f01623b02ea5477d1201fdf51157701c022d43e29a972dc6479d98cb1d4fcd0892d01834d6072e620c4f
 EBUILD rails-html-sanitizer-1.3.0.ebuild 864 BLAKE2B 830d8d376baa7b55a6009ea791f0f9bf43151f665c65faea542d68f5873f7332bdbc73419a55df10b12fe83fc8cf585dd9e790fb384b2422638daf172ef32979 SHA512 f8169dfd5744cf370c1ab1e2ce831b15f5bff4c5279a396897642e25b0e68ea8e2e1d3e9a3b0d65e8f1038b40c5a1bb880401234c4b5ae362e69898bdf207618
 MISC metadata.xml 359 BLAKE2B f227b45aa66e29d5ad9fe902cbd05ff8d41b6ad06ea0acbf812595b936897db899436a788fb0af5143303f0ebe6f18de1f2d265c337e57d616bdbfc7b1fdfcd5 SHA512 a7b934bec0d958559083b417dac76c3ffee71d9efa912b6bab2c2c01e6aa9acf39a46d71fff54a9b750afe6f59a8eb4b12c10b5cbee62fc5f32dab29911f4bd5
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
index 7576409802c8..b96d893f1ddf 100644
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/loofah-2.3:0"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index a6c874daeef2..f5b9825158af 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca337304
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 EBUILD railties-5.2.4.3.ebuild 1677 BLAKE2B d601f23359cdf576011977ff20c04163a20143a9e24248e56afab2eac46824535f9c22df9b8575e7f9bccecbcda201412032fe70a2a89333e901597c81895564 SHA512 5240fec770a505a3f1748ab74f6edb2abbfae76ab6e0323c715aef497a945162f3c15c84aab1da41a7fe39d319f7c0afca2d136d48dae3ab0751915b0655848e
 EBUILD railties-5.2.4.4.ebuild 1677 BLAKE2B d601f23359cdf576011977ff20c04163a20143a9e24248e56afab2eac46824535f9c22df9b8575e7f9bccecbcda201412032fe70a2a89333e901597c81895564 SHA512 5240fec770a505a3f1748ab74f6edb2abbfae76ab6e0323c715aef497a945162f3c15c84aab1da41a7fe39d319f7c0afca2d136d48dae3ab0751915b0655848e
-EBUILD railties-6.0.3.4.ebuild 1632 BLAKE2B 239aba4d98294c747f6e99f720e69cbb79b9f86233c53a68e13b66c0e7bce9cba9b0f5d6c320e25dfe662fd4a99ed823c8037fc952a8930e3dcd467fd11ceb22 SHA512 037e009be08dc68e7fe952260a52ae1207f3c874696caf5a859e45885e589cec30495c741362703c4e08a8981823a4cd102c91fdf382c1d2446c4e1784eed63e
+EBUILD railties-6.0.3.4.ebuild 1644 BLAKE2B 3e67b4f6f883620d2a763ce7fcb7eed2d80cdfaef418ef48457024832e07764d42183dbb96c86674be1f54e92e8c08779ecc7f880f317292fa5a3985236a30ee SHA512 2a00fb68fb7e3908048e97722f8000c5263226e2b64f6aec9d900147ee3720b1e30e55d44dab9291234e3fb440ed491c5d64e6bf8fc4379aa1680ecd82e76d5a
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-6.0.3.4.ebuild b/dev-ruby/railties/railties-6.0.3.4.ebuild
index ac2c8ddd992c..d8cfce5dde5f 100644
--- a/dev-ruby/railties/railties-6.0.3.4.ebuild
+++ b/dev-ruby/railties/railties-6.0.3.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 8c33f4311a69..055527807951 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -4,6 +4,6 @@ DIST regexp_parser-1.8.2.tar.gz 85592 BLAKE2B 55333dbf59606d1f203c84cc3e712ddba9
 DIST regexp_parser-2.0.0.tar.gz 85985 BLAKE2B 6d206de85e85cd5f3f472f6b2cba49bc03aa43fc246af145188c2ebfe3da1c23e0b8b5d307d8902662abcd220b3c7a439825ada2012a09fdfffd9c390865a0d3 SHA512 a896f81988c8fb8074e05abe6c9723a314b147ac2098d11324842b79a8b74ae3a8237ef1ec0f80cadc223c13b06fa0ba231013ffdcd00710381e5c2fc7ebf175
 EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 065940af48ce7c93836019f0a9325e04db4e0ff31f0e9af6a13a637e86ced811bb38cd9c70b971e244df857e1d40b2ed2049fc0321a82141c43478822cac8b04 SHA512 c91492b8ea59137258d941e79659f1f511621c0d7da8af6e6c13aefa39f5473c2881e0893b68a56b428ce8da9a135e20371e4d5e0c6d5fc6996e6a77af5c22e6
 EBUILD regexp_parser-1.7.1.ebuild 876 BLAKE2B 82bacee65732f0f87c38e5f0e6044efb35e628f512de34a1dc55e866ebef3e947c0289c5aaa168fc136b5042e2e8e2af9aa23a77e5acccba5c8899ebd41ad5b6 SHA512 eec1e3db2f3bb6463ca114977281a0f50d5360eb8953e986f7f99a8b7694d817aeefe073e88f23bac4f7fef4eec2be516f457c4fa4d60b2c33dc6bb8d5ae1403
-EBUILD regexp_parser-1.8.2.ebuild 876 BLAKE2B 82bacee65732f0f87c38e5f0e6044efb35e628f512de34a1dc55e866ebef3e947c0289c5aaa168fc136b5042e2e8e2af9aa23a77e5acccba5c8899ebd41ad5b6 SHA512 eec1e3db2f3bb6463ca114977281a0f50d5360eb8953e986f7f99a8b7694d817aeefe073e88f23bac4f7fef4eec2be516f457c4fa4d60b2c33dc6bb8d5ae1403
+EBUILD regexp_parser-1.8.2.ebuild 888 BLAKE2B 5908b7be2be373462cd50b9445e1b111490dc0291dd4b050c2e0015ab6c77ee845b5b8dc0e34c4b223737e983a259dfa46a5c43cc0b10f825f8bb170e5e3168b SHA512 6ae591ed9ffa40bb8440cd05cec581a9a5126a2fe85768a0805d2c2e5b152aef482426a18836d2076e5cef313ce96484c686ab982ddaeb7f2a6f038ff55498d5
 EBUILD regexp_parser-2.0.0.ebuild 888 BLAKE2B f4c4432751aeba693e2d7ef3769b96fdea6ec480a0fb7d0393770cd9c98c32181cbcc12c0dc185e7996f1e4cffc4ceba47123d1246d123456a420316f58e3752 SHA512 18364c915f58475c0ae9175a928d3c033211048ecb33ef0787f5ba3e10416fb619722cd37280f74610ebe49b8c382ef524bebf37a8a9184f3dcf791829a5f708
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
index aac70a0d1954..58632b95a870 100644
--- a/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/regexp_property_values/Manifest b/dev-ruby/regexp_property_values/Manifest
index 377061c6c464..d16e4cc65bee 100644
--- a/dev-ruby/regexp_property_values/Manifest
+++ b/dev-ruby/regexp_property_values/Manifest
@@ -1,3 +1,3 @@
 DIST regexp_property_values-1.0.0.tar.gz 12884 BLAKE2B 82f63d21a1e1508cef79afc2f1b5cca842c1e5bc96b197efa90ec0d02e7bd213cc67ae99f4f71cae6e632e0804fa2d6e935c7d30f27a940c767f5a83dd9edd21 SHA512 f51946d93c255c3b51bfb8055d2c0548c9656db9f208de74b569df8799fa97712a76b509546e149f71e3176ae0e979f295b225c171cedc687e1871f204c1e0d3
-EBUILD regexp_property_values-1.0.0.ebuild 1270 BLAKE2B c2c9c136a08b01620919289499c185d698f526116dc7db35a313248d8eec8d15f4ad2f42bcb52726f696d26c799027f28e6f9e07086b66c8458d61636ffc4d65 SHA512 5bfeba5c9f900d41750f1def93b906df051538e761577479e17662eafd03e2f9e6a952cc6105c0411c234b6ce97d30a37677f4104adbfa4329e84d9ee402c939
+EBUILD regexp_property_values-1.0.0.ebuild 1282 BLAKE2B b2115799ef187e5a65a10230d30069d10cf56f1177672c96b3bb19219f5782ebf9e595bf1a26ae04f3384c382263a8d606c3d2ec45d6f9743b2033bb0265d78f SHA512 005bab690a5ebbabc4bbf6eea355ef2301c62170af84e8fd4474759a469a46be6e6e9d7ade85234ea4db9208785051f25d0ba211c8efd24839c40a4b2a1cfa6f
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
index 04561bc98b76..365b5f3d4e2b 100644
--- a/dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
+++ b/dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/janosch-x/regexp_property_values/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rspectacular/Manifest b/dev-ruby/rspectacular/Manifest
index 1ce43972afb9..c53b185bdbc0 100644
--- a/dev-ruby/rspectacular/Manifest
+++ b/dev-ruby/rspectacular/Manifest
@@ -1,4 +1,4 @@
 DIST rspectacular-0.70.8.gem 16896 BLAKE2B daf9b75be33ccf1b7d60a7aaa540b391578b7f841bb1999c52e566caf8000049d7b2180f372084be18bf4cf367f6c59dba422f187505e42ee6bd66e9431ed11c SHA512 6f048a7781bd672049c10687eede3e2218436ea396438e09814c9239cb07396df25f4b88ab78b98f91c66457c4aceaaf1a1b8aadbff748715a881cadff8dd2e1
-EBUILD rspectacular-0.70.8-r1.ebuild 620 BLAKE2B 8a33142a9ff94d9a7d8f47464bb6a066a5aef18795d4f9a4829b538e30e9a55ddc7556fcb3d9a9b29f3894cca3ec31acc39e1515d2ab53068ddb029740ec4c1a SHA512 a09b250c65f8afd3482dcdb0979fa244d21a85e772b8dea33832ddb31bf6f747b80adf41da1a6d078b2001939bcc813ab424d8561dc97ce2963546b07cd231b5
+EBUILD rspectacular-0.70.8-r1.ebuild 632 BLAKE2B a9dee4b19d9ebc24bd2b6c3346130250209535930000df662a017c85087039530dc789304f7b68ad4724bdf0964c362245046b355185d6adc56c404747426d9b SHA512 4f98bb3941d8108735f81f53a11e74031f2b93aca310cd47db77991d9e8592a5cb7c87b0f649a83571199114a208367adfd5fdc2e9bf62b9f9dd91dbdee87248
 EBUILD rspectacular-0.70.8.ebuild 626 BLAKE2B 7b0f63dae46fe047f61f4ac07b767eb4ca8c09b340bb9c94d5ebad23ddd198ada5367e89a587df1303abfefb3c506c17a76e0198264699324ead3b00e8f1fda5 SHA512 52a6271893be934673418e6e1b64bfe742b7addf08ad3ad15f3a6fc6ba895d2eea3eafa4acdd1a1c7f5c40de4e7cbfe76ec82f60f4b5beecbc3127355edcf17b
 MISC metadata.xml 350 BLAKE2B 478dd5a6b615f4a0ca0217d2fd4daca21b8421cc34c61d4c4356788ed059edf68a0c9b747076060415d7e9a62e17008560f44da4d0909d3f68c50ea77f5629ab SHA512 78e3ba17336c86b92811af99283d12b0bc191a2f06d907d0c792aedc17d5a39d81d00acb4b884f074103cbca587c3961dace871fc82e4a9a3fc6a9190c48b75d
diff --git a/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild b/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
index b40e6bc54350..8d2c24a82dc3 100644
--- a/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
+++ b/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/thekompanee/rspectacular"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2 dev-ruby/shoulda-matchers:3"
diff --git a/dev-ruby/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index f1ff0d2c1072..71855b2c10ac 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-progressbar-1.10.1.tar.gz 53416 BLAKE2B ee435291cd55558843ab05254c01a6148711aee54a5ce80d7b03902e32fd8735fda2e3686794f3f2c8a62c7ca26d90df4d63b48c8d947a471279c35131c49898 SHA512 6cbd791833a1638949c7283b5c475164b44ec8a5d4c7eb417d741da5c9cda9e777481a785f112be7fd1c3714668ad58cbf9aa39eecb61d1022fb3bb35ddb6203
-EBUILD ruby-progressbar-1.10.1-r1.ebuild 1023 BLAKE2B 440afe6ed2a1fcc164215739c179a261bec628b2e6ad3a402b5c653a91d0b136ef62227616b3716fb0dac98de838d6fe7d4b9e647b1b8686bdb625b176499b3e SHA512 35ff25452182e283e6fe757700ed1e8bfa4c4b27064e9d9635dd9cc40f25178671c2d932bfdf959091440d26c264aad46da64b12d4946c389327e8e0d819fb22
+EBUILD ruby-progressbar-1.10.1-r1.ebuild 1035 BLAKE2B b688bd6cc079f202478218f2438231f5e88e53d6b77ab5f5865a7a55516fc1fef2283f4e41f71943843f5b651b8f08ffc0b3f541da9b85d3cc89cbef68f4cd3f SHA512 6e149fd0038dc6a33a5361822e56d8696d9dc45364652d1697358779ab0082e59c0ae37375869130b6f29ad234dd66fe1dd6931e1ce91d6279b0b8061930f59c
 EBUILD ruby-progressbar-1.10.1.ebuild 1029 BLAKE2B 24093411f6bdcf8e8cd93761d889682edcd462d898b558b656a4536f0420f3c89f14c67ce118f64511cd930fe378cca809a872a785274794eada2a07afe1cdb6 SHA512 82a8e0d8e9b0641a832d4b2a1f77d73e88178580729fc897b5c6cb69b140eacee5c862980575cf97cb1e8f647902e9870d0bb06ada04f7a84d1d077656cc1a74
 MISC metadata.xml 352 BLAKE2B a36b436c51b56ed96a170c6edaff16655ff0d3b42f2cc6b13e67c252f89e2d56c47ce0c69fd693acc9ddab9a755a5fbf5d72e360f2e6a16bc0117148eb7a25ef SHA512 a572b7825c4e778c503bfa3bb1b82d4d91c28285578c614a8a0c62bdf1967f307645c92f0101a4898baa0ebeac9a26455e459b2440db6989593c0cc4472df616
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
index 9a3af0575d9d..bf18d30bc5b7 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
@@ -21,7 +21,7 @@ RUBY_S="ruby-progressbar-releases-v${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 7a7ab1c1d8df..e316ef27c315 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,6 +1,6 @@
 DIST selenium-webdriver-3.142.6.gem 864768 BLAKE2B 6d48561c4d50c64936cc0ec55a3f777723062f8ea1fb08f345e2c84d0080dd6a04b09e13caa23b77041c91dd2de9ae80980562f5f3a286992f0296a8e19adc75 SHA512 1a34c504214ac662195a6d0addcda8fc2de6d863aa367fd9d9b973bf7dd44699e4776fb52cf7c3dbaa16ebd87c427bac6c3747ad469a5b07e4cace7e02416e33
 DIST selenium-webdriver-3.142.7.gem 865280 BLAKE2B 650011848afaa3ea4fab7c8172828c7562df212383a8fbea9615a5136e3382aba0fcf17952d941c7b514e5229c0aafe3dbc320386698eb8756f567eff67722bd SHA512 0e7891c19b8a0b20441d85bc17032ecf03cba7ca435846e03abc50b62b0c53c075dc70456796c9bfcd1ecd28ecc517f907a3d6868346a07617fd1d0c1b9437c0
 EBUILD selenium-webdriver-3.142.6.ebuild 914 BLAKE2B 0d9273090a43a66c935e7e8d0844e910a68b5756f6f7d67f46786520b15dfdcdd33e6682a17a86c2c72721a85002364141efbbae2222334ea4e4978fb516315b SHA512 5e19bde871553bcd9c45207dbf6030c25ba1370cc32361f12286cccd13ed7de7e659aea31f2d817a76f072867f3eababf6634cd5c78a984f5271e70ab3aca531
-EBUILD selenium-webdriver-3.142.7-r1.ebuild 1093 BLAKE2B 72f999e934e51e8e73389740edeb5040b18c578e742e55676ec02cc7937fe55515c62afb0cd7fe6c82392603edd6ff80d1f4183af3bed2ae2eacf78c0ccbff8b SHA512 e85ff1cd2d82afe0fb2ba907be237a3713963c224f6fa2197beb69f9b920930aa22c1b3117c427c41347eccf57eff3d410c8cbbf96c85dca7abf018dea4650f0
+EBUILD selenium-webdriver-3.142.7-r1.ebuild 1105 BLAKE2B fbd7aec91d8f5eae4a45a29c01309d7facc0e3a73ffeae3fc3a5c81b3ed551d2fbe70f61ec52225f07fa709c80eea8bec13153ac7a1484d6334b8df752c2e74c SHA512 fcc13f25d587994c569c9f7ae6da5430d50a032a7ee13fdd5010d4c9de0da97cbb188760adc059bdc2e15ba6568ee4ac18c0a82af61053b7d425f26300f2f8b9
 EBUILD selenium-webdriver-3.142.7.ebuild 922 BLAKE2B b41dedf18bc905f1b30edb8396f005255331694a8fb064d4c966671c0031525b7d5c13166baa57c5346b3af5a578d5a38ffb23f2dffeb2d3e83234aa4ca8949f SHA512 92405c0e556374d125de5025731ae09ab988ba8658fd47d14c457b601185e3552f13cf266af280bbd4905c41e37c816fd366139859d67c3f302baa1808228faa
 MISC metadata.xml 335 BLAKE2B 374e7e6bdf450e60792ad3960c2c0fe8ab87f70c34ca76332bbbc632598354e2a774e4eba46434e9b7c85c7f5eee7086ac85268ae58bddea7d75713d9d2f014a SHA512 94e17dd297f6904f1b70709dba5f5612fcc42e9e0e57695df6d37344cc9a89c13b423e41d142631444990ff39367eb6132d6b070bcdbf256ae00e932cadc67e2
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild
index 629bc87f53d5..443cbb2b93fc 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://github.com/seleniumhq/selenium"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/childprocess-0.5:2
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index d1fe7204b132..203997669e0a 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -1,9 +1,9 @@
 DIST shoulda-matchers-3.1.3.gem 208384 BLAKE2B 0ce7cb91ec8a311ecd4872ca45b178686fedb126fd5a05d55cc8654f5a40d1ed7e0a1da2b2c47c34ce3e5ed13a302a1d309f4afa67bafb37d5ed8a724945e97f SHA512 c61397d20724f3048172a8a20ef8abaeafdba3a1d5d4b923b1b11480b25c70820fd372eb2851c6eb307894bc0b7e1aae515e23a3581a83db1b65a2c778b22d67
 DIST shoulda-matchers-4.3.0.tar.gz 235212 BLAKE2B 03d634a851d5b79baac7fb3c5017be2ba8ce5b36905597eb759ea6ed22d543af5ce02c0c2af0f560d913d17713a8b3c417770adb7f247a6548d0666164e0866f SHA512 ffc90760ec47502d0820decfb8ab0620fa65fd9f45f3435c1d905ce0fe96010a3e059c690e9dbab7b30146b09a9e511ed4687a220d7cdf000f2fe1060e0b5ada
 DIST shoulda-matchers-4.4.1.tar.gz 240423 BLAKE2B 5fca9389601f35c536fa8a37adc6a14282fdb4aba21453223d739e503fc226c74473791880d2fc0b4f308bf9deccc1bd640c320e86f586f075b5d1add69e33f2 SHA512 3103bbad862848d00f9ab8c71c20fef1fdc131c6ed13a5d6ae9e11c3da8ecd2aa09e5996f8b28ad08a5588b02ab5783dcc37d04357d13357ea3fa8ca28a02e3d
-EBUILD shoulda-matchers-3.1.3-r1.ebuild 523 BLAKE2B b66370893f63474e0b3cfd9aea37c97fcbfe9dd8cd92b707dfd678d187a2a9c63051914b18adb1042788af1f3892f5f9685556a67ef336104ad54a667af55b05 SHA512 339333a43b20cb5a0389e18003eb3b696ce818f5fa7d7c09a5c24ed8213641abd89686908f7f5043e6bf6379eafff6ac3f92b417ffbaa82c1bc2c86ef42a4dab
+EBUILD shoulda-matchers-3.1.3-r1.ebuild 535 BLAKE2B 1d70372e32dffd151239cf5b9b6b4b9baa93a24710efaaf00dac928702d33d64e9f19933a839a5d532fc37c6f2d11b3bd4daba08e377692c642876b42f250797 SHA512 a57717479260da7b69335404c7100b9c36929815b8c1e18ac9a3dff332a856b91de4b350450f74388886701af03af5843e66e00ff333ddad660b9bda5d73b131
 EBUILD shoulda-matchers-3.1.3.ebuild 529 BLAKE2B 8e86c34cb17d6cee8e2a6f139eb4337671ce57f38c0132568874c7f79d0784f4609d30684df3e4a0bed5eba750684f6de31f86be44f9369769c9a9d515cf01ed SHA512 2bac2b7f6d1bbc17aa01a98bb244212af4b90905b7a1516ae5f0e4a3a6b33f67cceb17de2064675e4711565ed6b24e1f7fca5679402723d8f795c72000c58a33
 EBUILD shoulda-matchers-4.3.0-r1.ebuild 816 BLAKE2B e1d68caae2340c23b4abaf0691a3aedbae59bb29357417616d998e724d83f07fff075a2aee58954924d3c7449b096cf499290dd00d1e6e5ba87815e4f415545b SHA512 d1e6b7955f15d523c19a135d5de795b384cf5f81de2045354936a86506aca541017fcad00cb28fb1e825275d3deb3ae3f6be4a4fd81769767edba61eea6aeaf3
 EBUILD shoulda-matchers-4.3.0.ebuild 815 BLAKE2B b0659e19572024e2db6db9a4620756f856c110526c5d1e2d8a398322b71fb38cd43453ab40214279ba5cd0d55007b73e8fe195656911515c17ea1fde2e1768d1 SHA512 3eede673c7b40c5f0a245e8c3d5d45bff86c050e430d4df0ae36c0aac252f49fd69939542406d4d6a1212832e58da315fc270a8f0369858e740aeb22946105d1
-EBUILD shoulda-matchers-4.4.1.ebuild 815 BLAKE2B 1cc8c1e6b68e7ae556a68174a0d934c6c185cedbbcd0f6cd11d39691b655b5bef05854de5d236f8c23398b2e831b18afffbbdebeedd125051debd6527f3f3739 SHA512 7298fe5e7a52c09e57b8e0026b95d11d874b4414ff69863f79f5a8bd04f06782993ffae33434548f47054578224b98e54a88c98c00b14241d440965acb481486
+EBUILD shoulda-matchers-4.4.1.ebuild 827 BLAKE2B 11bee72906fd00ea2d2a27ceb0de995f0da58525a1d05d7a11a3207974d4c69c4d4ef99e051f2b789756900975a4ba97a986d0ad1b5103507e6a351966be62b5 SHA512 393f70eed0992172d26da975fa7eb06c47552d3bdff86af1cecdf29a714cd58106c9d17f456332469c3d09af0d4e4cee0f88b035f77d0ed0b8c1486858ff0fd4
 MISC metadata.xml 467 BLAKE2B b4a8138623dc83ab8a5fa10d6242f3d04d20ce4e15b0abb00f678600212063ce8653f3644c3a98d0186d4bdf53d042ba7f7bc1d1bdb699501d8a7e1aa7fb36b7 SHA512 d3ba695c8bfd835a472f35442b16057a73219d9b320276823843b65f00f18d8cfd7fe7f814abf458bdaa945751883a5f490d0f7a02a1c200d99fcfb51a57a400
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild
index b0b00c69bd9a..f89418029a20 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/activesupport-4.0.0:*"
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild
index 217fd3c9ac0a..93c08dbdac1e 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 64060dadb499..539cd2bc6207 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -2,5 +2,5 @@ DIST sinatra-2.0.8.1.tar.gz 507102 BLAKE2B 7b88f50b2b2960c17aaa4f0ffbffaf70ece16
 DIST sinatra-2.1.0.tar.gz 511138 BLAKE2B 05eea600695abf6ee9b2ef0eb2a215c106ac45a343a60017f2cdf8aba8733c1ba5c55235a9c35a4665659797754f78e28d6b8fb1e24391e99a2336ee150bacff SHA512 7127593bd44a5648407631f05d5db04100db30ae862c37e22dc264025fe271336c25df3c47839e41ba200da98be6c7b985852cd53d494a8bbda90fe701a89fe0
 EBUILD sinatra-2.0.8.1-r1.ebuild 965 BLAKE2B 0a64a2f5754ef61d56a2acd3963ef5ffe0eabe5fff57711c90fca4b11fcc0def0ab27ca2c6ff5ba9b7e123764b4e8b37986e129dc2817c9c13eafc45b610de15 SHA512 616fb56643374b0cb9ee63abb60c9de154e86b5028090654770717a6fdd4d0435409a4aec21a334a9619049f2a83e33f42b9971f8718a4a47e332526606599ae
 EBUILD sinatra-2.0.8.1.ebuild 859 BLAKE2B 5d93b3d9572ba4874322b52f35324de551436de0185051b44b7afc161983ac681aa2f5c6b4d3c57c077b93fb37bfb16b732c7c8e6e405b892524786d7530f817 SHA512 340e52ab29f857541ff5f48e1fd66c6cacf40c8d2bc831f9385d6c5df0b149e256bb2ca012cd28b958ee197c8b7c25ab1d1b042e515fa3c6c1dae21644630947
-EBUILD sinatra-2.1.0.ebuild 854 BLAKE2B c1b90704b400fd931f6e5639854d20bc3ba19b0a41487eb7c53eac1227ce9d294df7a74a6d3757207d7f1350079e79a976221c90ad85bd68bf1b4d95d29674ef SHA512 27338b1e5dbcfad54d279d07a54ba4d11c32ac2de21c7bacd2528fa7c10a5fd5bdf8f256920e913d58d410f498b827d7613ee22b6abab4914dd954936f6e19c9
+EBUILD sinatra-2.1.0.ebuild 866 BLAKE2B 1524851a8ca52edbffd1bd00e47071af353cffda4d5e8795ab1f8ed5d8f5e836458905caa79e2d227d40f50f41cb568abfb80af9125fd3fc30803a40508fecba SHA512 3bf5873d2852eda090e57898ba2bff5caa451fca40935f57c285d185e8dcbd4fcfa5fe13d496cb8ff49426ccbd7cec0403a0e1270404b8270ef28ecfd4278c77
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sinatra/sinatra-2.1.0.ebuild b/dev-ruby/sinatra/sinatra-2.1.0.ebuild
index 601a0f85a37c..5a0f52662ef0 100644
--- a/dev-ruby/sinatra/sinatra-2.1.0.ebuild
+++ b/dev-ruby/sinatra/sinatra-2.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/xpath/Manifest b/dev-ruby/xpath/Manifest
index 6548fac130f0..d0080308568b 100644
--- a/dev-ruby/xpath/Manifest
+++ b/dev-ruby/xpath/Manifest
@@ -1,3 +1,3 @@
 DIST xpath-3.2.0.gem 14336 BLAKE2B a7e1927fe8831669171e4ffa4677d33fb2276820742596d20f7cadc47f0a523b1b438d7568c195119259c8e2f9f49e3bdf1bc224001f7e215a4a02af1e84e142 SHA512 2059938387f4d1656867457a480182bd73e02f265071a394472122aea0b5b4fb0af985ec5be513d2425cf1c341bf18c3cfb67616ba02e30ce6331879964dedc3
-EBUILD xpath-3.2.0.ebuild 586 BLAKE2B 6c90652674ce95d31990025179dea2b71ea5e476a4f6640b4d5b678f4735c24db04caa157a8d0b9bc16edb4a27ab185648b16a2b883e1f0d46ef2477e02cdee9 SHA512 dc6b0c6ae51233504ddec696e50b137427380102d76e39a8b63342bec16b0f3b20400a2c47440e34db0421f0fdbea223232da09ee21e2135165dac8f52263eaf
+EBUILD xpath-3.2.0.ebuild 598 BLAKE2B 689291c1d52bb3781c6754df8cf998aa403ad84bc948d2cababc9c14aa7d0935dcffbd461da9626c013d1598ea37130c304572116142662b474c92dab51ac5f5 SHA512 af209d4ab28721da5c7ec7f0a2f97c56d5f04e195c6afad578ce332041802dbbf03ffe500753256c94b9fbd682060a4ffeac2ba0cf0cc46ec05a93a4228eea71
 MISC metadata.xml 340 BLAKE2B 6426c5c5b6a61a7df860473b9636c072c43fde9a6bb986f4504a438abe4b86766934ea99eb001d42b308a2af778dabaa24b3edd5d12dde519029758e1609f766 SHA512 6b3fd82cb8cdcb55a98ede899602193acceabde52e93125adb02f0212b646273dc345867cd2c561de43afee480a19fcd4ee9e8a96287d43278877d4dca543e6a
diff --git a/dev-ruby/xpath/xpath-3.2.0.ebuild b/dev-ruby/xpath/xpath-3.2.0.ebuild
index 91a655c92300..53e37aa74684 100644
--- a/dev-ruby/xpath/xpath-3.2.0.ebuild
+++ b/dev-ruby/xpath/xpath-3.2.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="XPath is a Ruby DSL around a subset of XPath 1.0"
 HOMEPAGE="https://github.com/jnicklas/xpath"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 SLOT="3"
 IUSE=""
 
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index 232ff9883df8..c90e081679b6 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -5,5 +5,5 @@ DIST zeitwerk-2.4.2.tar.gz 99974 BLAKE2B 5913561057a6d5cd9bfa4eb549770ca18de3aaf
 EBUILD zeitwerk-2.3.1.ebuild 876 BLAKE2B cc0e637768e8add326ab61a654f1560af942de5c47c2492bbe5f4bf97032a9b3e5d7e7599e35331f92c6958c9ed68c816951445206f5ab24b84e6c5d74c2cb05 SHA512 7819df13cce152c5f21855db120b0df575766f484b29dd4b9276fcb11fd558e668c6d2f2b11718cb0cfdc23b18951f1b173747d559733583cf7f34695059fcaa
 EBUILD zeitwerk-2.4.0.ebuild 876 BLAKE2B cc0e637768e8add326ab61a654f1560af942de5c47c2492bbe5f4bf97032a9b3e5d7e7599e35331f92c6958c9ed68c816951445206f5ab24b84e6c5d74c2cb05 SHA512 7819df13cce152c5f21855db120b0df575766f484b29dd4b9276fcb11fd558e668c6d2f2b11718cb0cfdc23b18951f1b173747d559733583cf7f34695059fcaa
 EBUILD zeitwerk-2.4.1.ebuild 876 BLAKE2B cc0e637768e8add326ab61a654f1560af942de5c47c2492bbe5f4bf97032a9b3e5d7e7599e35331f92c6958c9ed68c816951445206f5ab24b84e6c5d74c2cb05 SHA512 7819df13cce152c5f21855db120b0df575766f484b29dd4b9276fcb11fd558e668c6d2f2b11718cb0cfdc23b18951f1b173747d559733583cf7f34695059fcaa
-EBUILD zeitwerk-2.4.2.ebuild 876 BLAKE2B cc0e637768e8add326ab61a654f1560af942de5c47c2492bbe5f4bf97032a9b3e5d7e7599e35331f92c6958c9ed68c816951445206f5ab24b84e6c5d74c2cb05 SHA512 7819df13cce152c5f21855db120b0df575766f484b29dd4b9276fcb11fd558e668c6d2f2b11718cb0cfdc23b18951f1b173747d559733583cf7f34695059fcaa
+EBUILD zeitwerk-2.4.2.ebuild 888 BLAKE2B b6aa39db8682e158fec51187d7ac5aabb321c9d02a6b271ce6a7da9359fb3b035906f46ed5f46cebfe74ef2e9fc271adcca1f7e2ce73fde1c2c27b1d9eb136cf SHA512 047db4053daf22021c1283291575cc8d6dde82a9cedcda88af9298c11d07aec9c7b85b23ab9818d2c8e75a366b6155b8fb0e8eb767f5ef6f8e918c3665cbf7b3
 MISC metadata.xml 640 BLAKE2B cdf101dca54d96dc5ce6713aecadb42050e945341cb19ff14088a258384259e5dc4d1668e2a8b161d787d21f79cd8a7c8cbdb47c10997e6ecc3b2ce7ec41497c SHA512 50b6eacea9ea202e3ff44b18046b5db26c5d4ed381664af46f9fecfdedcd69cb470fcc35010a747a21dbaebe1a8360b2f37d43aa22fbba31666704cdd9f39a48
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
index 827d557e2223..195751178c4e 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler )"
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index cabdd4734c08..5c2bab22f37c 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
index 6aae7904eafd..b33282f2b56b 100644
--- a/dev-tcltk/tcllib/Manifest
+++ b/dev-tcltk/tcllib/Manifest
@@ -3,5 +3,5 @@ AUX tcllib-1.20-test.patch 6599 BLAKE2B ebbbb624b0d214d6e0f9aa61b968f4133abbe8e1
 DIST tcllib-1.19.tar.xz 6298564 BLAKE2B f137227004dd4acded7c8aae6b36fd50fedee67a725ecef0046f1af7abc7bb8e11207a141e15390a6ce3a1a3914b1cd2e5a798035eba631254792b2819383013 SHA512 08f549a3513316919c61f015a604aa671a73c0fd59a8a20b916d106e7d7d6f4bd59b485a92307778cfea1b00f78c2972a086b1bf960fe85a26fe273b7ada8d12
 DIST tcllib-1.20.tar.xz 6692664 BLAKE2B 3e70cf0d0f9e469a20e18f84238f56a53b5b8e36abcf418dc32f64c819728968d24e2999705d91d8341cb608a6bb674a063e86253cddfb51f2693a94d0e070e5 SHA512 d2c20642f91cdc7bf3b329025be80eb9288d0919fa439c2066349b52950cf3c343f39c7745b9b08ec28a884ff2f219fe0fb5f47023f1266b6a6de6ae54852412
 EBUILD tcllib-1.19.ebuild 1219 BLAKE2B 6eae3d390eac5b17e5cd160b173f779098a02b05f44d3758d78cb226877f4a108dc7b7a2a69099318f4952983324dc3cb9cac6497410af64c7ff28ebb97e3c99 SHA512 5cfe773b4f81507db98941b1524e4fb30db393c6804d6f746e5c2db3a3e79e8e859c15e9b4dc1453d16ab97d90bb5dce2ed333bf1fb6e082630e6c83d88c20e4
-EBUILD tcllib-1.20.ebuild 911 BLAKE2B 3ea1532482cb47a11ce02ca55c33d6fe20321ff8e6a5e09f5283eb7a4b208072e6b51bf1019329187c660688360754af3ee448fdb3d423f840d5c47847f097e8 SHA512 279dc211757a6c057d8b2b4286408924a3dfb4ff36b728272fb982e3d1be34670131220dfe5154c77e0cebb1c0b741179999dcf6071d89075a3664675b728133
+EBUILD tcllib-1.20.ebuild 910 BLAKE2B b9d443f48b7c867173699082b73d7dfa90083d9f24dfd3c302bf2f319090b90f747a6f523195e1e77c927ceb311894e5ecd9af95eb6058166c92c0a7467ab380 SHA512 008c790c8ae746c75847f8506398caa5bab63c54864ab6ce2637e9d6d4090267d4fa557f3a97e427f42847005dce2dc43e42f86ffad6c3ba15158ba1db9847da
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/tcllib/tcllib-1.20.ebuild b/dev-tcltk/tcllib/tcllib-1.20.ebuild
index e3b15f8c4348..28e555d14893 100644
--- a/dev-tcltk/tcllib/tcllib-1.20.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 IUSE="examples"
-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"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 118a32e25248..3a4b45726541 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest
index 51432b44fc5e..a96b6447577c 100644
--- a/dev-tex/biber/Manifest
+++ b/dev-tex/biber/Manifest
@@ -2,5 +2,5 @@ AUX biber-2.7-drop-mozilla-ca.patch 5146 BLAKE2B 4380345c27ea3e3a23c787a820486b7
 DIST biber-2.12.tar.gz 1323440 BLAKE2B 9f124e1bdbfaeba6e3072c6e797d47eef50e4efe419b490975df0a25fa802f5f44a1c246d9c0bcf860767c35e1a399caf088b33223d0267286e0a5f064be7a63 SHA512 72f1a05224dc2735b32e92ac376d392fb631bf788a15de449471fdc5a94182ad4434ce71f95281e4cfc3a06cd275d2ff98e526d540c2979cd3e0dfa15b5c75ff
 DIST biber-2.14.tar.gz 1589847 BLAKE2B a5f2c1ebbcde68c8ec28d54f10f9217e710c0bb840f455fea2516441653d308666ec3e9c1732f3211f0b205952d59b63d87fe8baf6f846776c781555884730a5 SHA512 dd42aabdb8f469ea759a4a7bb97cbe27ebe57e46d1b6dde7d293d1b046a55e20ac889bf9c8c6b6219ee827b162a280bf7aca239af1f357ee1ccc90600a5dcfc1
 EBUILD biber-2.12.ebuild 1738 BLAKE2B 1a724077c2168c65ac02e6c5d04c3fcafab1317a35a9e5dc0fc134ff94310d8106b20dbeb70944f88a32f2a296b00dbe54e105c144174e48047887273f243716 SHA512 6333bf2e61e71da389b4beea9aa3466861682b37c9aa79971e5ffc6e80bcad065df6ca5a7a0be135b44c78be4a0f4fb7f699a34dfecde1f22c2c08038e67514c
-EBUILD biber-2.14.ebuild 1728 BLAKE2B 1fe53d333ec5bd3ddd0d08190d116a5fb5a6e518c6460cb78a5b1663f983045166afcd7f46ff920a1c0350ab010a1264f29167a7d81488c3124018df6dd458c3 SHA512 512e6af60f0b081e09af4cfa1bdb81bafacd552b16396288c9b865f94bc5078b59cabe2c264b39fabd0d5e99cf7b875de71555179f1d284314494127cb94aa5d
+EBUILD biber-2.14.ebuild 1727 BLAKE2B a06540c0fcd5e28d97566a2ae8ae5045c48091d8683a9b283ad0bc266ce2694c3b7cbcc05b7c4c4fe03f62fe9059c6277621cd677521696e548c1140cd1582f0 SHA512 f3e7891dad50f6145681888cb215ff802be5e39f694869735a6636e4163548056c5b7a14175f525a9b1ed78fc4b0943603a528a63ee8403ba07142be5eebe415
 MISC metadata.xml 498 BLAKE2B 0636fcce7046ba43b2b56c0a793b61e444e83ee7255212c5bf38f21cd89a642c92dc81b55ef34bec16bdf4a0141b824334d5b86eee8cfb562e5ba1af826f43c0 SHA512 f0b734bd7a376c3e3cbabfebe5675dc98cedf5c63c3f6b2e98079fd75eb9d64975fed2f36a618b6a6f23e4b759ad497b6b19cd28d1f8c6bb7386a4aedeedf967
diff --git a/dev-tex/biber/biber-2.14.ebuild b/dev-tex/biber/biber-2.14.ebuild
index a307066b4c96..0eb846f6d9a1 100644
--- a/dev-tex/biber/biber-2.14.ebuild
+++ b/dev-tex/biber/biber-2.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/plk/biber/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tex/biblatex/Manifest b/dev-tex/biblatex/Manifest
index 0a8794d46422..6e9bb0462dc8 100644
--- a/dev-tex/biblatex/Manifest
+++ b/dev-tex/biblatex/Manifest
@@ -1,5 +1,5 @@
 DIST biblatex-3.12.tds.tgz 19858631 BLAKE2B f98d3e0e591eb27b2eccb0a5ed1eee5bd3ace87af7e25938bf66fd946b4980f31304f480e875843c7e60171678c37b86c224c5b8d413abb981562c28c82293b0 SHA512 dfc191a139868248d64f12d588b9879d2921b9a35b8af32e8297173bf1acf4aed81cf300aa0cd4ab5af2a75cd84a46fc48774bc39d54ba38340e3b5336203c45
 DIST biblatex-3.14.tds.tgz 20047529 BLAKE2B e7d058050277d542233be957a0b3b7cff7ff3de99cd8ab1f54c8ad5477005f2622f5f50613f1bef969664603b1deebb4e02315ec6ddb47280b739a37e3347e55 SHA512 2d28ba0be1484e83de9f71fb8c759cd7522b5d933708b7c2bfd9cab5790620634965d5c5e92234f42b15a44180f53f2e38e3fad4b899f23011f0dde8d376f660
 EBUILD biblatex-3.12.ebuild 941 BLAKE2B 9707537db74783677f69f794408f0a7f0ce786ce862f0dc84a3db413896c40f9265d1260a7c09fb578581d959e3c01a0bea28894812ddc8c176b18ddf3361408 SHA512 953443fb09fdccefb05d1e506141f7ed0f00b19a6268c26004ac0d960e6900e3c1f4c2f39a35f7d722eac12fd8ab84fd7718ab1072de3b7fa37c4954966f031a
-EBUILD biblatex-3.14.ebuild 942 BLAKE2B db5ee85c0898280786499757d973968013fd767b3c218a7e7baf1ad1e4487a3fc3c0bc3e251b1edeb4cf2e57133ff9d90de74eb4120216d955f1cd5846469e68 SHA512 f9eff314932257f92575e496ceb2483a3d9a410e8939aed21d2b83b7cb8528eeedbb2e72ae840c4c5f0e544a07c17d7c63ff16ab9704d9844e4cdae89cd83d42
+EBUILD biblatex-3.14.ebuild 941 BLAKE2B 8e6ac93ebb569c466575890d294d7d038389e4e4ac1c60fc2362bf2e64cc83e04165718a8070b38c0b89be0147d2c142cf5ba87bcdfbf410ef17aeb2c51b36a1 SHA512 35813f7d5bf59d0d77db766e5fe79286c184692f36731a487ae053c9ddaaedde04dbefe05344f64904d56c2700da917a19f3d41099e5a789de4563a2d1d45391
 MISC metadata.xml 471 BLAKE2B 3dbb8d0950ee77e96dca4706be13da9affd195b7a3dc739cc61ce3fc1a3f70e90b3ad5130d167c71340b6d14e7365f7cf76ed5e0a61a05194a642d8bc505a685 SHA512 b47b664606a1c9d1d1a45e13f52d06b2a140209003c7002b54b9322f84e688e2a10a5b9c0185114059a8ba826a1afeb4649ac29391dc819f80d8a49c89be9cfe
diff --git a/dev-tex/biblatex/biblatex-3.14.ebuild b/dev-tex/biblatex/biblatex-3.14.ebuild
index 1a0ecc11fc9a..d821b64c0d4d 100644
--- a/dev-tex/biblatex/biblatex-3.14.ebuild
+++ b/dev-tex/biblatex/biblatex-3.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tds.tgz"
 
 LICENSE="LPPL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="+biber doc examples"
 
 DEPEND="dev-texlive/texlive-bibtexextra
diff --git a/dev-tex/hevea/Manifest b/dev-tex/hevea/Manifest
index a4f2d963ecd9..649dab13c5e6 100644
--- a/dev-tex/hevea/Manifest
+++ b/dev-tex/hevea/Manifest
@@ -1,7 +1,3 @@
-DIST hevea-2.29.tar.gz 969599 BLAKE2B 88724c0a1a139d370fa852af473e4f21f7c1f8a8ed79cf0a59fa6098d63a3956423f7b1403316aa2e296b00d77ddc529938f98476243795b6a00971532918d90 SHA512 4ea2f3d60fd43d183712a868cb3894b38f6d9809ba7905d69123a7672faba0d6dfe73ad1379d7996ede98ceb645bba903e5b7550bdf92e7950ce69ba7f4f3994
-DIST hevea-2.30.tar.gz 965635 BLAKE2B 7f23c6f793be1515b689571f0ae25d76d45c7bd8df9cc6fe1f73697b34dec598f64b0ed30e4b2cd5e456990c80ac0bba50c60e0294a825c6a0af59b228456cbd SHA512 75c700e009070bff4845ccc6f984ade8068f90ea78630a2e6ab1d27618a225a4bbbb7c4aa07c08be03094ddad4aac5d0c9e83fa01d41ff501f5c1eed9f4428eb
 DIST hevea-2.31.tar.gz 965678 BLAKE2B 770a3ff5b3e209d1e34e68647baffc064cb78f63a610e6b81181a829837861984f22e381cc17c34a3b0b4643c260a5cb84841cd8e2038e40083bba7ffbdab929 SHA512 4b66030f69b8b60750f8e62a9d81240b0ba399af8af69df10b33742e10d23fe7aef3e7782265fac9705f27715e5964debd47b9da7a394f70fda947b5fcd2d6ea
-EBUILD hevea-2.29.ebuild 1399 BLAKE2B b292b879fffbb1bfcc25cd391948575dcf258138ac1894f3e667c77666bb87d966c87725b3f91e23814bd34914eb932edb0679a27a206fde62640d770e95f6c1 SHA512 0d234ea448643a386d84df7add23c65f8be2367bdb9b068aab4864ba5e300082419ab1356fd7eefeaf81b2f1bf6d8fa91a8117163d10599efa0bc0450312cf19
-EBUILD hevea-2.30.ebuild 1402 BLAKE2B a1c8918296823122ad0d80282305389e9b76f79d06e35d56be2ccb1448500f73ca58073a1915725d22d1aec97248a8fbb260025799e5d36579391a25617fbea7 SHA512 cab09c6eca6883ff939229219f99966e775d595405371eef40a1b7ca2706b97b88ed3414cd7a6e92a0a67ad1c03353c71583372a7f6fb310c8873c8da1418269
-EBUILD hevea-2.31.ebuild 1397 BLAKE2B 626d89eb778519de4a635fd04e1abb997299713e198f41f6094a88df55b53859a6d67fa97e5be711dee6132698dea797544a4a00f18b5eef36f9a5b8014b14d0 SHA512 5153ebeff752d7a2fd2308aadb0bd2d95f9ad3a0d261c359e41a983aa1f310dc48a4d4cb334d71d73bb59643dd8110d885ade96c6b010637f8815b651fda9f3c
+EBUILD hevea-2.31.ebuild 1396 BLAKE2B 79d87379ff6e312de88206d2e582e9311136ca43b8348a017364e2e4b021c2a5fe320488f764f7ecb8816843957c6540858478166b883a09110863afb5f9fbc8 SHA512 53c1281028ac03459b9993026f4c8ad42f54084cd58a4d83ac3da81dcf88513695dc8d8ed4cf5b683c7f78921d232f702bc1a9601e7aa66f69d3fe7259975de0
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/hevea/hevea-2.29.ebuild b/dev-tex/hevea/hevea-2.29.ebuild
deleted file mode 100644
index 190fc255058d..000000000000
--- a/dev-tex/hevea/hevea-2.29.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-IUSE="+ocamlopt"
-
-DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator"
-HOMEPAGE="http://hevea.inria.fr/"
-SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	dev-texlive/texlive-latexextra"
-DEPEND="${DEPEND} dev-ml/ocamlbuild"
-
-src_compile() {
-	rm -f config.sh
-	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
-	if use ocamlopt; then
-		emake PREFIX=/usr
-	else
-		emake PREFIX=/usr TARGET=byte
-	fi
-}
-
-src_install() {
-	if use ocamlopt; then
-		emake DESTDIR="${D}" PREFIX=/usr install
-	else
-		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
-	fi
-
-	dodoc README CHANGES
-}
-
-# If texmf-update is present this means we have a latex install; update it so
-# that hevea.sty can be found
-# Do not (r)depend on latex though because hevea does not need it itself
-# If latex is installed later, it will see hevea.sty
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
-
-pkg_postrm() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
diff --git a/dev-tex/hevea/hevea-2.30.ebuild b/dev-tex/hevea/hevea-2.30.ebuild
deleted file mode 100644
index c5dfa8e05aaf..000000000000
--- a/dev-tex/hevea/hevea-2.30.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-IUSE="+ocamlopt"
-
-DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator"
-HOMEPAGE="http://hevea.inria.fr/"
-SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	dev-texlive/texlive-latexextra"
-DEPEND="${DEPEND} dev-ml/ocamlbuild"
-
-src_compile() {
-	rm -f config.sh
-	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
-	if use ocamlopt; then
-		emake PREFIX=/usr
-	else
-		emake PREFIX=/usr TARGET=byte
-	fi
-}
-
-src_install() {
-	if use ocamlopt; then
-		emake DESTDIR="${D}" PREFIX=/usr install
-	else
-		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
-	fi
-
-	dodoc README CHANGES
-}
-
-# If texmf-update is present this means we have a latex install; update it so
-# that hevea.sty can be found
-# Do not (r)depend on latex though because hevea does not need it itself
-# If latex is installed later, it will see hevea.sty
-
-pkg_postinst() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
-
-pkg_postrm() {
-	if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
-		/usr/sbin/texmf-update
-	fi
-}
diff --git a/dev-tex/hevea/hevea-2.31.ebuild b/dev-tex/hevea/hevea-2.31.ebuild
index 80046a30f85d..3c1e67628b19 100644
--- a/dev-tex/hevea/hevea-2.31.ebuild
+++ b/dev-tex/hevea/hevea-2.31.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
 
 LICENSE="QPL"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 
 DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
 RDEPEND="${DEPEND}
diff --git a/dev-tex/latexdiff/Manifest b/dev-tex/latexdiff/Manifest
index b325050787d3..ce1bda75b516 100644
--- a/dev-tex/latexdiff/Manifest
+++ b/dev-tex/latexdiff/Manifest
@@ -1,6 +1,6 @@
 DIST latexdiff-1.3.0.tar.gz 1791127 BLAKE2B e394dcf29d529f47a87eb7615d0da42a2d30c0e3a40938903cee75c2241ee8543713ee735f94f9eb9fe59829be85a5dad681183d96b2651e0e09d20ecae9e207 SHA512 d1b47ff4733bbba0ecadd71e6c54362b78ad8e97cac54b99b9ead4565dd0a56a8a5d4ce27866cabb4dc43c47a3c2230ce7743909f2d30bb94ecbae75c6ecbaae
 DIST latexdiff-1.3.1.1.tar.gz 1879814 BLAKE2B 1f537dff75ff12eeacfcdfa05c0199a29a0ffc4e8ff728b390dcbd35b3ba490e4e1c2e7201b7313335aabd8b870e764b9573d6322c34141be9d4fa141349db0a SHA512 bdc573b4fdb4d647ab3208f350e89843e4602e81c293665e1d08ff9b1b0d531c665d687be0185ff9ae229b9f43fd9bbd6aac437b6b1bcdca9d72d39f360b6136
 EBUILD latexdiff-1.3.0.ebuild 1175 BLAKE2B da8a2ee81250501bcd2b4a623c424b1ad66e08d1016ad834721e38da17fe20e345552d0af603b3299105788785a0c8c70e2ae8ec811e27d025b67b33822ba1b2 SHA512 ad2f76582f4a86d254adfff2406f86f79354acbe6b8425b3a663549ea7b37e3ca830cbe07fdfc06d18bffbedb3e392cea8a470506c3a96214455309fae4e0ffb
-EBUILD latexdiff-1.3.1.1.ebuild 1180 BLAKE2B 44da830af7ddee33997b95b5b930f0884caf6a6631536517d4e273a9445c544519f374b65cdf4c632981d0856bfe12bd53502403c927ce74bf6c32332b3ede99 SHA512 5e349dfdbafeb2135d2c1226e1924331781382aa4048d28b9974c32d97b4cc79809fd711390f2a21ed640da67f5ec29f49590bd2330e25c083b8756fd16d7dfa
+EBUILD latexdiff-1.3.1.1.ebuild 1176 BLAKE2B 96f30d43473f0c5d2040842e35e1dd1698e0348c9c8d5eaac43b3011c5c90dc156d67e25b865deec06ee10d5c78937b9ffe2ad7ff3442ac07c62a6c256e86bb4 SHA512 96dce49ad3f55b7960e63d0200b582a321eeb0a28583ef4b3b9fa21036f890ca8f037b1a1e79368b37adda02f75434ec92ea40476d54b08cafbef115138e0e0d
 EBUILD latexdiff-9999.ebuild 1182 BLAKE2B 6aab4e29b22e72953edf34229ad41a795a41f64f399620e838c08f71354bcfd11d17f2b4a6237255428f3aff03f2ba5ab4e1fcbdceaac152d683d709df27c53b SHA512 5f4a7b47fb985d1785006d57e37b904f1bece9e1cf45004ab5ac8da62a34116b040d089447cecdcec4869820b4432298b8e1c073fa194815904f7965f07f6f65
 MISC metadata.xml 332 BLAKE2B e23b9e1ce0df618f8130ae9291147e4c2cdd33e0aaa3f26e6900cf30f41dae7f4954144180ca0886a8a3370910e1e4bba21dd87b303e23e6bbb8ceea484e00bc SHA512 a0e324d4d38574f5f5af8003e9e048f4c0628022e5b6553d1ce4b20cf12424f15e1bea07c6bd6cf87b7f7ba54c9983e2c025b42d517ef31c9fa3853def50ba3c
diff --git a/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild b/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
index 06bc0ba25ad4..6b2671ba5f95 100644
--- a/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/ftilmann/latexdiff.git"
 else
 	SRC_URI="https://github.com/ftilmann/latexdiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	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"
 fi
 
 LICENSE="GPL-3"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 99a2026d79ef..6ef09959f7df 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index e03648ae1020..f98fca802fca 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,6 @@
 DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b SHA512 938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
 DIST catalyst-3.0.15.tar.bz2 621366 BLAKE2B 890381a3ed53bd28eb110a95b98fbdac83d1ee72e935919a47a5bae29f672edb1943fdf5f259572ede578c0253e55a39f25fba88109e6d9bc5af0d3e344c2db2 SHA512 ed543b995664a5786790990cb4729e84a705820d1e72eefb432c3622bb2307646a0ee753eaaafac93bda04df130e83dd6db6b59052c4bae6347b77dabd67b2d5
-EBUILD catalyst-3.0.14.ebuild 1913 BLAKE2B 76c621805e4cbb86e2bd52537091309fea71a6abef1190b274180210dbd6c363502d478d9c27f2981143e5068264e5b0b05633b857184e053669f11e44eba913 SHA512 be473d81fb31ae9aec8aa25608c426f98c877d4115a091c7fd7561e45e2dca3805c076b6eb088dee3988dc6925f186a67f3f951b5e75f2ea5d66014290d981f3
-EBUILD catalyst-3.0.15.ebuild 1911 BLAKE2B ad782ce335c5ffa2663097df546c076296b7d7f653798aa5871abe4f7664192bb141f4bcc0a719c0e7b6810970e376c06a0f383e4554217f42841316a3abf078 SHA512 a5d9b170c74f254142de6bceb2b167ae36337b74fc50a6a2ed9b447bcfc366a8d06698f02ba4e853a7ad9be3d243ab3bd12ae19ce85f89d7a03de3211a315911
-EBUILD catalyst-9999.ebuild 2317 BLAKE2B 9e80914d109534080b36949a85afd9a4ca28d51e58b7c96bc5bbf359a3d18093ece3263650cf540584e4ad730f50ec7da2c1a8d8447950e46489be6a8d81e69d SHA512 45b47f8c3dfe12d15bad9b57e0fd4d885387e97bd44d8779dc9bcfe492d8240099185a434a25829eb6d43627e8a8ad3005403def3e3cd99fea2bbb1fc3173412
+EBUILD catalyst-3.0.14.ebuild 1913 BLAKE2B 2db4135e9407c87207c82b1840730eaf99564804a85724e67c8d37c458538297915ef7f032477493bace51a49fc96e185b2d2a5894ed9757951c338cf29142c2 SHA512 ddec3a42d64f74b99c676a6a2c142e105e10f50930bae2309053c854607ea6d9ba11b1589cc172cf71a6a5c83319a6fac7344b549b4811db7aa7afcf53c87771
+EBUILD catalyst-3.0.15.ebuild 1911 BLAKE2B cb5cdf33e45e54e4da861722d1397e4f5fc668a46df2f468f970806d5269422a8202d6618c74f64c2e00628a290cde75732cc46d2deb9855f39485f576522a4a SHA512 37fcd1eb807a304b1f09e90fb396b4c6c0cf42605d3888523cde5a97469d794e3eb05be44ce660688fb1afa2ce81cd539a969d55d5733445ba12c0e5fa47188f
+EBUILD catalyst-9999.ebuild 2324 BLAKE2B c32b5b5df4034b11e0c38c04aba755af3608500c07eccb866c9e147d52a533ccdd0b79596429be8077dff69d3fb637246b621bc676459a42a29f4af35d5df767 SHA512 11b29d6629f5c33546aa41a72b541a9efb99ef42c00bc6603f736e5ac5d70f23964678abf8103fb095ab07d695eab6ff008bf3d8c1c28c1781408a152f8a2082
 MISC metadata.xml 512 BLAKE2B 27e0e3638c330c780f163608e5e62b71ed636a2e26291f97465c4506ae1b99345d081046bcab70b1bf56e36c5b9a6b8220b94da8433f2b313235c784ad6b9b5f SHA512 7d6683e83df2d311f3210af91880486ede8f7ddea57044e765f29694eb3e1b8df6f3d22c9a729c480ae9d49ebe3778cfe7a6509365f59eaae34f8438afe97afd
diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 09099da1323e..5294c9749a86 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )
-	iso? ( virtual/cdrtools )
+	iso? ( app-cdr/cdrtools )
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
 "
 PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
diff --git a/dev-util/catalyst/catalyst-3.0.15.ebuild b/dev-util/catalyst/catalyst-3.0.15.ebuild
index a987630870fe..f1c19554ff9f 100644
--- a/dev-util/catalyst/catalyst-3.0.15.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.15.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )
-	iso? ( virtual/cdrtools )
+	iso? ( app-cdr/cdrtools )
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
 "
 PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 27ca55eff349..f72a52d76d0d 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -41,10 +41,10 @@ RDEPEND="
 	app-arch/tar[xattr]
 	dev-vcs/git
 	sys-fs/dosfstools
-	sys-fs/squashfs-tools-ng
+	sys-fs/squashfs-tools-ng[tools]
 
 	iso? (
-		virtual/cdrtools
+		app-cdr/cdrtools
 
 		amd64? (
 			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 3bd9a103b6fc..beb0c464618f 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -4,9 +4,11 @@ DIST devscripts_2.20.1.tar.xz 854932 BLAKE2B b9523b2882625b66c7972db7c10f7d3f605
 DIST devscripts_2.20.2.tar.xz 854948 BLAKE2B ca36f2d8d4f3d975479134d02ee4c035f7f32e087be523560c2c06d7625047fcf78d0428d1e4addcfa38a299befdd23b88ab3fbbef2028f67f8b7c9f8851c29f SHA512 d9147604a718582a19c036a040c62612427163146048dbf9e3665545072e8132d08f51dccfd3f0a01453c0405a0326dad8f83afd10270eec5c69fa0612cb8510
 DIST devscripts_2.20.3.tar.xz 859612 BLAKE2B 074905e621234c60e26a014831a021b51f5f8fbdac4d6fa3a17aa98f994b4c171404a2326f5b00565f365469b41f1c7e5f03b6efa29f809b51bbabde209cafc2 SHA512 6d86deeecff82fc16df7d978678f5b88293164688078bf0732a7e6b844cf8845868be31c107518cf43b8dbcbadcd12a9691585f5725abd397f63ff9456fbdd8f
 DIST devscripts_2.20.4.tar.xz 860604 BLAKE2B 05c486ed024964ec03f9e5396e739389010a2c51a4d01be14b4959aa86bd09ca426bbfbfa7657c87e54aec8497fbfc90064073310fb1af916b32142ff63d3137 SHA512 49e9ae38ca3682f399a17f2108a7ee15198dc955d8c7c4c1b043456c19cb35b47b6116de9a2cfaccbdd7560e79426ca0953674e5a89ac226d21af2c1cf847e5c
+DIST devscripts_2.20.5.tar.xz 881976 BLAKE2B 3d4079d3268b3b9bfacdd0a4afcfee5390bdbf4660038306611d9c24e7b5c6453eff5f24d938c9764a17336475cd60615919adaa11dcf47495d930cd4b3b4e09 SHA512 fbd372a62758e3d2872f37bfd93d9b169d0cc745719057078378949c4d01b4fb27830ae501fe45b06b30a869e8afc853d8477419bb2f46d7fd62749f54981ec0
 EBUILD checkbashisms-2.19.7.ebuild 842 BLAKE2B be6ec30a86a521baba5ffea3003dd5e77973c71b83409d91448638c8a33de24f1e4ac5daf00dc215f124c8c3628868f735f3ee41f4d59054f899b18d3a49c8d4 SHA512 39a3a939f89146e7c1f673f7123ace5580b2f9ef31b254a3174f4ad9911a6bc46293bad1850e872f05d4ed798e16530fbbc0059b8b5279086c35a6a2d443d6a2
 EBUILD checkbashisms-2.20.1.ebuild 844 BLAKE2B 32ae094871d3c8854b76228ff850385b7ad6ef8acc540adf30daec20890014ff3ce9c28ff60a36172293b9349b765bf8a88f98e36cc064282862e5ccca5d78bd SHA512 69ae2da6c4f081fc81fe7a216f0d3f852a68ceb6ff54c2041130008bdc9cd1ba7cfe639cf4cf15f867dc024507d8a57f92a9d126bd3e7caf754f2e55564e717a
 EBUILD checkbashisms-2.20.2.ebuild 844 BLAKE2B 32ae094871d3c8854b76228ff850385b7ad6ef8acc540adf30daec20890014ff3ce9c28ff60a36172293b9349b765bf8a88f98e36cc064282862e5ccca5d78bd SHA512 69ae2da6c4f081fc81fe7a216f0d3f852a68ceb6ff54c2041130008bdc9cd1ba7cfe639cf4cf15f867dc024507d8a57f92a9d126bd3e7caf754f2e55564e717a
 EBUILD checkbashisms-2.20.3.ebuild 787 BLAKE2B 6bda04ce6fdbdbade2d28bef48d153adb73aa5f385b6cbcbe83966240cbfb2576372d0fa1ba7acd2c977376129ab8b1c9d4691c0882467f96d949fcae1842fad SHA512 67e1df0ec01650605b34329d075db5fe3489cd6f6b9907f52f17583727d86e2aa743f4fc123328207194f8259e220a4caaa6ec7dbbabec58fb4965ce4becf251
 EBUILD checkbashisms-2.20.4.ebuild 787 BLAKE2B 6bda04ce6fdbdbade2d28bef48d153adb73aa5f385b6cbcbe83966240cbfb2576372d0fa1ba7acd2c977376129ab8b1c9d4691c0882467f96d949fcae1842fad SHA512 67e1df0ec01650605b34329d075db5fe3489cd6f6b9907f52f17583727d86e2aa743f4fc123328207194f8259e220a4caaa6ec7dbbabec58fb4965ce4becf251
+EBUILD checkbashisms-2.20.5.ebuild 787 BLAKE2B 6bda04ce6fdbdbade2d28bef48d153adb73aa5f385b6cbcbe83966240cbfb2576372d0fa1ba7acd2c977376129ab8b1c9d4691c0882467f96d949fcae1842fad SHA512 67e1df0ec01650605b34329d075db5fe3489cd6f6b9907f52f17583727d86e2aa743f4fc123328207194f8259e220a4caaa6ec7dbbabec58fb4965ce4becf251
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
new file mode 100644
index 000000000000..1d567b48dc59
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+	default
+
+	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 9220bf90c80c..811c8d9fec09 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -5,7 +5,7 @@ AUX cmake-3.1.0-darwin-isysroot.patch 1926 BLAKE2B 4e8dfc78db33e62a6234a91210f01
 AUX cmake-3.11.0_rc2-FindBLAS.patch 775 BLAKE2B 89249b37ca44cc9068a5fd81350637da16c3a92a662f5b30db7e7bbfb9b47c816122bcbe31cb01845bdec760d449d0babbbcd6638ad4975b39db73c7bc5ea2e2 SHA512 ab24736b64bff1f9213f3eef7acc6a78829c875e8e5ec7b0d96ad406517e5335b0e3930ef369a9d6190d25a298c6834965e4977e5062e87595169272339f7738
 AUX cmake-3.11.4-fix-boost-detection.patch 996 BLAKE2B 195ade40e279ca85ee55b1d46353f8809f68e405a6c914c34340825f7f77ec5cb78ebee3f7aa12cc6f026a802db4bc893ac8570a03b76af708ea2df7a3ecadb1 SHA512 66da91fb39286d1745af733a806f60db313ddb0a506b29509aba66259a57cf8abf65fcc871114c5a2cff91eb8c27ca346dd75fbd29f773fb2d31cfead827f250
 AUX cmake-3.13.4-prefix-dirs.patch 4239 BLAKE2B 470de3626a9f6edf65e5ec597b1de36697e6c2038ec5f435dd5a89ec69ac32227663f0eb5f86c9d5d89a1c809e1092b5e901c52dcab9f2a7d3bc8f7bdca110a7 SHA512 b1801d0f0ec8963181460a8b939a26e791295d6a45fb78135dce5684507689cb44cab7a536d5f85c26f51deda19e95b40500aba026f43920fa7eee686ad3869c
-AUX cmake-3.14.0_rc3-prefix-dirs.patch 4688 BLAKE2B ec197f40246ff9b47f6515cec92f0ef497de2e96756cd7c12ea3fe7c71d5e2220c637210f663194c63e72924d89dbce7afe92fed01bca8947bdd76af6f5365b0 SHA512 9da6be335e5615b2e14fdcccbadd50a0e2df6e19476818358216501b657350c73fa6bdc1dcaedec1fa50e3e18e39544e2d2815d6f54dd5b4aa5860bdf35e8d52
+AUX cmake-3.14.0_rc3-prefix-dirs.patch 4791 BLAKE2B bd5dece28a5900c8dbd994701712b65d2c366c61cb01dfadc2a6f941c4cee9bdf9d390291fe08f76bea68e0e0078b116c73682516fa62d6064e10c4a063b4bf5 SHA512 b53055ab0a72051dbc11ab91944e484a493e421a724a6ee60433484b9734280e1d1ab51114afef14ecdae67a78a9734a277a18d8d5e1a272e8a558c849a36809
 AUX cmake-3.16.0_rc4-darwin-bundle.patch 1388 BLAKE2B bcb6c3d8e4f64ccc3e6ebf9ae906960075b3fb1f432925e07a711ac27321023033013e7a2e1d0ffc60dd464b775fa2537a49c73089861a2ce8f6316ddaa3d03e SHA512 7e0f598fe1cbb2c44b345091c102fb42ebff510ea7eeccdbe1fe0d65251127d823c37f2d37b073305679ed86fd48923566f1d62a7c9fb55df475d48891b4b861
 AUX cmake-3.17.0_rc1-FindBLAS.patch 1087 BLAKE2B 5e549db39f0e8c5f821a70121551ccea132e11dd8b468cfc7439e61763b5406860d952787d5957ea719dd48ec32ac8313d3209bed2a3423f5e40b8a2fcf04ae4 SHA512 1ea5e5e44c6a97cced30ef38424e24a3551d58c828d71d3b5994c265f099a3aa19174febfc2778eb688930432073e012557a79550d38b6b716e6b619d74a298c
 AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383ba12fb5c3ce4369bd527c286e23260b551a915fa5257f0351bce00a4332c987c047c246812f2a713b0d1db312c7d03edee4 SHA512 20baafcda95ba219ae4e186a8878aa75e2e27f766ab3afaa14ce316cd2c2bc85debfc6be4ed1b6c17c3c1532b3a6868d0b4ee7cc47145cb788838f023b624303
@@ -23,5 +23,5 @@ DIST cmake-3.19.2.tar.gz 9264414 BLAKE2B f45727fd6b6e0e324f618577abbc7fb1830f05f
 EBUILD cmake-3.13.5.ebuild 6250 BLAKE2B 51fd5c675042b869a8dd3f54ceaed2f3a2d9bc43aeb2894b1b8c9d995660bc81ed9b39f99bfbb376d0dd658942def7bc2c1ec3538efc36c1f43f65bc1ca5dd5b SHA512 638eece44d2cb688d92fd9fbedd189aee9b0b878b1fd054984e806d17083eda352695136bf0d800d9e2ecb7993917f2da4f1f1913e14c7686c4d7cff8c641f60
 EBUILD cmake-3.17.4-r1.ebuild 6135 BLAKE2B e2a5cc3192918239c62b6502374a585d8f25dfb795e492a43de513a8f89e601862c0e010cedb02441a716884abc55ff1b455739ceeb769e41c4e873233df2a11 SHA512 a0b1ed0cd63486d3f625cfce02c14bb7363199b950850bf03380d48b8126402659712dad7c0254033846b43faf4051413cc875bc882e86f658baa5eff59a2236
 EBUILD cmake-3.18.5.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
-EBUILD cmake-3.19.2.ebuild 6620 BLAKE2B 08f857fbb4188519564decfb1c63a29f1269cd878466a8b8568bcd41640d2c0bd6c9f39769c4cad4f82843aca87ae08084441f969ae52f2f0f993a04d60d9e0f SHA512 b9c0a84740cfe4dc21efe715d22335bc56f615ee34d759113664c13fc35815fd7bad59849c79c6859ccf14d7d57f1114975ea8e44ee1cde7315c87c2d04f7b94
+EBUILD cmake-3.19.2.ebuild 6744 BLAKE2B ddc58bf2eeb856f5037afd96c74996d0d0edbbd6591874a71fbd61a5f50bef94bac3d7926e34b693cde7a661b2f810942438ee216c9af0a47a2de8c92476ad38 SHA512 764f96d50a9fa362dc803dc47699d71f444a34bd43365c0cedf9cc70253b8c1e9ac10cd961d3c564cbf016e45c55048744d174c41964672bd25bf3979807ed27
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.19.2.ebuild b/dev-util/cmake/cmake-3.19.2.ebuild
index 54a6d646dda4..945b1c1e8b09 100644
--- a/dev-util/cmake/cmake-3.19.2.ebuild
+++ b/dev-util/cmake/cmake-3.19.2.ebuild
@@ -137,6 +137,9 @@ src_prepare() {
 		# where things are via GCC configuration and ldwrapper
 		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
 			Modules/Platform/Apple-GNU-*.cmake || die
+		# disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
 		# don't set a POSIX standard, system headers don't like that, #757426
 		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
 			Source/cmLoadCommandCommand.cxx \
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
index d03b17551f0b..9a6054e9557f 100644
--- a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
+++ b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
@@ -17,7 +17,8 @@ Updated by Lars Wendler (cmake-3.9.0_rc2)
 Updated by Benda Xu (cmake-3.13.4)
 Updated by Lars Wendler (cmake-3.14.0_rc1)
 Updated by Lars Wendler (cmake-3.14.0_rc2)
-Updated by Lars Wendler (cmake-3.14.0_rc3
+Updated by Lars Wendler (cmake-3.14.0_rc3)
+Updated by Jacob Floyd (cmake-3.19.2)
 ---
  Modules/Platform/Darwin.cmake    | 12 +++++++----
  Modules/Platform/UnixPaths.cmake | 35 ++++++++++++++++++++++++--------
@@ -39,16 +40,17 @@ index 5590433a3b..b04383e51d 100644
  endif()
  
  # Older OS X linkers do not report their framework search path
-@@ -140,6 +140,8 @@ endif()
+@@ -140,6 +140,9 @@ endif()
  
  # set up the default search directories for frameworks
  set(CMAKE_SYSTEM_FRAMEWORK_PATH
++  @GENTOO_PORTAGE_EPREFIX@MacOSX.sdk/System/Library/Frameworks
 +  @GENTOO_PORTAGE_EPREFIX@Frameworks
 +  @GENTOO_PORTAGE_EPREFIX@usr/lib
    ~/Library/Frameworks
    )
  if(_CMAKE_OSX_SYSROOT_PATH)
-@@ -186,13 +188,15 @@ if(CMAKE_OSX_SYSROOT)
+@@ -186,13 +189,15 @@ if(CMAKE_OSX_SYSROOT)
    endif()
  endif()
  
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index a1aaf1ccd770..4268fae96f46 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,12 +1,6 @@
 AUX cvise-2.0.0-shebang.patch 1130 BLAKE2B 50f54e410f978a485aaa08cc7d9b8311211ec5b42fb372656821beba7bacd8aa7506b6e10732a0c426ce48a94440daa64bf931b23734d43b57e4a0d3d08a7281 SHA512 2c8fdc838ec802d7a1afb209dbe3e765780dd599f21cbdb7d9316e076ec06d0f0c1e78a00ea6a66fb614c8d0f7b44ca88ad624236223b47d87dddeab427621d3
-DIST cvise-1.6.0.tar.gz 243050 BLAKE2B 64c305426dbeaf2e3f3a92a902209b35fcc76b5f5a6d2e48fcc8e24d1325badc0839e70afa1381c6d1412c22a7e9dd41ca03d6ca714fa5082958378cc8863000 SHA512 9d4ee043c34748b600b49ac4f00463b853faff2809f8b581e9b07433a8f3bef4436d0e5d5a9dbff1b2d7c3a8ab1d6d4823e78787eb3e911a683808703b2e24b6
-DIST cvise-1.7.0.tar.gz 248515 BLAKE2B b1a2ca8abc7a09c240a7ae39400e3e60ca641dd0dff4edb34f43d755619ec47bb7a0d25fd6b4461bf80a3be14a63c6e56d0e3e758827ca7c2ef90370aba5d539 SHA512 2e0115355c0ca3cdf593ad4a8d0079ea0ea193234ff4fcae8bdc7c0244cc7b8672025682821279b826fda97f80dc71455390d709836acb671c19772f13156de5
-DIST cvise-1.8.0.tar.gz 248744 BLAKE2B 5196a2bb68c0f9ca1a8219ee0dccae80aa7adac64df5bc4c7601a8ef81048875bfa3d8fb2e8c407cfa8f238739733ad4fbdf08bb14a72ec208d562bd7e69ba84 SHA512 eaef3506f0fcd54953271494ebdbd043c028cd98c4a976bc2d978112c28d27d5d307527db52c2a3f8f153b52430ba9c61ad072dcae5a6e0b9bfb8be844a50bab
 DIST cvise-1.9.0.tar.gz 249042 BLAKE2B 357d429afc43691e616dba31621d1de89fb1f85fcbc177847b3367aac993ccd2c3bec20226e910a319d5d6194b32d0be9704e4fa7b8fce49f23788d10a378012 SHA512 518c48b7b9d9af9b856bfc46d4fb8064bca3730735bdabf2b3aa981a3f743fa6988594b7cbe39da71ac01fbadb4a45e5212d7c79b510fa36d86055978829495b
 DIST cvise-2.0.0.tar.gz 249307 BLAKE2B ba1a70da71706969a35b1223ad0c0fa1a1d4caf7f70eef184adc4dbc69586be6a33bdf11d7c1b606ea4b20d4cd2bf68170aabc1764364c235fe5f67182419080 SHA512 e49ca9919ced9db67b16af4b8a7cd3c18c7d96dea5724c9ee6d60736c8f34074d68ade151be702794c93b24943d167278e1c1a6e6f67a9a1422f695f3a177e46
-EBUILD cvise-1.6.0.ebuild 1162 BLAKE2B 09b719db9f8c428bd94aeec9ccb8a03b150323a62a9d014ee82cced18733a89d2272ba049fe8446b3f008d77861281be70549d351d5cd173d7e1fddb12e3c5ed SHA512 af3c19d0f1d2ed513f0533e4861f109546a5da5c1b9dacb6b6f585dc568ca1d28a34530e04eb6acc3bb77a2b47ab84490793c78d834637771a59b8341bc7c2e2
-EBUILD cvise-1.7.0-r1.ebuild 1202 BLAKE2B e0b789b8fc805718c1fe3cb71ae4180bfc0b5af7049a8631ed64d5983a980c84310d17c534aa1f638c76fe2a1a3053a1739d7351c5fbd4f192f204c67857638d SHA512 d94a2453dbe52425d800587465d1f5eae79fbc9d33fab09bbf6479ec217ce9ef78c1afa78b40f7294b986137cd689ef72d4b1371f44735f61ecdafbcb185fd78
-EBUILD cvise-1.8.0.ebuild 1202 BLAKE2B e0b789b8fc805718c1fe3cb71ae4180bfc0b5af7049a8631ed64d5983a980c84310d17c534aa1f638c76fe2a1a3053a1739d7351c5fbd4f192f204c67857638d SHA512 d94a2453dbe52425d800587465d1f5eae79fbc9d33fab09bbf6479ec217ce9ef78c1afa78b40f7294b986137cd689ef72d4b1371f44735f61ecdafbcb185fd78
-EBUILD cvise-1.9.0.ebuild 1281 BLAKE2B 9caf938cc99168552937f0fa61720d53eaad5644671bf1b877460936998c03a45a83926c517d4a70ef406a88b537285d1b4561304d04ab17cbd283dc961b852b SHA512 219fbe157eb7c25d8c2f84efd1a52de7e5bf8eadbfeb93c633d6f9101b3aa9a2fc614ddd409ee120fc9dbf2957e1291ce536ebfaa8f5411a9efea44eece8df74
+EBUILD cvise-1.9.0.ebuild 1280 BLAKE2B 52763d8bda5418cb30caa2f302351dce9b376fe23df691644ae91b092000b34e260dd7847499d04d7bfc60185874678e79a1975be50b5733fee44dd4908eed8c SHA512 c7a575cd101c62c493e10d52aca53efe0ac13b9f9a22a9349492948a31fdacd3afdb0eb2ae55d06d22da98185003b46e6c9dd3be06baaea2ec3afcecbdca298e
 EBUILD cvise-2.0.0.ebuild 1347 BLAKE2B 8651ce715dccf7bc322a7fae16e5f7b3b1d92eff666ec1faff37ad44541f39d2d394344a60cf1ca7f67f9c05b1efac0123ebdcd76343e9752a844089ceabe0f7 SHA512 aebd0940cd504e4f89ec9ae95e98574168274bddc7c9fac3406207d0e41cec114698af955dccbee6c90b864690d840a9865b707ff2a8d7b22acbeecb696da282
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/cvise/cvise-1.6.0.ebuild b/dev-util/cvise/cvise-1.6.0.ebuild
deleted file mode 100644
index ac8d916a8431..000000000000
--- a/dev-util/cvise/cvise-1.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm python-single-r1
-
-DESCRIPTION="Super-parallel Python port of the C-Reduce"
-HOMEPAGE="https://github.com/marxin/cvise/"
-SRC_URI="
-	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LLVM_MAX_SLOT=12
-DEPEND="
-	|| (
-		sys-devel/clang:12
-		sys-devel/clang:11
-		sys-devel/clang:10
-	)
-	<=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pebble[${PYTHON_USEDEP}]
-	')
-	dev-util/unifdef
-	sys-devel/flex"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/flex
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pebble[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	llvm_pkg_setup
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	pytest -vv || die
-}
diff --git a/dev-util/cvise/cvise-1.7.0-r1.ebuild b/dev-util/cvise/cvise-1.7.0-r1.ebuild
deleted file mode 100644
index 16f63504e0d4..000000000000
--- a/dev-util/cvise/cvise-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm python-single-r1
-
-DESCRIPTION="Super-parallel Python port of the C-Reduce"
-HOMEPAGE="https://github.com/marxin/cvise/"
-SRC_URI="
-	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LLVM_MAX_SLOT=12
-DEPEND="
-	|| (
-		sys-devel/clang:12
-		sys-devel/clang:11
-		sys-devel/clang:10
-	)
-	<=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pebble[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	')
-	dev-util/unifdef
-	sys-devel/flex"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/flex
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pebble[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	llvm_pkg_setup
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	pytest -vv || die
-}
diff --git a/dev-util/cvise/cvise-1.8.0.ebuild b/dev-util/cvise/cvise-1.8.0.ebuild
deleted file mode 100644
index 16f63504e0d4..000000000000
--- a/dev-util/cvise/cvise-1.8.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm python-single-r1
-
-DESCRIPTION="Super-parallel Python port of the C-Reduce"
-HOMEPAGE="https://github.com/marxin/cvise/"
-SRC_URI="
-	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LLVM_MAX_SLOT=12
-DEPEND="
-	|| (
-		sys-devel/clang:12
-		sys-devel/clang:11
-		sys-devel/clang:10
-	)
-	<=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pebble[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	')
-	dev-util/unifdef
-	sys-devel/flex"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/flex
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pebble[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	llvm_pkg_setup
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	pytest -vv || die
-}
diff --git a/dev-util/cvise/cvise-1.9.0.ebuild b/dev-util/cvise/cvise-1.9.0.ebuild
index 041dd4faeb67..ead00c52154a 100644
--- a/dev-util/cvise/cvise-1.9.0.ebuild
+++ b/dev-util/cvise/cvise-1.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 3e0ac7cbafb5..c7415015955c 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -3,7 +3,7 @@ DIST debhelper_13.2.1.tar.xz 541428 BLAKE2B eb377a09fe23aef159c6a8309c1a63df94be
 DIST debhelper_13.2.tar.xz 540400 BLAKE2B a1734ecbd92eadc3f5fbd0b118ffb4c6b697b157c39cab7626bd734adb80c6dfd0061298220c5d5c7a7fff412a1a52490e7001c8d634596dc41389a7e81c7a74 SHA512 07fd1f32975a9d84940a15140875994d30fe4bc0a40b40fe83a1ff9a304121167345194802691326251490852e601c388cab5cd02c000a4a6768edd1259a7bbc
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
 EBUILD debhelper-13.1.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
-EBUILD debhelper-13.2.1.ebuild 1524 BLAKE2B 26c0ec05171e41da67876ea27452d799f8be8540c0893beaade349bcaf447a2a3ecc4e9d97a97174c9eb04747b3d8948a6f2e07193c5e1ffd43f6389ed676044 SHA512 73016959d67d163b61d9af938b991df6388d1e23a0ef3debbd75d7d0fd101264805e31d4e29091debf8c65840631f9eab3af2a807090df4efedea05e6d2ebdc2
+EBUILD debhelper-13.2.1.ebuild 1523 BLAKE2B ec3225c3e4d807f7b9c0bf3004794d65d3b2dd7cbdd9de07972c12539db9f5fd32c30353814d7a455efe3541571b7d859b8067226c4d39c914eace5c12d2d683 SHA512 584759d292055b2593ec600c15afbd8ab5425a5f3f88c38f0325ad63779bcd8ce468e7603b46b55e08c0dd0a0ad2d856dd07cff42254196c96bad7b56ae432f0
 EBUILD debhelper-13.2.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
 EBUILD debhelper-9.20160814.ebuild 1530 BLAKE2B 8a4529891546c0553fc545b41c0721ab899ff6f62ca5b71e8950c306bc5bdb6f9971fec6534c3b4aa03270154290e6e41b91916deb67a58f6a5fce24c57cca9e SHA512 b466001b990d497caccfdbbd88cd6e28e2e55e399923b33d1050bf667d7a050ccede8c4c2bf2df7460177d4a2094247e2ffcfd34c29d580f40ab432e89a96525
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/debhelper/debhelper-13.2.1.ebuild b/dev-util/debhelper/debhelper-13.2.1.ebuild
index 8b150d906aa6..f77d4a3b89c7 100644
--- a/dev-util/debhelper/debhelper-13.2.1.ebuild
+++ b/dev-util/debhelper/debhelper-13.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 683abfb5a2c6..dc7e94d6c00c 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -2,5 +2,5 @@ AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d89036
 DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
 DIST desktop-file-utils-0.26.tar.xz 83132 BLAKE2B fdbe5427a0278ebe4a9b1bc15a148ecdc3f54b54058b355ae4f9a962fb1c4ec309d24a075973caf8f187a1c74b013e9bed0a7c3668bf888274e77fac9e077ec8 SHA512 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831
 EBUILD desktop-file-utils-0.24.ebuild 1287 BLAKE2B 7ac58a5fc22f86c48162d3ef0c5f5471031a36294d8e9a68c1bc6643db4bcabb51e0ad581115e18df0e97c1b119d9c0b65737c617f6cdd3dbb984c7c90e81fd5 SHA512 09ee0891f66b52b89f6f45e909c579408cb36f0e8e535636444ab82424cb1c93f89d9cebf48c141f8bd9322c362e3948a5bc6cc3d0e844d1d8d8cb758f129870
-EBUILD desktop-file-utils-0.26-r1.ebuild 1167 BLAKE2B 183e1c5b0b242143a9e59ba942be5497eaa4812ea8f99b83145ab5bb1142f10a7a5ad56cae010e94aed2f3d3d58ca1e16d2f37c670d1ad4cfa71e5152df54aaa SHA512 60da0a27b78328456d10d5cb66653bd4307b88624d15f2a26a10f1ca90a8b93bb1236b7b0f6b3f08b77568bfbe7fd37b11dbdfc9505abafc368c1b614482c594
+EBUILD desktop-file-utils-0.26-r1.ebuild 1166 BLAKE2B 86ed87f13dba2b757a182155a785030871e85d7003ccb9b5f640ba41734a87510131be34e9ff26c7be657b8064e0d93ec53a61299a2fe65cbab59c609e23da12 SHA512 370e68efc5b917689f34a06f32690f0dcbbdeb9465828923217e6c1a44ea1e321818418ee1f9c65120a83c78d01054db7cbc73855b39914ac5cf0d093a3bd828
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
index 7caea829dc2f..5e2cecfcf614 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index c4a746339348..fe834e0521f8 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,3 @@
-DIST diffoscope-162.tar.gz 1564386 BLAKE2B e5ea37ae48c65dae3c850a04152c322e1e8535ad982107689f23a4111ec04b9b7766681b7e61f69c75bece271d8875ef2d109b315ec5d55ad77658a065148ed6 SHA512 a5de428b491adfadc432322eba524dc8031a6be9709887f2f290376bb94b358cec45a4a0a31b8fb5f25377a33752044882245a22d7f2b71b17d5efe002c850f4
 DIST diffoscope-163.tar.gz 1566445 BLAKE2B 4985d3a1e63fd2d4ef7cdf9e933e3ac6d1bc6c18a703bc92a8dc573b368c5989107debd57d96cfa40fe9e48d43b8ef0a07143ee48dd982a4a71b914a8e4d64ae SHA512 fc02d864c9a4b799aec45b88646f68de4f559366462b2057094592dfd3bff94213c17ea048b98070ae9a1f2f30d0e8d58d630b643e198dd85369cadea227a7e4
-EBUILD diffoscope-162.ebuild 2161 BLAKE2B fb5e4e91fc32b56175d45b589cd3c11bdb42b5b1c33910843d489ea311d4eade3860c777a94398908fe2c94a0bf8a15b91df62b4f7ce7dfb43b76ad452bc8184 SHA512 4713e398d39141876170b6864e497321743b868eaf62f181dcb8341f95a012f72c46db35c51ff08ff375b1439efc2b411f61e36b50950aecac333af0d0df377c
-EBUILD diffoscope-163.ebuild 2161 BLAKE2B fb5e4e91fc32b56175d45b589cd3c11bdb42b5b1c33910843d489ea311d4eade3860c777a94398908fe2c94a0bf8a15b91df62b4f7ce7dfb43b76ad452bc8184 SHA512 4713e398d39141876170b6864e497321743b868eaf62f181dcb8341f95a012f72c46db35c51ff08ff375b1439efc2b411f61e36b50950aecac333af0d0df377c
-MISC metadata.xml 2137 BLAKE2B 6ff55f85ebf3f769c10c3e17a69900918abe142e491b7b8460bed8fe6a036763a743324bf1a10e7a3772761b38c9632ff1352e9c6677ef691f81acc29dc321e9 SHA512 e782e12dc91d86612768a2e0c498f54a9728691a76008ee1e6cdbc4d8719c2593344f6c37786982abb0de7b85d743d7614652a2e8c9cd9fef053c3a32e1e484c
+EBUILD diffoscope-163.ebuild 2161 BLAKE2B e34a8f2c33ccdd155d59e771071fbeacac3675e0e303fcacaf66f8ccd9a02d26c7a6429195a6835a4cb18ac684c6c1f33102b17b127dbce7429929b84d4fdd19 SHA512 9fdbd5bf6ed122e0412a206526fdb0c9d7eb5d85f3792fed23c1bd9ac71e53ebb5505aa39be5b74ea6516ab14155adfb525e931ed1449d2b501be293dfb868f5
+MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
diff --git a/dev-util/diffoscope/diffoscope-162.ebuild b/dev-util/diffoscope/diffoscope-162.ebuild
deleted file mode 100644
index 572dad5645e4..000000000000
--- a/dev-util/diffoscope/diffoscope-162.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_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	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_USEDEP}]
-	)
-	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 )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/diffoscope/diffoscope-163.ebuild b/dev-util/diffoscope/diffoscope-163.ebuild
index 572dad5645e4..5f49e7be247b 100644
--- a/dev-util/diffoscope/diffoscope-163.ebuild
+++ b/dev-util/diffoscope/diffoscope-163.ebuild
@@ -43,7 +43,7 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 	hdf5? ( sci-libs/hdf5 )
 	hex? ( app-editors/vim-core )
 	imagemagick? ( media-gfx/imagemagick )
-	iso? ( virtual/cdrtools )
+	iso? ( app-cdr/cdrtools )
 	java? ( virtual/jdk )
 	llvm? ( sys-devel/llvm )
 	mono? ( dev-lang/mono )
diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
index 86628d987731..484caf983568 100644
--- a/dev-util/diffoscope/metadata.xml
+++ b/dev-util/diffoscope/metadata.xml
@@ -25,7 +25,7 @@
   <flag name="haskell">Use <pkg>dev-lang/ghc</pkg></flag>
   <flag name="hdf5">Use <pkg>sci-libs/hdf5</pkg></flag>
   <flag name="hex">Use <pkg>app-editors/vim-core</pkg></flag>
-  <flag name="iso">Use <pkg>virtual/cdrtools</pkg></flag>
+  <flag name="iso">Use <pkg>app-cdr/cdrtools</pkg></flag>
   <flag name="llvm">Use <pkg>sys-devel/llvm</pkg></flag>
   <flag name="opendocument">Use <pkg>app-text/odt2txt</pkg></flag>
   <flag name="pascal">Use <pkg>dev-lang/fpc</pkg></flag>
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index aec5a97f9fce..152528119e77 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,8 +1,4 @@
-AUX edb-debugger-1.2.0-gcc-11.patch 1849 BLAKE2B 5d9fa2dbd7738752bf95453442f0c1726fa395c2126bc0e4c8a2b7d9970e73c88334627938baf07d229937aac4de8ed13bf764e57d636df607262982fe1ae7a2 SHA512 e3eefa58075bb509b0d4721cd3484e4dd5ef38c180b5cc93c1ebef77a7c6f39eb0260566afbf288f65d8edc9c778e3c4fe872cfa961c9c33e8b268324aeb1736
-AUX edb-debugger-1.2.0-qt-5.15.patch 635 BLAKE2B b5f575f009bd81e5a9e7feb580e706b06e67f11dc0aba8a7c7473f2d1dd944bf6d56079e405403c8b64ee52c5e9e45d019c0219b2a90689cfab1fad41c3c70a3 SHA512 dc1a56a5b4e2d86bf4dd96bebd3e4272fe3c933fe462810028905e32be1056b7720c78443a5b7f82b266f204b10dd0fd8e3c77b68859dc1666cf73ec5047c6d6
-DIST edb-debugger-1.2.0.tgz 608773 BLAKE2B d67136b3bfb153f0e5ba0aef514756f39d63692636adcad3569e79237613004f2a4c425b4bed875408473a7caa6280b3bfc590e8eeb4beb5bafaa2326da892bc SHA512 c04b8d3972497ac170c740f2625301ee7d3ea52b81b29084628aa0091d7cd7df12a34ae707be629cde6e0dea54254bfde25e290aba1d6bad2635eff704282ea9
 DIST edb-debugger-1.3.0.tgz 618227 BLAKE2B 1650e727851b629d7778c8488a464b6439f2ac4e5a72c0738cfe1ee302538b0d97dcbf9587a1108a82f8f8f4a6bec273e31ad454063f70704ffb48ca8ba5b73f SHA512 9d813bb61cdc7b61b594e63834ffb3999d3e1bb0c7a435095efea9b3b6726369a06c553ba6633df160d9456758ff54d5eee8cfbee6a1304f3a01d09fe2c7a65d
-EBUILD edb-debugger-1.2.0.ebuild 1220 BLAKE2B 6a0bcf405c881062268b85b047b13fc71d3b2d0f134b97dbd0544ffa54761f84d20414276295048c3cbe2618e13e41cfb0007d18c6497691bdd4f1963d873dfb SHA512 bfba99aa6125d3ce9b968ad03550c7502d6d5c6f95354a858e4aa1cfe5a35cb7eba873a317caefa5d84f7a6f00c6d2e5ea8c3e7427be70b6930f2a162b89f267
 EBUILD edb-debugger-1.3.0.ebuild 1126 BLAKE2B c9b9391d5d06b797c3ad0e8eadab04ca983a7c344c179ded66357a99f13e26b7cb0b6fefc0d972f62b61f2599bc499243c35fd8ba77e443dd5da34d4b6cb4e95 SHA512 272eecf3dd7d6c386fbe5143a9c84baf429ae45f1c53312386567c44a4f48b472542d9f406844f015a16141066180c4c2636530b2ae8edc9b977362e52ffd0ea
 EBUILD edb-debugger-9999.ebuild 932 BLAKE2B 060e1be8043c1fd6f12684b197f60cd88de8f8d35c1227246de4bba18546b23f16ddcd60cdf92a54a48cda5ab1640e9e199a1429edf52bdf935ebf18f120df19 SHA512 1c09eaaecff1866de7307512ced499f0eb10f1f3defc8663111d9cfa64f6a7ef3b846365f8e9e18e14d19fde18909e1a5bbbdc60a674f1918f0476316399d929
 MISC metadata.xml 358 BLAKE2B eae911d14bc54d81aaf32eee088708b75027fe67c1dd9458ffeb1af3ecc429bbfa51805aab9a3ecbf8bfbc8e221b6411423852fc2fc61381ca381a61869521be SHA512 da7c4e88f58521bf9521b060b328498aa8e30be151671f5d81bbc15695e23b9a0bd75f7a98cee91866ccc4347d0fc18dd76259a8ac244bf5d0e9826b6cb8ca1e
diff --git a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
deleted file mode 100644
index 4d27f38f9869..000000000000
--- a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
-HOMEPAGE="https://github.com/eteran/edb-debugger"
-SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphviz"
-
-RDEPEND="
-	dev-libs/capstone:=
-	dev-libs/double-conversion
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	graphviz? ( media-gfx/graphviz )
-"
-
-DEPEND="
-	dev-libs/boost
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.0-qt-5.15.patch
-	"${FILESDIR}"/${PN}-1.2.0-gcc-11.patch
-)
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	#Make the desktop's entries somewhat better
-	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
-	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
-
-	if ! use graphviz; then
-		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
-	fi
-
-	cmake_src_prepare
-}
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch b/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch
deleted file mode 100644
index 68d58b2b90eb..000000000000
--- a/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/eteran/edb-debugger/pull/776
-
-From a46587a77c33256d56077a2d0709291b3ab12505 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Fri, 11 Sep 2020 07:57:39 +0100
-Subject: [PATCH] x86-generic/PlatformThread.cpp: avoid non-constant offsetof
-
-On gcc-11 edb-debugger build fails as:
-
-```
-.../x86-generic/PlatformThread.cpp:332:79: error: 'n' is not a constant expression
-  332 |         return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value);
-      |                                                                               ^
-```
-
-The change workarounds by avoiding non-constant expression:
-https://gcc.gnu.org/PR95942
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- .../unix/linux/arch/x86-generic/PlatformThread.cpp          | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
-+++ b/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
-@@ -318,7 +318,8 @@ edb::address_t PlatformThread::instructionPointer() const {
-  * @return
-  */
- unsigned long PlatformThread::getDebugRegister(std::size_t n) {
--	return ptrace(PTRACE_PEEKUSER, tid_, offsetof(struct user, u_debugreg[n]), 0);
-+	size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]);
-+	return ptrace(PTRACE_PEEKUSER, tid_, drOffset, 0);
- }
- 
- /**
-@@ -328,7 +329,8 @@ unsigned long PlatformThread::getDebugRegister(std::size_t n) {
-  * @return
-  */
- long PlatformThread::setDebugRegister(std::size_t n, unsigned long value) {
--	return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value);
-+	size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]);
-+	return ptrace(PTRACE_POKEUSER, tid_, drOffset, value);
- }
- 
- /**
--- 
-2.28.0
-
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch b/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch
deleted file mode 100644
index 795cb8fce681..000000000000
--- a/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/727530
-https://github.com/eteran/edb-debugger/pull/766
-
-Fix build failure on qt-5.15. Typical build error is:
-
-src/widgets/QDisassemblyView.cpp:1503:17:
-  error: aggregate ‘QPainterPath path’ has incomplete type and cannot be defined
- 1503 |    QPainterPath path;
-      |                 ^~~~
-
---- a/src/widgets/QDisassemblyView.h
-+++ b/src/widgets/QDisassemblyView.h
-@@ -25,6 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include <QAbstractScrollArea>
- #include <QAbstractSlider>
- #include <QCache>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QSvgRenderer>
- 
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index bb130c6f422c..c00dc525ce0d 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,3 @@
-DIST goland-2020.2.3.tar.gz 427140538 BLAKE2B 0bc742e4fc4c5860b364cc34b4a17fa3147881a8e110fea43440e8cf89755b24840a86c770984b3e5d640229fa7806e2739acd6bbf5c7aee83af4404c92fb517 SHA512 742a7e134f01b882778b980f19f35f9310bf5e926ab4de1994af626f453ede74ea6fb5d2ed19c8077f6c152bc0836b1d4f36c5e3752b5cdd5b143a0f72ed4e79
-EBUILD goland-2020.2.3.ebuild 2504 BLAKE2B e50db652814195f564e98c9398c2b5a6694044a5e66799fc77e5d097f6a77e199e9a4d92f6d0b7747069a652d88c20647a87204142ff30ea7c56c9235d84232b SHA512 9d0f3229470a40d4539afa7993e3c6bece0b65c8920dbeee10d45167219ab3bb2e37d81028b93c692b4a0b11887dda0a43deb8c4998b24d24b9514a31eb81c97
+DIST goland-2020.3.tar.gz 484825433 BLAKE2B d3991ca6fdbbe0556ac99f65f5714a9e7b4904782a66904161d6a408ab816b2a44ea2282e51a41e71c827011da099f09e1087c259c42c8cca4e766da4cae0164 SHA512 47d5e91e17a4b3515fb72e9331bf63d69aec36d207822f20e99079d12de0351d8a9d3eca2f201a8a29bfcdc14c2f88015542f94c30be29921d4e12f0db4901f5
+EBUILD goland-2020.3.ebuild 2504 BLAKE2B e50db652814195f564e98c9398c2b5a6694044a5e66799fc77e5d097f6a77e199e9a4d92f6d0b7747069a652d88c20647a87204142ff30ea7c56c9235d84232b SHA512 9d0f3229470a40d4539afa7993e3c6bece0b65c8920dbeee10d45167219ab3bb2e37d81028b93c692b4a0b11887dda0a43deb8c4998b24d24b9514a31eb81c97
 MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
diff --git a/dev-util/goland/goland-2020.2.3.ebuild b/dev-util/goland/goland-2020.3.ebuild
similarity index 100%
rename from dev-util/goland/goland-2020.2.3.ebuild
rename to dev-util/goland/goland-2020.3.ebuild
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index a7b048991d05..ac8303a5b8fa 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -7,5 +7,5 @@ DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b7
 DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679fb0df1021de9952af5a80c81f0c36c70e8dd6609b7e7ec5e36596f974d9c9ac31a7cad831a431cd9401758981d46a7ec SHA512 f89f04bb3b9772c5428ef6df939b5cbe92761f3a39869020dad4f98a5e48c57c34de526803141258c9d55ba6edaedf05127009530aa09b1a54cfa15c8a421a31
 EBUILD indent-2.2.11-r1.ebuild 1231 BLAKE2B 89908894927dbcf9a423998aca2f3d5052a6912bad1ff67a68dafee6bd651b402a388873dab797efb196c2a4cb8208b9a0f259b0b1af5be64ba16267885e9571 SHA512 1ddfa9c9624bf7409a063fbf2707a095e120f64c3b2a86abd86ad0e8b9b2200e0a2ba2cf7bacf221d3d9c1553fa71971c94ff4e19bc59fa90ee87bf198177fa7
 EBUILD indent-2.2.11_p5.ebuild 1392 BLAKE2B de097169420daf098c4a3a1f88cd973f0047bc282e3ae5e08be60ea27c18eef908d91d44d418b395ac79af0c6caa4f4fc742a4423d7f3162c5e9ea37a7c77af7 SHA512 9b1b34cdc5fbdc205fa448ba9ddb47a313c2842eb6f0872078c0b1769fe98a8fc491f6b2d4af4c425dacc1f105f2dbe88eb1b27682d339f9cc98185ea1fede1a
-EBUILD indent-2.2.12.ebuild 1116 BLAKE2B 8a06875a4d6ef730ff939c11f16b7b6d7c500fb2859028dbc4bdf35c2e38955397bf233448d4e6f75d7a1fa752251cdc429a9c12e70592453ee3f682b5196bc8 SHA512 1a03c1c440cdf5642b7982ffb9d1b9b6f4754b60f4930d7ba237a4e385d1a021f145aa38c4ce3952850bc42f747d7bca9de12f77caef0b6a5c8237e813f0d78c
+EBUILD indent-2.2.12.ebuild 1115 BLAKE2B 43b5323a79ba3aeccea9268f4a7f98cb821da986d7b98fb451f0d0f17f6a21c5065f9fff2e0248999d95a8fd6536169638d6ec4e324c90cc28f9e7730bbad5f6 SHA512 e3fb4a26f6ee896471b10edfbfae600d36c16e05c4ed45a9a3e43365a0e03a78b227e97d8cd053173b2d9fc25a7668aba18d126678013f54be791666de0bc0ed
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
index f147dca41c81..d24c91e8ac8a 100644
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index 8c66892ce8ce..90c9d604c943 100644
--- a/dev-util/itstool/Manifest
+++ b/dev-util/itstool/Manifest
@@ -1,3 +1,3 @@
 DIST itstool-2.0.6.tar.bz2 103067 BLAKE2B 72d3254cb88ef9d02f9b3509a46c2208e98bf6327f139e5d29b99cc6d80651bd41ea3bfb78e48e23cf7c217770cd8c6c74b00946ad9d2608a92925e43457edf0 SHA512 51058bdcb208f6fb84810f71f9bf67e42b00bf157a9756be45f060849c0aff36f695f4403404193720d4446818fa77de61fa94eed9e8789d26c07a2926072eb7
-EBUILD itstool-2.0.6-r1.ebuild 1003 BLAKE2B e2f07b569c4dcc574ab8fd4e89f5375e855c4016b0084d24a4155c05cae9f7a520cf089bf8b29a9c0e59a306c55109b47bdab2de7e1c7a5bbb5ad42483f7d3d7 SHA512 70765082cf5f3b3f5273bc23b0d2327f893ff23776839e05555b1e9ac506f629eda8c188d279718a754d4585db8ead6888d723d3f32055a8a15a7ff70cdd5237
+EBUILD itstool-2.0.6-r1.ebuild 1014 BLAKE2B 0d23c085b9c8f02ac6ebb96b535c62760abe805ddfd2a7b62c5bac7f039e292181a0dac1313c427e6dd32438c6016a8dfff22e76d632c41195cad91ccd39059d SHA512 2ccbd6bd30b3bfe3a3472c448f9667a5b60ff6fb6910a19146653e6da7e0e1892204e5c8beae999953cd4d74378f0c1fb8ba2f196cc61c3ac970bbefb6fde7c3
 MISC metadata.xml 525 BLAKE2B a7e426bd9dd273bed10ad74315547eb758df04ceb7ee6ef66f643ba23e60ad8b9c80aa344688e4af7a16fd699a500cf7ceb9d24eb94a930eebf1637e09919a5f SHA512 ad9928fa0359257e3418c0fb6bba6c416fc4505911f35e97377ef7c1426e228b34312fc3156e98f3657974f1156ee2bdc58bbb4b51903bb40b10c97b0714b39b
diff --git a/dev-util/itstool/itstool-2.0.6-r1.ebuild b/dev-util/itstool/itstool-2.0.6-r1.ebuild
index a8ed9c271124..b8f7df5ace99 100644
--- a/dev-util/itstool/itstool-2.0.6-r1.ebuild
+++ b/dev-util/itstool/itstool-2.0.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
 # files in /usr/share/itstool/its are under a special exception || GPL-3+
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 5f6b535cc86b..a92d4acf5e4a 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lldb-10.0.1.ebuild 2335 BLAKE2B 1e8212cd840aa2898451bca1c2670f443707738b4c8ca9c673f9e940fa918d0f742b04273f9d2899791aebb2db499bf210605f9ed90479029d4c25add49a310c SHA512 86f5ded28593601e21abf270a0dd0ff703c1ef863534cae87ec72f67ddf8de4fc3394b7088be9d38dfb39a79c1593a57b3df4f5a167e96e6aa1a34c2b1c8f656
 EBUILD lldb-11.0.0.ebuild 2383 BLAKE2B 86df01e0663b79c93b5816c6cbf4ec9a995cded9350d100bbdbad9b9ab7529fedf0244274718a919a003209ad0c48580192a06aeb19f3ca4c06bea0c9d35f9b7 SHA512 ddc49fda9558b794f08ed9c3b0f91ea3fffc67ab171354a7f229790a7b2f05d0b144da8bbc686571a5f9dc1f0fbf5fc502bf99ec3f8897d4537b0ba9ad69a7e4
 EBUILD lldb-11.0.1.9999.ebuild 2377 BLAKE2B 24e812157bf567f7fe15f3cfd87be257d497f3718344d811289268e8dbc88a3fef3f5c93fb40b05b3f7d2c967e7eb8c995d558c5d735ffc770c2d2ae20a35c99 SHA512 84be51f4c642347a8d9210aab04c5de8c990c8cd413fc575aa3a8d4eadf8b83ea5c0f3df41d60b41deab20b1cde465ee9262a17e7f6cf9eca44f20210dc17c5f
 EBUILD lldb-11.0.1_rc1.ebuild 2377 BLAKE2B 24e812157bf567f7fe15f3cfd87be257d497f3718344d811289268e8dbc88a3fef3f5c93fb40b05b3f7d2c967e7eb8c995d558c5d735ffc770c2d2ae20a35c99 SHA512 84be51f4c642347a8d9210aab04c5de8c990c8cd413fc575aa3a8d4eadf8b83ea5c0f3df41d60b41deab20b1cde465ee9262a17e7f6cf9eca44f20210dc17c5f
+EBUILD lldb-11.0.1_rc2.ebuild 2377 BLAKE2B 24e812157bf567f7fe15f3cfd87be257d497f3718344d811289268e8dbc88a3fef3f5c93fb40b05b3f7d2c967e7eb8c995d558c5d735ffc770c2d2ae20a35c99 SHA512 84be51f4c642347a8d9210aab04c5de8c990c8cd413fc575aa3a8d4eadf8b83ea5c0f3df41d60b41deab20b1cde465ee9262a17e7f6cf9eca44f20210dc17c5f
 EBUILD lldb-12.0.0.9999.ebuild 2366 BLAKE2B 4dc3eb12f0168e7915b6baaee930a79ff514e2ea900562c3ed46c01e6d115bd7bfeff34ae1f65e46fc8b6d142b7de63b848b38d35f0306c185793ead33cdf752 SHA512 61b66d649f28a0dea7805ebec036ea6c805c76d4bc9cf8c9ba778cdd6f7568c6c3d5c803f6510374fbb2f483c24056e6bd0a01b338bed30cab9f98d39d260622
 EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-11.0.1_rc2.ebuild b/dev-util/lldb/lldb-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..e3f6cc1ae822
--- /dev/null
+++ b/dev-util/lldb/lldb-11.0.1_rc2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
+		sys-devel/lld
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_COMPILER="$(type -P clang)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-lit
+	# failures + hangs
+	#use python && cmake_build check-lldb
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 719c179c1993..db8e6913df20 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -5,6 +5,7 @@ DIST ninja-1.10.1.tar.gz 211216 BLAKE2B cb27beeef903ff7c5a00f2ac85b36e66d9c41bcb
 DIST ninja-1.10.2.tar.gz 213959 BLAKE2B b8160ca6d58cfa0edb93d16b7dfb9776d290c42e54b33b78cd925f167c80f8794e4cc30af984a526b8263c7904a734cf0770d3c27283d21d02f18d3e2eb70032 SHA512 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496
 EBUILD ninja-1.10.0.ebuild 2687 BLAKE2B e025b310f8ba38be99d226155b365e3a62d5230fbccbe24f045a396b313ee3e8cff7785a9cc3a1e2c55586a4953863d37c7a64fcb0a9a26a1924a335c4b8ca7c SHA512 d25cbb60faa8cf707c4850ae431cb9f46c024ddb32683b226c906294b2dc40f3cd5df5faacc2a6ee968a98cd1df6bdd6ee958e8e3c536b90bafaa96d311115db
 EBUILD ninja-1.10.1.ebuild 2648 BLAKE2B c2207e99eafb807dfd3c2fc92bd2a95bb807d338098f05fc8d37e57febb7d92447e7e21434c5a01c04a4257a8de5c10c37040f2e6be1569d690518f1e387a715 SHA512 06d81ac9a2021f27c75847ff7ae0a68a7652f0b1497d10326b2edf91bbf869e9e9142c3dd2b14c151b55220d78b898ad05f9d86990bd52c85802cd71b1e56baf
+EBUILD ninja-1.10.2-r1.ebuild 2812 BLAKE2B e7a247466541eea7bb53427eeac43c1814ac1edf8450851e3c968b7c4921c912df7be1ea8e27a23e83d38a99676fa0dfb98b6f74ca3248721dfccbf208c3a24d SHA512 bc1a7702852f819ad38ee1795d9f2789579f484282bdf0eab5f8f94b925152eea4343bc45e87bdd730eb094798a06ec6f470fc74ecced9a80632c346774d888e
 EBUILD ninja-1.10.2.ebuild 2657 BLAKE2B f7ce3fd75ba0221b701aee7845ebda0476365284914291f2568cf563126819dbb4b1c9ac46d4066ff3db5e3b3823d294d373d33ba58ffe499ea043a0db07f846 SHA512 9228921ff8ac1a4c27f1b03931198c0577d5e79064b24b62d911b5c16cce8a55548c08bb5b2da2416b11259785cbac6dde06dbcc3857b2190896d363ca9f6c3d
 EBUILD ninja-9999.ebuild 2605 BLAKE2B 63f1a467b6a02f99b2db9555d7bfe54c0f7232e7c0e1551f0b440d1e77926876eb9c461540b57788d43499246f8d595244313ecee2b99146e01d4f7a8503c785 SHA512 e4028a3e3fbc58b02faa9e1b857ca45985490e6beb446474fe00acc781101b9c2a76cd777d5f3f71f072ceea32050b6bb1a9d7f97b149898a80315df4b644d6f
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.10.2-r1.ebuild b/dev-util/ninja/ninja-1.10.2-r1.ebuild
new file mode 100644
index 000000000000..fb3ff9a2773e
--- /dev/null
+++ b/dev-util/ninja/ninja-1.10.2-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+else
+	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/ninja-cflags.patch
+)
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	echo "$@" >&2
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py appends CFLAGS to CXXFLAGS
+	unset CFLAGS
+
+	# enable LFS, bug #760848
+	export CXXFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+	BUILD_CXXFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		${EPYTHON} configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README.md CONTRIBUTING.md
+	if use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/ninja.vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/ninja.vim"
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ninja ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index e2bafcb53a7c..16d40010e83f 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -11,5 +11,5 @@ DIST patch-5.9.9.xz 502816 BLAKE2B 104fa2ecaac3c543662b891de22cb881a917320317d58
 EBUILD perf-5.4.20.ebuild 6651 BLAKE2B e1a091114d71ba1c01f838b8d5ff372e2adad012769b973a2e79d662f6c5f6ed6fd97b2f7be880bfc57fbb99c549c487a084bf2450a935dc34ef22725268047a SHA512 e14917b4e051d3734fa515f3dbf61a2fe2cfdbe5b3aed29b9ce3b05e70609a13276d5f8fd0522f0b4addca16abdd986fb70b16d2b51f1204d02df848b64e6138
 EBUILD perf-5.7-r1.ebuild 6481 BLAKE2B 049d8502779dcc2b3f80cff18ab9795855495ce13342ab0394f29c22d552f45652c7faf0b19e24953180d5851167c875b397540375e3db0f66141863851387ab SHA512 66b7922dd0b77f2ee974695bbc6c2330c06b523b1cbc0d0dac0bf16f32489cb4266152267b70ee6130ad252075fac7f3858e5dc222e06d6ab2a8f2a10344f52e
 EBUILD perf-5.8.ebuild 6647 BLAKE2B 961f9690951c762298aa6d87371ce27079bf5387e3f470d6ffa90e8233fa9e1823aeb975658079ce165893420d4a980082414dc28befce63fb522a2250fe3c3e SHA512 39ebe613bafbeb9a2d7544e60e68b15645d51b8514b05e96f4fae8e2f4da0e7bb66059dcefb55e75c2e07c0bda2539468d70dc09d2e08b28fc1bc53c79337258
-EBUILD perf-5.9.9.ebuild 6860 BLAKE2B 1803c9d7d4f1387a1c1d68d16618d2575631566d60a77420aa44809d910a5f1f1982c3a3bfad1e31f3aafa9dfacf4b81536b5837cb542f920007a2b715ff172c SHA512 26d047b194db438875a348317c90fe71550f9523b3c81a26de48b91e0157b89e83ce8a239c63dad622e67f58c7337398c476d88d8aec402f8a5bff07b450a8e9
+EBUILD perf-5.9.9.ebuild 6865 BLAKE2B b668d3c975dbce2c588560d8c0e59555d259cdf0513c86ed7830c95cf9954d8310f0c24bd15e6a0fd14fba404b1fc30006b1e6b49c10bc215dbb2008dc7fd001 SHA512 09b92c9e707ee58bc0facf6813b74953c27cf24b7d8bbf105ce123fd1c2c6c9422fb8a0053ffe6bdf2b6172bd85a4d979ab399978cd7788eca8d506f830eda8b
 MISC metadata.xml 1506 BLAKE2B 3f82b3824ed6e126239ccedc332b79b450a695df6149b094b05674e6bf99c1300919fd7046bc47b62a39f879cfaa72d1f496f46c2f6b76aded8ef154b3ae5a2d SHA512 ba7560b91456c4930c44427865859512166e747002fb4e5331530a2fd2b40f0828870ec59f21abb2836b6c51c70ddf77a820d475f7f8f97a03737c7178b5d8d6
diff --git a/dev-util/perf/perf-5.9.9.ebuild b/dev-util/perf/perf-5.9.9.ebuild
index 4ab143e4afea..0b729ff3cc0c 100644
--- a/dev-util/perf/perf-5.9.9.ebuild
+++ b/dev-util/perf/perf-5.9.9.ebuild
@@ -31,7 +31,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
 # TODO babeltrace
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/shflags/Manifest b/dev-util/shflags/Manifest
index 97e22644b2c6..b4d0d336a2a9 100644
--- a/dev-util/shflags/Manifest
+++ b/dev-util/shflags/Manifest
@@ -1,5 +1,5 @@
 DIST shflags-1.0.3.tgz 43549 BLAKE2B 2f5376dc9589eb63133857dd48fde5bd9aae48b31d1f94a97c1d9d3f505d48ee1586a2e6a6f7b44ae85be26b4e7643beee2cdc47a5f3c3ff1a69379f174d98eb SHA512 993f5b274855d5dea5d01d3a799cfd5ff6c5ff2bf153461983052a78d8a96f9b0ee44124b4c51977baa4905c86a3293778c5d7e154305ee051fcac03f6fe70cc
 DIST shflags-1.2.3.tgz 42253 BLAKE2B 4837d31762129790659b67d4025cf8627ca5db32225ac61b437a5ba6bf9f894c87976d06dd5e5039a5ad4b7a0b7b173cc7f96fc3a11dc3c2ac797de2c749a8ed SHA512 5bddebce14e516fe37b2b1631d5aec54651ee728e538dfb0fcc68d32b79d335c7b48f5ef5aab99dd730de3b8fd556a6640db9b9ae2a7753feb6aa1e0831b64af
 EBUILD shflags-1.0.3.ebuild 628 BLAKE2B 480e47ff6f6a76724df5ea404c95e8c02bd9120f50931b46d19c155321dd1963e1208ad64e8a33c97ddf61d852d6e1692c4a14904bbe2875c9c2d83e35f451f6 SHA512 e74ebbc0240e843f49e84b99bd518c296416c572f0bbe6e2d1166beda6c2dfce32aac652ad8ddd056368a9feb58da3d66a9e894b25f0a2c7ad989543d98fd99c
-EBUILD shflags-1.2.3.ebuild 582 BLAKE2B de3030c851d9d84e74f94ec5b31e2e6643da2cb368bdaf2ed8d4a0bf5e3371e067cfbc9995d46541038392ff16fd009e0815c5f6f023242ea03ddb5540698a03 SHA512 52a462369358190db0890bc609e3dbdd764b1b63b74225a1c66f888b31cc9008be30be3632bfd107ad17e4d82f4e9122d96e88e97234c2c18bc32cbd2fe78774
+EBUILD shflags-1.2.3.ebuild 581 BLAKE2B 00968d01ce894edb19a70ffe5e81a19cc9a1bfe3abcf4c729fdb14c0f7bfb29cfe6f30598916745ca8f830f6900ab91c404bc3bde8af1059519588ec73a99523 SHA512 4054721ce78c20c34a28e9e6c3c16160f4bf3bf85b5aa34156764b74458bcf97e57d6a68d7eadb363b257d4c5ee5988c8a6a7231b42db9df491fc08c826931c0
 MISC metadata.xml 395 BLAKE2B 771aa58612fb4b5b7502bb3ce0b98eeea7449b3c56fe57b2de23cddec6c4041dea7d4f61cbf29f95bdfbd87c4b1bbb24eba62b255b7b4c7e05ff7710112e7dce SHA512 d5cec821871007bded7b69b96c3a36ff84b5756c97dc21d8e18af460e6218d176f019771843b9bb3e8cd940226c8d121057a3dcc1345bec0771ed301dac9bcc6
diff --git a/dev-util/shflags/shflags-1.2.3.ebuild b/dev-util/shflags/shflags-1.2.3.ebuild
index 87735aff81d9..90397e69e81e 100644
--- a/dev-util/shflags/shflags-1.2.3.ebuild
+++ b/dev-util/shflags/shflags-1.2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kward/shflags/archive/v${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="LGPL-2.1"
 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="examples"
 
 src_test() {
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 6c75dddb0fe8..5001db99226c 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 33fd33725092..0d39cede6427 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -1,5 +1,3 @@
-DIST darcs-2.14.5.tar.gz 1063677 BLAKE2B 7f38aa09d5af53e68829a9181f1981eccd173e2af5a044d100758164b668297303aed947ffc579ea1977e4a1f2820d1954b5c5428e429e5ff42ee238e0043611 SHA512 75f89dc920eb9a417e86bcbf185b0ba35e284a0a0c6bbd27c7dec46c4f143f5c37f0559a1ff1b3d3bd39ebdca98fa3a7420bee5e179c1bef0b0fc203e04e0484
 DIST darcs-2.16.3.tar.gz 1244848 BLAKE2B 59754a782a456b3c6bba2b382d485b5de00ae3fc7ac1107bcf89877aff9650eb823704eb23912a83643685612a0cfc84ccf2af2303b52249d9e7a3e55c08c7b7 SHA512 267787c5b3111a20158858b42a8b9c2698b80dc40f7d340175e26d74b955643cefffc2f4de9811fa26464eac2e79913150fb3cd73871275725d10a690b9d73c3
-EBUILD darcs-2.14.5.ebuild 4208 BLAKE2B ab83e211185599db01ee7e05f9fe35dadee0b292602fb79f5b933fcc82082d742647b402729c97968013e02f423f07fd7a4b651a1a31823e788e90a73be0b7e7 SHA512 d08c82089cd278b4683825df57062ed9cd661d76bd53f19e51839980f302ffb67abd244eb43b6aa625a68811b46a2597000b193ff1e54fd38df8812024d02ac6
 EBUILD darcs-2.16.3.ebuild 4835 BLAKE2B 0bda137c9f96c86958b8d70b71f449d14bd0a96d546e35f3179fbc89e21fad8ff62ebd7c1fc80c803a32e1eda3d503bd10d37688caa09043c40bf0cdc48e5260 SHA512 b7fd2dd9787a161ed6a56e42715bb96cbe6df49f0dd6023265834c1fadf8775e8fdf6bcc5f355021eae8c518c25877002f12aaebcdb6401a891c28e6a9fc7e20
 MISC metadata.xml 378 BLAKE2B 13e2f65cc6ea5e9757b7ef30aa946f38daddca9a592bcce78bda172936de89aee38d0e28ac70d7e886ab12c58c5c27cf49a7c1fe6426811b696bddb8cb9989b2 SHA512 fe6b44da867aebd58b302aa0bb3dc17bc815e300cd7ddf05851fe52f1fe2c4cacebb4624e6ca96c0d8f0a28a05e96075497e9fefc96459a73ff2aea6bc40a5aa
diff --git a/dev-vcs/darcs/darcs-2.14.5.ebuild b/dev-vcs/darcs/darcs-2.14.5.ebuild
deleted file mode 100644
index 16ea2a78fd89..000000000000
--- a/dev-vcs/darcs/darcs-2.14.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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: +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-cola/Manifest b/dev-vcs/git-cola/Manifest
index 74a4ab550b1b..1b4b6d477a8e 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -3,6 +3,6 @@ AUX git-cola-3.5-py3.8-line-buffering.patch 1342 BLAKE2B e13e576a8e4d88975b59e3f
 AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac
 DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
 DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
-EBUILD git-cola-3.5-r1.ebuild 2730 BLAKE2B d54f7e418027e9c3718bf6da0052a87f99cdedf8e6d5e53c71b6ee4bf2bf5547b65c1b4782554f61090c3c66d675adaa128322a0200ff837169f77972a47b557 SHA512 7e6e221d12f1212748e90c07f2a1646ffc42e0edd0d55a09a8c173ba0b1bb509a1a6262c7f5b303bcb8ab6a61ae6e2c0b4be0ff6c70b2fe73861d62fe3140903
+EBUILD git-cola-3.5-r1.ebuild 2732 BLAKE2B 4f3cafb29992e2787a24521efafacd018f747591f3db95a188f25497dac2d28c5b346b6a428c61214e8d8a4c4d955458d78e4b704363d0285a5cebe2d25c48bf SHA512 bef97f174d223b0fb220c22fcf36b9f42a5958e3064671397fd2ea36d2181fb668d8dc3e0201b5e349ba6b5ccaf89d7d8d3aa2caff12b1377ae1a0041af1ef00
 EBUILD git-cola-3.8.ebuild 2527 BLAKE2B cdc2bfb801db6cdca9a47fb9d62fa6aa2b6facfa92b6a6eb2dab2866b852ea8d36e1c976e9f1b1106550024d092cca31a6c08ffd3e4e442d887c5e2be508007f SHA512 1ee2043174cc1bf055de8c160e3b9665deac31553512ba2410e7cb616604e852a9a4ccbab4d5f7cca9bc1ce3ca4f2740a5ff51a7a08c832f3c00f2a4765493e0
 MISC metadata.xml 550 BLAKE2B 65feeb544a556d9202adda4f760b622c21bc03e04ae40428a49f3c53f253065cb923bbdf70c10187935895d5afc47ed9e49d8789d616503963689fdac06e860c SHA512 92a636e729d3d000e04773b2debb015b399f0b87f32a14c259c915975864e1d40114e68c7434fbe055913fbdc9f73c3f1d400807c25e83cf0b49f354b302e657
diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index e6a1500ea821..a977e0dd5d29 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index ed030678d083..f41073f3d6b8 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -18,7 +18,7 @@ DIST git-2.26.2.tar.xz 6007864 BLAKE2B efce003a95e24dbb6e14feebd35874c9ed1a5c06d
 DIST git-2.27.0.tar.xz 6074636 BLAKE2B 72c992ee35a50cdeb2363f04edfab65358216b8415f31f217b6e837d1f7bc28b90e49850006596a8f5f1932fd3011c4253df287d445dca58e335d2f6e7bab8c2 SHA512 8ddea44503db7caf1f6080e64555541aa64a7b8761fd6541965ee244d9c4a47befccda1a239f11d86c2ad0ff24923d084f65712f5f2d6cfa178573e3471c6c33
 DIST git-2.28.0.tar.xz 6117608 BLAKE2B 81c834dfda5b8e3065d098e411eb2408a1e7ccfde9c447a4164c131c9c2c32dcfd888980bcd180952435c05976a4fa18c155830432170deff70aa1aa2989cd2a SHA512 a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a
 DIST git-2.29.2.tar.xz 6187988 BLAKE2B 15c2446a266d7cc3032e4b3bd32f57a2c2ff3d377848f307225ea585883c993ed835c8ffe02202386360b94f5a1f4bd3124322f0034c0d65ed15aa28b7e45ffa SHA512 34117628c6d43ac0940c43bffaa1bda7f12af863728f391492725a3e57d1bbda523cf7734e90f463fe9a9ae4e70fc1cc2523643dbb3c27377d98dc4736b0ea62
-DIST git-2.30.0.rc0.tar.xz 6223120 BLAKE2B c0f376d114970c307742c2bb613dc38230db683b9d3eb34803527cb333b78ecf2f2f04d3829c0286b9fdeac477f8ebcf7fb80457215bcafa7d1382578fcc7511 SHA512 aecfa17571ec718e9f8892f6d5ba059451e44ac00f4e39f0d8fef51b9c27e885eff2711e3fc2ebfbb0bc0815370fa0a13b8e9243b60d6cf7cb1278e406cb743f
+DIST git-2.30.0.rc1.tar.xz 6223884 BLAKE2B 560b4bb78ac7d4d67d6c63f26af91f7c7999161c7cd1e3a24e31e228b02bb0d9ed6cdc2396a19f4edd9cdf471e0395a0f517aed53c1abffec9c95ab85e532014 SHA512 dfd51fce13b93fefde0364601efade9e438556469f5d6977e00a2e0727e5f50c506452d214848804831855bf22ba2593aa1d7bb01ad81a111e7ddfd9b17a9760
 DIST git-htmldocs-2.23.3.tar.xz 1295344 BLAKE2B 7a6d8198cf8285717f11731ea907ea06786c486701a729d071deedc5437a595dab355ae2d0ac2814b10503ab4161e76a1245663a9ce35ce48d03be9905315db3 SHA512 2c86c03f29f1a4fc2acb17a17a9e1a3df2ec95138895f5c8e776859772ebc7b95c24af0e328508ccf1ea85b7adaa86a9aedc4d0c353ffc91ad5810ecc9a48059
 DIST git-htmldocs-2.24.3.tar.xz 1307828 BLAKE2B 5d6dda03e2c51346326a1258a14a0ee16fab7fe83c80b4a1a0b307a6343db851d89b96afcf616e10ad5831352a90332ac602e5713444855327e11be8992a5274 SHA512 14289fb46cff48bece0cdafea9ef201facdb58eafce4b735ce50489356deb993c481ac1b6e96a2f98cfe30434280997c47f2cca0bdb2b6e85c31cb7cf17cc257
 DIST git-htmldocs-2.25.4.tar.xz 1296896 BLAKE2B 4f6469acdcd699698bd1f19bd0d911fd522c1890115f25c087a7870b855eb9354340fe17e9e6aaec7fb27cd951fe28cadbf26e1aeadc76f3c3a1cde4d23e42cd SHA512 e10c6fa52e213a2b18290fed375f6e176eef17b0a19f6906f09d6228d18bece88ff0ec97d871db0ba29fc0fbff73740312ab01eab809bd6a9a41c8b295cf8d67
@@ -26,7 +26,7 @@ DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B e0de88c5c41646d5fb9b54e2ee873c79
 DIST git-htmldocs-2.27.0.tar.xz 1325820 BLAKE2B a86cb62b6e42e451201a69e92c897566a78ed4965a98ef7b09f7c4674f60a334357ea8834ec5d97764f5f7e8fe580b8ac3af4da588b72a0e01f065adcd019aec SHA512 6af974ea6c8458f72c5fc7a372611e0153b705a85092a5fe37587a3165368712e077f582ce4085538f48df925d60898b96c32275182b7ef034711ab53e7ab811
 DIST git-htmldocs-2.28.0.tar.xz 1347596 BLAKE2B 9c447f951cc31eb306841d12a94aefd3bb9699f374f2919f7eed0789f6b49cd54df74ecddaa1475203a5dca33140787f53272774f71ccbb48e5da5f1ab6bfbde SHA512 bbe7a7c221d1bb8d9852d5210a80b3d60c5b66f159591971abb2d9a08570cb7bf85686c7eba8cf37e04d37d63702906b308692a68c05fdbd0e3f3d60322003f0
 DIST git-htmldocs-2.29.2.tar.xz 1364856 BLAKE2B 76498ef5bfdc058ad1e7c3b2c0c5ba715fa2682c7429db837cfeb7abe64ae3561e8b3f2dc032dd193514778271a040b1b120071d12ae5082a415db5084c7b6aa SHA512 d7223160af9bc97201bff59b94c8c09d331cdb9f979c878698230bb579b3f4751b6a455d8413ce09a507799744d7e3c77a2ad4d265386de7ef3ba9e11fb20445
-DIST git-htmldocs-2.30.0.rc0.tar.xz 1340368 BLAKE2B 7db7f4ec396351c36ada8189e37dadb736015c8e4d3c327d6805a8ad812430093dfadf99c84c6cc64f85e130971e2eb2480e3926bb6ae6acc840b11c811cfae6 SHA512 5154ddbf8b744f035b2ac2eb0f19d982e04a45f95fe7f19cdc10cadaf1a989b33bc23af8e16459767474a7a2184397115b1a7bca500b5b6ff293bc20579c884b
+DIST git-htmldocs-2.30.0.rc1.tar.xz 1340480 BLAKE2B fff1d44c91c7de6f3db94136b41435cc057e7212abf17a396682fd867040823db7d784fb991c1c75e448c9cb27f8ee063a0eec6c8b7913a646d0869b17bb30d4 SHA512 2c1583ad69b0fe5058096f0a64c79cda2550bb4884042f08fa2a2389091cada12fb90440bd8b996bf80b7b7fa3b61f09186154ee4372df8c5e1e57dde25c3b9b
 DIST git-manpages-2.23.3.tar.xz 449464 BLAKE2B bfc0153e43724df7210110e836d47f17258e45a876aa9bf4604c3f38e690e0e5379d4394df96c3dd84ea4d7371b7843729e6fb5d4b43fd7d4a9b4c3f4062a922 SHA512 a7b5fc48a5b840eb9b668b441ad3c30f65adc73c22cda461ffaca1cfddf154bf1974cab6c372b4534fd45a43a2e2ab96513364845a7db4285b88e31bf7619f8e
 DIST git-manpages-2.24.3.tar.xz 454796 BLAKE2B b340b33593e596a7a87385110fea53a96b68f0b0c5c02e046a1aff5ff7c7a6bf3d7a55c4d33796db8e84824df72451ad51db9fc44df4840ecd0183c0ef49eba0 SHA512 22709e159196da27befc26eef3ab40dab9700c95abf6892860a81c8e5df7d85ad423c877e6c88949cfc611c4dfebd956f02a78f0340c1cd4d58c48f80e3e1cce
 DIST git-manpages-2.25.4.tar.xz 459344 BLAKE2B b0ac88f691984f39f6cfbf41d2d61ab443573974277536641daddf0e9b7755ea9cb6bc96ecf3c14479809036171e461eff72cb498c63a56eea041341b8a65af5 SHA512 a67b881f289d5b3e2187ad55c5176258c30108c73fc7c18d50c1a6b42b241ce46dba28acf2f7bfc994b044444a6678096a35ad60936ea6cba07b52ddf647da17
@@ -34,7 +34,7 @@ DIST git-manpages-2.26.2.tar.xz 462052 BLAKE2B 27fc44360c9f890e9f7754e8423f55965
 DIST git-manpages-2.27.0.tar.xz 470724 BLAKE2B 83db9c5aaf9ada63d4e6146ffa4f20f1d21797ba7c7b27ade9d6f4dedb1091591b8afe4f368a4433cf75d2b148d68cec725f5504504c703eb7c22916d17b8069 SHA512 a4ceb7b86d67d15a52fec22e9bac5c8b1a5447041c3278710c2e24f70d6d443853d6a6ec5eb5ab7633390c5fa2494dd495096c26a6467d9cb13d9da007a73d12
 DIST git-manpages-2.28.0.tar.xz 472524 BLAKE2B 84752bee094eb879be8905dd561593e9f2a71d91971be7be83ed421bdeef83f7165f9506297bf23127a46a1d05c718999dab6b3ac3bda0ce0fba95ca64145de8 SHA512 ba4d41c2c2efd1eb5ab8ccf00efcebbc2fbbd31ab325da66b05181d15f677c2fc97c9eefd58c3b1c75a07276b399214f398df8d084c1a5092f982ce392876a2f
 DIST git-manpages-2.29.2.tar.xz 478516 BLAKE2B d9a9840a8c869e2f7f9dade12c780032a7eeff59314b4d45c8c65e3f076e0335f0674c484fe7cebbc70d13b51a17b5fcf69b1bd51dca7ff226d76b1fed33d8bf SHA512 f2af31f8b2242961a0633258dd4668dbf21b26eff440e302608bc5bee2ed45a3e573528cdd0f11503d0ac4745e03cb457d99f5529fc96c105ce441ece07e4fe8
-DIST git-manpages-2.30.0.rc0.tar.xz 481784 BLAKE2B 990e597e6c9fb772c7e7a4b81230b7e5b737ecdba4759afbaf1ec9a3ec9963a05cab99f23a24d73c1412a9ff8d7ef4e6fb9d0b72c0d2450c8beac4834c998b59 SHA512 c53756f6c6bfd81ba72290516a8c9751fe946baa1937ff2f24784953c7a22e8e629c27093b45dc8219f77868b9f33fe90495ae8e5f6631c6a14c5ae7a2e018c7
+DIST git-manpages-2.30.0.rc1.tar.xz 481852 BLAKE2B 24a70c2e7346e378bab74e739382970185aa9aee7181f1ece50694a7ffd402b20e8df29c99ad8e1110b6d2786d11120f9d27962c50dd8a7b00826c6931ee29fb SHA512 95c23ac1dac8f071a8326de777631a1c41fc845d280b333cad99102ee0a120f35421ad1b8b410ac84192696a494863516c3bd144160039c116f237c01fedc4f2
 EBUILD git-2.23.3.ebuild 19572 BLAKE2B 5841475703086587bb399d8c7f7298b9a3da33184fe7a9f060a8d286a8392014bc6133aa4ed4d727f0d7c37915d900d7d760ad994909da32061152bfe5f9bf2f SHA512 5ef0dcfd745b800a27fbbe8186c3050fc11dfac243bdb54e590d45f50a24645204b9eb5747ef3e2a0ed8b760aa3a38c7bad66357e900b4ed151a100d0e8dca3d
 EBUILD git-2.24.3.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea884194bd3106957447988869bd3c3d1e343285d6f2c49374bd06532e462613f3016b6bfccfe2172a6713be51b53 SHA512 e017844d87dee555355ddc45f25bdff34d75a1f3a3d49e5f214aead8fbbd0316f0f39abe1afcca919c7b83ff226c00fb4524dd900983a9c7811d0d167d946673
 EBUILD git-2.25.4.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea884194bd3106957447988869bd3c3d1e343285d6f2c49374bd06532e462613f3016b6bfccfe2172a6713be51b53 SHA512 e017844d87dee555355ddc45f25bdff34d75a1f3a3d49e5f214aead8fbbd0316f0f39abe1afcca919c7b83ff226c00fb4524dd900983a9c7811d0d167d946673
@@ -42,7 +42,7 @@ EBUILD git-2.26.2.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea8841
 EBUILD git-2.27.0.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
 EBUILD git-2.28.0.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
 EBUILD git-2.29.2.ebuild 18586 BLAKE2B 70fa03b3858a96196db9a8eb6c5f294bf3d432d87103d0b57e93b694f890234c506aa338b6c4a97b5d23463941c8469564690540141bdb390db9c5fa0fb10fb5 SHA512 896572e27cc03d35312d3dc9010e199b44fd9f6a00799f0ff99e1723b9c95380be27bb691f3270d3969a3daf76ca8ff6e3b24ddd24a14b0d0c069ba5330f641e
-EBUILD git-2.30.0_rc0.ebuild 18586 BLAKE2B 70fa03b3858a96196db9a8eb6c5f294bf3d432d87103d0b57e93b694f890234c506aa338b6c4a97b5d23463941c8469564690540141bdb390db9c5fa0fb10fb5 SHA512 896572e27cc03d35312d3dc9010e199b44fd9f6a00799f0ff99e1723b9c95380be27bb691f3270d3969a3daf76ca8ff6e3b24ddd24a14b0d0c069ba5330f641e
+EBUILD git-2.30.0_rc1.ebuild 18586 BLAKE2B 70fa03b3858a96196db9a8eb6c5f294bf3d432d87103d0b57e93b694f890234c506aa338b6c4a97b5d23463941c8469564690540141bdb390db9c5fa0fb10fb5 SHA512 896572e27cc03d35312d3dc9010e199b44fd9f6a00799f0ff99e1723b9c95380be27bb691f3270d3969a3daf76ca8ff6e3b24ddd24a14b0d0c069ba5330f641e
 EBUILD git-9999-r1.ebuild 18556 BLAKE2B 13da7097172b5614876866bf15bcc9f428ab52bb16ce068f2f7012a498b1c36ce5823e933aed58e296489949a7c6442a5a4fe0c081c21c521f2c37570e432043 SHA512 d918d1c13b20020a1857939dab0d45aa3eb350527d2471d021bcb939227494a0a011e57da85ce84192064f2659c668eae229d51e286c00047825e27429673f8b
 EBUILD git-9999-r2.ebuild 18556 BLAKE2B 13da7097172b5614876866bf15bcc9f428ab52bb16ce068f2f7012a498b1c36ce5823e933aed58e296489949a7c6442a5a4fe0c081c21c521f2c37570e432043 SHA512 d918d1c13b20020a1857939dab0d45aa3eb350527d2471d021bcb939227494a0a011e57da85ce84192064f2659c668eae229d51e286c00047825e27429673f8b
 EBUILD git-9999-r3.ebuild 18586 BLAKE2B 70fa03b3858a96196db9a8eb6c5f294bf3d432d87103d0b57e93b694f890234c506aa338b6c4a97b5d23463941c8469564690540141bdb390db9c5fa0fb10fb5 SHA512 896572e27cc03d35312d3dc9010e199b44fd9f6a00799f0ff99e1723b9c95380be27bb691f3270d3969a3daf76ca8ff6e3b24ddd24a14b0d0c069ba5330f641e
diff --git a/dev-vcs/git/git-2.30.0_rc0.ebuild b/dev-vcs/git/git-2.30.0_rc1.ebuild
similarity index 100%
rename from dev-vcs/git/git-2.30.0_rc0.ebuild
rename to dev-vcs/git/git-2.30.0_rc1.ebuild
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 289a1af75340..2ae1cf1d229b 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 2fc797e764cb..4908e4491e60 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -109,15 +109,6 @@ done
 
 if [[ -n "${CABAL_USE_HADDOCK}" ]]; then
 	IUSE="${IUSE} doc"
-	# don't require depend on itself to build docs.
-	# ebuild bootstraps docs from just built binary
-	#
-	# starting from ghc-7.10.2 we install haddock bundled with
-	# ghc to keep links to base and ghc library, otherwise
-	# newer haddock versions change index format and can't
-	# read index files for packages coming with ghc.
-	[[ ${CATEGORY}/${PN} = "dev-haskell/haddock" ]] || \
-		DEPEND="${DEPEND} doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )"
 fi
 
 if [[ -n "${CABAL_USE_HSCOLOUR}" ]]; then
diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index 63aedee4480e..3a1dc9f29f33 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -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
 
 # @ECLASS: unpacker.eclass
@@ -356,6 +356,8 @@ _unpacker() {
 	*.lz)
 		: ${UNPACKER_LZIP:=$(type -P plzip || type -P pdlzip || type -P lzip)}
 		comp="${UNPACKER_LZIP} -dc" ;;
+	*.zst)
+		comp="zstd -dfc" ;;
 	esac
 
 	# then figure out if there are any archiving aspects
@@ -459,6 +461,8 @@ unpacker_src_uri_depends() {
 			d="app-arch/unzip" ;;
 		*.lz)
 			d="|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )" ;;
+		*.zst)
+			d="app-arch/zstd" ;;
 		esac
 		deps+=" ${d}"
 	done
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index ad5a6a909330..eeaf27736911 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 21deaa247677..d9b1fbaf650e 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,4 +1,4 @@
 DIST dolphin-5.0_p20200705.tar.gz 41580877 BLAKE2B 78fce8cb10543857633d66789999b0ebb8f195e10652b9316f3346d5c84797dea96a31f509f86cb9470b4b9677ca58c4a865494121277cd0bc7dcc93932da9f4 SHA512 8b1aed8c98ff7205d7b1716aea3faad0bfa3d1ff3fe3a616431a421ae62592a57887e18295276b7a0fee52d19e641b72d5dc00e071cefea7fbe40adc9f3f01a1
 EBUILD dolphin-5.0_p20200705.ebuild 4427 BLAKE2B 1e5bb1dc1d994e38989f4414837da45ca0f3f1fd9e684ff017199ac0e1ffda7e3472a90c937b7a029736114f34cb0e8e58f3c77c8702b1c7547bbe5e8320a581 SHA512 f46e6bc95f0cb5c68fa4bf202acac60bebe1a9fad8d399161e156da1a365b70c2eb974516f3275f26a4e1f8506344874f257230248a3c7eaf497f74ce5245f09
-EBUILD dolphin-9999.ebuild 4671 BLAKE2B 5de627ef99a6ca280c244ac862e39d35de9fae454bff7db7846ced1b96e4321ba491ec6536bbce6c31d5bb09da317abfb9ebfa541c6d9b6b7737ff8aa740e745 SHA512 dd6377b8f39bcd1c02a66a45f90e31b9a10449b545977658beb68a336a72533981d710e04f888a49f70bd5400d1b89abc139a6a2ea811fb7fac9dc61d7758671
+EBUILD dolphin-9999.ebuild 4677 BLAKE2B fe9d9f67ee3be9bd025f56904bbb37dbe53585401e2382723b8c009c642da1bc0877f3f3ecf0717826176c4b13e9e1722e4152727aff25bcd5c91fcb62ecbf09 SHA512 3d3ffdfd0dc77abedfbbb53034ca38072b2d7ddc95e0d8cdf04625ab0c685789e0a245f044b94447ee7910801068b3241a7f81d47e960087ebad0cb3b131dd5b
 MISC metadata.xml 856 BLAKE2B 982e3d9ee65ed158e831ccb72d144944eaab8efd8f535f120f2d9e14f8332a980244bb23ee7fe0ca6c1ca8b6f2cdc6c1c766439b4416e17fc8df93fc24ca7655 SHA512 994efa4a7b1504a2d02f4d470382c212f0b9c2f929bbc67483b1a4efa4e68d4422216737dca65977ad99afd26fb6772224f6b1902a0eb6b869f155cf010aff33
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index b63534d242d3..14b329e33b85 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -28,7 +28,7 @@ IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile pulseaud
 
 RDEPEND="
 	dev-libs/hidapi:0=
-	dev-libs/libfmt:0=
+	>=dev-libs/libfmt-7.1:0=
 	dev-libs/lzo:2=
 	dev-libs/pugixml:0=
 	media-libs/libpng:0=
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index d78ce229e596..b4dc09ce87e7 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index ffd7c6836ffe..fb64b7d925c9 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -2,7 +2,9 @@ AUX stratagus-2.3.0-debug.patch 667 BLAKE2B 6f81f640dc5773a29f5c97732c1ace1de896
 AUX stratagus-2.3.0-doc.patch 378 BLAKE2B 673afcbcf6131a49d03b683db2b430795b30226a97d4355ba88780bc4543f08c51b49c3726a79bc93620cd23595e2dcef62452d6afc989aa2ea06f616ce86fa6 SHA512 185b4a82d4960369bdff7c5522418553838d0d2c0947d8f75a55bf7a22741b9be20a20b60ae086ee04bd31ecf963c5c58167ef6b57b777659832a82d79726483
 DIST stratagus-2.4.1.tar.gz 1087678 BLAKE2B be7fc8322aee2a28c80833d44c3180e26b961ce9dfd1bc5e0a8e3fa0caac74bf713224de4c38b2ebf6d5aeabbe778a5664346c6a444b066f07f719bba5317bac SHA512 1f0420677df72e3e2d2f31e60030fa2eba4c3d1ab80cfc79c045724fe39ac237846bc38e8762ee9aa51768a443cdbbaa1fe91bf80fb2164261288a1bb17e27cd
 DIST stratagus-2.4.3.tar.gz 1123537 BLAKE2B 90e40b2b277b5c52977f3c0ae2ae8f2e65d940d765e2ca4f7def4f8cf903399350f5e46f6dc6fbc38f3a53c7ca9ecaf5cf38025ec69154972869f28da37865d4 SHA512 16271c4fed3fb75fb8fb08e363e72713ede7979ea7e25b7c83db2fa9a0688fb7927cad3379e3b23e172c409cf0f6db18f7c6557d19a693c9a7f24109b56d2a56
+DIST stratagus-3.0.0.tar.gz 1149659 BLAKE2B 62a14bdc84462f22867b836b9a83f58ba31c7793c20f25cd8a0ca58adf7e5a38ee4559e96dddf8eb61dd1572dac55e08b16c95f8b7590644da0d0ffd040e0360 SHA512 baef3636471134c53ae0a60471f217daf694c20f439db125cf31cc33a510be456486aa905950aec15f28acada1af39a245e97fc85045d849b10532939a8f3a83
 EBUILD stratagus-2.4.1.ebuild 1523 BLAKE2B 3b165318ba374101a436297ef4e8bdfefe977fa60ef850001f1de415135babc0d6692a4321c3a56a7249ccbc5cf903b1322e4c51e202c590636125ab43d41251 SHA512 0751342ca95b1384e116732401481c341c0c79555eecda4ab6dda0318d0823c6130ea4a4e988ec97c77a315bc5f70db8be4b36c6cd9e705a7fe0885d86bab269
 EBUILD stratagus-2.4.3-r100.ebuild 1585 BLAKE2B 207b0a52a39c7704491a8e64181336401e5594f1103e6d14933df721f08f34755e066199033c9a13eba77237de8892e6964790b974622fa31c6a8c130f7a0c75 SHA512 873a5079b9783abf710df210876048f6928f06e1963cb75ed13bc7cf549b9d97fb10a0f04bbf3afde13209777013efef35225a3349e69437f8f3eeb14b8cd3ee
 EBUILD stratagus-2.4.3.ebuild 1516 BLAKE2B a31e4732e29ab32c34f161956c107d159e3b9fdc22a3c882b02278d161b1239392e9aafa855f58caf5945dde82815254b37712e18f282e570a388c84832d12e8 SHA512 d7b71f58898721bb8a6d73a6fb42456433dc1ba0494e16ecc9ffcfeda565e0c6b03aac333e3c21654746f7209fd542e09bc2431c562626743c0fe0a802ee8ca9
+EBUILD stratagus-3.0.0-r1.ebuild 1495 BLAKE2B 2a44250de9676936a02ad67f3c1b4977c2c3351ee651d28717bcd252d3f704696a31a4f0d0d1d70126b997a60b300e0d6ea9270e51004e2e6000fdc5fa0bf542 SHA512 ada564c80ad5cdf7f68ca450d50ce2642b998e7ff2811de7a066cff5182029a63f5843d83795fe69f4864015020ecb185960e416aecccd5ce6a123f7eb5b9cae
 MISC metadata.xml 526 BLAKE2B ae5eabae36efabcfa6af79a4ec6be482532af44eddb2725b5405a013dbc12171440c8790cae30c5e21dce0eaa605bfd0273c6f7e985149b9b0b5c6a9e86a2dc2 SHA512 b1ec75815ac742ab9c9a69ffc83bf191de9ba5c6b461a1094d6827e90d104e9db63a92f2094e93cd235265ffb8e4c690f51cd5729b86bfe74a8f30af069444e6
diff --git a/games-engines/stratagus/stratagus-3.0.0-r1.ebuild b/games-engines/stratagus/stratagus-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..ee369f12de34
--- /dev/null
+++ b/games-engines/stratagus/stratagus-3.0.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake optfeature
+
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="https://wargus.github.io/stratagus.html
+	https://github.com/Wargus/stratagus"
+SRC_URI="https://github.com/Wargus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 debug doc mng theora vorbis"
+REQUIRED_USE="theora? ( vorbis )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-lang/lua-5:0
+	dev-lua/toluapp
+	media-libs/libpng:0
+	x11-libs/libX11
+	media-libs/libsdl2[sound,opengl,video]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-image[png]
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	mng? ( media-libs/libmng )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		theora? ( media-libs/libtheora )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-2.3.0-doc.patch
+)
+
+src_prepare() {
+	sed -i -e 's:-Werror::' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# there are in-source switches
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	local mycmakeargs=(
+		-DGAMEDIR="/usr/bin"
+		-DDOCDIR="/usr/share/doc/${PF}"
+		-DWITH_BZIP2=$(usex bzip2)
+		-DWITH_MNG=$(usex mng)
+		-DWITH_OGGVORBIS=$(usex vorbis)
+		-DWITH_THEORA=$(usex theora)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_DEV=ON
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "MIDI music support" "media-libs/sdl2-mixer[midi]"
+}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index f8e35a67ceec..4edca7680baa 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/war1gus/Manifest b/games-strategy/war1gus/Manifest
index 4190fd44ebfd..5c596405dc7f 100644
--- a/games-strategy/war1gus/Manifest
+++ b/games-strategy/war1gus/Manifest
@@ -1,3 +1,5 @@
 DIST war1gus-2.4.3.tar.gz 436938 BLAKE2B 662c3e2d16d4ca3225a50ec28ff6ae11f9c309a02c1b71e26a28155012395091dec7833a4f32a0ee6c19119a9c0aa2aa96cb465b06937da8efdd54b040189778 SHA512 909dc3375a00a4ff05eb287e6a1e3414b084f51cda37fe73ab4d728eb2d13e3e0e8612700a90e000d67a9ddffb115fe41554a4ad9db9f68e0b62cdbc0d025ae0
+DIST war1gus-3.0.0.tar.gz 446245 BLAKE2B f58d8fe8248cc7cc661a5c2dabef9b13410eb3530bb045c03c54abeea8028e26ada3bd98d50680165b3ce35b17a08acba2b953b8c896de990cdbb3acf59cd4ae SHA512 fad712945e939fededf202181523b34945ba58ded5b5ea8089709860b63ad9c9766eb926293e5195c14f0dc3b8531ac0ae4654ab6b6718068648f9efc0fb817c
 EBUILD war1gus-2.4.3.ebuild 1496 BLAKE2B 88682061cccc413ed62d0916738dd40eb53f2635e58bddc11b40fdc621598a40017e64e17106a48b2188076009f57db216dbfec47c85f299568906890376503f SHA512 b7126069f9e42f13618552546d5bc9c6a407acef835271d9c3bc6842670b9ef856e87b9a2988f3aa9c0d8184a336773c1adcc097d9f3c3ffc31787cd628b9419
+EBUILD war1gus-3.0.0.ebuild 1496 BLAKE2B 88682061cccc413ed62d0916738dd40eb53f2635e58bddc11b40fdc621598a40017e64e17106a48b2188076009f57db216dbfec47c85f299568906890376503f SHA512 b7126069f9e42f13618552546d5bc9c6a407acef835271d9c3bc6842670b9ef856e87b9a2988f3aa9c0d8184a336773c1adcc097d9f3c3ffc31787cd628b9419
 MISC metadata.xml 326 BLAKE2B ee56deed66d8e6505929adafa4fd6d41ec36f71f6289134bac4c7e9efdfefd4dd8243a793ee16bbceda788759cad4827f6fcb7428b80cc93838a9b5d2a063395 SHA512 f3097f181d9ffd627b29eb7fb6df021323067955dd0610d4497bf23e49812322339a0379424bc257caddeb86b13f98d9cd52ab09c36987070006892b36aa8567
diff --git a/games-strategy/war1gus/war1gus-3.0.0.ebuild b/games-strategy/war1gus/war1gus-3.0.0.ebuild
new file mode 100644
index 000000000000..7871af95da19
--- /dev/null
+++ b/games-strategy/war1gus/war1gus-3.0.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Warcraft: Orcs & Humans for the Stratagus game engine"
+HOMEPAGE="https://wargus.github.io/war1gus.html
+	https://github.com/Wargus/war1gus"
+SRC_URI="https://github.com/Wargus/war1gus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	=games-engines/stratagus-${PV}*[theora]
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DBINDIR="${EPREFIX}/usr/bin"
+		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
+		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/war1gus"
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "War1gus requires the data from the original game to run.  The game"
+	elog "will ask you for the location of the game data and extract/convert"
+	elog "it automatically on the first run."
+
+	if ! has_version media-video/ffmpeg ||
+		! has_version media-sound/timidity++
+	then
+		elog
+		elog "If you did not convert the game data yet, you may want to install"
+		elog "the following optional dependencies:"
+		elog
+		elog "media-video/ffmpeg -- to convert game videos"
+		elog "media-sound/timidity++ -- to convert game music"
+	fi
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest
index 6ad26d8d499b..6d9fbb4874be 100644
--- a/games-strategy/wargus/Manifest
+++ b/games-strategy/wargus/Manifest
@@ -1,5 +1,7 @@
 DIST wargus-2.4.1.tar.gz 45981981 BLAKE2B 8d80e5d781a1be1edf602f13d77b84e85fe2592fb0a784f1b25b5c9656eaf10a11c3241dfa71388c9a01a9e8fad15b1805a67ddb3157c2a0e86d967f3852869a SHA512 d468d9ad08907fbbfd02af0bca069d6a95d5303cd4f3d838c12bbfe6af0d48f695f9f49d446dbddeae2a91deb1eaa17875954eefdfbe5e25cd840c4454dc6ea0
 DIST wargus-2.4.3.tar.gz 46635465 BLAKE2B be559e6efdba7542e9ed65f4ece5419b781b61d7d6d43b40418ca8dffc446fa7478f608d7f24696281c7acbda4dc5bf8d808feeb3376ae3e8a04b3372d18ace1 SHA512 0c9eca898146c44e211e0da7061cb605eb04ab113fd9ad0c51f9b92df8724a5b28aea9b7cf9bfadd44f0183f8b5c519d7da0050b260624f4f7da4b9f8aee458c
+DIST wargus-3.0.0.tar.gz 4890178 BLAKE2B 7ab4a4b5e8171b2297e17f0338a5fd674cff7beb3457e33c7938c12f9a262d81b9faf2db6ae00fdbbef440624880c37bfe61c2b9957e943cf13d364544f58a65 SHA512 70bf6a5a3d489c9d88bf28e65eea85936ac42850b9c8f27c5cb4a7ba8ff28c609274235c735abb4de92e5c63113d4850adc1da313ff39cbdee797de6b9e1cc43
 EBUILD wargus-2.4.1.ebuild 1015 BLAKE2B 2ec460a15d26df522ead61b9863618d24057da3b48e73eedb8888017369b94458e87e4792f05d6eb965412c3fee8b21a8fbaf8868065d46948e1e8acfdc0f793 SHA512 4b5b967cfbd52156e3fbe32eb75829ef627ef69534fb5994ad3d0a76ad4280cb89026eed1a5eef643c198865781a32eccb3d9308b356b3b00ae936fe736fd9f8
 EBUILD wargus-2.4.3.ebuild 1933 BLAKE2B 1570688d37ca291df56f903b130957f8e898b8b3c618863743bdf24f3c8a4ea2ce6d3850bd3d746947efcef7f0bead9849a23f72124b87d12e323ecd4bad0e7c SHA512 eda886eae8fdd69c877d3b2f9c175eedb899a2d79b0d67c3006b69f15800679297c0397a861a86749187cd62f4423f4cffa1969ff7c10ae4583ca7ad2a800a1c
-MISC metadata.xml 439 BLAKE2B eebdbfe89e7dde448e4828a3d6d9aab70fa1269da5069cf14560edb1dab234cd90f510251af7cbed27440c7712b6ec17273ec2f22a1c8082bd70a8ef13e32094 SHA512 047eacf4d2169f8446f04312c14ea7f9693d631da3eef54c2c5ec696d6b721905dbcf88b196942b796e373ae125b7b2a62301766927a82c18385cac8d1b93ff7
+EBUILD wargus-3.0.0-r1.ebuild 1939 BLAKE2B b8272a50ba893a4c39ab03374af5ab4e7b3da5cfa5643be31e7c6f38ed85baec5d96b4e6bdeb313481711fd2f355240ad2c5e2044df4b903cbf2ea960ff16673 SHA512 c3cd057699fd4b42111eef93e6143f554c695ead5ceaf4801b6420fc581004b61f0f6b9dae3603ed4245dba14d94075d6fd38ae9a975007883eb15611560c640
+MISC metadata.xml 535 BLAKE2B 1c618d85c92a9daa24009d320dbc05c83d78ffb58a343e88e5df9cbf0a8097051ebb10021200ebe7f2ba5679274d316a98d7cc0171224f371dffe35cee29fa85 SHA512 d369b2201b6461b4709d54817f0b99982260362e3c54e99e93aaeec614843aa14d1fb0d4c24c7c5b5825e05c2e2bd52971f7a6395995aee3f33d9872f9ad2215
diff --git a/games-strategy/wargus/metadata.xml b/games-strategy/wargus/metadata.xml
index 4dbdbbfd0323..e87f6c4d810f 100644
--- a/games-strategy/wargus/metadata.xml
+++ b/games-strategy/wargus/metadata.xml
@@ -9,6 +9,10 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<use>
+		<flag name="bne">Support extracting data from the Battle.net
+			Edition</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">Wargus/wargus</remote-id>
 	</upstream>
diff --git a/games-strategy/wargus/wargus-3.0.0-r1.ebuild b/games-strategy/wargus/wargus-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..a15e86163b5b
--- /dev/null
+++ b/games-strategy/wargus/wargus-3.0.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Warcraft II for the Stratagus game engine"
+HOMEPAGE="https://wargus.github.io/
+	https://github.com/Wargus/wargus"
+SRC_URI="https://github.com/Wargus/wargus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bne"
+
+RDEPEND="
+	=games-engines/stratagus-${PV}*[theora]
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	bne? ( app-arch/stormlib:= )
+	!games-strategy/wargus-data"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if has_version games-strategy/wargus-data; then
+		ewarn "The system-wide install of game data via games-strategy/wargus-data"
+		ewarn "no longer works.  The old data will be uninstalled after merging"
+		ewarn "this version of Wargus.  If you would like to preserve it, please"
+		ewarn "abort the process and back /usr/share/stratagus/wargus up."
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DBINDIR="${EPREFIX}/usr/bin"
+		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
+		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+		-DWITH_STORMLIB=$(usex bne)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "Wargus requires the data from the original game to run.  The game"
+	elog "will ask you for the location of the game data and extract/convert"
+	elog "it automatically on the first run."
+
+	if ! has_version media-video/ffmpeg ||
+		! has_version media-sound/cdparanoia
+	then
+		elog
+		elog "If you did not convert the game data yet, you may want to install"
+		elog "the following optional dependencies:"
+		elog
+		elog "media-video/ffmpeg -- to convert game videos"
+		elog "media-sound/cdparanoia -- to rip game music from the CD"
+	fi
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 05772ff549ef..9ac4f13ae25c 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 8cb5db92ef8e..96c056c414df 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,10 +1,8 @@
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
 DIST gnome-desktop-3.36.5.tar.xz 738956 BLAKE2B 6c419df487e908f57a1dc8798a8dfe8b574d8c5c9aa5d83e45aed233ba856ba398367a990aa83fb1b8966aad02c868cd0e41805908863ea8fef24cc3ade3687c SHA512 0b5ad42c0832d58552270e9e24dabf56668c4fbb84d07812e4a2a34cff0a67344a7c8ee963a53a703b2e4bb28c67035bf2ce854ea271194511dc66e051481b1b
-DIST gnome-desktop-3.36.7.tar.xz 739284 BLAKE2B fb64db72883ca6b5001b519f6ce3b5b26605e081530ff27728bc565e5d3ce832281adf3d10107e74028d14d9d1e5fa64f8e5d447c13690ff67aa3d2c2816c2e8 SHA512 20e3566ce1c36399a7fa359dd218f0357e1deef54ad613ce825d19f9266d98ed03c5ae59843100b36dcc6b3cdee8479ea9403514eb39e1f32d9b1fd4e53a7679
-DIST gnome-desktop-3.38.1.tar.xz 745400 BLAKE2B 872b0cdd993ed8f8865ec02e8f4e818657f526caebb3cd1b772c1182a6655d1502f454b94acb0a1dc9e3a1b8f8b8308c5dcee7933a63600d7f8d93fa3876a1d2 SHA512 b3927f0b8571d2ecb528dbe3e096e816e4e90333ce4f1ab8682c8682bbaaf5fc3484dc0944a9437aca40036d29b0feace8ed3954fb17c0bfd7ce503c99af830b
+DIST gnome-desktop-3.36.8.tar.xz 739236 BLAKE2B 378cf551787863543e30b0e69dd7447a5a9fd1026c3c85f32f140874658f803e6e8d2a82c79a1a9c4aadd08043905f1b0486e900596e855c2650248ac9478d01 SHA512 d9a447ec1c34e98d19ed6f5ef7e48f19d89009bd20368e2d731ff0cea30adc2dea6c0293df9b07f39e4573035edd25815ccd7d740f09ba421ebee74b7c8c90a2
 DIST gnome-desktop-3.38.2.tar.xz 745252 BLAKE2B cdbc3ae5bf78dfed0dcedfd83c01ab13f551c312d4eb5e680a9e22932d55ee9cf9334bec84cd99186d43afcf3fe707a12b469409d5c2094a8bbd8a1d36a75ed2 SHA512 93e98c10cac0f1c035af33fc61f945dfdbe12e88e4c42d44b5ba0570f8d81bb3f40f5e0d9fd6c4e4d9faf674f38ded0fc99dfffd57b824d62b92368df6239da8
 EBUILD gnome-desktop-3.36.5.ebuild 2022 BLAKE2B f3dd6dca7559c79967f73859b72c5ec3f9edcd8ab4d527e8d9503fd93ff2e117637223261a59e3937d5d074ebb064c36d7294adb62b5686435cce88fcbb0c7f5 SHA512 7280f4ae4748c982826f10248a3b6edf8e963a982facc182c98895ad1e6c695d076a62d4f56830c6fbf96dc0a9cdb3c9d533f1ceb16757f4f3475c8942579fcf
-EBUILD gnome-desktop-3.36.7.ebuild 2025 BLAKE2B 5ea77d5672464d313a241a3d74f047935d40857c95a90eea21c1f4005f28a90e58000d0448ccef3c5718551f339138ba456bcb4e25804e21cdc7acba66da2ec5 SHA512 a37c5dde9f212becf1661b65364a97b9ed4bfe194cc651e208bd152addf7eee42b6ddc5d83bf7c4cfefdd205e5fb7723b03047e14e13a44a1f50e22b77ba1a52
-EBUILD gnome-desktop-3.38.1.ebuild 1927 BLAKE2B befbd291e5a488f81c53ad4da33ed3ddf05ccd51525018bbab13b020be432c0c47cbdf7823b6330bd4e58a6930994558ab977afdb9cb04520bad203ce7a47466 SHA512 8639565b2cfaa893a1b692f7a39b4a269c1a9b4ae8b1586487b8e0779f79e9a07c30bd3680b8675e060c6a8d60826f2f0f00b8f7ab1f84dfe2167c245b9c51f1
+EBUILD gnome-desktop-3.36.8.ebuild 2022 BLAKE2B f3dd6dca7559c79967f73859b72c5ec3f9edcd8ab4d527e8d9503fd93ff2e117637223261a59e3937d5d074ebb064c36d7294adb62b5686435cce88fcbb0c7f5 SHA512 7280f4ae4748c982826f10248a3b6edf8e963a982facc182c98895ad1e6c695d076a62d4f56830c6fbf96dc0a9cdb3c9d533f1ceb16757f4f3475c8942579fcf
 EBUILD gnome-desktop-3.38.2.ebuild 1927 BLAKE2B befbd291e5a488f81c53ad4da33ed3ddf05ccd51525018bbab13b020be432c0c47cbdf7823b6330bd4e58a6930994558ab977afdb9cb04520bad203ce7a47466 SHA512 8639565b2cfaa893a1b692f7a39b4a269c1a9b4ae8b1586487b8e0779f79e9a07c30bd3680b8675e060c6a8d60826f2f0f00b8f7ab1f84dfe2167c245b9c51f1
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.36.7.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.36.8.ebuild
similarity index 94%
rename from gnome-base/gnome-desktop/gnome-desktop-3.36.7.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.36.8.ebuild
index e7951e7ba9c2..bcd26befee5f 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.36.7.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.36.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/19" # subslot = libgnome-desktop-3 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.38.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.38.1.ebuild
deleted file mode 100644
index f2127cb11f3b..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.38.1.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
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
-	x11-misc/xkeyboard-config
-	app-text/iso-codes
-	systemd? ( sys-apps/systemd:= )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
-	media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
-	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
-
-src_prepare() {
-	# Don't build manual test programs that will never get run
-	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgnome_distributor=Gentoo
-		-Ddate_in_gnome_version=true
-		-Ddesktop_docs=true
-		$(meson_use debug debug_tools)
-		$(meson_use introspection)
-		$(meson_feature udev)
-		$(meson_feature systemd)
-		$(meson_use gtk-doc gtk_doc)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index c5410cef58f3..80f1573e5800 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -2,7 +2,7 @@ AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
 DIST librsvg-2.48.8.tar.xz 15302184 BLAKE2B 7d44b58d894afbeff0cb4606ed64191c028e7ac9d987dd3248b90df4ae0c000ee47b02484116bf7ee6e7aad567b91df7a2aae6880514f5ddee3ef4826c2e828e SHA512 7b35afbbad17927168acb3a308bff59ea66e8e1ac18c2ab5626a7d494e90d87d2dc552959ad72974d3ed8ba4c2f919335cf9110a0d0a09148e606222e4fcee43
 DIST librsvg-2.48.9.tar.xz 15309204 BLAKE2B 2547f9eb2bb81c7c879356df0df674ba27a09e3b1f0eb8df99df7a9a9c5e6838e94e143f50a00a742a4fd7043c01b4f484cfa78c84c4d5e6ec281bde35fd98b2 SHA512 91fc480a9e9ff3755ed2685170a1fadea9232ab9a727a66da5085df09cd1a160cb8f443de7dec950799de5f4cb88b1ee33384107e316f573940147346c155a40
-EBUILD librsvg-2.40.21.ebuild 2621 BLAKE2B 50fdea0a81bba894e643f143459798398ed4404bb48f5068df79ff6877aba8ae1eca4f9d9f46e25d34db6a06e00b2cb5c1a7b0b2c5518da968c74bf427dbd828 SHA512 bb345f47471b2685f2cf3499f8e4bac8fa6ab652c7de60aabef402aa6a8c22d442c376662f7adda4a4d470ae6eec8a8c34a75fb71c3d19b07ff5689b5e06cab5
+EBUILD librsvg-2.40.21.ebuild 2545 BLAKE2B 0e4151ebcd62ad6a15c54a8642ef571311c45d2c4e6ce6f1b513019325147d7fb6c2642f415eff9bd1c87a242f7f760ab04770d5a75ae853545defe784ffc9a2 SHA512 754173c7ee44b8dd1584b166df68eafc146581e64d97377176f034cee77af9f268eee6544f79dc95ff608d765df12c827c5328b55498f897e2ccf3a90997bc87
 EBUILD librsvg-2.48.8.ebuild 2493 BLAKE2B 0dcdd0e0604652803e354397a61a6da127f59ac4f73c84355ae1ed473d9de28443ac96c144b06eab7d24da7c9f46d8f31580ce2cfbca734b8407f034c10c9d65 SHA512 9c05dee8de012eff413ac0444e0dbb1dc0fab8f50bad7d0c4179bfb2dc4a264d1110a26b2a5f808f0169a6e11922c220d27ff651835dcee4e80f5bc0c372d1f4
 EBUILD librsvg-2.48.9.ebuild 2498 BLAKE2B 77ad625306c3e87b085268d1b4f659f083ac58026d23f7285a866babeada7a43a3e28a5666043e5154af6573ac39325eba7e852fcb6052ae7ad59ccba5e1a84b SHA512 9e4445991fadcc1d29cb640248ffa0c8a3837afd3df750bbc1472ae2c66017c746335af351e4fc59652a3f0680470a0d81d1ec0586876bf606f590f5a633fc8a
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
index 44a6e1505746..7fa10b848624 100644
--- a/gnome-base/librsvg/librsvg-2.40.21.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.21.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
+GNOME2_EAUTORECONF="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils gnome2 multilib-minimal vala
+inherit autotools gnome2 multilib-minimal vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
@@ -19,55 +19,52 @@ REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
 	>=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
 	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
 	tools? ( >=x11-libs/gtk+-3.10.0:3 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-libs/gobject-introspection-common
 	dev-libs/vala-common
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.13
 	virtual/pkgconfig
+	x11-libs/gdk-pixbuf
 	vala? ( $(vala_depend) )
 "
 # >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
 
 RESTRICT="test" # Lots of issues due to freetype changes and more; ever since newer tests got backported into 2.40.19
 
-src_prepare() {
+PATCHES=(
 	# https://bugzilla.gnome.org/show_bug.cgi?id=653323
-	eapply "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
-
-	eautoreconf
+	"${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
+)
 
+src_prepare() {
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
 
 multilib_src_configure() {
-	local myconf=()
+	local myconf=(
+		--disable-static
+		--disable-tools  # only useful for librsvg developers
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_with tools gtk3)
+		$(multilib_native_use_enable vala)
+		--enable-pixbuf-loader
+	)
 
 	# -Bsymbolic is not supported by the Darwin toolchain
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=( --disable-Bsymbolic )
-	fi
+	[[ ${CHOST} == *-darwin* ]] && myconf+=( --disable-Bsymbolic )
 
-	# --disable-tools even when USE=tools; the tools/ subdirectory is useful
-	# only for librsvg developers
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tools \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_with tools gtk3) \
-		$(multilib_native_use_enable vala) \
-		--enable-pixbuf-loader \
-		"${myconf[@]}"
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
 
 	if multilib_is_native_abi; then
 		ln -s "${S}"/doc/html doc/html || die
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index d10da42ca3e5..56c17eb2e6fa 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 3e9a9cdd2b93..76b779c69914 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-boxes-3.36.6.tar.xz 1275972 BLAKE2B a4b6bc98a8ed644020dce7ce5f5f08ae75291e2ac3351d1b3354d495a0579a59a245d63ba22754679b9641088bb71f96cd3abc7944f9996526ad7e6db9552458 SHA512 a37f34ea54d60d2d927dfe07a6ace6bd74910054b63a58bc2782f6dcd087d4a2153db0662d715a1bc67e2687742a162b3f66ff97b7678eb280f46b53765c7f73
-EBUILD gnome-boxes-3.36.6.ebuild 3853 BLAKE2B 0dc09c0bfa2f18d7bf4505d29895d33aa8fccf6cdf8437d00dfc59f671e9c4f40d8607f0ed7fe3dc5fc18595f77672b67781b0278cd463b5186548f2adddec60 SHA512 4dd12bd869e7acd101a65bae9226debf43fadc1cd090b9175caedb6df3e6dcb9a7a373103de62dd84cc1b62cb36d222441b43d660f13f33899790f808363b91a
+EBUILD gnome-boxes-3.36.6.ebuild 3853 BLAKE2B c1eea77aa1309b15f67adba655c474d1f7dd1287caf6fbed76cbfedf55df487de92664128487ba57665c85c45f232935da4033f0c996bc4a1b0510130861a8dd SHA512 1981a11ea69d55cb24192f7a0c8cf811482f5c0c3615512047db3054915d53e4c920bb54ab75f5b053a414b09a33c8580701e698d96526425c9e1fdf09893a82
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild
index 098d16b342b9..bae4e2ebd197 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild
@@ -42,19 +42,19 @@ DEPEND="
 " # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
 # These are called via exec():
 # sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
-# virtual/cdrtools mkisofs is needed for unattended installer secondary disk image creation
+# app-cdr/cdrtools mkisofs is needed for unattended installer secondary disk image creation
 # app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
 # sys-apps/policycoreutils restorecon is used for checking selinux context
 # app-emulation/libvirt virsh used for various checks (and we need the library anyways)
 # sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
 # app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
 RDEPEND="${DEPEND}
+	app-cdr/cdrtools
 	>=app-misc/tracker-miners-2[iso]
 	app-emulation/spice[smartcard]
 	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
 	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
 	sys-fs/mtools
-	virtual/cdrtools
 	sys-auth/polkit
 "
 # gtk-frdp generates gir and needs gtk+ introspection for it
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index a897cadfd69e..3753b5ed22de 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-calendar-3.36.2.tar.xz 605904 BLAKE2B 42b0337a01a5316a60d41eede91c453e3c0fa2b056e9053f8868f344a662fdf4b3de4ade1f1a59b729f2bc3e087cf6b971094cd282d75432a83acc89a21054a7 SHA512 83d0157a3958ff7f16af2f6a06c2c5fdd7ce19bb532c1cda0982ab37d78149f4c0ae252de937103baa56d105a1cf54c2e29174f6f3f969904071e187cf564c33
 DIST gnome-calendar-3.38.1.tar.xz 547168 BLAKE2B 05ad63cb5ca6ed39456846dc9f08ce9dabe5614d92a985060dfe079f7fd5472bf449506ff9ac00f1c7fbe0af7c2d6895799392a579ca5b9525b0e1c46ebdebc5 SHA512 24ddb69852139954f0b29b3333b712bb56f79fa8cdefba567cad99ddeb1bd5a4af644fdfc8ac0c7c404be49437df0395722d5d7e7e5221847b2eb4b83c9b5f05
+DIST gnome-calendar-3.38.2.tar.xz 547228 BLAKE2B ef7ba6dce47d9ee664d1dc648da81738cfd20108799e0c262b16152ce7b590613b711fbcf9ddbff4fb9ba597b1067b558697874744abd3f32ac08d7dcbe5550d SHA512 2744c91e37c8966f2deee1588fe439ccd520344c24f1b74422f7ba95f592c9691a2530984499a00af3065447932195879bc1b5b9e8ae6731487ac047e5d75267
 EBUILD gnome-calendar-3.36.2.ebuild 1161 BLAKE2B 552a219456498bfc668ee77679e8d612f02424a93e3ed6203b847345b387ab2993deb220bfd6f67dc5b27ba22aa8dcd849f7cf7729b4f69425f50ec1dc85ba66 SHA512 4370221f5610fad479ead77121c790102cf215ddaf7f4c3a691fe1fb2a2e93820231cd4b61e6a68b5b7f04b5bef8c077dc8afdc81f1319d4b27e1705828c6066
 EBUILD gnome-calendar-3.38.1.ebuild 1163 BLAKE2B b711a957515d016563149208b021ae82df2be2ea63a0edfc2fc807354c2b9cf91b24dabee4a1d87111785ec4a067e2d672603d24e8da85be8ad954d8fcb5f2fd SHA512 67549b65156269daa0b64d3255c17d38535c31f8c1b0dc7706fb6dee7ca540eb08e3fc10b6cc2380b5589db13ffd13b004e7232d0020b38e3b3a2508c34a1bb4
+EBUILD gnome-calendar-3.38.2.ebuild 1163 BLAKE2B b711a957515d016563149208b021ae82df2be2ea63a0edfc2fc807354c2b9cf91b24dabee4a1d87111785ec4a067e2d672603d24e8da85be8ad954d8fcb5f2fd SHA512 67549b65156269daa0b64d3255c17d38535c31f8c1b0dc7706fb6dee7ca540eb08e3fc10b6cc2380b5589db13ffd13b004e7232d0020b38e3b3a2508c34a1bb4
 MISC metadata.xml 522 BLAKE2B 24cb41757041daedf83e72cd8620bef49d2bced678ede42c1a071c3cf99f2f157b086acc393953b42a612dd5c4d622b0a869934f89661c28be742370cd4688c2 SHA512 f595d013522df745a86b01e6696ea5fe6dafa55d55e3fe22adf469fef56507846194f24c2ec5cd13382c69a494ca530438d12c69a6bec41247da1783fc78eef8
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.38.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.38.2.ebuild
new file mode 100644
index 000000000000..23459051d17b
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.38.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+DEPEND="
+	>=dev-libs/libical-1.0.1:0=
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
+	net-libs/libsoup:2.4
+	>=dev-libs/libdazzle-3.33.1
+	>=gui-libs/libhandy-0.0.9:0.0=
+	>=dev-libs/glib-2.58.0:2
+	>=x11-libs/gtk+-3.22.0:3
+	>=net-libs/gnome-online-accounts-3.2.0:=
+	>=dev-libs/libgweather-3.27.2:=
+	>=app-misc/geoclue-2.4:2.0
+	>=sci-geosciences/geocode-glib-3.23
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 420a8f21eaf4..df48728a89c8 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,3 +1,6 @@
+AUX 3.36.2-fix-telepathy.patch 2839 BLAKE2B 42e48203bb17cab1940d12169e39703c85dcd368a9c296b4771d9128f9f98d2a6b10305ab745139bfe94c3088129c1fd985a4bd5fe3950c2196f054b6d4beb34 SHA512 112872143b270507465f1a203973bc5a7e1987a40cd45a67ee62b8aa88eb94fba9d803c77cc289d24c15d4a20e307588e6078f243a0c754fa961a85330e2a3b2
 DIST gnome-contacts-3.36.2.tar.xz 635932 BLAKE2B 9bcdf093d99477d1162c9ea78007e65cf20a1e4038fe284fafa4c174ab1d1d0c2ceb7ec2806c9abeed1c8ab168549c80b2763e65ece22c76a9044781eef8ed5d SHA512 ebbce67aa5c0af55559230c558c5f28b065182d434582431595bffedc25dd0ec3caa44e60f4670b4b2a1f784e90c8dd4f56df937054697b4ea932a39da78f1c1
-EBUILD gnome-contacts-3.36.2.ebuild 1635 BLAKE2B d434c443649256adfe872153523926d208b2e79aa402531869536c2ef20a1933709f9ef4899a902a1752e21df211fd16cd1de33ab934ff433398999717776ab4 SHA512 bfb263315df2828a9d7487a56ee800acfc00825ef4b2360a0d8511cac143f51f3f3822d26eaf67dd14bd3334f01e291b0b6d3cf5ff0359954193b48e9c71b00e
+DIST gnome-contacts-3.38.1.tar.xz 657376 BLAKE2B 5c042566ad99be1bda454466dcc2a42d6494cfbfb5a9f60eb0fa718a8d9bcbb986798ec48a87d5d322989b22d0fac2eee69df852ae39ba8a228ad91f50247c30 SHA512 bc2ed06d491c4773b9cedb2c51dc390a95d0271cf22d54864f5da4d892f80efece3cbdc1b90b4497f730039c8c83065b2a0ca590cecec579f011dd324ff8f134
+EBUILD gnome-contacts-3.36.2.ebuild 1717 BLAKE2B 402bae46c48b40440e11e99c2e0b68bf25251fbcb41bb806dc90c2adbe7d4629c0851c2c59598b59b7fee257b3d52a46c2811d4c2b6d7832c9c8315d588e0a31 SHA512 01e1837785076273e06eb275aa63714daa23b7cf43f5a7ea49448aaafd8f76db12c05b4be8832557ed025620dc4689758844ed679a183a7566c2d221169aaf93
+EBUILD gnome-contacts-3.38.1.ebuild 1644 BLAKE2B ad29a47b8415f388a694b766f16dc37ca7e8b0fa61e19dff4b8b76b6b9afbdf1607dc3ada7349ef907ba760c78ce945588854f7d64e0205c4e203200167dbfe2 SHA512 d5e23cfde1774f5b89eec2dfe735ce8549c01788c9a9e2256e7f350a1f94e97d158b681cc4656956186986043256b4a188d7a0ecccc87fe4d5f6e4b4859b47a6
 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
diff --git a/gnome-extra/gnome-contacts/files/3.36.2-fix-telepathy.patch b/gnome-extra/gnome-contacts/files/3.36.2-fix-telepathy.patch
new file mode 100644
index 000000000000..07d4e7783634
--- /dev/null
+++ b/gnome-extra/gnome-contacts/files/3.36.2-fix-telepathy.patch
@@ -0,0 +1,71 @@
+From cbcb28f91f2c5dab9300ded79dc8e246a7ae0f36 Mon Sep 17 00:00:00 2001
+From: Niels De Graef <nielsdegraef@gmail.com>
+Date: Sat, 7 Nov 2020 12:01:59 +0100
+Subject: [PATCH] Fix build when -Dtelepathy=true
+
+---
+ src/contacts-contact-list.vala  | 2 +-
+ src/contacts-contact-sheet.vala | 4 +++-
+ src/contacts-utils.vala         | 4 ++--
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/contacts-contact-list.vala b/src/contacts-contact-list.vala
+index aa3cd33..b371644 100644
+--- a/src/contacts-contact-list.vala
++++ b/src/contacts-contact-list.vala
+@@ -243,7 +243,7 @@ public class Contacts.ContactList : ListBox {
+     selection_changed (individual);
+ #if HAVE_TELEPATHY
+     if (individual != null)
+-      Contact.fetch_contact_info (individual);
++      Utils.fetch_contact_info (individual);
+ #endif
+   }
+ 
+diff --git a/src/contacts-contact-sheet.vala b/src/contacts-contact-sheet.vala
+index b6c2249..669e771 100644
+--- a/src/contacts-contact-sheet.vala
++++ b/src/contacts-contact-sheet.vala
+@@ -27,6 +27,7 @@ using Gee;
+ public class Contacts.ContactSheet : Grid {
+   private int last_row = 0;
+   private Individual individual;
++  private unowned Store store;
+   public bool narrow { get; set; default = true; }
+ 
+   private const string[] SORTED_PROPERTIES = {
+@@ -43,6 +44,7 @@ public class Contacts.ContactSheet : Grid {
+   public ContactSheet (Individual individual, Store store) {
+     Object (row_spacing: 12, column_spacing: 12);
+     this.individual = individual;
++    this.store = store;
+ 
+     this.individual.notify.connect (update);
+     this.individual.personas_changed.connect (update);
+@@ -242,7 +244,7 @@ public class Contacts.ContactSheet : Grid {
+                 var type = im_persona.presence_type;
+                 if (type != PresenceType.UNSET && type != PresenceType.ERROR &&
+                     type != PresenceType.OFFLINE && type != PresenceType.UNKNOWN) {
+-                  Utils.start_chat (this.contact, protocol, id.value);
++                  Utils.start_chat (this.individual, protocol, id.value);
+                 }
+               }
+             });
+diff --git a/src/contacts-utils.vala b/src/contacts-utils.vala
+index 879c4a9..8f3b8c1 100644
+--- a/src/contacts-utils.vala
++++ b/src/contacts-utils.vala
+@@ -80,8 +80,8 @@ namespace Contacts.Utils {
+   }
+ 
+ #if HAVE_TELEPATHY
+-  public void start_chat (Contact contact, string protocol, string id) {
+-    var im_persona = contact.find_im_persona (protocol, id);
++  public void start_chat (Individual individual, string protocol, string id) {
++    var im_persona = Utils.find_im_persona (individual, protocol, id);
+     var account = (im_persona.store as Tpf.PersonaStore).account;
+     var request_dict = new HashTable<string, Value?>(str_hash, str_equal);
+     request_dict.insert (TelepathyGLib.PROP_CHANNEL_CHANNEL_TYPE,
+-- 
+2.27.0
+
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
index 669b2a1ab433..372d51f30729 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+VALA_MIN_API_VERSION="0.40"
 VALA_MAX_API_VERSION="0.48"
 
 inherit gnome.org gnome2-utils meson vala xdg
@@ -48,6 +49,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-telepathy.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 	vala_src_prepare
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild
new file mode 100644
index 000000000000..279d1ad7f841
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="GNOME contact management application"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="telepathy v4l"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+VALA_DEPEND="
+	$(vala_depend)
+	>=dev-libs/gobject-introspection-1.54
+	dev-libs/folks[vala(+)]
+	net-libs/gnome-online-accounts[vala]
+	gnome-extra/evolution-data-server[gtk,vala]
+	telepathy? ( net-libs/telepathy-glib[vala] )
+	>=gui-libs/libhandy-1.0.0:1[vala]
+"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
+RDEPEND="
+	>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts]
+	>=dev-libs/folks-0.11.4:=[eds,telepathy?]
+	>=dev-libs/glib-2.58:2
+	>=dev-libs/libgee-0.10:0.8
+	>=gnome-base/gnome-desktop-3.0:3=
+	net-libs/gnome-online-accounts:=
+	>=x11-libs/gtk+-3.23.1:3
+	v4l? ( >=media-video/cheese-3.5.91:= )
+	telepathy? ( >=net-libs/telepathy-glib-0.22 )
+	>=gui-libs/libhandy-0.0.12:0.0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${VALA_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature v4l cheese)
+		$(meson_use telepathy)
+		-Dmanpage=true
+		-Ddocs=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index bcd6b5e3f549..a57410ab95d6 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-user-docs-3.36.2.tar.xz 10568116 BLAKE2B bf53e85276d455bfeed645621b8273ace47644c5de0896f07b46c1dde5316f03385cbedce5ca259fe6c6460d35c090ad0dca8cbf46e3db0df95cc6a832424dc0 SHA512 6f9d5e6c86a377a7c77a89246b1c0555a5ddbbf9e0ec983182b9cc019c03c53d585c71f63fedb67ff1e0547ec65e1c2d832947d7e58ac2f1491c268735617c77
+DIST gnome-user-docs-3.36.6.tar.xz 10607064 BLAKE2B 2b6173905f16a72885ea684e79930ee9425adea7b98b11f324df48c5f788a6f72aafcf9b782aae764eca3db451bd232be6f2572eec6278e179ae04102c863a1f SHA512 62384715c9cfa82fcf39f93d574e61aa2a127060f558f7f68b7ce1a3a724cf1670affeff165cff16b6c019b2c4135a517d39da6be859e8756c850763c912f3ab
 EBUILD gnome-user-docs-3.36.2.ebuild 947 BLAKE2B 2d63b7d012c49dd350c274f6e7bc2776c58cc2637512bd9dbf139f53a0d1500c7869832f7a0bfd4ed3ca941e459e3d0ba411c4183ac4df738a91f01cacf6bf32 SHA512 e53c4bbe490e9ae8b08abf8bce2e297c665b38bad680cb52866ffa567240d90757a0f9e1bb8f1e9746ed27d227a5f5b0dfc582cf9a25231d73eb50d462e51dbe
+EBUILD gnome-user-docs-3.36.6.ebuild 949 BLAKE2B 4e576f3a233baa42375a2086e5a18db47ee0d0316063faff9f6bfcf6e4cf766ccf64e12f93d2d300907ac06ff085cd21544782e5d81abc76fa69883b92b2e8fe SHA512 b0cf4e019833cda7ab1e35eef0855fc82fe9e648d4cc3f9f56fbdb2f6290023430645f59540fecd1fdbb316e6e42f68c744118d5f1026590bf17e2c677123888
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.36.6.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.36.6.ebuild
new file mode 100644
index 000000000000..1c83d246f5a8
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.36.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="GNOME end user documentation"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	test? ( dev-libs/libxml2 )
+"
+# eautoreconf requires:
+#	app-text/yelp-tools
+# rebuilding translations requires:
+#	app-text/yelp-tools
+#	dev-util/gettext
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip
+	!test? ( test )"
+
+src_configure() {
+	# itstool is only needed for rebuilding translations
+	# xmllint is only needed for tests
+	gnome2_src_configure \
+		$(usex test "" XMLLINT=$(type -P true)) \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
+	# which can take > 2 hours on a Core i7.
+	return
+}
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 7a1e2332ffa1..9cc8fcd21b82 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,4 +1,6 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
 DIST yelp-3.36.0.tar.xz 1538076 BLAKE2B d3f8817a54506997581ddc5477c87e2b61be0303c275e9174602a005838f141b1b7ad1904b682dfe3cf1118aaf497abbbfc855c5b57e2f7f3fdf6108a90f3ef1 SHA512 533916c61f6c0c830ddd21533c4462bea8493c76246092b1d77fa145f29cda15ae01817a4ac680bdf61ed591513320faf48e0aa727567c677fdb0ad66b6fa0c8
+DIST yelp-3.36.2.tar.xz 1526300 BLAKE2B f33bbbab9c02d36d8d2472735b661f5a29bfae8b104851e202a0b825390c308500fe108b6a7741ddf0774b2657f772bf94b69051b089b98009ab49a1cc55e4f5 SHA512 eabf1513a723c208d63c728aa08da641672b93f026317258f5732371e9837ab7626d2dcaf609da7982458fe2caf76a6d7607042d073bb5779a2e3916e938af0d
 EBUILD yelp-3.36.0.ebuild 1236 BLAKE2B 4718064927a9cafcbbb1b53146e4d25916183d90e8d7c6c86270d8a547af7f027ae23abeaaeb4103836dd59ffafc3ba6e0badc8b84667bfec5da5ead18ebbf0b SHA512 49c550d5ec380c1708661b6de856bfe610443938ff04d5b10215abdac197fb4c8a24b489c6a7cd3874b595f14d37adfc5cd32b014f4476290fa50fdff5fef50d
+EBUILD yelp-3.36.2.ebuild 1216 BLAKE2B a3683ff92d896e3e22b1eba7d21d3a97ce243dbbb1fb851c79edb841c293dcf7e7bc09e885f04cbb9fdee7a7c4e2c688550e345b48fa70439f16ce1dcf3319bc SHA512 76e122f5fa5a6b7653bd3de7db8f300723ea17cb949dbbe3d330d35b6bcd57d0875d61679c5bfc25142ce4d2a9d63081d5ea0fcbe73405f0afc6855c1c37479e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-3.36.2.ebuild b/gnome-extra/yelp/yelp-3.36.2.ebuild
new file mode 100644
index 000000000000..4c46c28a79fe
--- /dev/null
+++ b/gnome-extra/yelp/yelp-3.36.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+
+inherit 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}"
+BDEPEND="
+	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
+"
+
+PATCHES=(
+	# Fix compatibility with Gentoo's sys-apps/man
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
+	"${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch # needs eautoreconf
+)
+
+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/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 2718d5d9ace6..002306a5a07d 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 8148667983f9..645c5444daed 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,5 +1,7 @@
 AUX 0.0.13-glade3.36-compat1.patch 1655 BLAKE2B fcc6be57b5eea5554e5ba0149fdc6fe9067a436b333c299f2b6366c98798e821d6d1c861b0fc299c6de145e9f310ea5822505591e678c36f938802accecbe0e6 SHA512 beffe74c8f78767113930193870165c751443d0f9c3cf5c6df89f1f872c892a559c1d34c63f84090d6187afa4495bc2c6a557335db5a98afc3820fe688a48a6f
 AUX 0.0.13-glade3.36-compat2.patch 1879 BLAKE2B d21b874a52028e2b7e4c09da9fb1b97296872a2a7d1665124813a644c9524e56fdeba2afbca218519edf524e91efb76f6182009319e3b098e2464e478b4b5b2d SHA512 c154ee41052dadc97afe99350a08eb141c61dad7201fe2421ae0c27e9cbd5fad8af057e44ae277a2dac9b22d3e1bf945345791bc764783a8bd19448da63bde95
+DIST libhandy-1.0.2.tar.xz 388756 BLAKE2B c4995c5865378b133ba90125cd2c6c7500730be32b2426ccb323c878c22e556c0aad4eb0a5ab5f6ff936b3132a1717759af826e5bc0c9426b6f6972ac20f4f44 SHA512 411e016e1770ea83507a66e6e751f223304890cd193191c28cf751f8128dc5c98feb5342012596c10219e4da5a2445659395a0e7086d5c9990f7845b0406c685
 DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
 EBUILD libhandy-0.0.13.ebuild 1598 BLAKE2B e7f3e2a5c8974c91a0609e91c7b6f6c3431adbaff0d123e9d9d371baf8e192f79029df1563dd0490a6a67c0651cdbbdc196ce7122b2f0df34ee80abfd9cc8900 SHA512 d9a7f2a75d6239b39fb6899bb7072d9177c415737095ce5820c9b9a5fff7f523426a299a9debb91d1efe23ff7b14b021685a98fe198485b6093568358a173387
+EBUILD libhandy-1.0.2.ebuild 1250 BLAKE2B d485b113d14e7c640bb5329abf59de104a6e8d1a4568278967c05da082d03ebf856058bc85435447f72456ae4a4173de27eade28292f263f19241ac8d630fa8f SHA512 16ba69dd21140246b0fe93afbb96e0df22bd130f4677d4decf0b84c95d661075970b20236aebbd93d17aafce60e16e0fb883e6b4ee07cf48a4323ccb82578153
 MISC metadata.xml 353 BLAKE2B 7857afbafa45ea4d3230afa20992cf7196bdd23430ba09bd032b5965b3ce6b7ebadf8122b412549a84d798107adbce3f0b1d6ed79975f315889f7a7700187504 SHA512 f54a7b013a4b5f2e94efda2de95f8063a8755fb2162262a2734ea561fa10cd48be737ddbc3ab7ea93f5d1cf3f59dd91c70da25db5d331828aa74194109c5d36f
diff --git a/gui-libs/libhandy/libhandy-1.0.2.ebuild b/gui-libs/libhandy/libhandy-1.0.2.ebuild
new file mode 100644
index 000000000000..43d30fc4e3fc
--- /dev/null
+++ b/gui-libs/libhandy/libhandy-1.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Building blocks for modern adaptive GNOME apps"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="examples glade gtk-doc +introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.24.1:3[introspection?]
+	glade? ( dev-util/glade:3.10= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofiling=false # -pg passing
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use test tests)
+		$(meson_use examples)
+		$(meson_feature glade glade_catalog)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 9c66b08dd47e..7f7ea2040957 100644
Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 2f1c21d6c135..11ff1467cfac 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,6 +1,7 @@
 DIST sway-1.5.1.tar.gz 5536721 BLAKE2B 4dcb6ca380ef8451ab9219a584598928a79e999bc0b1de0599cb7867c8fd94d54c55a2be9585635b4fd230fd83852141d6fd41ef35dbc4a8fef1bcc2828b3be4 SHA512 3b937249db2875100bc22e99f955a3300d3294a296fb37006fa1468a3986bf4fa8e5197279e3587bd8dc29f31adff8fbdc9ddc840e7be982b73331a05cd06ba5
 DIST sway-1.5.tar.gz 5535966 BLAKE2B e863e97ee897dcd1652d363a09b712932de55da08c88b4858f0aadc29b2cb19d2bda1e5e1184f4e4be6fa54a0136463556f9072f32e2b952d4f12ffd0ee9baf9 SHA512 702e44f8923a4ca05d831dd7ed76165654f113a8b2754d332c509ee844528f47c52b7f21deca78d4a79dad465cbcd0934574fff4ad9bb7a45aec3124dea5bca4
+EBUILD sway-1.5.1-r1.ebuild 3148 BLAKE2B 0c71e5d52ca525bd7c25e28108da95d6d86dc419dbca0ec97cdff6b88688ce2ccc0226773bf22b296ac66116c4c5b129613af02a30c5f7dc9ef2396688591fec SHA512 b95e2e5c6f45aeaf62372d8dbbdff3d57f48980051d301bd23c1105da8e3ce597e624132e3b116e6bce09e484b753d1b187c345b21b5148c7c5719c7c8076435
 EBUILD sway-1.5.1.ebuild 3123 BLAKE2B e6b31593b2dc7f47edb561b95ff74562f29604e24dfafd603c4f343e8e91641ccf76402aa4608879fdc410a691b47a35f412ecc130c8ef79772a1bc14497864e SHA512 df481568d43bfbc64bb1ff293ee94c126d40e2379e50217f383ac1a315f48bb7a4d22fd1fa69abc7b526f2bf317811a97ff99ecae8e9ec78c6ee344be1f23885
 EBUILD sway-1.5.ebuild 3124 BLAKE2B 62294350697990792f27d39c7c720455b50434bfbf805fd67b4c474750af3c7319e3877f2bd00b033a4a82cd8dcd5ae4cac5fcbd6c754d769c25d7e9a6b0f77c SHA512 6f991e0e9f8fc39f3d833e1636b529d8fb0e9b002a990ceefb43864db1febbd8657084a8e8849a11af4a4b00a721f14955ade2d1742ac051c68d1d1934939a09
-EBUILD sway-9999.ebuild 3126 BLAKE2B eccd23c8a4c57d9c8e05e41115b6038193e27c9fc3ff68ca70b4c04ecffb796abf95d1fe8990d324b49c27fe647a96dc51b6292d656face5e33c934afccfd2ff SHA512 bdbe1568aee63184c8a240c63090b929f12ee30dd246ddfa570d0c20b1f90dded9c233619a949f035ed997d03f3025836f07380df750d1aa642d32699f39a106
+EBUILD sway-9999.ebuild 3148 BLAKE2B 0c71e5d52ca525bd7c25e28108da95d6d86dc419dbca0ec97cdff6b88688ce2ccc0226773bf22b296ac66116c4c5b129613af02a30c5f7dc9ef2396688591fec SHA512 b95e2e5c6f45aeaf62372d8dbbdff3d57f48980051d301bd23c1105da8e3ce597e624132e3b116e6bce09e484b753d1b187c345b21b5148c7c5719c7c8076435
 MISC metadata.xml 2468 BLAKE2B dc1da35dc84c5c977c7ecdd44972bea616119c166a5b4d138895a7c4327f8465db94f4b039afe4e1cab119063fa0d050a7ef9ef25ed77c22c3776098560cb7dd SHA512 1abe7b4a3871350e6573fb2eb88de1c2b908a13c18661a19a4a192e73ba5860bfdf268f10761413110c9eedea67c811c3a4dc0ce700ad9c59713b5c6546ddc0e
diff --git a/gui-wm/sway/sway-1.5.1-r1.ebuild b/gui-wm/sway/sway-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..1d2aa6e981d5
--- /dev/null
+++ b/gui-wm/sway/sway-1.5.1-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils meson
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="https://swaywm.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion"
+REQUIRED_USE="?? ( elogind systemd )
+	tray? ( || ( elogind systemd ) )"
+
+DEPEND="
+	>=dev-libs/json-c-0.13:0=
+	>=dev-libs/libinput-1.6.0:0=
+	dev-libs/libpcre
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	media-libs/mesa[gles2,libglvnd(+)]
+	elogind? ( >=sys-auth/elogind-239[policykit] )
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	swaybg? ( gui-apps/swaybg )
+	swayidle? ( gui-apps/swayidle )
+	swaylock? ( gui-apps/swaylock )
+	systemd? ( >=sys-apps/systemd-239[policykit] )
+	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]"
+else
+	DEPEND+="
+		=gui-libs/wlroots-0.12.0*:=[elogind=,seatd=,systemd=,X=]
+	"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	>=dev-util/meson-0.53.0
+	virtual/pkgconfig
+"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+
+src_prepare() {
+	default
+
+	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
+	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
+	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dtray=$(usex tray enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		$(meson_use wallpapers default-wallpaper)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+
+	if use swaybar; then
+		emesonargs+=("-Dgdk-pixbuf=enabled")
+	else
+		emesonargs+=("-Dgdk-pixbuf=disabled")
+	fi
+
+	meson_src_configure
+}
+
+pkg_preinst() {
+	if ! use systemd && ! use elogind && ! use seatd; then
+		fowners root:0 /usr/bin/sway
+		fperms 4511 /usr/bin/sway
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd && ! use elogind && ! use seatd; then
+		elog ""
+		elog "If you use ConsoleKit2, remember to launch sway using:"
+		elog "exec ck-launch-session sway"
+		elog ""
+		elog "If your system does not set the XDG_RUNTIME_DIR environment"
+		elog "variable, you must set it manually to run Sway. See wiki"
+		elog "for details: https://wiki.gentoo.org/wiki/Sway"
+	fi
+}
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index ffac4374950d..1d2aa6e981d5 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -34,12 +34,12 @@ DEPEND="
 	x11-libs/pango
 	x11-libs/pixman
 	media-libs/mesa[gles2,libglvnd(+)]
-	elogind? ( >=sys-auth/elogind-239 )
+	elogind? ( >=sys-auth/elogind-239[policykit] )
 	swaybar? ( x11-libs/gdk-pixbuf:2 )
 	swaybg? ( gui-apps/swaybg )
 	swayidle? ( gui-apps/swayidle )
 	swaylock? ( gui-apps/swaylock )
-	systemd? ( >=sys-apps/systemd-239 )
+	systemd? ( >=sys-apps/systemd-239[policykit] )
 	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
 	X? ( x11-libs/libxcb:0= )
 "
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index cc979016a21f..866c5683fb17 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index f5244a24e864..abf10e4caea2 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
 DIST k3b-20.08.3.tar.xz 10684548 BLAKE2B bfb9a06fd5b9c023fe7a9c1c93fd2f473941906870f8face596617cf5bc2e26e258cc6adbe9fb7a99da0ed5bd9f09273168408133c8d6142bd42dc4779e2fa32 SHA512 0d068f10d8dd287a33ca672e780673b7f6a92c2071ea9ec22176ea4a9a210e205eb1b605ee23edca4d2e7eaefbe2dead04ef8b8ee29b690f38185e3caae14ba8
 DIST k3b-20.12.0.tar.xz 10684460 BLAKE2B 865b36f8c14c372967851da484155dbb472cfb990e4e6f215d180682eaa9390caf05c222660bcb54b41d3f90b8dbf16b18a896145d517553bad719691c6a096e SHA512 fb1cae4cc10dffeab522d4cf28c03520fec8bdf2baad3b37637521be614f0a9174672579f3ab5fee3fd759ddc3625b46cec889e7123dfdba870d3fbde615ac98
-EBUILD k3b-20.08.3.ebuild 3438 BLAKE2B a3dadf1a955dc72e7c50d3f7b203bd4da5dda48a0acd7f8a5d214a63157df00dba5e8a530c35f0547c4695a1f920db669acfeb4f51756080acc9d45286f51f22 SHA512 1e17cf400baeba16e7a5350fae39ce5ff9d137062f6a08ae151a8d3452c907a8feb772820dd0196d9391c2713081866cd48db56c5fca2ae5ef9d0947523007db
-EBUILD k3b-20.12.0.ebuild 3441 BLAKE2B cc4dc70ea124b1261d382f5dd81838f56acaf79944ff5590f190681888fce8cb65297514b343cdc5a11240e57cd149a77a7a48aead404398ef85a2b757eb33e5 SHA512 23f93a952bf9c8c8bde2bd5a1e72eb470f67862cdca2ba643cddf4821844ab5906eb314ba3d0f3fccc6cead47eabd032becec92fa5ab95a84e334c4927430785
+EBUILD k3b-20.08.3.ebuild 3438 BLAKE2B 5fb85afbf32ec5f1ec912b2e9058ec0b455f7dbc4ee594b78d9265c4ef39172ed492f25bb7b2bcffc2f10ecf10fee19af9658c73723610148fa569ea40c031eb SHA512 ce21464e436c493918e7440f01d6c16746ad4e73ad4a21f848212fbb99cd8d6a62e6b42852bc27486d81273fd51879be8ff5bd921e481b941e2f1b914ecab3e6
+EBUILD k3b-20.12.0.ebuild 3441 BLAKE2B 8c4d9b97de0e86d8b293092b0e56a7c1f324cd195be08c91a948a67aa14609ee1a172ce179400d7b085454ab4d6c113704c40dfdb5698eefb9fa0217ec50973c SHA512 e4cd9dddbe592d3603d4fc12198df4895307be8c6ac42b9e0858569ce7dc3e812fde58cf05ea6694b205c13666b89b2ea7f937ed79f73ee1e4e2410f8cb4f238
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/k3b/k3b-20.08.3.ebuild b/kde-apps/k3b/k3b-20.08.3.ebuild
index 7187e896a880..cfe5805e1339 100644
--- a/kde-apps/k3b/k3b-20.08.3.ebuild
+++ b/kde-apps/k3b/k3b-20.08.3.ebuild
@@ -66,9 +66,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	app-cdr/cdrdao
+	app-cdr/cdrtools
 	dev-libs/libburn
 	media-sound/cdparanoia
-	virtual/cdrtools
 	dvd? (
 		>=app-cdr/dvd+rw-tools-7
 		encode? ( media-video/transcode[dvd] )
diff --git a/kde-apps/k3b/k3b-20.12.0.ebuild b/kde-apps/k3b/k3b-20.12.0.ebuild
index 2b788559cf74..dac793b68014 100644
--- a/kde-apps/k3b/k3b-20.12.0.ebuild
+++ b/kde-apps/k3b/k3b-20.12.0.ebuild
@@ -66,9 +66,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	app-cdr/cdrdao
+	app-cdr/cdrtools
 	dev-libs/libburn
 	media-sound/cdparanoia
-	virtual/cdrtools
 	dvd? (
 		>=app-cdr/dvd+rw-tools-7
 		encode? ( media-video/transcode[dvd] )
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index df13ec7fe342..db2c9491ae65 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index a9262ba83ba8..53b55c654ec7 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-5.74.0.tar.xz 58624 BLAKE2B eea0d23caa6a6fdd363de3cc891ff366ea9dd11e80c3f82b90c7908101d41d96279ac42e775ff8ed4480b61545ab64fc930757459b1fb94f2e4c08d85e1df271 SHA512 77d789edc670d5930010185f5969c6b34678f39a4e3c0c2e05b79fb9cb029c7bc152b2418ee3a57659fb40472cd9fd8b40beeae4834299cf8dc1f9ede189fa4c
 DIST kdav-5.77.0.tar.xz 59300 BLAKE2B ad1e9baa8423d5ded0fe975b5cbe2b906ea49a7766b34f89049d1253c14ce6001ac270454d2fba539e443a4ecb0ad78497438898f57019b54ea28164a22bae5e SHA512 18f13f38c5b78be4258062ab38b6b626bc19ba6a9ff5f0b983d5d9f5e000932346362e8f9f8a6af8544ea4037b99f24640998a5978269415b63a406b82c48e24
 EBUILD kdav-5.74.0.ebuild 795 BLAKE2B 3d62c46274a9c300c22a7c1e0d0fbde7d924cb87741ae92fd121b4231da47abb45862d39850a38291cf8812bab4ff22c048ecf66ca446c07672d0e921b356547 SHA512 94fe8e1c79caa490640292e64753e9a691f7a8cc35f7ca72f8fb66245fc3badca454b9774f914404a08fe1c07bf7bfb3c5f06d9669aa3e4bfaf2b0969362e6ff
-EBUILD kdav-5.77.0.ebuild 805 BLAKE2B 6ea97208e6c22ce38e5c813f0c13fc4b297370fe45e5bc7b66cfb0721d9455516b6d62a45dd7839eb3178e04c51b24b7cf3b0df915e30d710eb0f6dabc882bae SHA512 70949c3c82faf787ca7707c07e5d74899858f2acb24ad073b11a4fbcb24d1d6cf5ffc186e713067bbcc65a1d611c751a26979033d41019c456dac5cae2a121b4
+EBUILD kdav-5.77.0-r1.ebuild 796 BLAKE2B 7e041d5a492d40600061dde3d7d01ad0dc656cd075933f9f23861c791476e74322d5e993213cb1e4d0530b6beae365b92d846d617f2701143c7f3d449b31161d SHA512 e7c6e51bedda02cdd9c921b90c35b0d46c394322de537bdfc7420a06358dadbc22126c00c337d4d08b454dd318a8737061007272c7787e90abc97c5cfd6fdda5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdav/kdav-5.77.0.ebuild b/kde-frameworks/kdav/kdav-5.77.0-r1.ebuild
similarity index 98%
rename from kde-frameworks/kdav/kdav-5.77.0.ebuild
rename to kde-frameworks/kdav/kdav-5.77.0-r1.ebuild
index 8b3627220883..6225b8738794 100644
--- a/kde-frameworks/kdav/kdav-5.77.0.ebuild
+++ b/kde-frameworks/kdav/kdav-5.77.0-r1.ebuild
@@ -12,7 +12,6 @@ inherit ecm kde.org
 DESCRIPTION="DAV protocol implemention with KJobs"
 
 LICENSE="LGPL-2+"
-SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 3e3ac72c361e..f3d552e23be9 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,5 +1,6 @@
+AUX knewstuff-5.77.0-add-dptr-to-cache.patch 4360 BLAKE2B cdfcdcce877f360a79731d508a8b52be23682efaa842ff58aed96539fb2e0c08a6744c3a6401c52116d5b19bf869043e3d0b73d873f50cabcef0101c155fae38 SHA512 78906c52f768bf7240bd088913292d486ea74310f6071e4baa7b5ebddf7e1dc229b6aaef36e44a79a6b303982b9da5dc6c07d4987de6617a4f85b1cee28d9618
 DIST knewstuff-5.74.0.tar.xz 1143920 BLAKE2B f36956a82bf92960ee78ef61b272363de52b0be4acb2701fa1ad1494a7c05492fac79349b49a998549d2dd7f1c93406daef5e06f8fd28758aea460f667fe3b3a SHA512 038af364cf048035bc2d1a505e4f4c8318fd90efbfdd9c2fdffd9c22b1196a29b0d153643e838a98d472c19094e994a55983f84c63ef50f47574013a8b9f697a
 DIST knewstuff-5.77.0.tar.xz 1143780 BLAKE2B 72b1e040041e6aca1593700a5378ca88be8b9edc3f2682c433231ee07fed5f56cea749f34dec74835cbc2cf5455e879296d388a0deed5132a9cdedb59ece85e1 SHA512 408b3dd045f13050a41389b4864888f8d261ecade50b4d3903f0982194a0a15828e459e755a001a5593cf818894cca2203ded9cc3fcdd60e23820a1d0f7c45b7
 EBUILD knewstuff-5.74.0.ebuild 1094 BLAKE2B 24cd855095c1df4b504eabab595e719f8cfc4af7c65186b8ef277ba8cfd1358a9da8f84acb47d93a79973e2670c1d9eddcfe2ed4dc83b564714385134c2f2feb SHA512 14beed78d3994cfa9b556bf49a5802936eb779ddef447754c4a7f3bde0ba1eab7120354a0cce22babd9857f799e2edf203030d9cbf306b7a3e333de14b3f6b3b
-EBUILD knewstuff-5.77.0.ebuild 1097 BLAKE2B feec3ad726c4ffff0bbab809b2a49092500f92d5b7f66d9c80f576da3399e8f5e8b7888656ea502cdbaeb08b867b6ede82106137c68fcd43db2e30bbeff7093a SHA512 f546380fa6f6fd26cc8b80941784569d06d59097b10f1ed0c1a663b3e9701d5e3c52894242ea3e4feb021fbd56fb9068a20c323d525980b24fb558db329d812a
+EBUILD knewstuff-5.77.0-r1.ebuild 1170 BLAKE2B 0973a71b781644415e05c4b487181bca88f3a76d0d59f77204b756e58c96d5aca760e0f888d8ae66bfe8b8c190e38d841beddd2644d47a635c78f9f38afabdf0 SHA512 6481a75e450f0e2308bf3a1ac469556643860a6955d0be3852a3571f57458dd67a5db1204518a53fa31339f2d86184bcb0aa80992ab3347db6a9c2edd5071dc6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.77.0-add-dptr-to-cache.patch b/kde-frameworks/knewstuff/files/knewstuff-5.77.0-add-dptr-to-cache.patch
new file mode 100644
index 000000000000..f6547fc6e5ff
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.77.0-add-dptr-to-cache.patch
@@ -0,0 +1,135 @@
+From 243ea6155b28457c8b1441fee8ab1037828d21ba Mon Sep 17 00:00:00 2001
+From: Dan Leinir Turthra Jensen <admin@leinir.dk>
+Date: Mon, 14 Dec 2020 21:11:51 +0000
+Subject: [PATCH] Add a dptr to Cache, and move the throttle timer there to fix
+ crash
+
+Previously, the throttle timer was a raw static, but it was also a parented qobject, which means that when the cache was deleted, so was the timer, but the variable was not reset. Consequently, things would crash left and right later on. So, to alleviate this, and hopefully avoid future issues, introduce a dptr, stick the timer there, and move the logic to that private class as well.
+
+BUG:429442
+
+FIXED-IN:5.78
+---
+ src/core/cache.cpp | 41 ++++++++++++++++++++++++++++++-----------
+ src/core/cache.h   |  7 +++++--
+ 2 files changed, 35 insertions(+), 13 deletions(-)
+
+diff --git a/src/core/cache.cpp b/src/core/cache.cpp
+index 0395045c..ace7be4e 100644
+--- a/src/core/cache.cpp
++++ b/src/core/cache.cpp
+@@ -11,17 +11,42 @@
+ #include <QDir>
+ #include <QFileInfo>
+ #include <QFileSystemWatcher>
++#include <QPointer>
+ #include <QTimer>
+ #include <QXmlStreamReader>
+ #include <qstandardpaths.h>
+ #include <knewstuffcore_debug.h>
+ 
++class KNSCore::CachePrivate {
++public:
++    CachePrivate(Cache* qq)
++        : q(qq)
++    {}
++    ~CachePrivate() {}
++
++    Cache* q;
++    QHash<QString, EntryInternal::List> requestCache;
++
++    QPointer<QTimer> throttleTimer;
++    void throttleWrite() {
++        if (!throttleTimer) {
++            throttleTimer = new QTimer(q);
++            QObject::connect(throttleTimer, &QTimer::timeout, q, [this](){ q->writeRegistry(); });
++            throttleTimer->setSingleShot(true);
++            throttleTimer->setInterval(1000);
++        }
++        throttleTimer->start();
++    }
++};
++
+ using namespace KNSCore;
+ 
+ typedef QHash<QString, QWeakPointer<Cache> > CacheHash;
+ Q_GLOBAL_STATIC(CacheHash, s_caches)
+ 
+-Cache::Cache(const QString &appName): QObject(nullptr)
++Cache::Cache(const QString &appName)
++    : QObject(nullptr)
++    , d(new CachePrivate(this))
+ {
+     m_kns2ComponentName = appName;
+ 
+@@ -280,36 +305,30 @@ void Cache::registerChangedEntry(const KNSCore::EntryInternal &entry)
+     if (entry.status() == KNS3::Entry::Updating || entry.status() == KNS3::Entry::Installing) {
+         return;
+     }
+-    static QTimer* writeThrottle{nullptr};
+-    if (!writeThrottle) {
+-        writeThrottle = new QTimer(this);
+-        connect(writeThrottle, &QTimer::timeout, this, [this](){ writeRegistry(); });
+-        writeThrottle->setInterval(1000);
+-    }
+     if (!property("reloadingRegistry").toBool()) {
+         setProperty("dirty", true);
+         cache.remove(entry); // If value already exists in the set, the set is left unchanged
+         cache.insert(entry);
+-        writeThrottle->start();
++        d->throttleWrite();
+     }
+ }
+ 
+ void Cache::insertRequest(const KNSCore::Provider::SearchRequest &request, const KNSCore::EntryInternal::List &entries)
+ {
+     // append new entries
+-    auto &cacheList = requestCache[request.hashForRequest()];
++    auto &cacheList = d->requestCache[request.hashForRequest()];
+     for (const auto &entry : entries) {
+         if (!cacheList.contains(entry)) {
+             cacheList.append(entry);
+         }
+     }
+-    qCDebug(KNEWSTUFFCORE) << request.hashForRequest() << " add: " << entries.size() << " keys: " << requestCache.keys();
++    qCDebug(KNEWSTUFFCORE) << request.hashForRequest() << " add: " << entries.size() << " keys: " << d->requestCache.keys();
+ }
+ 
+ EntryInternal::List Cache::requestFromCache(const KNSCore::Provider::SearchRequest &request)
+ {
+     qCDebug(KNEWSTUFFCORE) << request.hashForRequest();
+-    return requestCache.value(request.hashForRequest());
++    return d->requestCache.value(request.hashForRequest());
+ }
+ 
+ void KNSCore::Cache::removeDeletedEntries()
+diff --git a/src/core/cache.h b/src/core/cache.h
+index 06e95ab4..73ea7c61 100644
+--- a/src/core/cache.h
++++ b/src/core/cache.h
+@@ -16,9 +16,11 @@
+ 
+ #include "knewstuffcore_export.h"
+ 
++#include <memory.h>
++
+ namespace KNSCore
+ {
+-
++class CachePrivate;
+ class KNEWSTUFFCORE_EXPORT Cache : public QObject
+ {
+     Q_OBJECT
+@@ -99,7 +101,8 @@ private:
+     QString m_kns2ComponentName;
+ 
+     QSet<EntryInternal> cache;
+-    QHash<QString, EntryInternal::List> requestCache;
++
++    std::unique_ptr<CachePrivate> d;
+ };
+ 
+ }
+-- 
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-5.77.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.77.0-r1.ebuild
similarity index 93%
rename from kde-frameworks/knewstuff/knewstuff-5.77.0.ebuild
rename to kde-frameworks/knewstuff/knewstuff-5.77.0-r1.ebuild
index 96d2ca852d9f..59ba609ab98f 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.77.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.77.0-r1.ebuild
@@ -38,3 +38,5 @@ DEPEND="
 RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${PVCUT}:5
 "
+
+PATCHES=( "${FILESDIR}/${P}-add-dptr-to-cache.patch" ) # KDE-bug 429442
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 10ecc125a280..bce5ed8883eb 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,6 +1,7 @@
 AUX plasma-5.74.0-fix-pc3-button-icons-color-set.patch 1276 BLAKE2B b74a469f50ba5c31edf6bf7ab80113a68f91eb27ebbabb6eb18b53d8fff1c71fd352fc93baf51114e6f964c75a3ec9ba516c87b02b664fc649fd8d6bc484aab9 SHA512 b527e08d5f116cc00390ccbc960501e6f95f80da6d3d42153c8a07675799aa0d8dd002e4f2f52088d66133090b888e5acef3e6be70f66acf39c38e9652f0cb38
+DIST plasma-5.77.0-fix-broken-background.patch.xz 3732 BLAKE2B 19c656de212e3b2162e5f43e6ee2aface46d9169169179b6ac8af3eee01e64ec54139ac0001a6009f2a6d3cc4a59775951a3e10e8c33c7d04bf2b78543564137 SHA512 a262bebc754102709d1b41a2e5571938e58bfbcfd027dce9d0c1dd5cbdb8adee44a1c18b716976dc36d7f55b1d7e16d0536615e9f2895fa62eebb5f08cf05098
 DIST plasma-framework-5.74.0.tar.xz 3140648 BLAKE2B dfc8df92d351446a146204f48c42cd4d6325f2652b5b61e0a530b27763fb3b6f07bf14319c86a54f933a58329d214977545e00f261cc784c0d8659eebd8cddb0 SHA512 7aae44d94a175dcdbd779a6801626d20e8d986597d1d05c82c5c035997b874ebb9b4412191e1fa7a26aa4e045ceaf22a7ef359d3e817d812357d51219eb5fb46
 DIST plasma-framework-5.77.0.tar.xz 3152748 BLAKE2B 717d620fd5249887d47bbc6ed8ec42f103b56c4e566b0baae3624e64403b48977b5d36ebdbb30b52ae6cbec7694645050cf76eceaf6ab28c3690bcafcf8c7a07 SHA512 abcbb0b5bf063cdda728b0fc03f0d51f0ad84b4c45fb428efe54556aeb27b4cc3c488244ba0f7e3a435c31e802551d09f758bde815ca0a5aa43cf18e916d1ea4
 EBUILD plasma-5.74.0-r1.ebuild 1939 BLAKE2B 7d1e4fbf1808204a47427d9def5a0ce30818096e539107f61134883cf35c128d2474277c3b4ae0c5a6658fa66b3e4856fb081a3b190b4811bb98faa7c87ca310 SHA512 f0ff7c56fad5461f7cf4907bc68443c497013beca852fcfaa0b846862de797cabff7d71774473c00336375aac574d88ea77878f0b1ae98dc9c7c73dc65a01f17
-EBUILD plasma-5.77.0.ebuild 1873 BLAKE2B 5d07c9c39ff770565f0cb29726d09174f404b11f5ec9fc837c41edc1ad0ac51fc479d8b0a4497d33138eb32c79037a48ccae91e768d72157ef4bd72e2121ec0f SHA512 074814744efd82c0b1065829271ddea539889b1ac9657ce0476c5cc4db715e7e65b12a023aad3ee2c2f86e5cdaf81fe6bf129b50ab1a7606f13a3409a1889bdf
+EBUILD plasma-5.77.0-r1.ebuild 2038 BLAKE2B b94b8626005eec6e98d0802ef806171f41db1b2e96a096c2ae6352bacff8bbe425bb52f8939fdcf194c39d17ef88dafafd0f995ff742c0624e89680cc36e2c79 SHA512 66f3be07950ebcd8ce4efcf80f031727c9c18eaf1fbefbe8042fb03e09e2c26429d1f2f03ab514a3bb6748e744a921f5e2b7536e0133776ea45603ce849bfcc5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/plasma/plasma-5.77.0.ebuild b/kde-frameworks/plasma/plasma-5.77.0-r1.ebuild
similarity index 91%
rename from kde-frameworks/plasma/plasma-5.77.0.ebuild
rename to kde-frameworks/plasma/plasma-5.77.0-r1.ebuild
index 3e2958b66620..298dcdf54342 100644
--- a/kde-frameworks/plasma/plasma-5.77.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.77.0-r1.ebuild
@@ -10,6 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Plasma framework"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-fix-broken-background.patch.xz"
 
 LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
@@ -61,6 +62,8 @@ DEPEND="${RDEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${WORKDIR}/${P}-fix-broken-background.patch" ) # KDE-bug 430390
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package !gles2-only OpenGL)
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 2149e841c622..cbf6385c1cc8 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index c7c18f904fba..e1c105e673f0 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,3 +1,5 @@
+AUX krename-5.0.1-no-kjs.patch 20279 BLAKE2B 06a3267c03489c06122fccb65b7ce317dca41ac9531f5c3db1b0f315361b2b02ee9877bd9d5920b40339414f7e73c08f723934993254f1f6be0394dddd062dfb SHA512 24ea4270caa76a44132d8412ea7209a436710d8e6a35033a6218451bc71cd94814faf42336390e9f4a41d856d749d7efca424a0922408279e89664c3b6f253e2
 DIST krename-5.0.1.tar.xz 321556 BLAKE2B 38835e4f7ce97b4991419ac7676268701c0977feb32457c9dc5ddcea92f576012320eac06aadbe426a5e176aae6270606688afd377af4c9ea32d66bd75a74fdd SHA512 1e8b17d9b8396354da131132fb6add24c6620ac39ab7ea5954391358369a4749f83df040e8425c74442ec143d1f07b322e592e5744f80eeef4b961d72f9dd379
+EBUILD krename-5.0.1-r1.ebuild 1534 BLAKE2B 8248ea78284ffe0a0a52bf1dba319bf908cb7640017fb94271934c122a0637f058434e6ba49ac14f5efea10da2d10edee2280f9439a43ead59b345103497ebf1 SHA512 7a4d9255b4b77b82e9242028b349eb315d6d3af769be93e9a1dfc7e84c71d653f9c9f60b357701626e911520b07d1ef3a14b25223c1ea1c6be2524de29a7154d
 EBUILD krename-5.0.1.ebuild 1486 BLAKE2B 4e284b7e2cec7a2d10973f03053b6ef29c00b5c7b6448b619548d2d80c5ba1c04b6bc52262ea0a3954fb68e1267d69a93ce88e6484a5564edd24024544db584f SHA512 0161c660fb891ea3453d5fa7de3acb154d6f332840c9e5580548583689d0f68de44caaa3a736719d8b80bf870b87d676f940de40b479aa42455abe72ec111231
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/krename/files/krename-5.0.1-no-kjs.patch b/kde-misc/krename/files/krename-5.0.1-no-kjs.patch
new file mode 100644
index 000000000000..f4b7eb786890
--- /dev/null
+++ b/kde-misc/krename/files/krename-5.0.1-no-kjs.patch
@@ -0,0 +1,519 @@
+From 407b612a93128b9f935a686d5ff82c7ee06087f5 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Thu, 17 Dec 2020 13:19:56 +0100
+Subject: [PATCH 1/5] reduce nesting
+
+easier on the eyes
+---
+ src/scriptplugin.cpp | 63 +++++++++++++++++++++++---------------------
+ 1 file changed, 33 insertions(+), 30 deletions(-)
+
+diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp
+index 0790fd4..8f4b11e 100644
+--- a/src/scriptplugin.cpp
++++ b/src/scriptplugin.cpp
+@@ -175,36 +175,39 @@ void ScriptPlugin::initKRenameVars(const KRenameFile &file, int index)
+             file.srcDirectory());
+ 
+     // User definitions, set them only on first file
+-    if (index == 0) {
+-        for (int i = 0; i < m_widget->listVariables->topLevelItemCount(); i++) {
+-            // TODO, we have to know the type of the variable!
+-            QTreeWidgetItem *item = m_widget->listVariables->topLevelItem(i);
+-            if (item) {
+-                EVarType eVarType = static_cast<EVarType>(item->data(1, Qt::UserRole).toInt());
+-                const QString &name  = item->text(0);
+-                const QString &value = item->text(1);
+-                switch (eVarType) {
+-                default:
+-                case eVarType_String:
+-                    m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+-                            name, value.toUtf8().data());
+-                    break;
+-                case eVarType_Int:
+-                    m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+-                            name, value.toInt());
+-                    break;
+-                case eVarType_Double:
+-                    m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+-                            name, value.toDouble());
+-                    break;
+-                case eVarType_Bool:
+-                    m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+-                            name,
+-                            (value.toLower() == "true" ? true : false));
+-                    break;
+-
+-                }
+-            }
++    if (index != 0) {
++        return;
++    }
++
++    for (int i = 0; i < m_widget->listVariables->topLevelItemCount(); i++) {
++        // TODO, we have to know the type of the variable!
++        QTreeWidgetItem *item = m_widget->listVariables->topLevelItem(i);
++        if (!item) {
++            continue;
++        }
++
++        EVarType eVarType = static_cast<EVarType>(item->data(1, Qt::UserRole).toInt());
++        const QString &name  = item->text(0);
++        const QString &value = item->text(1);
++        switch (eVarType) {
++        default:
++        case eVarType_String:
++            m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
++                    name, value.toUtf8().data());
++            break;
++        case eVarType_Int:
++            m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
++                    name, value.toInt());
++            break;
++        case eVarType_Double:
++            m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
++                    name, value.toDouble());
++            break;
++        case eVarType_Bool:
++            m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
++                    name,
++                    (value.toLower() == "true" ? true : false));
++            break;
+         }
+     }
+ }
+-- 
+2.29.2
+
+
+From f80de4b81846da45c4cc16c585a159872dcc2c29 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Thu, 17 Dec 2020 13:24:37 +0100
+Subject: [PATCH 2/5] don't needlessly use qpointer
+
+for one it has no value, scopedpointer might. we don't need a pointer
+at all though, simply put qdialog on the stack and let the compiler
+take care of it
+---
+ src/scriptplugin.cpp | 44 ++++++++++++++++++++++----------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp
+index 8f4b11e..fec61e7 100644
+--- a/src/scriptplugin.cpp
++++ b/src/scriptplugin.cpp
+@@ -28,7 +28,6 @@
+ #include <QTemporaryFile>
+ #include <QFile>
+ #include <QMenu>
+-#include <QPointer>
+ #include <QTextStream>
+ #include <QVariant>
+ #include <QFileDialog>
+@@ -228,7 +227,7 @@ void ScriptPlugin::slotEnableControls()
+ 
+ void ScriptPlugin::slotAdd()
+ {
+-    QPointer<QDialog> dialog = new QDialog();
++    QDialog dialog;
+     Ui::ScriptPluginDialog dlg;
+ 
+     QStringList types;
+@@ -238,32 +237,33 @@ void ScriptPlugin::slotAdd()
+     types << i18n("Double");
+     types << i18n("Boolean");
+ 
+-    dlg.setupUi(dialog);
++    dlg.setupUi(&dialog);
+     dlg.comboType->addItems(types);
+ 
+-    if (dialog->exec() == QDialog::Accepted) {
+-        QString name  = dlg.lineName->text();
+-        QString value = dlg.lineValue->text();
++    if (dialog.exec() != QDialog::Accepted) {
++        return;
++    }
+ 
+-        // Build a Java script statement
+-        QString script = name + " = " + value + ';';
++    QString name  = dlg.lineName->text();
++    QString value = dlg.lineValue->text();
+ 
+-        KJSInterpreter interpreter;
+-        KJSResult result = m_interpreter->evaluate(script, nullptr);
+-        if (result.isException()) {
+-            KMessageBox::error(m_parent,
+-                               i18n("A JavaScript error has occurred: ") +
+-                               result.errorMessage(), this->name());
+-        } else {
+-            QTreeWidgetItem *item = new QTreeWidgetItem();
+-            item->setText(0, name);
+-            item->setText(1, value);
+-            item->setData(1, Qt::UserRole, QVariant(dlg.comboType->currentIndex()));
++    // Build a Java script statement
++    QString script = name + " = " + value + ';';
+ 
+-            m_widget->listVariables->addTopLevelItem(item);
+-        }
++    KJSInterpreter interpreter;
++    KJSResult result = m_interpreter->evaluate(script, nullptr);
++    if (result.isException()) {
++        KMessageBox::error(m_parent,
++                            i18n("A JavaScript error has occurred: ") +
++                            result.errorMessage(), this->name());
++    } else {
++        QTreeWidgetItem *item = new QTreeWidgetItem();
++        item->setText(0, name);
++        item->setText(1, value);
++        item->setData(1, Qt::UserRole, QVariant(dlg.comboType->currentIndex()));
++
++        m_widget->listVariables->addTopLevelItem(item);
+     }
+-    delete dialog;
+ }
+ 
+ void ScriptPlugin::slotRemove()
+-- 
+2.29.2
+
+
+From 5979b30da5b385008894ff5577da917dd888959e Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Thu, 17 Dec 2020 13:32:41 +0100
+Subject: [PATCH 3/5] fix dangerously implicit int->int->enum mapping
+
+the type order in the qstringlist was implicitly the int values of the
+type enum. incredibly scary. instead push the items into the combobox
+along with their enum value as Qt::UserRole and then pass that along.
+this ensures (kind of) that the int we cast back to enum in
+initKRenameVars will be an actual enum value
+---
+ src/scriptplugin.cpp | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp
+index fec61e7..1933bc6 100644
+--- a/src/scriptplugin.cpp
++++ b/src/scriptplugin.cpp
+@@ -4,6 +4,7 @@
+     begin                : Fri Nov 9 2007
+     copyright            : (C) 2007 by Dominik Seichter
+     email                : domseichter@web.de
++    copyright            : (C) 2020 by Harald Sitter <sitter@kde.org>
+  ***************************************************************************/
+ 
+ /***************************************************************************
+@@ -230,15 +231,11 @@ void ScriptPlugin::slotAdd()
+     QDialog dialog;
+     Ui::ScriptPluginDialog dlg;
+ 
+-    QStringList types;
+-
+-    types << i18n("String");
+-    types << i18n("Int");
+-    types << i18n("Double");
+-    types << i18n("Boolean");
+-
+     dlg.setupUi(&dialog);
+-    dlg.comboType->addItems(types);
++    dlg.comboType->addItem(i18n("String"), eVarType_String);
++    dlg.comboType->addItem(i18n("Int"), eVarType_Int);
++    dlg.comboType->addItem(i18n("Double"), eVarType_Double);
++    dlg.comboType->addItem(i18n("Boolean"), eVarType_Bool);
+ 
+     if (dialog.exec() != QDialog::Accepted) {
+         return;
+@@ -260,7 +257,7 @@ void ScriptPlugin::slotAdd()
+         QTreeWidgetItem *item = new QTreeWidgetItem();
+         item->setText(0, name);
+         item->setText(1, value);
+-        item->setData(1, Qt::UserRole, QVariant(dlg.comboType->currentIndex()));
++        item->setData(1, Qt::UserRole, dlg.comboType->currentData());
+ 
+         m_widget->listVariables->addTopLevelItem(item);
+     }
+-- 
+2.29.2
+
+
+From 82161c323b7b0d4b77602551923118f304c5c536 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Thu, 17 Dec 2020 15:05:49 +0100
+Subject: [PATCH 4/5] port away from stringy QMenu::addAction to functor based
+ API
+
+was introdcued in 5.6 so is fine to use and loads safer
+---
+ src/previewlist.cpp    |  8 ++++----
+ src/progressdialog.cpp |  8 ++++----
+ src/scriptplugin.cpp   | 10 +++++-----
+ 3 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/previewlist.cpp b/src/previewlist.cpp
+index df8097b..0d3ccb6 100644
+--- a/src/previewlist.cpp
++++ b/src/previewlist.cpp
+@@ -28,12 +28,12 @@ PreviewList::PreviewList(QWidget *parent)
+     : QTreeView(parent), m_model(nullptr)
+ {
+     m_menu = new QMenu("KRename", this);   // we need any text here so that we have a title
+-    m_menu->addAction(i18n("&Change filename manually..."), this, SLOT(slotManually()), QKeySequence("F2"));
++    m_menu->addAction(i18n("&Change filename manually..."), this, &PreviewList::slotManually, QKeySequence("F2"));
+     m_menu->addSeparator();
+-    m_menu->addAction(i18n("&Open"), this, SLOT(slotOpen()));
++    m_menu->addAction(i18n("&Open"), this, &PreviewList::slotOpen);
+     m_menu->addSeparator();
+-    m_menu->addAction(i18n("&Add..."), this, SIGNAL(addFiles()));
+-    m_menu->addAction(i18n("&Remove"), this, SLOT(slotRemove()));
++    m_menu->addAction(i18n("&Add..."), this, &PreviewList::addFiles);
++    m_menu->addAction(i18n("&Remove"), this, &PreviewList::slotRemove);
+ 
+     connect(this, &PreviewList::activated, this, &PreviewList::slotManually);
+ }
+diff --git a/src/progressdialog.cpp b/src/progressdialog.cpp
+index 4eaaf1a..d217614 100644
+--- a/src/progressdialog.cpp
++++ b/src/progressdialog.cpp
+@@ -49,11 +49,11 @@ ProgressDialog::ProgressDialog(ESplitMode eSplitMode, unsigned int dot, QWidget
+             qApp, &QApplication::quit, Qt::QueuedConnection);
+ 
+     QMenu *menu = new QMenu(this);
+-    menu->addAction(i18n("Restart &KRename..."), this, SLOT(slotRestartKRename()));
++    menu->addAction(i18n("Restart &KRename..."), this, &ProgressDialog::slotRestartKRename);
+     menu->addSeparator();
+-    m_actProcessed   = menu->addAction(i18n("Rename Processed Files &Again..."),    this, SLOT(slotRenameProcessedAgain()));
+-    m_actUnprocessed = menu->addAction(i18n("Rename &Unprocessed Files Again..."), this, SLOT(slotRenameUnprocessedAgain()));
+-    menu->addAction(i18n("&Rename All Files Again..."),          this, SLOT(slotRenameAllAgain()));
++    m_actProcessed = menu->addAction(i18n("Rename Processed Files &Again..."), this, &ProgressDialog::slotRenameProcessedAgain);
++    m_actUnprocessed = menu->addAction(i18n("Rename &Unprocessed Files Again..."), this, &ProgressDialog::slotRenameUnprocessedAgain);
++    menu->addAction(i18n("&Rename All Files Again..."), this, &ProgressDialog::slotRenameAllAgain);
+ 
+     m_buttonMore->setMenu(menu);
+ }
+diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp
+index 1933bc6..46b27ca 100644
+--- a/src/scriptplugin.cpp
++++ b/src/scriptplugin.cpp
+@@ -68,11 +68,11 @@ ScriptPlugin::ScriptPlugin(PluginLoader *loader)
+ 
+     m_help.append("[js;4+5];;" + i18n("Insert a snippet of JavaScript code (4+5 in this case)"));
+ 
+-    m_menu->addAction(i18n("Index of the current file"),     this, SLOT(slotInsertIndex()));
+-    m_menu->addAction(i18n("URL of the current file"),       this, SLOT(slotInsertUrl()));
+-    m_menu->addAction(i18n("Filename of the current file"),  this, SLOT(slotInsertFilename()));
+-    m_menu->addAction(i18n("Extension of the current file"), this, SLOT(slotInsertExtension()));
+-    m_menu->addAction(i18n("Directory of the current file"), this, SLOT(slotInsertDirectory()));
++    m_menu->addAction(i18n("Index of the current file"), this, &ScriptPlugin::slotInsertIndex);
++    m_menu->addAction(i18n("URL of the current file"), this, &ScriptPlugin::slotInsertUrl);
++    m_menu->addAction(i18n("Filename of the current file"), this, &ScriptPlugin::slotInsertFilename);
++    m_menu->addAction(i18n("Extension of the current file"), this, &ScriptPlugin::slotInsertExtension);
++    m_menu->addAction(i18n("Directory of the current file"), this, &ScriptPlugin::slotInsertDirectory);
+ }
+ 
+ ScriptPlugin::~ScriptPlugin()
+-- 
+2.29.2
+
+
+From e0a93830d0ea0c71ab649b7e68af0238bd48eb10 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Thu, 17 Dec 2020 13:45:07 +0100
+Subject: [PATCH 5/5] port from deprecated kjs to qjsengine
+
+for kf6 todo https://phabricator.kde.org/T11604
+
+kjs is deprecated and we want to move away from it. this ports to
+qjsengine which does what we need for krename just fine and is also
+supported in qt6 still
+
+all use cases of the js plugin still seem to work fine. variable
+definition, function definition and using either in the replacement.
+same for the implicit global variables.
+---
+ CMakeLists.txt       |  2 +-
+ src/CMakeLists.txt   |  2 +-
+ src/scriptplugin.cpp | 55 ++++++++++++++------------------------------
+ src/scriptplugin.h   |  6 +++--
+ 4 files changed, 23 insertions(+), 42 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2b39e18..e1673e1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,7 +17,7 @@ include(FeatureSummary)
+ include(KDECompilerSettings NO_POLICY_SCOPE)
+ include(FeatureSummary)
+ 
+-find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
++find_package(Qt5 REQUIRED COMPONENTS Core Qml Widgets)
+ find_package(KF5 REQUIRED COMPONENTS
+     Completion
+     Config
+@@ -27,7 +27,6 @@ find_package(KF5 REQUIRED COMPONENTS
+     IconThemes
+     ItemViews
+     JobWidgets
+-    JS
+     KIO
+     Service
+     WidgetsAddons
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3f262b3..bee7378 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -128,9 +128,9 @@ target_link_libraries(krename
+     KF5::KIOCore
+     KF5::KIOFileWidgets
+     KF5::I18n
+-    KF5::JSApi
+     KF5::IconThemes
+     Qt5::Widgets
++    Qt5::Qml
+ )
+ if(TAGLIB_FOUND)
+     target_link_libraries(krename
+diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp
+index d7f7125..651e656 100644
+--- a/src/scriptplugin.cpp
++++ b/src/scriptplugin.cpp
+@@ -18,8 +18,7 @@
+ #include <QTextStream>
+ #include <QVariant>
+ #include <QFileDialog>
+-
+-#include <kjs/kjsinterpreter.h>
++#include <QDebug>
+ 
+ #include "ui_scriptplugindialog.h"
+ #include "ui_scriptpluginwidget.h"
+@@ -46,7 +45,6 @@ ScriptPlugin::ScriptPlugin(PluginLoader *loader)
+ {
+     m_name = i18n("JavaScript Plugin");
+     m_icon = "applications-development";
+-    m_interpreter = new KJSInterpreter();
+     m_menu   = new QMenu();
+     m_widget = new Ui::ScriptPluginWidget();
+ 
+@@ -65,7 +63,6 @@ ScriptPlugin::~ScriptPlugin()
+ {
+     delete m_widget;
+     delete m_menu;
+-    delete m_interpreter;
+ }
+ 
+ QString ScriptPlugin::processFile(BatchRenamer *b, int index,
+@@ -90,13 +87,13 @@ QString ScriptPlugin::processFile(BatchRenamer *b, int index,
+         // Make sure definitions are executed first
+         script = definitions + '\n' + script;
+ 
+-        KJSResult result = m_interpreter->evaluate(script, nullptr);
+-        if (result.isException()) {
+-            qDebug("JavaScript Error: %s", result.errorMessage().toUtf8().data());
++        const QJSValue result = m_engine.evaluate(script);
++        if (result.isError()) {
++            qDebug() << "JavaScript Error:" << result.toString();
+             return QString();
+         }
+ 
+-        return result.value().toString(m_interpreter->globalContext());
++        return result.toString();
+     }
+ 
+     return QString();
+@@ -144,21 +141,11 @@ void ScriptPlugin::createUI(QWidget *parent) const
+ void ScriptPlugin::initKRenameVars(const KRenameFile &file, int index)
+ {
+     // KRename definitions
+-    m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+-            ScriptPlugin::s_pszVarNameIndex,
+-            index);
+-    m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+-            ScriptPlugin::s_pszVarNameUrl,
+-            file.srcUrl().url());
+-    m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+-            ScriptPlugin::s_pszVarNameFilename,
+-            file.srcFilename());
+-    m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+-            ScriptPlugin::s_pszVarNameExtension,
+-            file.srcExtension());
+-    m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+-            ScriptPlugin::s_pszVarNameDirectory,
+-            file.srcDirectory());
++    m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameIndex, index);
++    m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameUrl, file.srcUrl().url());
++    m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameFilename, file.srcFilename());
++    m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameExtension, file.srcExtension());
++    m_engine.globalObject().setProperty(ScriptPlugin::s_pszVarNameDirectory, file.srcDirectory());
+ 
+     // User definitions, set them only on first file
+     if (index != 0) {
+@@ -178,21 +165,16 @@ void ScriptPlugin::initKRenameVars(const KRenameFile &file, int index)
+         switch (eVarType) {
+         default:
+         case eVarType_String:
+-            m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+-                    name, value.toUtf8().data());
++            m_engine.globalObject().setProperty(name, value);
+             break;
+         case eVarType_Int:
+-            m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+-                    name, value.toInt());
++            m_engine.globalObject().setProperty(name, value.toInt());
+             break;
+         case eVarType_Double:
+-            m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+-                    name, value.toDouble());
++            m_engine.globalObject().setProperty(name, value.toDouble());
+             break;
+         case eVarType_Bool:
+-            m_interpreter->globalObject().setProperty(m_interpreter->globalContext(),
+-                    name,
+-                    (value.toLower() == "true" ? true : false));
++            m_engine.globalObject().setProperty(name, (value.toLower() == "true" ? true : false));
+             break;
+         }
+     }
+@@ -233,12 +215,9 @@ void ScriptPlugin::slotAdd()
+     // Build a Java script statement
+     QString script = name + " = " + value + ';';
+ 
+-    KJSInterpreter interpreter;
+-    KJSResult result = m_interpreter->evaluate(script, nullptr);
+-    if (result.isException()) {
+-        KMessageBox::error(m_parent,
+-                            i18n("A JavaScript error has occurred: ") +
+-                            result.errorMessage(), this->name());
++    const QJSValue result = m_engine.evaluate(script);
++    if (result.isError()) {
++        KMessageBox::error(m_parent, i18n("A JavaScript error has occurred: ") + result.toString(), this->name());
+     } else {
+         QTreeWidgetItem *item = new QTreeWidgetItem();
+         item->setText(0, name);
+diff --git a/src/scriptplugin.h b/src/scriptplugin.h
+index 367310b..f91e79b 100644
+--- a/src/scriptplugin.h
++++ b/src/scriptplugin.h
+@@ -3,9 +3,10 @@
+ 
+ #include "plugin.h"
+ 
++#include <QJSEngine>
++
+ class QMenu;
+ 
+-class KJSInterpreter;
+ class KRenameFile;
+ 
+ namespace Ui
+@@ -171,7 +173,7 @@ private:
+ 
+     QStringList         m_keys;
+     QStringList         m_help;
+-    KJSInterpreter     *m_interpreter;
++    QJSEngine           m_engine;
+     QWidget            *m_parent;
+     QMenu              *m_menu;
+ 
+-- 
+2.29.2
+
diff --git a/kde-misc/krename/krename-5.0.1-r1.ebuild b/kde-misc/krename/krename-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..168940d1e283
--- /dev/null
+++ b/kde-misc/krename/krename-5.0.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.70.0
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Powerful batch file renamer"
+HOMEPAGE="https://apps.kde.org/en/krename https://userbase.kde.org/KRename"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="exif pdf taglib truetype"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${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/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	exif? ( media-gfx/exiv2:= )
+	pdf? ( app-text/podofo:= )
+	taglib? ( media-libs/taglib )
+	truetype? ( media-libs/freetype:2 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-no-kjs.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package exif LibExiv2)
+		$(cmake_use_find_package pdf PoDoFo)
+		$(cmake_use_find_package taglib Taglib)
+		$(cmake_use_find_package truetype Freetype)
+	)
+	ecm_src_configure
+}
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index ad5e6fdde7ee..4bdb1afa1dc9 100644
Binary files a/licenses/Manifest.gz and b/licenses/Manifest.gz differ
diff --git a/licenses/Mendeley-terms b/licenses/Mendeley-terms
deleted file mode 100644
index e4e3e32c463c..000000000000
--- a/licenses/Mendeley-terms
+++ /dev/null
@@ -1,220 +0,0 @@
-TERMS OF USE
-
-These terms (“Terms of Use”) apply to the use of our website at http://www.mendeley.com (the "Site"), and our software (the "Software") downloaded from the Site (collectively, the “Services”). Please read these Terms of Use carefully before you start to use the Services. These Terms of Use include the Site’s privacy policy, Copyright and Intellectual Property Policy and any additional terms or product requirements applicable to the Services you use. By using our Services, you are agreeing to these Terms of Use. 
-
-We may revise these Terms of Use at any time by amending this page. You are expected to check this page from time to time to take notice of any changes we make, as they are binding on you. 
-
-
-1. INFORMATION ABOUT US
-
-1.1. The Services are provided by Mendeley Limited ("we", "us" and "our"). We are registered in England and Wales under company number 6419015 and have our registered office at White Bear Yard, 144a Clerkenwell Road, London, EC1R 5DF, United Kingdom. Our VAT number is 494 6272 12. 
-
-
-2. PURPOSE
-
-2.1. The principal purposes of the Services are to:
-
-2.1.1. 	assist you in the cataloguing and managing of your academic papers and articles ("Academic Papers");
-
-2.1.2. 	share your academic and scientific knowledge with selected colleagues;
-
-2.1.3. 	discover academic knowledge and enable detailed search of academic papers;
-
-2.1.4. 	put you in touch with like-minded people and facilitate research projects;
-
-2.1.5. 	provide data and analytics to help monitor, guide and facilitate the research being undertaken across your institution.
-
-
-3. ACCESSING OUR SITE
-
-3.1. We restrict access to certain parts of our Site to users who have registered with us. If you register with us, you must provide true and accurate information about yourself. Should the registration information provided prove false or misleading (including your personal details), we may suspend or terminate your account.
-
-3.2. We restrict access to the Mendeley Institutional Edition portion of our Site to users who are covered by their institution’s license agreement granting such access, if any. If you are covered by such license agreement, additional terms detailed therein govern your use of the Services.
-
-3.3. If you choose a password or any other piece of information as part of our security procedures, you must take reasonable steps to keep such information confidential and secure, and you must not disclose it to any third party. We have the right to disable any account or password, if in our reasonable opinion, your account information has been compromised. You must tell us immediately if you become aware of or suspect any unauthorised use of your account or access to your password.
-
-
-4. OUR SOFTWARE
-
-4.1. We hereby grant to you a non-exclusive, personal, non-transferable license, in accordance with these Terms of Use, to:
-
-4.1.1. 	download, install and use the Software for the purposes of cataloguing and managing your Academic Papers, including making a back-up copy of your Academic Papers;
-
-4.1.2. 	distribute the Software so that other users may install and use the Software for the purposes of cataloguing and managing their Academic Papers; and
-
-4.1.3. 	make a copy of the Software for back-up purposes.
-
-4.2. When you download our Software and connect it to a Mendeley web account by entering your account details, our Software collects (even while you are offline) certain data which is uploaded to our servers when you synchronize your Software and Mendeley web account, specifically, data relating to:
-
-4.2.1. 	Academic Papers such as the author name, title and keywords for the purpose of assisting in the:
-	
-
-    cataloguing of your and other user's Academic Papers;
-    indexing of academic articles and materials;
-    searching of the indexed academic articles and materials;
-    improving the document recognition process for all users;
-
-4.2.2. 	reading, cataloguing and accessing your Academic Papers for the purpose of:
-	
-
-    generating recommendations for you including articles that you may be interested in reading and these recommendations are displayed in your private account;
-    preparing individualized statistical information which will only be made available to you via your account; and
-    generating anonymous aggregate statistical information regarding the interests, habits and reading patterns of all users and/or certain sub-groups of our users such as all users at your institution.
-
-4.3. Except as we permit in these Terms of Use or as permitted by any local law, you undertake:
-
-4.3.1. 	to use our Software only in accordance with the Terms of Use;
-
-4.3.2. 	not to copy, rent, lease, sub-license, loan, translate, merge, adapt, vary or modify the whole or any part of our Software, nor permit our Software or any part of it to be combined with, or become incorporated in, any other programs (though you may contact us at office [at] mendeley [dot] com to seek a written permission from us to do so);
-
-4.3.3. 	not to disassemble, decompile, reverse engineer or create derivative works based on the whole or any part of our Software nor attempt to do any such thing except to the extent that such actions cannot be prohibited by law;
-
-4.3.4. 	not to remove or alter our (or our licensors’) copyright or other proprietary notice on our Software.
-
-4.4. Save for the Content (as defined below), you acknowledge that we are the owner of or the licensee of all intellectual property rights in our Site and in the material published on it, including the Software, and that you have no rights in or to our Software other than the right to use the Software in accordance with these Terms of Use. 
-
-
-5. INTERACTIVE AND SOCIAL NETWORKING SERVICES
-
-5.1. We may from time to time provide interactive services on our Site, including, without limitation:
-
-5.1.1. 	forums for discussion of issues of interest to users and members of our Site;
-
-5.1.2. 	wikis for users and members to share and collaborate on knowledge relating to issues of mutual interest;
-
-5.1.3. 	social networking services where registered members can: (i) create online personal profiles; and (ii) interact with other members;
-
-5.1.4. 	facilities for the uploading and sharing of users' and members' Academic Papers with other users or private user groups you have created;
-
-5.1.5. 	generation of statistics and recommendations.
-
-5.2. We do not oversee, monitor or moderate the content that you upload to our Site using our interactive services and neither do we vet or screen users of our Site.
-
-
-6. ACCEPTABLE USE
-
-6.1. You may use our Services only for lawful purposes. Accordingly, you may only post versions of Academic Papers or other Content (as defined below) on the Site if you have the right to do so.  By way of example, while many journal publishers permit posting of some versions of Academic Papers, most journals restrict the sharing of final versions. To be sure you have the right to upload such content, you should review your publishing agreement, the publisher’s copyright policies, and/or any other applicable information prior to posting any version of an Academic Paper.
-
-6.2. "Content" shall mean any material you post on or through the Site, including, without limitation, Academic Papers and any comments on forums, wikis, personal profiles and communications with members. By using the Site and posting any Content, you permit us to extract metadata and convert to PDF form, for indexing and improved searchability purposes only, any such Content that you post or upload to the Site. We do not claim any ownership rights in your or any other user’s Content. After posting or uploading your Content to the Site, except for the permissions granted to us hereunder, you continue to retain all your rights in such Content.
-
-6.3. By posting your Content you represent and warrant that: (i) your Content is original to you and/or is licensed and fully cleared to permit us to use such Content as contemplated herein; (ii) your Content was produced in compliance with all applicable laws and regulations; (iii) your Content does and will not, in any way, violate or breach any of these Terms of Use; (iv) your Content does not contain libelous, tortious, or otherwise unlawful information, infringe or violate any copyright or other right, or contain any matter the publication or sale of which will violate any federal or state statute or regulation; (v) your Content is not obscene or in any other manner unlawful; (vi) your Content shall not be injurious to the health of any user; and (vii) we shall not be required to pay or incur any sums to any person or entity as a result of our use or exploitation of your Content.
-
-6.4. You may not use our Services:
-
-6.4.1. 	to send, knowingly receive, upload, download, use or re-use any Academic Papers without authorization. You may perform these actions only if you are the copyright owner, have the copyright owner’s permission, are permitted to do so under your publishing agreement or your institution’s license agreement or under license from an Open Access database or under a Creative Commons license.
-
-6.4.2. 	in any way that breaches any applicable local, national or international law or regulation;
-
-6.4.3. 	in any way that is unlawful or fraudulent, or that advocates, promotes or assists any unlawful act, or that may deceive any person or that breaches any legal duty owed to a third party, such as a contractual duty or a duty of confidence or that may be harmful to a user;
-
-6.4.4. 	in any way that is defamatory of any person, obscene, offensive, hateful or inflammatory;
-
-6.4.5. 	in any way that promotes sexually explicit material, violence, or discrimination of any kind;
-
-6.4.6. 	in any way that infringes any copyright, database right, trade mark or other intellectual property right of any other person;
-
-6.4.7. 	in any way that is threatening, abusive or invades another’s privacy, or is likely to harass, upset, embarrass, alarm or annoy any other person;
-
-6.4.8. 	to impersonate any person, or to misrepresent your identity or affiliation with any person;
-
-6.4.9. 	to upload, post, email, message, transmit or otherwise make available or initiate any content that includes any unsolicited or unauthorised advertising, promotional materials, “junk mail”, “spam”, “chain letters”, “pyramid schemes”, “market research”, or any other form of solicitation whether it be for commercial or non-commercial purposes. This prohibition includes but is not limited to (a) using Mendeley invitations to send messages to people who don’t know you or who are unlikely to recognize you as a known contact; (b) using Mendeley to connect to people who don’t know you and then sending unsolicited promotional messages to those direct connections without their permission.
-
-6.4.10. 	to knowingly transmit any data, send or upload any material that contains viruses, Trojan horses, worms, time-bombs, keystroke loggers, spyware, adware or any other harmful programs or similar computer code designed to adversely affect the operation of any computer software or hardware.
-
-6.5. Unless you have express prior written permission, you may not use any spider- or bot-like system, software or other device or program (whether automated or otherwise) to extract content, data, information or other material from the Site.
-
-6.6. You also agree:
-
-6.6.1. 	not to access without authority, interfere with, damage or disrupt:
-	
-
-    any part of our Site;
-    any equipment or network on which our Site is stored;
-    our Software or any software used in the provision of our Site; or
-    any equipment or network or software owned or used by any third party.
-
-6.6.2. 	to use our Services only for research related activity (e.g, not to store your personal collection of movies, music and other large file types unrelated to your research activities).
-
-6.7. You may form more than one private group as part of a Mendeley for Teams package only if you intend to be active in all such groups; you may not form more than one private group to act solely as an administrator.
-
-
-7. FAILURE TO COMPLY WITH THESE TERMS OF USE
-
-7.1. To raise complaints regarding alleged copyright or other intellectual property infringement, you must follow the instructions set forth on the Copyright and Intellectual Property Policy page. For all other complaints about the use of our Site or Content (as defined below) posted to our Site, please contact us at complaints [at] mendeley [dot] com. We request that you provide a sufficiently detailed description of the basis of your complaint and your contact information in case additional information is necessary. We will then review your complaint and decide whether there has been a failure to comply with our Terms of Use. If not, we will deal with the matter as described below. We will inform you of the outcome of our review within a reasonable time of receiving your complaint.
-
-7.2. If we determine, in our sole discretion and judgment, that you have failed to comply with these Terms of Use we reserve the right at any time to take all or any of the following actions (and any other action we reasonably deem appropriate):
-
-7.2.1. 	temporary or permanent withdrawal of your right to use our Site and/or closure of your account;
-
-7.2.2. 	temporary or permanent removal of any posting or material uploaded by you to our Site;
-
-7.2.3. 	issue of a warning to you;
-
-7.2.4. 	legal action against you including proceedings for reimbursement of all costs on an indemnity basis (including, but not limited to, reasonable administrative and legal costs) resulting from the breach;
-
-7.2.5. 	disclosure of such information to law enforcement authorities or third party complainants as we reasonably feel is necessary or required;
-
-7.2.6. 	disclosure of your identity to any third party who is claiming that any material posted or uploaded by you to our Site constitutes a violation of their intellectual property rights, right to privacy or other legal rights;
-
-7.2.7. 	use any technological, legal, operational or other means available to us to enforce the provisions of these Terms of Use.
-
-7.3. You hereby hold harmless and indemnify us and our affiliates, officers, agents and employees from and against any claim, suit or action made by any third party arising from or related to your use of the Services or violation of these Terms of Use, including any liability or expense arising from losses, damages, claims, costs and reasonable attorneys’ fees. 
-
-
-8. DELETION OF CONTENT
-
-8.1. Except as set out in 8.2, you may delete your Content at any time using the automated account deactivation tool. When you delete your Content, our right to use it shall cease save that we may retain a copy in backup for a reasonable period of time and as necessary to comply with our legal obligations. However, the deleted Content will not be generally available to other users or registered members.
-
-8.2. Where you make use of the interactive features of our Services to share Content with others, you may not be able to delete such shared Content. 
-
-
-9. OUR SITE CHANGES REGULARLY
-
-9.1. We aim to update our Site regularly. If the need arises such as an operational issue, we may suspend access to our Site, or close it indefinitely. Any of the material on our Site may be out of date at any given time, and we are under no obligation to update such material.
-
-9.2. Although we aim to keep the Services available at all reasonable times, we may withdraw, suspend or amend the Services in whole or in part without notice including, for example, in the event of technical failures, upgrades, routine or emergency repair work or some reason outside our control. We will not be liable if for any reason our Services are unavailable at any time or for any period. 
-
-
-10. LIMITATION OF LIABILITY
-
-THE SERVICES AND ALL CONTENT ARE MADE AVAILABLE ON AN "AS IS" AND "AS AVAILABLE" BASIS, WITHOUT ANY REPRESENTATION OR WARRANTY OF ANY KIND, EXPRESS OR IMPLIED (INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF TITLE AND NONINFRINGEMENT AND THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE), OR ANY GUARANTY OR ASSURANCE THE SERVICES WILL BE AVAILABLE FOR USE, OR THAT ALL FEATURES, FUNCTIONS OR OPERATIONS WILL BE AVAILABLE OR PERFORM AS DESCRIBED, OR THAT THE SERVICES WILL BE FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS. Without limiting the foregoing, we are not responsible or liable for any malicious code, delays, inaccuracies, errors, or omissions arising out of your use of the Services.
-
-You understand, acknowledge and agree that you are assuming the entire risk as to your use of the Services and the Content, including without limitation the quality, accuracy, performance, timeliness, adequacy, completeness, correctness, authenticity, non-infringement, security and validity of any and all features and functions of the Services, your Content and materials associated with your use of the Services.
-
-YOU UNDERSTAND AND AGREE THAT, TO THE FULLEST EXTENT PERMISSIBLE BY LAW, WE, ANY OF OUR AFFILIATES, OR OUR RESPECTIVE SUCCESSORS AND ASSIGNS, OR ANY OF OUR RESPECTIVE OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, REPRESENTATIVES, LICENSORS, PARTNERS, OPERATIONAL SERVICE PROVIDERS, ADVERTISERS, OR SUPPLIERS, SHALL NOT BE LIABLE FOR ANY LOSS OR DAMAGE, OF ANY KIND, DIRECT OR INDIRECT, IN CONNECTION WITH OR ARISING FROM USE OF THE SERVICES, INCLUDING, WITHOUT LIMITATION, COMPENSATORY, CONSEQUENTIAL, INCIDENTAL, INDIRECT, SPECIAL OR PUNITIVE DAMAGES.
-
-We do not claim ownership, endorse or take responsibility for any third-party product, information, guidelines, materials or services that may be offered, advertised, provided or displayed on the Site or incorporated in the Content, products or services contained on, accessible from or distributed through the Site.
-
-Some jurisdictions do not allow for the exclusion of certain warranties or certain limitations on damages and remedies, accordingly some of the exclusions and limitations described in these Terms of Use may not apply to you. 
-
-
-11. RELIANCE ON SITE INFORMATION
-
-11.1. We do not claim that the information on any specific subject contained on our Site is accurate, comprehensive, verified, complete or error free. Commentary and other materials posted on our Site are not intended to amount to advice on which reliance should be placed. You should seek appropriate professional advice. 
-
-
-12. UNITED STATES OF AMERICA FEDERAL AGENCIES
-
-12.1. Use by U.S.A. federal agencies will follow the amended terms found here.
-
-
-13. LINKS FROM OUR SITE
-
-13.1. Where our Site contains links to other sites and resources provided by third parties, these links are provided for your information only. We have no control over the contents of those sites or resources, and accept no responsibility for them or for any loss or damage that may arise from your use of them. 
-
-
-14. JURISDICTION AND APPLICABLE LAW
-
-14.1. The English courts will have non-exclusive jurisdiction over any claim arising from, or related to, our Services although we retain the right to bring proceedings against you for breach of these conditions in your country of residence or any other relevant country. These terms of use are governed by English law. 
-
-
-15. YOUR CONCERNS
-
-15.1. If you have any comments on our Site or our Software, please contact us.
-
-Thank you for visiting our Site and using our Software.
-
-
-These Terms of Use were last updated on February 6, 2014.
-
-Copyright © 2013 Mendeley Ltd. – All Rights Reserved.
diff --git a/licenses/OPERA-2014 b/licenses/OPERA-2014
deleted file mode 100644
index cfb71f516498..000000000000
--- a/licenses/OPERA-2014
+++ /dev/null
@@ -1,101 +0,0 @@
-Format: Mostly copyright-format 1.0
-# http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-# Making this file match the format entirely would require
-# reformatting the Opera license.
-
-Upstream-Name: opera/opera-next/opera-developer
-Source: http://www.opera.com
-
-Files: *
-Copyright: 2014 Opera Software
-License: Proprietary
-End-user license agreement and terms of service for Opera for desktop for Open Source operating systems
-
-Please read this carefully. This software license agreement and terms of service (“Terms”), including the privacy provisions in section 7 of these Terms, form a binding contract between you and Opera Software ASA (“Opera”), whose principal place of business is Gjerdrums vei 19, 0484, Oslo, Norway. By acceptance of delivery of the software and services you (“you”) hereby agree to be bound by these Terms. Otherwise, please discontinue the use of the software and services.
-
-These Terms govern your use of the software in executable form and your use of the associated services. Source code used in the software, under open source license agreements, can be obtained at http://sourcecode.opera.com or by sending an email message to opensource@opera.com.
-
-1	Acceptance of terms
-
-You can accept the Terms by selecting to accept or to agree to the Terms during the installation process or when the dialog is displayed in the user interface, or by your use of the Software and Services.
-
-You declare by acceptance of the Terms that you are of legal age to use the Software and Services.
-
-2	Definitions
-
-2.1 “You” (or “your”) means the legal entity or person who orders or downloads the Software and/or activates the Services.
-
-2.2 “Documentation” means the standard end-user technical documentation, specifications, materials and other information Opera supplies with the Software and/or Services.
-
-2.3 "Services" means the various services to which Opera provides users with access, including without limitation, the Opera Turbo feature, Discover feature, search services, automatic updates, personalized content and branded offerings.
-
-2.4 “Software” means Opera’s software products (in object code format only) delivered to you (including but not limited to the Opera browser), together with any update or upgrade, when and if made available to you by Opera. Software does not include Third-Party Software.
-
-2.5 “Third-Party Software” means the software of certain third parties that Opera may deliver with the Software, including but not limited to any third-party open source components.
-
-2.6 “Use” (or “use”) means to cause a computer system to execute any machine-executable portion of the Software in accordance with the documentation or to make use of any documentation or related materials in connection with the execution of any machine-executable portion of the Software, and to make use of any of the Services.
-
-3	License
-
-Subject to the terms and conditions of these Terms, Opera hereby grants you a limited, non-exclusive, non-transferable, non-sublicensable license; (i) to use the Services and to install and use the Software supplied to you hereunder, as installed on your personal computer, including your laptop, desktop, or on computers within your organization; and (ii) to reproduce and distribute the Software without modification, provided that any such reproduction or distribution of the Software by you: (a) must be in an application repository for a desktop Open Source OS distribution (expressly excluding distribution for embedded Open Source OS); (b) must be made available free of charge for end-users; (c) must be subject to and distributed with a copy of this Agreement; and (d) no automatic modification of the default search engines in the Software settings is done at any time, including but not limited to after the Software is installed.
-
-4	License restrictions and Third-Party Software
-
-4.1 You shall not and shall not allow any third party to: (a) Use the Software or Services except as expressly permitted under Section 3; (b) separate the component programs of the Software for use on different computers; (c) adapt, alter, publicly display, publicly perform, translate, embed into any other product, or otherwise create derivative works of, or otherwise modify the Software or Services; (d) sublicense, lease, rent, loan, or distribute the Software or Services to any third party; (e) transfer the Software or Services to any third party; (f) reverse engineer, decompile, disassemble, or otherwise attempt to derive the source code for the Software, (i) except as permitted by applicable law, or (ii) to the extent as may be permitted by the license of any included Third-Party Software; (g) remove, alter or obscure any proprietary notices on the Software or Services, or the applicable documentation therefore; or (h) allow third parties to access or use the Software or Services, including without limitation any use in any application service provider environment, service bureau, or time-sharing arrangements.
-
-4.2 Third-Party Software is subject to separate terms and conditions included with, or contained in the setup installation segments of such Third-Party Software. The license restrictions contained in these Terms do not apply to Third-Party Software to the extent they are inconsistent with such Third-Party Software terms. Opera shall not be responsible for any Third-Party Software.
-
-5	Use of services
-
-5.1 Opera reserves the right at any time and from time to time to modify or discontinue, temporarily or permanently, the Services (or any part thereof) with or without notice. You agree that Opera shall not be liable to you or to any third party for any modification, suspension or discontinuance of the Services. Opera reserves the right to change, limit usage of, charge for continued usage of (of course require you to opt in before incurring any charges), and/or discontinue any service at any point in time.
-
-5.2 Opera Turbo: When Opera Turbo is enabled, the Software will request normal web content through an Opera proxy server. The browsing experience may change due to increased webpage loading speeds when using the Opera Turbo feature.
-
-5.3 Discover: The Discover feature helps you to discover and access content made available by third parties on the internet. Opera exercises no editorial control over any content that you access through the Discover feature.
-
-5.4 Synchronization: Opera allows you to enable synchronization of browser data such as your speed dials between Opera browsers on the devices you are using. The service requires that you login a social network service or by creating an Opera account.
-
-6	Proprietary rights
-
-You acknowledge and agree that the Services and the Software, including without limitation the Software’s sequence, structure, organization, source code and applicable documentation contains valuable trade secrets and other intellectual property of Opera and its suppliers and is considered Opera’s confidential information. The Software and Services are licensed and not sold to you, and no title or ownership to such Software or Services or the intellectual property rights embodied therein passes as a result of these Terms or any act pursuant to these Terms. The Software and Services and all intellectual property rights therein are the exclusive property of Opera and its suppliers, and all rights in and to the Software and Services not expressly granted to you in this Agreement are reserved. Opera owns all copies of the Software, however made. Nothing in these Terms will be deemed to grant, by implication, estoppel or otherwise, a license under any existing or future patents of Opera, except to the extent necessary for User to use the Software or Services as expressly permitted under these Terms.
-
-7	Privacy and personal information
-
-7.1 General: No personal identifiable information is collected. Your installation of the Software contains a unique ID that can not be linked to you as an individual person. This unique ID is required for auto-updates of the Software and any installed extensions. Data about the features (not websites) used in the Software is collected with the purpose to improve the Software and Services. The Software also creates a unique ID that is linked to your computer. This unique ID is processed with the sole purpose to measure marketing campaigns and distribution partners. Any crash logs sent by the Software will include the version number of the Software and information about the operating system. This information is collected with the sole purpose to improve the Software or the Services. Opera’s privacy policy located at http://www.opera.com/privacy (“Privacy Policy”) is incorporated by reference.
-
-7.2 Opera Turbo is a web browsing service relying on web content being compressed on Opera proxy and video compression servers and then sent to the Software installed on your device. Opera is not able to link usage related data in Opera proxy servers to individual persons. Opera proxy servers log in addition to the web addresses (not content of the web pages), IP-addresses, Operating system, any campaign reference for the Software and a randomly generated identifier for the Software. Opera stores and processes usage related log data to provide, debug, maintain, and optimize the service. Opera server logs are kept for up to six months. Usage-related log data is also used to generate aggregated and anonymized statistics for Opera’s own use and for reporting usage to Opera’s customers.
-
-7.3 Discover: Opera is not able to link any usage related data to individual persons.  The service collects the web addresses (not content of the webpages), IP-addresses, the end-user device make and model, and a randomly generated identifier for the Software. Opera stores and processes usage related log data to provide, debug, maintain and optimize the service. Opera server logs are kept for up to six months. Usage related log data are also used to generate aggregated and anonymized statistics for Opera’s own use, and for reporting usage to Opera’s customers.
-
-7.4 Synchronization: Opera allows you to enable synchronization of browser data such as your speed dials between Opera browsers on the devices you are using, by logging in using Facebook, Google, Twitter or by creating an Opera account. Opera collects data submitted by you, and your name, username, email address and language if provided by the social service you use to login. The data is processed with the sole purpose to enable synchronization of browser data, including debugging, improvements and optimization. Data received for a social service may be retained for up to six months after you stopped using the synchronization feature. The data in your Opera account can be modified and deleted with the tools we provide.
-
-7.5 Built-in web search: The Software has a built-in, web search feature. This gives you the option to utilize external web search engines directly from the browser interface. Opera relies on third parties for this service. The Software sends the your search requests (in a specially designed URL string) directly to third-party websites that handle the actual search queries. What is sent to the third-party site is the special search string along with the text terms needed to perform the particular search query. No personal information is sent.
-
-7.6 Some third-party sites may monitor data traffic from the Software, such as numbers of hits and the search terms used. No personally identifiable information is made available to these services by the Software, and not by Opera. Please note: Opera does not control the privacy and security practices and policies of these third parties and their sites. Check the particular site and/or business for more information. It is your responsibility to use caution before sharing personal information via forms and other methods used by third parties and their websites.
-
-7.7 Opera reserves the right to disclose any information we have as required by law and when we believe that disclosure is necessary to protect our rights and/or comply with a judicial proceeding, court order, or legal process. Opera restricts internal access to data that is not aggregated or further anonymized, exclusively to those who need it for the operation of the services. Information may be stored outside of the country in which the user resides, and user hereby consents to such storage and transfer of information between jurisdictions. Any updates or changes to these privacy provisions will be included in Opera’s Privacy Policy available at http://www.opera.com/privacy/.
-
-8	Term and termination
-
-These Terms will commence upon your download of the Software and/or your commencement of the Services and, unless earlier terminated as provided in this Section 8, will continue in perpetuity. These terms will immediately terminate upon your breach of these Terms, unless such breach is curable and is actually and immediately cured by you after Opera provides notice of breach to you. Upon the termination of these Terms, you will discontinue all use of the Software and/or Services, promptly destroy or have destroyed the Software and any copies thereof, and, upon request by Opera, certify in writing to Opera that such destruction has taken place. These remedies are cumulative and in addition to any other remedies available to Opera. Sections 2, 4, 6, 7, 8, 9, 10, 11, 12, and 13, shall survive such termination.
-
-9	Disclaimer of warranties
-
-THE SOFTWARE AND SERVICES ARE PROVIDED “AS IS,” AND ALL WARRANTIES AND CONDITIONS, EXPRESS, IMPLIED, AND STATUTORY, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR USE, ACCURACY OR COMPLETENESS, SATISFACTORY QUALITY, AND QUIET ENJOYMENT, OR OTHER WARRANTIES OR CONDITIONS ARISING BY STATUTE, OPERATION OR LAW, COURSE OF DEALING, USAGE OF TRADE OR OTHERWISE ARE HEREBY DISCLAIMED. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OR EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE LIMITATIONS MAY NOT APPLY TO USER. OPERA DOES NOT WARRANT THAT THE USE OF THE SOFTWARE OR SERVICES WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE OR SERVICES DO NOT CONTAIN ANY VIRUSES. THIS WARRANTY DISCLAIMER IS A FUNDAMENTAL ELEMENT OF THE BASIS OF THE BARGAIN BETWEEN USER AND OPERA. OPERA WOULD NOT PROVIDE THE SOFTWARE OR SERVICES ABSENT SUCH DISCLAIMER. NO REPRESENTATIONS OR WARRANTIES ARE MADE BY ANY SUPPLIERS TO OPERA UNDER OR BY VIRTUE OF THIS AGREEMENT.
-
-10	Limitation of liability
-
-IN NO EVENT SHALL OPERA BE LIABLE FOR ANY INCIDENTAL, SPECIAL, CONSEQUENTIAL, OR INDIRECT DAMAGES OF ANY KIND (INCLUDING WITHOUT LIMITATION DAMAGES FOR INTERRUPTION OF BUSINESS, LOST DATA, LOST PROFITS, OR THE LIKE) REGARDLESS OF THE FORM OF ACTION, WHETHER IN CONTRACT, TORT (INCLUDING WITHOUT LIMITATION NEGLIGENCE), STRICT PRODUCT LIABILITY, OR OTHER THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN NO EVENT WILL THE CUMULATIVE LIABILITY OF OPERA ARISING OUT OF OR RELATED TO THIS AGREEMENT EXCEED THE AMOUNT PAID TO OPERA IN RESPECT OF THE SOFTWARE GIVING RISE TO THE CLAIM OR IF NO FEES WERE PAID THEN FIVE HUNDRED EUROS. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE FOREGOING EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. THIS LIMITATION OF LIABILITY WILL APPLY NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED REMEDY SET FORTH HEREIN. IN NO EVENT WILL ANY SUPPLIER TO OPERA HAVE ANY LIABILITY TO YOU UNDER THIS AGREEMENT. THIS LIMITATION OF LIABILITY IS A FUNDAMENTAL ELEMENT OF THE BASIS OF THE BARGAIN BETWEEN YOU AND OPERA. OPERA WOULD NOT PROVIDE THE SOFTWARE TO YOU ABSENT SUCH LIMITATION.
-
-11	Notices
-
-All notices required under these Terms will be given as follows: (a) in the case of notices to Opera, by certified mail, return receipt requested, to the following address: Chief Operating Officer, Opera Software ASA, Gjerdrums vei 19, 0484 Oslo, Norway, such notice to be deemed effective upon receipt by Opera; and (b) in the case of notices to you, by email to the email address that you provided to Opera prior to initiating the download of the Software or start of the Services, such notice to be deemed effective upon the earlier of (i) twenty-four (24) hours after sending, or (ii) your actual receipt of any such email. Source code used in the software, under open source license agreements, can be obtained by sending an email message to opensource@opera.com.
-
-12	Injunctive relief
-
-You acknowledge and agree that the Software and Services contain valuable trade secrets, confidential information and proprietary information of Opera. You further acknowledge that any actual or threatened breach or violation of Section 3 or Section 4 of these Terms will constitute immediate, irreparable harm to Opera for which monetary damages would be an inadequate remedy, and that injunctive relief is an appropriate remedy for any such breach or violation.
-
-13	General
-
-You acknowledge and agree that the Software may contain cryptographic functionality the export of which is restricted under applicable export control law. You will comply with all applicable laws and regulations in your activities under these Terms. You will not export or re-export the Software in violation of such laws or regulations or without all required licenses and authorizations. The laws of Norway will govern these Terms without giving effect to any conflicts of law principles that may require the application of the laws of a different country. The United Nations Convention on Contracts for the International Sale of Goods does not apply to this Agreement. All actions or proceedings arising under or related to these Terms must be brought in the Oslo City Court, and each party hereby agrees to irrevocably submit to the jurisdiction and venue of any such court in all such actions or proceedings. If any provision of these Terms is determined by a court of competent jurisdiction to be invalid, illegal, or unenforceable, the remaining provisions of these Terms shall not be affected or impaired thereby. You may not assign or transfer this contract without obtaining Opera’s prior written consent, and any purported assignment or transfer in violation of this Section 13 will be null and void. Opera may update the Terms of this agreement if and when you install and update or upgrade to the Software and/or Services. You will be responsible for all of your access and data charges from your internet service provider or mobile operator. Applications you download or that are made available to you may automatically connect to the Internet to update information or provide a service to you.
-
diff --git a/licenses/OPERA-2018 b/licenses/OPERA-2018
new file mode 100644
index 000000000000..7c03c43c64f6
--- /dev/null
+++ b/licenses/OPERA-2018
@@ -0,0 +1,57 @@
+Format: Mostly copyright-format 1.0
+# http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+# Making this file match the format entirely would require
+# reformatting the Opera license.
+
+Upstream-Name: opera-stable
+Source: http://www.opera.com
+
+Files: *
+Copyright: 2014 Opera Software
+License: Proprietary
+
+
+END USER LICENSE AGREEMENT
+
+
+Opera for Computers
+
+Last updated: December 14, 2018
+
+This end user license agreement ("EULA") governs your download and/or use of the executable code for the Opera for Computers desktop software application, including any update or upgrade thereto ("Software"). This EULA forms a binding contract between you and Opera Unite Pte. Ltd., a Singapore company with a registered address at 8 Burn Road #07-07 Trivex, Singapore 369977 ("Opera").
+
+Terms & Conditions
+
+1. THIS IS A CONTRACT. This EULA constitutes a contract between you and Opera. You may not use the Software if you do not accept the terms in this EULA. By downloading and/or using the Software, you agree to be bound by all the terms and conditions set forth in this EULA. If you are under thirteen (13) years of age, or at least thirteen (13) years of age but a minor where you live, you must have your parent or legal guardian accept this EULA on your behalf and approve your use of the Software.
+
+2. YOU ARE ONLY GRANTED A LIMITED LICENSE TO USE THE SOFTWARE. Subject to the terms and conditions of this EULA, Opera hereby grants you a personal, limited, non-exclusive, non-transferable, non-sublicensable license to:
+
+(A) use the executable code version of the Software solely as installed on your personal computer; and
+
+(B) reproduce and distribute the Software solely as included in an application repository for a desktop open source operating system distribution PROVIDED THAT in all cases the Software is distributed: (i) without modification; (ii) free of charge to end-users; and (iii) with a copy of this EULA. Distribution for embedded open source operating systems is not permitted. For the avoidance of doubt, the Software must be distributed without modification (including as to the default search engine(s) in the Software settings), both at the time of distribution as well as after the Software is installed.
+
+You may only use the Software as expressly authorized in this Section 2.
+
+3. YOU MUST RESPECT OUR RIGHTS IN THE SOFTWARE. Unless expressly permitted by law, you may not copy, decompile, reverse engineer, disassemble, attempt to derive the source code of, modify, or create derivative works of the Software. You may not remove, obscure, or alter any copyright notice or other proprietary rights notices affixed to or contained within the Software. You may not separate the component programs of the Software for use on different computers or sublicense, lease, rent, loan, or distribute the Software to any third party. You may not permit, direct or authorize any third party to take any action with respect to the Software which is inconsistent with the terms set forth in this EULA.
+
+4. THE SOFTWARE CONTAINS OUR VALUABLE INTELLECTUAL PROPERTY. You acknowledge and agree that the Software, including its sequence, structure, organization, source code and applicable documentation, contains valuable trade secrets and other intellectual property of Opera and its suppliers. The Software is licensed and not sold to you, and no title or ownership to such Software or the intellectual property rights embodied therein is granted to you. The Software is the exclusive property of Opera and its suppliers, and all rights in and to the Software not expressly granted to you in this Agreement are reserved. Nothing in this EULA will be deemed to grant, by implication, estoppel or otherwise, a license under any existing or future patents of Opera, except to the extent necessary for you to use the Software as expressly permitted under this EULA. You acknowledge and agree that any actual or threatened breach of this EULA will constitute immediate, irreparable harm to Opera for which monetary damages would be an inadequate remedy, and that injunctive relief is an appropriate remedy for any such breach or violation.
+
+5. COMPONENTS FROM THIRD PARTIES MAY BE DELIVERED ALONG WITH THE SOFTWARE. The Software is delivered along with certain software components provided by third parties (“Third Party Software”). Opera shall not be responsible for any such Third-Party Software. Third-Party Software, particularly open source software, may be subject to separate license terms included with, or contained in the setup installation segments of such Third-Party Software. The terms set forth in this EULA do not apply to Third-Party Software to the extent they are inconsistent with such Third-Party Software licenses. This EULA governs your use of the Software in executable form. Source code for any open source Third-Party Software delivered along with the Software can be obtained at http://sourcecode.opera.com or by sending an email message to opensource@opera.com.
+
+6. THE SOFTWARE MAY PROVIDE FOR ACCESS TO ADDITIONAL SERVICES. Various services may be offered where available via or as integrated into the Software (“Services”). By using any such Services, you agreed to the terms of service at https://www.opera.com/terms (“Terms of Service”). The Terms of Service are incorporated into this EULA by this reference. As is more fully explained in the Terms of Service, some Services are offered by Opera, others by third parties (which may be subject to separate terms – please refer to the Terms of Service for more information). Opera reserves the right at any time and from time to time to modify or discontinue, temporarily or permanently, the Services (or any part thereof) with or without notice. You agree that Opera shall not be liable to you or to any third party for any modification, suspension or discontinuance of the Services.
+
+7. OUR SOFTWARE AND SERVICES ARE AD-SUPPORTED. The Software is free to download and our Services are generally provided free of charge. Opera incurs substantial development, collocation and bandwidth expenses in doing this. To support our business and continue providing you with the Software and Services for free, we will display the advertisements of select partners to you. By using our Software and Services, you consent to the placement of such advertisements within the Software and Services.
+
+8. YOUR PRIVACY IS IMPORTANT TO US. Opera takes the protection and security of its users’ information very seriously and will treat any and all such information in accordance with our privacy statement, which is currently posted at https://www.opera.com/privacy (“Privacy Statement”). The Privacy Statement is incorporated into this EULA by this reference. You agree to the use of your data in accordance with Opera’s Privacy Statement.
+
+9. YOUR LICENSE TO USE THE SOFTWARE TERMINATES IF YOU BREACH THIS EULA. This EULA will commence upon your download of the Software and continue in perpetuity unless terminated earlier as provided herein. This EULA will immediately terminate upon your breach of any of the terms or conditions set forth herein. Upon the termination of the EULA, you will discontinue all use of the Software, promptly destroy or have destroyed the Software and any copies thereof, and, upon request by Opera, certify in writing that such destruction has taken place. These remedies are cumulative and in addition to any other remedies which may be available. Section 1, as well as Sections 3 through 14 of this EULA shall survive termination.
+
+10. THE SOFTWARE IS PROVIDED WITHOUT ANY WARRANTIES OR GUARANTEES. THE SOFTWARE IS PROVIDED “AS IS”, AND OPERA DISCLAIMS ALL WARRANTIES WITH REGARD TO THE SOFTWARE WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR USE, SATISFACTORY QUALITY, OR QUIET ENJOYMENT. OPERA DOES NOT WARRANT THAT THE USE OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE DOES NOT CONTAIN ANY VIRUSES. THIS WARRANTY DISCLAIMER IS A FUNDAMENTAL ELEMENT OF THE BASIS OF THE BARGAIN BETWEEN YOU AND OPERA. OPERA WOULD NOT PROVIDE THE SOFTWARE ABSENT SUCH DISCLAIMER. NO REPRESENTATIONS OR WARRANTIES ARE MADE BY ANY OF OPERA’S CUSTOMERS OR SUPPLIERS UNDER OR BY VIRTUE OF THIS AGREEMENT. IF YOU ARE DISSATISFIED WITH ANY PORTION OF THE SOFTWARE, OR WITH ANY OF THESE TERMS, YOUR SOLE AND EXCLUSIVE REMEDY IS TO DISCONTINUE USING THE SOFTWARE.
+
+11. OPERA IS NOT LIABLE FOR ANY DAMAGES YOU MAY INCUR. IN NO EVENT SHALL OPERA, ITS AFFILIATES, OR THEIR RESPECTIVE SUPPLIERS OR CUSTOMERS BE LIABLE FOR ANY INCIDENTAL, SPECIAL, CONSEQUENTIAL, OR INDIRECT DAMAGES OF ANY KIND (INCLUDING WITHOUT LIMITATION DAMAGES FOR INTERRUPTION OF BUSINESS, LOST DATA, LOST PROFITS, OR THE LIKE) REGARDLESS OF THE FORM OF ACTION, WHETHER IN CONTRACT, TORT (INCLUDING WITHOUT LIMITATION NEGLIGENCE), PRODUCT LIABILITY, OR OTHER THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN NO EVENT WILL THE CUMULATIVE LIABILITY OF OPERA ARISING OUT OF OR RELATED TO THIS AGREEMENT EXCEED THE AMOUNT PAID TO OPERA IN RESPECT OF THE SOFTWARE GIVING RISE TO THE CLAIM OR, IF NO FEES WERE PAID, THEN FIVE HUNDRED EUROS. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE FOREGOING EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. THIS LIMITATION OF LIABILITY WILL APPLY NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED REMEDY SET FORTH HEREIN. THIS LIMITATION OF LIABILITY IS A FUNDAMENTAL ELEMENT OF THE BASIS OF THE BARGAIN BETWEEN YOU AND OPERA. OPERA WOULD NOT PROVIDE THE SOFTWARE TO YOU ABSENT SUCH LIMITATION.
+
+12. THIS CONTRACT IS BASED ON ENGLISH LAW. This EULA will be governed by the laws of England and Wales, without giving effect to any conflicts of law principles that may require the application of the laws of a different country. Any and all disputes arising out of or in connection with this EULA, including any question regarding its existence, validity or termination, shall be referred to and finally resolved by arbitration in English in accordance with the UNCITRAL Arbitration Rules for the time being in force at the commencement of the arbitration. The place of arbitration shall be Singapore before a tribunal of three arbitrators, one to be appointed by each of the parties and the third by the two so chosen, unless the parties have agreed to the appointment of a sole arbitrator. The parties agree that the seat of the arbitration shall remain in London. Notwithstanding this, you agree that Opera shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. If any provision of this EULA is determined by a court of competent jurisdiction to be invalid, illegal, or unenforceable, the remaining provisions of this EULA shall not be affected or impaired thereby
+
+13. OPERA MAY MODIFY THESE TERMS. Opera may update the terms of this EULA, the Privacy Statement or the Terms of Service. The current version of this EULA is posted at https://www.opera.com/eula/computers, the latest version of the Privacy Statement is posted at https://www.opera.com/privacy, and the Terms of Service are posted at https://www.opera.com/terms. It is your responsibility to remain informed of any changes as you are bound by the latest version of the EULA, Privacy Statement and Terms of Service.
+
+14. GENERAL. You acknowledge and agree that the Software may contain cryptographic functionality the export of which may be restricted under applicable export control law. You will comply with all applicable laws and regulations in your activities with regard to the Software. You will not export or re-export the Software in violation of such laws or regulations or without all required licenses and authorizations. You may not assign or transfer this contract without obtaining Opera’s prior written consent, and any purported assignment or transfer in violation of this restriction will be null and void.
\ No newline at end of file
diff --git a/licenses/WRI-EULA b/licenses/WRI-EULA
deleted file mode 100644
index 16861fac9e0f..000000000000
--- a/licenses/WRI-EULA
+++ /dev/null
@@ -1,22 +0,0 @@
-You should visit http://support.wolfram.com/technotes/latestfonts.en.html
-for up to date license and accept it. As of 02.12.2008 the text on that page was:
-
-READ THIS AGREEMENT CAREFULLY BEFORE PROCEEDING. IT IS AN AGREEMENT BETWEEN
-WOLFRAM RESEARCH, INC. ("WRI"), AND YOU. ACCEPTANCE OF ITS TERMS CREATES A
-BINDING CONTRACT BETWEEN YOU AND WRI.
-
-Wolfram Research, Inc. ("WRI") licenses Mathematica fonts to individual users
-downloading from this site. All WRI fonts are copyright Wolfram Research, Inc.
-or its vendors. All rights reserved. WRI fonts are not in the public domain.
-
-WRI reserves the right to control all distribution of the Mathematica fonts and
-does not, at this time, allow them to be widely distributed via any servers,
-archives, or non-WRI software products of any kind without express written
-consent of WRI. There are no restrictions on embedding the fonts in documents
-transmitted to service bureaus, publishers, or other users of WRI products.
-There are no restrictions on widely distributing metrics files generated from
-the Mathematica fonts.
-
-WRI does not require authors to credit Wolfram Research for the use of the
-Mathematica fonts in published papers. However, such credit is appreciated.
-“Mathematica fonts by Wolfram Research, Inc.” is sufficient.
diff --git a/licenses/eGenixPublic-1.1 b/licenses/eGenixPublic-1.1
deleted file mode 100644
index 8fb8789e9683..000000000000
--- a/licenses/eGenixPublic-1.1
+++ /dev/null
@@ -1,106 +0,0 @@
-________________________________________________________________________
-
-EGENIX.COM PUBLIC LICENSE AGREEMENT                        VERSION 1.1.0
-________________________________________________________________________
-
-1.  Introduction
-
-    This "License Agreement" is between eGenix.com Software, Skills
-    and Services GmbH ("eGenix.com"), having an office at
-    Pastor-Loeh-Str. 48, D-40764 Langenfeld, Germany, and the
-    Individual or Organization ("Licensee") accessing and otherwise
-    using this software in source or binary form and its associated
-    documentation ("the Software").
-
-2.  License 
-
-    Subject to the terms and conditions of this eGenix.com Public
-    License Agreement, eGenix.com hereby grants Licensee a
-    non-exclusive, royalty-free, world-wide license to reproduce,
-    analyze, test, perform and/or display publicly, prepare derivative
-    works, distribute, and otherwise use the Software alone or in any
-    derivative version, provided, however, that the eGenix.com Public
-    License Agreement is retained in the Software, or in any
-    derivative version of the Software prepared by Licensee.
-
-3.  NO WARRANTY
-
-    eGenix.com is making the Software available to Licensee on an "AS
-    IS" basis.  SUBJECT TO ANY STATUTORY WARRANTIES WHICH CAN NOT BE
-    EXCLUDED, EGENIX.COM MAKES NO REPRESENTATIONS OR WARRANTIES,
-    EXPRESS OR IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION,
-    EGENIX.COM MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY
-    OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
-    THE USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-
-4.  LIMITATION OF LIABILITY
-
-    EGENIX.COM SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
-    THE SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
-    OR LOSS (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
-    BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS
-    INFORMATION, OR OTHER PECUNIARY LOSS) AS A RESULT OF USING,
-    MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE THEREOF,
-    EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-    SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF
-    INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE ABOVE EXCLUSION OR
-    LIMITATION MAY NOT APPLY TO LICENSEE.
-
-5.  Termination
-
-    This License Agreement will automatically terminate upon a
-    material breach of its terms and conditions.
-
-6.  Third Party Rights 
-
-    Any software or documentation in source or binary form provided
-    along with the Software that is associated with a separate license
-    agreement is licensed to Licensee under the terms of that license
-    agreement. This License Agreement does not apply to those portions
-    of the Software. Copies of the third party licenses are included
-    in the Software Distribution.
-
-7.  General
-
-    Nothing in this License Agreement affects any statutory rights of
-    consumers that cannot be waived or limited by contract.
-
-    Nothing in this License Agreement shall be deemed to create any
-    relationship of agency, partnership, or joint venture between
-    eGenix.com and Licensee.
-
-    If any provision of this License Agreement shall be unlawful,
-    void, or for any reason unenforceable, such provision shall be
-    modified to the extent necessary to render it enforceable without
-    losing its intent, or, if no such modification is possible, be
-    severed from this License Agreement and shall not affect the
-    validity and enforceability of the remaining provisions of this
-    License Agreement.
-
-    This License Agreement shall be governed by and interpreted in all
-    respects by the law of Germany, excluding conflict of law
-    provisions. It shall not be governed by the United Nations
-    Convention on Contracts for International Sale of Goods.
-
-    This License Agreement does not grant permission to use eGenix.com
-    trademarks or trade names in a trademark sense to endorse or
-    promote products or services of Licensee, or any third party.
-
-    The controlling language of this License Agreement is English. If
-    Licensee has received a translation into another language, it has
-    been provided for Licensee's convenience only.
-
-8.  Agreement
-
-    By downloading, copying, installing or otherwise using the
-    Software, Licensee agrees to be bound by the terms and conditions
-    of this License Agreement.
-
-
-    For question regarding this License Agreement, please write to:
-
-	      eGenix.com Software, Skills and Services GmbH
-	      Pastor-Loeh-Str. 48
-	      D-40764 Langenfeld
-	      Germany
diff --git a/licenses/maui b/licenses/maui
deleted file mode 100644
index d48bf7b0f7ea..000000000000
--- a/licenses/maui
+++ /dev/null
@@ -1,155 +0,0 @@
-Moab Scheduling System - End User Open Source License
-
-This software is based on the Moab Scheduling System which was created by 
-Cluster Resources, Inc.  
-
-Copyright (C) 1999-2005 Cluster Resources, Inc., all rights reserved.
-
-Moab Scheduling System is a trademark of Cluster Resources, Inc.
-
-This SOFTWARE is bound by an 'End User Open Source' LICENSE from Cluster
-Resources Inc.  The conditions of the 'End User Open Source' LICENSE include,
-but are not limited to the conditions described below.
-
-THE SOFTWARE IS PROVIDED AS IS, AND CLUSTER RESOURCES, INC. (CRI) AND ALL 
-CONTRIBUTING PARTIES DISCLAIM ALL WARRANTIES RELATING TO THE SOFTWARE, 
-WHETHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  NEITHER
-CRI NOR ANYONE INVOLVED IN THE CREATION, PRODUCTION, OR DELIVERY OF THE 
-SOFTWARE SHALL BE LIABLE FOR ANY INDIRECT, CONSEQUENTIAL, OR INCIDENTAL 
-DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE SOFTWARE EVEN IF CRI 
-HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES OR CLAIMS.  IN NO EVENT 
-SHALL CRI'S LIABILITY FOR ANY DAMAGES EXCEED THE CONSIDERATION PAID FOR THE 
-LICENSE TO USE THE SOFTWARE, REGARDLESS OF THE FORM OF CLAIM.  THE PERSON OR
-ENTITY USING THE SOFTWARE BEARS ALL RISK AS TO THE QUALITY AND PERFORMANCE 
-OF THE SOFTWARE.
-
-By installing or using this SOFTWARE you are accepting a non-exclusive 'End
-User Open Source' LICENSE from Cluster Resources Inc. and are bound to abide by the following conditions:
-
-1.  Inclusion of Notice and Disclaimer
-
-  All copies of the SOFTWARE, whether or not for redistribution and whether 
-or not in source code or in binary form must include a conspicuous and 
-appropriate publication of the above copyright notice and disclaimer.
-
-2. Usage
-
-  Source and/or binary forms of this SOFTWARE may be used by any 'End User'
-organization pursuant to the conditions of this and other associated LICENSES
-at no charge and for an unlimited period of time.  An 'End User' organization
-is defined as an organization that is using this SOFTWARE on their own 
-systems and is not commercially redistributing, modifying, supporting, or 
-providing other services specific to this SOFTWARE to other organizations 
-for profit.
-
-3.  Modifications
-
-  SOFTWARE may be freely modified by the 'End User' as necessary to meet the
-needs of the 'End User' LICENSEE'S system.  'End User' may solicit the
-services of Cluster Resources Inc. or 'Authorized Distribution and Services
-Partners' of Cluster Resources Inc. that have received express prior written
-authorization to redistribute, modify or provide services for SOFTWARE.
-Available services include but are not limited to technical support, 
-training, consultation or optimization services.  'End User' may not 
-solicit or receive this SOFTWARE or services associated to the use, 
-customization, training, development, or support on this SOFTWARE from any 
-organization that is not an 'Authorized Distribution and Services Partner' 
-of Cluster Resources Inc.  Any organization that desires to become an 
-'Authorized Distribution and Services Partner' of Cluster Resources, Inc. 
-may contact us at support@clusterresources.com.  'End User' organizations 
-that desire services from Cluster Resources Inc., or an 'Authorized 
-Distribution and Services Partner' may contact us using the same email 
-listed above.
-
-4.  Distribution
-
-  'End User' organizations that are academic and government agencies may 
-redistribute this SOFTWARE subject to the condition that the distribution 
-contains conspicuous publication of the acknowledgement statement found 
-within the LICENSE agreement distributed with this SOFTWARE.
-
-  Organizations that are not academic and government agencies including 
-commercial and other for-profit organizations may not redistribute this code
-or derivations of this code in any form whatsoever, including parts of 
-SOFTWARE incorporated into other software programs without express written 
-permission from Cluster Resources, Inc.
-
-  Redistribution of the SOFTWARE in any form whatsoever, including parts of 
-the code that are incorporated into other software programs, must include a 
-conspicuous and appropriate publication of the following acknowledgement:
-
-  'This product was developed by Cluster Resources, Inc.  Moab Scheduling
-System is a trademark of Cluster Resources, Inc.'
-
-  Any redistribution or modification of the SOFTWARE must, when installed, 
-display the above language, the copyright notice, and the warranty 
-disclaimer.
-
-  Each time the SOFTWARE (or any work based on the SOFTWARE) is 
-redistributed, the recipient must automatically receive this LICENSE, 
-copyright notice, and the warranty disclaimer as described in this license 
-agreement, which govern the ability to copy, distribute or modify the 
-SOFTWARE subject to these terms and conditions, and have the choice of 
-accepting or declining the LICENSE.  
-
-  As the LICENSEE, you shall automatically provide the recipient with a 
-copy of this LICENSE.  Further restrictions are not to be imposed on 
-recipients of the SOFTWARE by the LICENSEE beyond those expressly described 
-herein.
-
-5.  Use of Modifications
-
-  LICENSEES with a redistribution agreement that wish to distribute their 
-modifications (including government and academic institutions) must first 
-send a copy of the modifications along with a brief explanation of why the 
-modification was made and the resulting performance or functionality of the 
-modifications to Cluster Resources, Inc. at support@clusterresources.com.  
-Failure to send a copy of distributed modifications renders the LICENSE 
-invalid, as well as any LICENSES granted to third parties subsequent to the 
-incorporation of the modifications into SOFTWARE.  Any such modification of 
-the SOFTWARE must, when installed, display the LICENSE, the copyright 
-notice, and the warranty disclaimer as described in the LICENSE agreement/s 
-distributed with this SOFTWARE. Those without a LICENSE to redistribute may 
-send modifications to Cluster Resources for evaluation and possible 
-incorporation into SOFTWARE.
-
-  Copyright owners of modifications to SOFTWARE hereby grant Cluster 
-Resources, Inc. a non-exclusive, royalty-free, worldwide, irrevocable right 
-and LICENSE to install, use, distribute, sublicense, and prepare derivative 
-works of said modifications.  Only organizations receiving an express prior 
-written exclusion to this condition are exempted from providing these 
-non-exclusive rights to Cluster Resources, Inc.
-
-6. Communications about and Endorsement of SOFTWARE and Products/Software 
-Derived from the SOFTWARE
-
-  The name 'Moab Scheduling System', 'Moab Scheduler', or any of its 
-variants must not otherwise be used to endorse or to promote products 
-derived from the SOFTWARE without prior written permission from CRI.
-
-  Products derived from or incorporating the SOFTWARE in whole or in part
-shall not contain as part of the product's name any form of the terms 
-'Cluster Resources, Inc.', 'CRI', 'Moab', 'Moab Scheduling System', 
-'Moab Scheduler', or 'Supercluster Development Group' unless prior written 
-permission has been received from Cluster Resources, Inc.
-
-  All advertising materials for products that use or incorporate features of
-the SOFTWARE must display the following acknowledgement: 'This product
-includes software developed by Cluster Resources, Inc. for use in the Moab
-Scheduling System.'
-
-7.  Acceptance of this LICENSE
-
-  It is not required that you accept this LICENSE; however, if you do not 
-accept the terms of this LICENSE, you are prohibited by law from installing,
-using, modifying or distributing the SOFTWARE or any of its derivative 
-works.  Therefore, by installing, using, modifying or distributing the 
-SOFTWARE (or any of its derivative works), you have agreed to this LICENSE 
-and have accepted all its terms and conditions.
-
-  If any portion of this LICENSE is held invalid or unenforceable under any 
-particular circumstance, the balance of the LICENSE will continue to apply.
-
-
-
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index dac381a54eca..041c2f04e113 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/postgrey/Manifest b/mail-filter/postgrey/Manifest
index 180a866dd058..663577578eb9 100644
--- a/mail-filter/postgrey/Manifest
+++ b/mail-filter/postgrey/Manifest
@@ -5,6 +5,8 @@ AUX postgrey.service 345 BLAKE2B 4ca6ab7a5649ea49fe69128b64111113301ab891f3de9f2
 AUX targrey-0.31-postgrey-1.34.patch 8555 BLAKE2B 5957c9ea2fa62554bb45ecad71712f5a5c7c655a132434fe6520335a07f2ad5475cd45fe592c8769f44df03f951ee6bfffa1aad2c331aa393ea20b64fe783d96 SHA512 af4433f08120ae6ab07179f1adb88ca8c86c142b68727657555cef04d84105912e8e67c969c860ea000930196c6046b7b2bef2647f04b202ceecaf163d8515d5
 DIST postgrey-1.36.tar.gz 38797 BLAKE2B b8e4dedb28ababc92cdd1d128652a468caeb55eb611ca019148a2e538d3cc0d397cd14889942904b05c9471bb13ed9fa6250e399d47df22241895c109a68315d SHA512 9b2502b873658c1ef8a86bff091d61b8dc8d66f7395bc0a869f9e6ec60b691a317c084ae326f49ce8dd926f0fa2620a58f3ad76c25e1b1c9606557d2802d1395
 DIST postgrey-1.37.tar.gz 41815 BLAKE2B dd8a1f62f56a614c25863afde089f1882a1567e3a53a24b1d12b6f23994388caf99059f05775853065143f4f953a6fd964625d5c865993e0e679dd545b848c11 SHA512 369968212ea60539efc0d4a7ae84f7c3ce13f5622e6ee070a0089423ef81ca8f7541ebd20289291d0e6a3aec2ca30dbc9c0d9c0a6f0a686adfadb5d0dd7830ca
+DIST postgrey-1.37_p20190625.tar.gz 124667 BLAKE2B ca2caba51a72198e42d6d4d9c5c7590b62c1bd1589d05bfb4096fb4d95ff62ff96976beac8c1b35136a4a6830af936244485ff7dcdcd46d8558a4bef0bbb123a SHA512 f3caf3c7663bd8784701c7e1ad45d1c577edf6fac14591a6983fda25e7f8a875f2501780a8f97ce72e6a324878404e9ac2a003a07ae07ad4debae61fe734b8d4
 EBUILD postgrey-1.36-r1.ebuild 1748 BLAKE2B 17fa8ad75a46cac8658b70666b16427405282799ce1d2528677fefb573c0e8638d68075b7dc6401ebd5722639404a970f1644e0fe7bb1afb6a81bf6af00a6ba6 SHA512 0ea4a73933a11d84894bc8a286193a3b1d71f2ecf5ac2513e9c3cf18364479485519839d09fed3a15152a1208c9dd908695c853a2a17a003b295f9842bbf99bb
-EBUILD postgrey-1.37.ebuild 1662 BLAKE2B b4f70a90e59b28635840c222dc6fb6d7a9008705649db3ed50445ed1c19b0c15be49d5574547197a82ada5242115f4c358e8245b27dc1c18073b119eef6d20a6 SHA512 17512115c889bceccc2a8fd09ffc8aa5815b37256b473a7f794c42f4fd561dc625e7d72f6f67b9a1abe2b89a6a14e0f51ecec913029ea7fd12e1fdca8d707790
-MISC metadata.xml 582 BLAKE2B 68f063bb59cf9526167905dc77294f8c5da400bf2a128dab804f2286c594db84c397f98233fe4428842f0191d495c776b299bd6ab8fc9c3fda509df7c80f3611 SHA512 0b40a89f66f637c4086475a4808771e967063ad6841a7b23174ce2a2adc7c3bc25ce683a37d18c6935f9d2f4ef081cac0c465270484bc15cbe552fd2a3160e01
+EBUILD postgrey-1.37.ebuild 1656 BLAKE2B ab895b8c30d8817c7bb8d990a8828540ade53107ce56c569cfa1fe5a4c76140c3b57d38cafc8320885ecaa1cb4c32dc09788dc32ff029a5620dea31ef4d74408 SHA512 3fc92f83203ffb093268aae830bbdb2aed01da388fed571ebe530b8d43261aaf0c6ab2ed4ec37384a5912e8d4f42f9ad982e5e296274c68de14ca75098813a3b
+EBUILD postgrey-1.37_p20190625-r1.ebuild 1723 BLAKE2B 1fee548caf43321267bc90f709464b559778b865c6eef028b0429a8df88b96bb7dae63bb38f2c42a0a2268226e600fc26bee1c3f507dd1118d7d50f4987af6c4 SHA512 cf9b26c4c940b2c2937e24573bc187e2016d0f08ee90147254a43f0a95b31f29c3cd473de03d53420b5e87c4fd0fb21dda92b218bdbe2ca2947f48d9625b2467
+MISC metadata.xml 541 BLAKE2B 8f30317d462b08e6fffae9e71ebe09c5eaf7d2595df60211201a0c63c409693617bef6be47862d323a50ca5037b28aee97811ff846324fd470d7745b812d632c SHA512 3211c4a2afbd3bb58fc4a179776014e1bf85571ad8e522b5f07171305f934c353b531d2adf12588c076d0122ccaf079a23d71cd3b3c854f4c2d01ee80e7f5de1
diff --git a/mail-filter/postgrey/metadata.xml b/mail-filter/postgrey/metadata.xml
index 2805de6dd07d..53aeb0809926 100644
--- a/mail-filter/postgrey/metadata.xml
+++ b/mail-filter/postgrey/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>lists@xunil.at</email>
-		<name>Stefan Weichinger</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
 	</maintainer>
 	<longdescription>
 		Postgrey is a Postfix policy server implementing greylisting developed by David Schweikert at the ISG.EE.
@@ -15,4 +11,7 @@
 	<use>
 		<flag name="targrey">Enables the targrey patch</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">schweikert/postgrey</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/postgrey/postgrey-1.37.ebuild b/mail-filter/postgrey/postgrey-1.37.ebuild
index 37e2c1011e8c..03ab30c7a0e3 100644
--- a/mail-filter/postgrey/postgrey-1.37.ebuild
+++ b/mail-filter/postgrey/postgrey-1.37.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
@@ -12,7 +12,7 @@ http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild
new file mode 100644
index 000000000000..7714cf102c09
--- /dev/null
+++ b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+COMMIT="eb420c5dee57dd54e6f63bad5d74e85f5cc9535d"
+DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting"
+HOMEPAGE="http://postgrey.schweikert.ch/"
+SRC_URI="https://github.com/schweikert/postgrey/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	acct-group/postgrey
+	acct-user/postgrey
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/perl-5.6.0
+	dev-perl/Net-Server
+	dev-perl/IO-Multiplex
+	dev-perl/BerkeleyDB
+	dev-perl/Net-DNS
+	dev-perl/NetAddr-IP
+	dev-perl/Net-RBLClient
+	dev-perl/Parse-Syslog
+	virtual/perl-Digest-SHA
+	>=sys-libs/db-4.1
+"
+
+src_prepare() {
+	default
+	# bug 479400
+	sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed"
+	sed -i -e '/git/d' Makefile || die
+}
+
+src_install() {
+	# postgrey data/DB in /var
+	diropts -m0770 -o ${PN} -g ${PN}
+	dodir /var/spool/postfix/${PN}
+	keepdir /var/spool/postfix/${PN}
+	fowners postgrey:postgrey /var/spool/postfix/${PN}
+	fperms 0770 /var/spool/postfix/${PN}
+
+	# postgrey binary
+	dosbin ${PN}
+	dosbin contrib/postgreyreport
+
+	# policy-test script
+	dosbin policy-test
+
+	# postgrey data in /etc/postfix
+	insinto /etc/postfix
+	insopts -o root -g ${PN} -m 0640
+	doins postgrey_whitelist_clients postgrey_whitelist_recipients
+
+	# documentation
+	dodoc Changes README README.exim
+
+	# init.d + conf.d files
+	insopts -o root -g root -m 755
+	newinitd "${FILESDIR}"/${PN}-1.34-r3.rc.new ${PN}
+	insopts -o root -g root -m 640
+	newconfd "${FILESDIR}"/${PN}.conf.new ${PN}
+	systemd_dounit "${FILESDIR}"/postgrey.service
+}
diff --git a/mail-filter/postsrsd/Manifest b/mail-filter/postsrsd/Manifest
index 2479dc701410..a660a1fd9512 100644
--- a/mail-filter/postsrsd/Manifest
+++ b/mail-filter/postsrsd/Manifest
@@ -1,5 +1,7 @@
 AUX postsrsd.init 737 BLAKE2B 76342c7707e86c8d111e550393ce2e624c2ed192e16a4521cf6b14deb81a21d2bc8be9ca1027890dd0dc883cadf6659fedd17b417d0712e55e38781f5ec8cffe SHA512 9550e26ddee4eec5b324bc6364b52ea8ebf755c1463498ab7380aac87e79d1a84e2048ef0bfdd250d029674d5050bab1bb5d1cec455ec5d4863e08d320e06111
 AUX postsrsd.init-r1 787 BLAKE2B 6d5431bb32974dc88ace86d2781681fdc9058475569080d057cb0336f337b8ccb3bd63f12344829085e5ba7399569dc951a820e6bdb8c5e0cecba718bfa19774 SHA512 dd80b6be1e2c28ddd7ff48ac761ce15b46d01db58aa91ddaa29db63acec5c071a52c055b9ecf8839f04696765a937dfcd2532be4a99fe2cf04bd881a7bd5acc2
+DIST postsrsd-1.10.tar.gz 34844 BLAKE2B 4722e8f3ec1d5d7de0648d8afc03c38f485c92b092bd42bc02c82c4072b5eb053cbb907bd1198de1219acf465c850b4f08ee8bca629f85734ca2ff643d77c1e4 SHA512 79f824cbc56de2e79da2eb67b1888c1c171a10a7bae5f19384c22024ff7e65dd36a447e632ddaf77bea6bdfa4972c7a918a30cd3b06f7b7ae49ab7552c43be0e
 DIST postsrsd-1.6.tar.gz 32111 BLAKE2B 5b4e562aa9c9b5faf0e45c035a71d76dc2b6e9b3d4399108f06e6d0ad3e4f7abfcb8c18c818f3b4787bab155bf7895caaf127a97b861b26525ad5a27f2ee4dc7 SHA512 b2df4cdec41361e15cd8c9207fb16564d607559bcb36dd73c9347b90e4f3c2414b88434ef1ffe6a18783f38c5960383516e40e4ffa28802a03539e52ca723aa1
+EBUILD postsrsd-1.10.ebuild 755 BLAKE2B eb9cf776de3754b304756c2f89111744aab78a98c71c89c5bfb61c013d2e9b64281f03199edf97b28254353a0fb8baa509ae4084c90df2c77c982183f0286fb2 SHA512 418447dfb7816380b7fd81d4b4f50bafb9be362280e2482d10798cbea7174b9b8ae6f6b946f6d54bd8bd782672a582800fc46015f084d69ac77e9d5aba230f53
 EBUILD postsrsd-1.6.ebuild 771 BLAKE2B 63cdc5cc1f67a499b8c96a27c788f0fb565834184100268afa722d46a91e534257c6a24c1b28c2f7fa3201ff40500a1a7ca14e8ecd96262cb6e8dc73d0c58ce9 SHA512 90f45343c349513fbcbb4af3fc8b1cc19be465e53dda7dd086758fd28bca469db30d30b3f980c8aa3fe2c1a384397310846357f5c8ab26b9fc9aa976de9dc461
 MISC metadata.xml 337 BLAKE2B caac016ab1be7bad01670321e5aae7cf8c3699a394f4911350b4104d313e5b921071cb3406a47f976f16d1fc6879a16b2d6be03e0765a02f0e1e65de5703df0f SHA512 9093270e1a174ca6c5e1316015b3e9605f247bcd4fccf1e1c9595f5b94e3e182e532dced5c483a0be24c053fd453a5b9ba272c1004fbc54fe95cc3069dfe7d59
diff --git a/mail-filter/postsrsd/postsrsd-1.10.ebuild b/mail-filter/postsrsd/postsrsd-1.10.ebuild
new file mode 100644
index 000000000000..58991e5e7a9a
--- /dev/null
+++ b/mail-filter/postsrsd/postsrsd-1.10.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
+
+DESCRIPTION="Postfix Sender Rewriting Scheme daemon"
+SRC_URI="https://github.com/roehling/postsrsd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/roehling/postsrsd"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+BDEPEND=">=dev-util/cmake-2.4"
+RDEPEND=""
+
+CHROOT_DIR="${EPREFIX}/var/lib/postsrsd"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCHROOT_DIR=${CHROOT_DIR}
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newinitd "${FILESDIR}/postsrsd.init-r1" postsrsd
+	newconfd "${BUILD_DIR}/postsrsd.default" postsrsd
+	keepdir ${CHROOT_DIR}
+}
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 0d9ed0dfc0ae..2e19487f1ff1 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -14,6 +14,6 @@ DIST rspamd-2.5.tar.gz 4490310 BLAKE2B 8d117b1b03e8092d0c724a4da4de23dd145f5b226
 DIST rspamd-2.6.tar.gz 5079444 BLAKE2B acb9d9471d0bb457da33b4d23e3c75ef87ea26a47e6c731bfd5fbbfe28567244e2bc72fd25ca3408db0928dab4e4ab66596e38cf3eff7cb9690eec59d3b62372 SHA512 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
 EBUILD rspamd-2.5-r1.ebuild 2565 BLAKE2B b8e44e7c74887186c9a228e0fa706f8070b95238a2d63e1ecb0e26d89b930442f8e72c5371d50236e34e67c1f6991c1a36e74fc06bb66fe965fd2565c238a9d3 SHA512 c34e5d2ec35dd9dfb2586a4690221c7aab98459c69694f1c82795c264e41723fc791c830c940df97bcbfd611ff1461fb0ddd142bf0e6c8c6dce25e6110db08b0
 EBUILD rspamd-2.6-r100.ebuild 2746 BLAKE2B cb91e2db0ade31521975900a4d3ccd3bb68119aca71eec4139843d204477ee556b59ff5082e3eba1b0afbf49af1e4ed182bf9b165e58bd7b9c3608676fbcdf71 SHA512 668e8baeea10cd5e213f9d2d259447c678726ab5dc11bf1b95ffe716e321c5900a85ef98c4d459722e163be5730511b6eede0151700b5b323ddb3a6897916538
-EBUILD rspamd-2.6-r2.ebuild 2535 BLAKE2B 5968455ea16f256449cef924f026fc1f30186e1805902bf4e34de0c4c0d6b6dd16ddb39e80be352b0ea113203e164c2aa28c8b2bca9e0d34c5c09fad82827cf0 SHA512 d6a5710aaf4db8f40f959e92811875f01b1fd2c1a248a0875bc65373bc453ec488314c267e83c98884bb7a52a328d5c10efbe381b0383856178dc6767bb3ae51
+EBUILD rspamd-2.6-r2.ebuild 2534 BLAKE2B f9a60233509527d4e593f832083cd7414390ada25a036ea1e388f3303ca29d96e38eac9a262d11b47e2889b007f598907ec9d899d388210760f2069b735634b8 SHA512 a1b1334e4a97685cef7a3a01934accb9a7ceac19e6cbdba240717cc65f53cba52fc83bc15035bd78d79a0258c05752f07bad1afbd3ab63155e6324ef5f588210
 EBUILD rspamd-9999.ebuild 2747 BLAKE2B e3f88f2d25c948628dcd8619137ee9aeff91bedde69e7e328a1113858867ef53116cdcf06b21fc6c86b8f0e51d81d2657913243d34b645d099abb858d66044e7 SHA512 95f70ab731b647f74fa433c86f6ec3692f6b746c8064da41ecde3b79e705467bac28f03069b623c7c1fff1837d06e5ee9d9ba1f5915a5b77bceb6f5361e0f9b2
 MISC metadata.xml 639 BLAKE2B 935ca7becc486efc41fa07b224808a67893e8a609819a1d7a299f03689d94ea6c959f0e606896f0bd899294e7a48c48279125f9e8508981aebaa42a55a8eb4a7 SHA512 22cadde54711e1b4b7324fe68dfacc95fac4477910001b99e0423b9735e83f69801580822aa5f6ea6460955eda6fe4cd4702d9c22cfe1b09721203744f556a80
diff --git a/mail-filter/rspamd/rspamd-2.6-r2.ebuild b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
index a31a0897fc9a..d22ac2c67f30 100644
--- a/mail-filter/rspamd/rspamd-2.6-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-2.6-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Rapid spam filtering system"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index bb4f87b16807..9af00f127e62 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index b5971a712aea..504fe95cda01 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -1,5 +1,8 @@
 AUX 60-liberation.conf 1055 BLAKE2B 066343b8a6a6b1a17deb54718404a723d56aa354b3125caea83fc432bf8ed9f11998403a626117d403be478cbb83961510b1bcc17e885ac8e1d3375c7760d8f0 SHA512 dcc8066e511db34ed007df018fd2d24a9e4020e382e0f12bba8fcedac5c8a93f917885c09919e3eb38bf73b94f59eb16fc4a894952dc9709c2b12353542cf117
 DIST liberation-fonts-2.1.0.tar.gz 4986277 BLAKE2B c8d60a749d35d979237d1c82be69e5fc4fe3e8702893235b9064c6790974126a6e019f20164ca3431bfc2c972cd7102aa688519739e381660f745cc5f1099613 SHA512 70dbdd2e61808e7a56f76d605ded6195fc1b2d91b8682e8daef1bc5bf36a45a04b8f4e77fdcafa81f1253835c65637abc4c2df65ebe86aa1555fc074826ee0ba
+DIST liberation-fonts-2.1.2.tar.gz 4976962 BLAKE2B 934b71cbd45ba94b6cf18fc81942004beefe2dba860f13e885930b423208aa0b2f328f3d6e95f65c16017fdf40d51c25bf2b94d8654e3118fd347a00253056fc SHA512 9eec48e3a87d07499969926204fc9063d9d196894b95536b506988041b1965064319a2686bf54cbaabf836f54323816fe0d2a74ae14249366791de94da630e29
 DIST liberation-fonts-ttf-2.1.0.tar.gz 2355448 BLAKE2B 675f739710d46b7198fd2bab68ee084c205c2ac5c4ce34d502040ee2ea9be50d9014302840edf72997619c6acefcb81984f04c2c5f5e5a4c57f276016e53ed5c SHA512 608252c064b5368591549a6c1b927a361e1373881607bf7217a2cd9f3ae72eda7389a7cfd530bba29ffbffc1128e68b8d8c83d9b9937c33815caf41766301c4b
+DIST liberation-fonts-ttf-2.1.2.tar.gz 2370416 BLAKE2B 386eab6e886b677082bbbe1bf625bf91304e6baa4352a8dba3d073d3d2d80c1ae85ebb456f0b967be7ba9c430d7a95364107e54e789d419605976174ceb751b3 SHA512 bfdc3fb7dff1e78aa833035dad40bc26b12bce24b9e16863ec2f8f768a2a370705fafd25c430e3ed4ba7f742051c52ed3cf14da82a8500797b9efcdeef507f3c
 EBUILD liberation-fonts-2.1.0.ebuild 1264 BLAKE2B 9aecbf698f84fa9c31e5745441df9e40bd9e33883863c78127ccb945f6e52a623fb37f9d3cbe12aeddc6d9fd3faa52221c9d0956de9341ebb04bf83935be2a3f SHA512 05a1b649b17b0f8f9554726cdfebfd1be6edbae5e85a085f8f6c52d6d62c53d63734f8a35a58c68171cac13b36a09fc239e07a2cd4820e0a0ddacbd874529222
+EBUILD liberation-fonts-2.1.2.ebuild 1273 BLAKE2B ced995526e7ec31af3d0f94f4b2a1bdcbe4c243903e03b11c4bdd93b3da2d049186d381c33ff5bd4d2715bfa46434510aa4b32e51240c20b4ab8c455e04e24d3 SHA512 5114000a638a5a05ee357100ca9223501a5d89587b290c60695aca8cc65cf61218d5cf28b9a07d937e37ddf827fe5be81ec77e7b9e5a87024a8b400287ee4c68
 MISC metadata.xml 347 BLAKE2B d87f084f711672ea5d33cdae481ac57f5359a87daa9dc6b27267d227e85a935abbb7abbeec64f3610c2aa758d59c46ad4d62f5f3cf90480c0a385a270b099f9c SHA512 e6b5b7a4374456a468c2a42536858ad64ef12b0156623685370350895f4e0210210d9c5618dd1c581733e114b5b54ba5cbc11bc42f9274040418d3695988144a
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild
new file mode 100644
index 000000000000..817ed2e44f8a
--- /dev/null
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit font python-any-r1
+
+DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
+HOMEPAGE="https://github.com/liberationfonts/liberation-fonts"
+SRC_URI="fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/5722232/${P}.tar.gz )
+	!fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/5722233/${PN}-ttf-${PV}.tar.gz )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+SLOT="0"
+LICENSE="OFL-1.1"
+IUSE="fontforge X"
+
+FONT_SUFFIX="ttf"
+
+FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
+
+BDEPEND="
+	fontforge? (
+		${PYTHON_DEPS}
+		media-gfx/fontforge
+		$(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
+	)"
+
+python_check_deps() {
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	if use fontforge ; then
+		sed -i "s/= python3/= ${EPYTHON}/" Makefile || die
+	fi
+}
+
+pkg_setup() {
+	if use fontforge; then
+		FONT_S="${S}/${PN}-ttf-${PV}"
+		python-any-r1_pkg_setup
+	else
+		FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
+		S="${FONT_S}"
+	fi
+	font_pkg_setup
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 88afaa4b0e3c..66746c254765 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 6c31df9f7c6c..5642ddbe6904 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,5 +1,5 @@
 DIST CairoSVG-2.4.2.tar.gz 38715 BLAKE2B 3c8f77561e13e0fdec371a601f09f0d107f972955c8e8fbc34f5092a7ff5f65b24338c20ae8e21b428eea083925a36b3e5635a9b0010c569d013169d919b7a35 SHA512 0d6dd22d9569fd3849cf7f6594c86bed719169dac1f0f3219e88d82f9d245bf29d51715159085cb26c0340c8f0dcb88412d141ec0ee3710b1477626f5a578441
 DIST CairoSVG-2.5.0.tar.gz 40481 BLAKE2B d177570710f54a7d64446de81a700a6ebe5dd475ab75e268575ee2d3a45cb1da14a349d6a5516ef965191093f12ba916a1919fe115fa4b6e4dc0f9a22657946b SHA512 9387273a5531f2e055871d3ccc3b770a46e549dceb443d9d7dbf3635f44da4a752f06ece2f86582f57eac08d59d78f833e1ed2e7badea340d5a0f1eb31beb24c
 EBUILD cairosvg-2.4.2.ebuild 872 BLAKE2B 4f326bdcaa5571e152cd438654fa0ffe4f9aa9465f0e88dce89f00c683506e932fd58fcd075d75f94f634e33d152c8b14a8dbdd8b467e087a6eb2c38d654a0fd SHA512 8bb35201de54b9f633516fa768925ac9b77245a8f8a89ddfea5ed12f01cf0ce57bb39deb24d3b3c11d8c0a59ace7fee30292b2ea175c29f88476e777b43935cf
-EBUILD cairosvg-2.5.0.ebuild 873 BLAKE2B 14c9f7bc21c36ccfa7c8af5dfc202a8c224022f6c1fa8e9097776ceb5a04cbf9039d80fffbf614d45fd220beec61b0dd9a3bf704454ce5a69ad0061bfb75d18a SHA512 2f97dcf15a076d968296625cd1af14d0781f7f9bd18197aeb9910e88572dd5d6ea5f74d9f3c94180a6fe40b93c1a1b9d846c439c08131f737fc9c50659bf9c63
+EBUILD cairosvg-2.5.0.ebuild 872 BLAKE2B b3ed730a0f9f3f96be8e891eb8aeb9cb29e6fb25f78ad71dff2d95e79d90c9c98777f20468d64fafa62f20f87804614d0681aa2ffca1f7e83b977e681597e524 SHA512 7e655af8cf7ba52bf3913ddb790a5f7a56ffa96999b72d5773f21ab2f5f9658809f1aa46552085432e0dc999b9d50e4d0880aa09b8783a3524cabbc03510e648
 MISC metadata.xml 328 BLAKE2B 168e60e4dbd12e2b99ba4ad8a6f8f42ef5a4de12f8f1edc68ba4d1d4252b24995da5d0e4ef9e1db09b3934ba42b042685db625439425a6e98cde2f52050c4af1 SHA512 ebb7d9d27e014fd083d0abe9508040730f980ba8a0bc89670ee5418af2c3af036d0ec16b5607a8805944d3b7eeb835e8806ab059fed68c52268df1cd10d7bbb0
diff --git a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild b/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
index a0513821d46b..4c147e00d421 100644
--- a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 237892175ba7..d30ee77610e0 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,3 +1,5 @@
 DIST eog-3.36.3.tar.xz 3651556 BLAKE2B 6224b21342b24bed8cfed5702c440547423a7c0db36278c082f336f274ebabea401700c418eafced814fb33043362963055acbcacc81edff8b0f202898c09542 SHA512 90205561dbc49aa42e60f636ce23d04dcd05513d28176ffa4c1dd6602889c4b2c920bd299086d3d7bfee72fcc6a029e2d34e14eb80ba5f91573161fbd1b85aea
+DIST eog-3.36.4.tar.xz 3651632 BLAKE2B f971ab236422a875ea8d91a661c6c653ba2ef4834b282dcce7d5c53e9c23bedf49610c0a8ff1bedb2af1821610ab29de8476a2b13b6cb1b82e58c3309b56b7dd SHA512 d1f4aa2e225a8147507cbed74a74bd435887884a2431f3ea0d1c569217a291f93c1440bede1c6abf03660ad8df46530e8b2195399ac8faaac36b1e31e8e93daf
 EBUILD eog-3.36.3.ebuild 1556 BLAKE2B 6ba5e5184a6916dcc56b4879ca3abf4e5eff4711fcdc97c3a56a415f3564d1b02ec74dbf270b0586e9496ba421b9bae052591a40aeebb789e22867b1d6443dba SHA512 c59d6e36cec5e04be93567fe493f62885effd1a828240aed0e4d5afe04d31a1615d237294814eef7c774ac009cccf0cadea8c86881908df08a1a312a774f9e06
+EBUILD eog-3.36.4.ebuild 1558 BLAKE2B fc7954cbc8763a3d4037bfc445576b8a1e0b7f5db72e59e5d5f35879a59c12a0ce96d1ae68fd2af8eeb4218082c0af2bd9f9d47f8ea68a8080ee1b317de636f9 SHA512 f2527c036b67ff6cd1d9047014117f65b6497ecf4fe09398301d32ae97b9ff8ae21665138e4565cec2d747e83815f9312ca08a50546dcf7ca3144f9321c37dfd
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.36.4.ebuild b/media-gfx/eog/eog-3.36.4.ebuild
new file mode 100644
index 000000000000..75800455eb94
--- /dev/null
+++ b/media-gfx/eog/eog-3.36.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 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/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 1bbf9a5cc225..bda21f12e77a 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -3,5 +3,5 @@ AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0
 DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
 DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42
 EBUILD graphviz-2.42.3-r1.ebuild 7864 BLAKE2B 4390c7d22ec3e914d25445eda9ffab4bd879c5a1316355a69cd0cea756a3d85c15c3dc31bcbf97161de877eb70605e230b7a43b2c3201d980387f49653231278 SHA512 9105485fa2e67399edd207249ad80ed7b16c2f9378b33e2f844f402a4e7cbef53868ef8fb4800d06672deb75f62a51ec68949fd2d16c2cf345846116c0e68b74
-EBUILD graphviz-2.44.1-r1.ebuild 7837 BLAKE2B eb30898121035261a7bf7bd92d1ec865acf862228777562db4ff2598113cf2a427264ba6bf0beedd599a8105e5bc988e86400b08aa1022a9e90506b2876d331e SHA512 1b209908a66e85ea977d5aebff2d4e9aaaae7ed60d855d38bbb7a2a117033b8d56d1cee9d4e501c33854f1803e7439a93ea18219c3428066236c134580b56ca3
+EBUILD graphviz-2.44.1-r1.ebuild 7831 BLAKE2B ec67505722ac47f4164a08283e083733e38162f16131e12dbfab159b51ed20df94a886c60b567d03104d47bdddd322ee322c39b081ebb0fc17cb5db663a16d55 SHA512 f34f2a0936c98abf4bdf258ecfdfbcbeaacde92c966b74aa6237122e0f38e5b5079476b132c70f144b5f2f7416c6470b9ec51ae62d3ece1e072d4ec9f74f7b3b
 MISC metadata.xml 2244 BLAKE2B 61cc818a6f736cee316c026bef8f02dc03ffa3c63f620832fd063f00111178b07be4c5224f5d4fc0f1cddbfc3180e31ac277d493107e0d716d0d2f05c7272633 SHA512 e8c8d5b2abf9c21c6fe8dd7e3489210275065a2f0f64023f5aa52fac2b2646b974fc36c60aa189be022728384ff223aae5856095846dc5ea85638d1b882ad7e0
diff --git a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
index 99dae78ef38b..009934548efa 100644
--- a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 805405e2e5ca..20e995cbd026 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,6 +1,6 @@
 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
 DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d SHA512 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
 EBUILD hugin-2019.2.0.ebuild 2337 BLAKE2B 9ca08518fef5bb7d3167cc01caa64da8bd076142174e000cd3881f855644e8e95021149104d86ef82973c6d073eddbaccaf7ea0e8621e3a8e458562d4b7f5b6f SHA512 a17162e5db9fad823f35f867f96e13bb443e2150da84b54d71577a4c33cdbf9497da3d1b3cc0ee051ee7ed607a877133dd6e4483e2a86f150f27f7558e8627cc
-EBUILD hugin-2020.0.0.ebuild 2144 BLAKE2B 3d5e2cd2a531552be99fce17f722f71fc24ff513293b6ee53faf7b2e673bce44c56257eb1903317396aabc47929c68ba9653053099240d934855d7f008175320 SHA512 9e4f95d87863101cd67a21aa5c78d58fbde97b63b8a255f8c23bac5f607e42a884e43a43037d07a81b26838c25b6f84bec4bfdba1e5da56965ab4f702e5835b1
-EBUILD hugin-9999.ebuild 2058 BLAKE2B d7f7ab9b065dcc31cc85033a044b3e8da912779069709e2c1c02c3958744896c9c84cfb2bbf9c802b444e92ce6f6cd86d402254d3b2e5eb5f2b2b766eef069e0 SHA512 65ead2eab2416af88e8529704ee0c936901d3512558e1433eaff5ec3b3db5ba8659b2f72fd4613cc305afb9461003841ce7e3c04b8bbd201c8842ab7ddb5c5c7
+EBUILD hugin-2020.0.0-r1.ebuild 2125 BLAKE2B 7fed3491685573cf5288d91c1bd8287372eb1b93fd729028a3fdca9d4cbbaf247ece8376eb91ebb4a7ac6bd3af66fcc69f710e714a90e5f42bc7415d838753fa SHA512 d013ac7b751f6d624db2744349fa100fe240b40d106b29c443bc37b2ce30738423da5096babe7d4e37abb17b377b1741a612a40cee58eea8b8aec017b534a4ac
+EBUILD hugin-9999.ebuild 2065 BLAKE2B f64cb2ca7c5eadade0e76545a7f3fe778e41e22509eb8a2149bd2e45efc0de33193dbbcb52820878b85e08b1b977c38ca99b62163196334fc5ca5d90d8eb8f77 SHA512 eeb41148cd7ca8cca9429fa2e231007ba99885790563a266c05730a62ee3be1a513927d632aede8e1e2f10c1965bfc03d66cb6326c0f1a1a239d5c61a194b90b
 MISC metadata.xml 546 BLAKE2B efad9c27562890b23594411333a0ef827b7e54acde132ffdec4f664eae37fb3ab270950ef650e6caaea4bd3b69a7bed469e794dce51d59850cd06ff844e08836 SHA512 0d096754e2f6ef1468e6bdf7464e6f5cc1de06f20136b68be7aaf199cd78a10e4213678d875ff61d829f692dbd5b0728d50bb35eefb1de6af4e5e0fd7d91d350
diff --git a/media-gfx/hugin/hugin-2020.0.0.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
similarity index 90%
rename from media-gfx/hugin/hugin-2020.0.0.ebuild
rename to media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 7c7d2c57f260..60bec67bbd97 100644
--- a/media-gfx/hugin/hugin-2020.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+inherit python-single-r1 wxwidgets cmake xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -39,7 +39,7 @@ CDEPEND="
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
-	x11-libs/wxGTK:3.0=[X,opengl]
+	x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
 	lapack? ( virtual/blas virtual/lapack )
 	python? ( ${PYTHON_DEPS} )
 	sift? ( media-gfx/autopano-sift-C )"
@@ -68,7 +68,7 @@ src_prepare() {
 		-e "/COMMAND.*GZIP/d" \
 		-e "s/\.gz//g" \
 		"${S}"/doc/CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -76,11 +76,11 @@ src_configure() {
 		-DBUILD_HSI=$(usex python)
 		-DENABLE_LAPACK=$(usex lapack)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use python && python_optimize
 
 	local lang
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 3eb92a7c66c7..0c9e3ac20a0f 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+inherit mercurial python-single-r1 wxwidgets cmake xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS=""
 
 LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
 
 CDEPEND="
 	!!dev-util/cocom
@@ -41,12 +41,13 @@ CDEPEND="
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
-	x11-libs/wxGTK:3.0=[X,opengl]
+	x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl]
 	lapack? ( virtual/blas virtual/lapack )
 	python? ( ${PYTHON_DEPS} )
 	sift? ( media-gfx/autopano-sift-C )"
 RDEPEND="${CDEPEND}
-	media-libs/exiftool"
+	media-libs/exiftool
+	raw? ( media-gfx/dcraw )"
 DEPEND="${CDEPEND}
 	dev-cpp/tclap
 	sys-devel/gettext
@@ -65,7 +66,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -73,11 +74,11 @@ src_configure() {
 		-DBUILD_HSI=$(usex python)
 		-DENABLE_LAPACK=$(usex lapack)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use python && python_optimize
 
 	local lang
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 3c3b1e778bb6..4b36c628ec24 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.11-44.tar.xz 9155096 BLAKE2B efd52ca6d30a385f29f0fda102c58d89dff6b80d702391a39d52cb59835fe258a21b171a64dfefd91f15d377177219de1a1db1b2e8bb2e3337119497a38b272e SHA512 dcf2965f1751c50649c74160b29f6909b6fa2dfdf64520d0f55be9fe0eef02aac32f9c376756295c90b9c89b2947890249ca0e41f0cc56e2ec4b37678bc92372
 DIST ImageMagick-6.9.11-46.tar.xz 9165256 BLAKE2B 5fb2c7ef90c165388bf9c9b42d752823e62b94a631f8dd8161d8c71b718154b5f577474a7074f42644e994af1aec99f28c4d69913be3045865cbc87533c05fca SHA512 63022225e694dccbfb52eec3793332bc92ff2d6a51a6ed161d63e044a33c8d13f0a2630afc1935cb139ca2d0e141d99a9bec23f5eac82a488a461ed30baf85f5
-DIST ImageMagick-7.0.10-44.tar.xz 9649740 BLAKE2B b721532e267c2832252519b52fd6f88795e0bc22cc165020478dc80164784a0407e0eec066ecf8db68409e04a48e877d16f882e773f34c50797784ba771ec997 SHA512 246567c84ecaaba4f7742c215b2d79f181fedd3ba953d318f177916e5a3757ddbae111837657a5df4b420da3b1337b1ec78c871c57b3e738585ee847a7b9d768
+DIST ImageMagick-6.9.11-52.tar.xz 9152084 BLAKE2B bc50767e3eacc06ccf6168d9cac5666a2836e3b2085ee834594da419c2912cafce7dee84573f1a2062e051afb066529ae79b7bea25242fb055fdd11e734ee0d7 SHA512 79e6ab62722060601283f4c172f7a27b7d3c00f5dbdfaea4c1f5c1940a681ab3fd53e4ea4b736adc3e0662ecccba13f7f86baada3d319733191eda37abee38a1
 DIST ImageMagick-7.0.10-46.tar.xz 9649132 BLAKE2B 8083aa4fa26d59c4bea4bd9a45ab5b1a46d3fe0ecdbb0090588d16bcc31ad044171a59dc7e8681c878e885d83c7b34a4bbfa21273d5711181bbefdee457ac895 SHA512 7008286a05a1794a3061bd598bf6acc70dcfe1aec3a6b5632dce9dd87bb6c28385af0d469b47996d5576c4b39c5d48a4fcd7752b9353ec28b7f7d8160f4c5023
-EBUILD imagemagick-6.9.11.44.ebuild 7047 BLAKE2B c8a589ac24fb824399cdf0459e46d52fa5aa08b184befdb8d7c991778e41fa91a30e89d6e1cab206969c47d9d438977528c6ad533da242398c380c434b0cf8db SHA512 ea9007174ea7d0eb0c583e659e761f25904f63981d88c41e03ffb6680e58885f8cc6faa6bb2f63686e69137b1ad0acd815e646993fe6b2ec7d25be51b6c5e3c9
-EBUILD imagemagick-6.9.11.46.ebuild 7054 BLAKE2B c1f4280b7d3380b01a44f33af60b062eeb2c98f0850dcd3d4fe88ebe292ad5c2e299c018983724b96f18461c0acdb6f9807ccaf8b233328a5ff2c00582734255 SHA512 9aa1c7e617fe258be2eb1f7f0f9d462a51d6d0884edab102fbfa70936891b3371e1d86fa059648fccfb52a25645fb6376171d55ce20f7d6de267445c0f958b97
-EBUILD imagemagick-7.0.10.44.ebuild 7356 BLAKE2B d2f907df96ed9c207652de11dc4178b3ac6c6ced8ee759a78bfeb7d8c8e152a73dbd03ff146a1dd8eb66155cc09612621c0c5aaee394461127b2f80707e20eab SHA512 26ee49e6b467c1c777ef2acfa5740601ae529b1a4aed6dd07c287ad2246d21edfa72285a63c4f27e1241e81b485b3ccad14ddf9aa58eea63949cb6f68c7e9c1b
-EBUILD imagemagick-7.0.10.46.ebuild 7364 BLAKE2B 5067a5a79b93c7ea8364940352cc4988393ceb86a08e617dd95a309022be37b60dd9ffd1621c1a799cb372608f75c213d7fc1ddb13340225ad4643c408630bc4 SHA512 85560f10889069420c6459e696aa96d7306486bea2410d8f3bdc9160995eaad65b10ca171c2a39a170ba21043bb4cd84f5e6e0776e020ecf1286b84611430981
+DIST ImageMagick-7.0.10-52.tar.xz 9642352 BLAKE2B c1a86214978da88d66ef90b91516482fe67ee5e215fd5d76c79dbbcd9e33cc2d417d8f5d8e29056743737dd2275fe7a8d891b6ad2f3c8d7d5ab0adfd83f60dd1 SHA512 da1a8d53af0dc8f0dc8f71a7d41c5277c1e17f81e03a3c54852ced65d5d379577989e274bac66926c8a10f4d2f2834f7456b79635007252308ca593e98ef6d43
+EBUILD imagemagick-6.9.11.46.ebuild 7047 BLAKE2B c8a589ac24fb824399cdf0459e46d52fa5aa08b184befdb8d7c991778e41fa91a30e89d6e1cab206969c47d9d438977528c6ad533da242398c380c434b0cf8db SHA512 ea9007174ea7d0eb0c583e659e761f25904f63981d88c41e03ffb6680e58885f8cc6faa6bb2f63686e69137b1ad0acd815e646993fe6b2ec7d25be51b6c5e3c9
+EBUILD imagemagick-6.9.11.52.ebuild 7054 BLAKE2B c1f4280b7d3380b01a44f33af60b062eeb2c98f0850dcd3d4fe88ebe292ad5c2e299c018983724b96f18461c0acdb6f9807ccaf8b233328a5ff2c00582734255 SHA512 9aa1c7e617fe258be2eb1f7f0f9d462a51d6d0884edab102fbfa70936891b3371e1d86fa059648fccfb52a25645fb6376171d55ce20f7d6de267445c0f958b97
+EBUILD imagemagick-7.0.10.46.ebuild 7356 BLAKE2B d2f907df96ed9c207652de11dc4178b3ac6c6ced8ee759a78bfeb7d8c8e152a73dbd03ff146a1dd8eb66155cc09612621c0c5aaee394461127b2f80707e20eab SHA512 26ee49e6b467c1c777ef2acfa5740601ae529b1a4aed6dd07c287ad2246d21edfa72285a63c4f27e1241e81b485b3ccad14ddf9aa58eea63949cb6f68c7e9c1b
+EBUILD imagemagick-7.0.10.52.ebuild 7364 BLAKE2B 5067a5a79b93c7ea8364940352cc4988393ceb86a08e617dd95a309022be37b60dd9ffd1621c1a799cb372608f75c213d7fc1ddb13340225ad4643c408630bc4 SHA512 85560f10889069420c6459e696aa96d7306486bea2410d8f3bdc9160995eaad65b10ca171c2a39a170ba21043bb4cd84f5e6e0776e020ecf1286b84611430981
 EBUILD imagemagick-9999.ebuild 7364 BLAKE2B 5067a5a79b93c7ea8364940352cc4988393ceb86a08e617dd95a309022be37b60dd9ffd1621c1a799cb372608f75c213d7fc1ddb13340225ad4643c408630bc4 SHA512 85560f10889069420c6459e696aa96d7306486bea2410d8f3bdc9160995eaad65b10ca171c2a39a170ba21043bb4cd84f5e6e0776e020ecf1286b84611430981
 MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
index 671132b9e8fb..2093cc705f7b 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11-37"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.44.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
similarity index 97%
rename from media-gfx/imagemagick/imagemagick-6.9.11.44.ebuild
rename to media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
index 2093cc705f7b..671132b9e8fb 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.44.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11-37"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
index c476290b8c6a..e5576b5108a8 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	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 ~sparc-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.44.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
similarity index 97%
rename from media-gfx/imagemagick/imagemagick-7.0.10.44.ebuild
rename to media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
index e5576b5108a8..c476290b8c6a 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.44.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	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 ~sparc-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index c506c9c27502..ba986832aa8e 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,8 +1,4 @@
-AUX pstoedit-3.60-libdl.patch 428 BLAKE2B 8ed39e1a13da74ccecaa2aeec57447fc75b682c9ea5a8fe6586052fd766bc9ab23cb76bdc56bb613cb43672f6d10a05cfaa8bc860865d2586673ab4a9c8642aa SHA512 dc29caf4b1bf1e6ce7cc73fd5ae1682f0aba8a798f632d29cca450bf3883afe54142ea06fbe6d9aa07f2580450780afe1c671cb1c37f1dd800582b2036797f73
-AUX pstoedit-3.70-pkgconfig.patch 627 BLAKE2B 00412e11239e49f12babc35f2225c7ac2a25ce62e59d8b3088c0d7284b867c8919dc70c61bc60cea06e75dee84698eaf223861ad8db09cd36dfdf5ee813aee9c SHA512 8edfc9f0c0db6371405ff16641294c8aebb7dc09e9bc8b9114c7506f4fd494f0361b90abceddad68c351baa2d2917b6212056ed69c0a6dde0d914a2c801888ec
 AUX pstoedit-3.75-libdl.patch 432 BLAKE2B 19d6b192c7fa1497f40baff8c039139248be34bbd7f1858e4731da4e631a46dfa8a7e5a9041a5e991a44fb049b0399fad763c65b9a27437d7bcd1d61631fd760 SHA512 010263020e07b57fdde3fa6478cf5865877d71d015a446d8111326d69ce7138467e384bb5f48baa149932a0c4a42d9a60552ff8616125cbc1dabf613cd78df79
-DIST pstoedit-3.70.tar.gz 1013949 BLAKE2B ec459dc56851d942076adf4352ef974188b0b8273a6f9150c8767c1d63c3c9b6d993ea8c0b1a0b59663b31652eb7a4b8697e4c38c23d5aa0572d554120a5e900 SHA512 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9
 DIST pstoedit-3.75.tar.gz 1290057 BLAKE2B 607a265ea6f058e1ba432d55c4602452cd52a48302441ecee542a113d90b090ce888cc6fa5e3a8e3a2fdbf94dce9b1ab1f7f5ba58ab81f1f509eea9052a3cd82 SHA512 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28
-EBUILD pstoedit-3.70-r1.ebuild 1298 BLAKE2B 050683e34422597851f06393dc58d17c2b30a30e55afc1b35f73011d316f034ac328f644defcb73fbf5e64db47cd553bb41fd2c92bbff3542cae6346fd67ed73 SHA512 a4c08a36a6b7135e482d679a4310536612a09904f668eef29ad07115425d2b0c3c85fc6f20ede32a1c91df1b6566dc44423a86cf6d777e2c0e6c34ff1a334b37
-EBUILD pstoedit-3.75.ebuild 1294 BLAKE2B cf1dfd3f6a9902ca45e41f157f1701a337c6842f281201c9ae996980ab6902e07a5099edff39b4b26371d909724174df180785755ee32172ffe076222d499d5f SHA512 6c9ce12556007c84f208b591cb2009e248d6a68ea766d29f6ea295c8525181a3a200d91678006b5f1058cfcedd79914a7023260c44d47d9a21946699dac6f9a1
+EBUILD pstoedit-3.75.ebuild 1293 BLAKE2B f549f1af21a983957a6101676632123994fa7c57014ef76133f05bcfec37cd37d9c4e5d620688746fddad0577d4077406f5e4639253fa5d8b803f2e35932e2e4 SHA512 d01f29f8263591a0aee8996d17575163c4602f07443c855230da9323d998a068aabffb406d73e5bedd3268c407472da278c587cd6bdf0cc9222140ce188b1427
 MISC metadata.xml 633 BLAKE2B 3a142022d38aaf0e5bd5d6df58b8a6e2f94589992eba8a48d875138af60bb44d8893ed91a7dcb169246ff2d2405940c406d5d37f84bfc9c621b8771b96678f05 SHA512 6d62633c23d2b45c5bdf75e8e09e3f58def09a2512e540699857809ea79ddc41c823cc382a9a412b6dc061e02c3b5574c8addc7bebd6e7bb10caa2c2408162a6
diff --git a/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch b/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch
deleted file mode 100644
index 279ed715f53a..000000000000
--- a/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6b33220..30c9f2e 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -139,7 +139,7 @@ libpstoedit_la_SOURCES =			\
- 	genericints.h 				\
- 	version.h
- 
--libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
-+libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} ${LIBLD_LDFLAGS} -lm
- libpstoedit_la_LDFLAGS = -no-undefined
- 
- pstoedit_SOURCES = cmdmain.cpp
diff --git a/media-gfx/pstoedit/files/pstoedit-3.70-pkgconfig.patch b/media-gfx/pstoedit/files/pstoedit-3.70-pkgconfig.patch
deleted file mode 100644
index c101077431e5..000000000000
--- a/media-gfx/pstoedit/files/pstoedit-3.70-pkgconfig.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-LIBPNG_LDFLAGS is never substituted...
-https://bugs.gentoo.org/show_bug.cgi?id=551208
-
-Index: pstoedit-3.70/config/pstoedit.pc.in
-===================================================================
---- pstoedit-3.70.orig/config/pstoedit.pc.in
-+++ pstoedit-3.70/config/pstoedit.pc.in
-@@ -7,5 +7,5 @@ Name: pstoedit
- Description: converts PostScript(TM) and PDF files to other vector graphic formats
- Version: @VERSION@.0
- Requires: 
--Libs: -L@libdir@ -lpstoedit @LIBPNG_LDFLAGS@ @CXX_STD_LIB@ @CXX_RUNTIME_LIB@ @LIBLD_LDFLAGS@
-+Libs: -L@libdir@ -lpstoedit @CXX_STD_LIB@ @CXX_RUNTIME_LIB@ @LIBLD_LDFLAGS@
- Cflags: -I@includedir@
diff --git a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
deleted file mode 100644
index 23d9052cacf5..000000000000
--- a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
-HOMEPAGE="https://sourceforge.net/projects/pstoedit/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="emf imagemagick plotutils pptx static-libs"
-
-RDEPEND="
-	>=media-libs/gd-2.0.35-r1:=
-	>=app-text/ghostscript-gpl-8.71-r1
-	emf? ( >=media-libs/libemf-1.0.3 )
-	imagemagick? ( >=media-gfx/imagemagick-6.6.1.2:=[cxx] )
-	plotutils? ( media-libs/plotutils )
-	pptx? ( dev-libs/libzip )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.60-libdl.patch
-	"${FILESDIR}"/${PN}-3.70-pkgconfig.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/CXXFLAGS="-g"/d' \
-		-e 's:-pedantic::' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with emf) \
-		$(use_with imagemagick magick) \
-		$(use_with plotutils libplot) \
-		$(use_with pptx) \
-		--without-swf
-}
-
-src_install() {
-	default
-	doman doc/pstoedit.1
-	dodoc doc/*.txt
-	docinto html
-	dodoc doc/*.htm
-
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild
index ff88b5ffff46..c876af5e5c68 100644
--- a/media-gfx/pstoedit/pstoedit-3.75.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.75.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 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="emf imagemagick plotutils pptx"
 
 BDEPEND="
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 36af0abbb8ad..ac574d9355f2 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,14 +1,6 @@
 AUX ax_prefix_config_h.m4 8195 BLAKE2B d2eb17b7730a216f8fa88585b7dce51d641fb9e801a77d8059329a3838a8ce0d4eac02e1229cd087cdbac9f47c7bcfe99bfe0a14e8c4db233c6c4e066ea09b81 SHA512 cf70c3e909da9379ebed51a66fe94cbd7a068574e0ba0da5690f917523b090f29eb23f0464849d6364adc28411258483b0d773ed3488c9e9328d5a1f732427c4
 AUX scrot-1.2.bash-completion 1990 BLAKE2B 6c99578185f7d69581854372344088398279af8227fccccff07dcb590ae1a90d6ef9122ba3cf02b0db634fe68554818e63d1cfa54bae0fb1ccb65cf0f84769b4 SHA512 76880911e6799894d68aae78313a114fc18c6bf2f0411a0fdce3f30d33c8ff266290aed9570a546c3a05a71503a130c5cbe2cb6e0f92c240edbc8e9f19362db4
-AUX scrot.bash-completion 1063 BLAKE2B ab03add49bb68db845d1cb599e62dfd4070a8110b5bbf03584fec395a3b0c60262bf3f4fc0ddc1a35c17996a8986107ae3bad053a8974da7c456bdfe7410b424 SHA512 ce8df63bb5b10dbf19f465f2629ebe7045d84105f3da70a49f2bde6a0a416a8f14a02ba3e7d3a8aeba144a592b45a770929b56f6ae7ac867222213ac8f923a0f
-DIST scrot-1.2.tar.gz 36839 BLAKE2B 26ca05fb3c8fa9069ad87bdd5cc93791994e44e2f5cd7a4b729a6c9e3035c349049500b9627fd31532c280465f77f839370d095f1b0f2ccc10649b3e6fa01edb SHA512 b89e7a94e6317fdb7bd260190c6d68a2dfefc08691b4574337afdfff84f55b8b9c955a6ac60642ae9749c1deaa16bee7b855fbd15833a95f602536693daf8c37
-DIST scrot-1.3.tar.gz 141726 BLAKE2B 1972edfa3b61c95fd786d0b4db13633778293b2c671c395939ea0b77d49714e644abd60cfae5656f03fd1c701185d2c8961c45d62989e882f2cd8f4a824dee57 SHA512 45828824701c7574676d0746d01f3dc8313ea91a272fa169b616765442e8842b67d8aa73f47009a66d34dd6b89a230fd9fb42bc598e88baae70fc45345c13a4c
 DIST scrot-1.4.tar.gz 157779 BLAKE2B ba844f8bc500c468d028ce62ae57bd6a9fa0e403df6f05dd217722a9115456b70a38aabd7ccb0da53d855b9971d0f5948f82545ca0c8cceb75ede0d4546e27c1 SHA512 8423e7b2658f3e0ccf30f61e122016469226328adf8b1e511aeb031dd2655ae66582651e2d046c7c35d23efb98656369a02b59e711980481ddc4db24c299ee11
-DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4d0ed2bf9619cc8ea5824b5e42c66ee5163c7f4e76308763947b933003dbd3df6e641b0596ed342993343fd5418a75 SHA512 3f6d0a8e592088af38a3d90394b6b7246430479f5b0c8451af5eae383725d1896dc4bbf595495f9f2b546f00ef38780123c4ee0e3f06971c55a6ac2dfa5b7d53
-DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
-EBUILD scrot-0.8_p13-r1.ebuild 975 BLAKE2B 4f0920e23cada110c426fcd1ef874379f8ae3d9ed272dc5fd8a8cc4ffa0253066ee1f26428cad4d771bc5875fc205daea8d3e5fa381a204e5d13edcec2bab881 SHA512 b26b4f5aaa5a522a602404197697b17cd04d53d23229c7d1078e851400019c2fc506b96ba72b6aa36c9fe084711c67b9a57f4b75113e0b3ebb64289fd03fbf75
-EBUILD scrot-1.2.ebuild 920 BLAKE2B b00fcbdf7665347b42716ce8ab78b8f6965f90b4b1f1a88acd2fffacd2978145208965afd206012c837ab22126ba7e78990b8760c5a58cccef373d2715991918 SHA512 341f2fbb5f4824b38d4c42e18929173cad358faf4b9b475d0c735ddc1a681962019c3a8a35892c5120afc42895ac1ac654c1faeb7a7fee5010725a61251bc7cd
-EBUILD scrot-1.3-r1.ebuild 971 BLAKE2B f4daabaf37c8e2d6ea724d1b96f12928b4f5ece6301a0fa44dcffbbfdf00d4b213f56b5b066116b64eb45bb78100c9b9fd2fb451e2e8d9da664b9624c7f67c63 SHA512 552252c5ca01774197b34dd862a458399004f5be2f78b5d889176c0ebf072b05b08cfa842953205dc64da4ed3d4d011f81fb964a071992ea5b772c0ae69fcacd
-EBUILD scrot-1.4.ebuild 1038 BLAKE2B d06310bfa132481ab5af318e94594ba41ff80696fc0ac9455162ea607ba094c0da7333fe142ad30f3a34efae100abd708d236ee31fdf04087c8c4f2b5240508d SHA512 32877ebd7db9cd06e00974f3a87aa510c23d4fdb38fe4c8ced564762fce25df9dc33ab5189a58186586f5d5def753b091124405cb23556fed7b84b1ed8f99ea2
+EBUILD scrot-1.4.ebuild 1034 BLAKE2B 4a10c46323e28c44908d11c99c107b9061266e469d8488afbbc4cfd591b673eb71487f0cc812325f4e7f25e89d78ec85ffe589c886303a8b1f8848924595bb36 SHA512 2681c19f15ac74efcf30071dcf78efa4220e792b630a9415eba314f310d490aa473cb9b1f63ea54ac6185669aeb859502d0b62c6fd3fcb87c1fe90d63b567689
 EBUILD scrot-9999.ebuild 962 BLAKE2B bd263137adf2fa88b029f8b38b92d86219308cdf290b775334fd28bd0f4e51b2a10bb6726b8f6c568a5fa5b309ec7b71199958b7030374bdfb6cb83ede7a0121 SHA512 2eddd1a3086c9b834ead426e1df2c0aa84a85021aa7606d30d92a23ad0e2869a99a9ff248f6af960a28082555f68a823d448837a9f70892c49ec9a8ea5bd9903
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/scrot/files/scrot.bash-completion b/media-gfx/scrot/files/scrot.bash-completion
deleted file mode 100644
index d7e5729cd849..000000000000
--- a/media-gfx/scrot/files/scrot.bash-completion
+++ /dev/null
@@ -1,40 +0,0 @@
-# bash-completion script for scrot
-# place this in /etc/bash_completion.d
-
-_scrot() {
-	local cur prev opts
-	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-	opts="-h --help -v --version -b --border -c --count -d --delay -e --exec \
-	-q --quality -m --multidisp -s --select -t --thumb" 
-
-	if [[ "${cur}" == -* ]] || [[ ${COMP_CWORD} -eq 1 ]]; then
-    	COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
-	fi
-
-	case "${prev}" in
-		-e|--exec)
-			COMPREPLY=($(compgen -A command -- "${cur}"))
-			;;
-		-h|--help)
-			COMPREPLY=($(compgen -W "${opts/-h --help}" -- "${cur}"))
-			;;
-		-v|--version)
-			COMPREPLY=($(compgen -W "${opts/-v --version}" -- "${cur}"))
-			;;
-		-b|--border)
-			COMPREPLY=($(compgen -W "${opts/-b --border}" -- "${cur}"))
-			;;
-		-c|--count)
-			COMPREPLY=($(compgen -W "${opts/-c --count}" -- "${cur}"))
-			;;
-		-m|--multidisp)
-			COMPREPLY=($(compgen -W "${opts/-m --multidisp}" -- "${cur}"))
-			;;
-		-s|--select)
-			COMPREPLY=($(compgen -W "${opts/-s --select}" -- "${cur}"))
-			;;
-	esac		
-}
-complete -F _scrot scrot
diff --git a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
deleted file mode 100644
index 94d6392391df..000000000000
--- a/media-gfx/scrot/scrot-0.8_p13-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=5
-
-MY_PV=${PV/_p/-}
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="http://scrot.sourcearchive.com/"
-SRC_URI="http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_0.8.orig.tar.gz
-	http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_${MY_PV}.debian.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/imlib2-1.0.3
-	>=media-libs/giblib-1.2.3
-	|| ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-0.8
-
-src_prepare() {
-	local d=${WORKDIR}/debian/patches
-	EPATCH_SOURCE=${d} epatch $(<"${d}"/series)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -r "${ED}"/usr/doc || die
-	dodoc AUTHORS ChangeLog
-
-	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
-}
diff --git a/media-gfx/scrot/scrot-1.2.ebuild b/media-gfx/scrot/scrot-1.2.ebuild
deleted file mode 100644
index 234442c4fbc2..000000000000
--- a/media-gfx/scrot/scrot-1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=media-libs/giblib-1.2.3
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	|| (
-		media-libs/imlib2[gif]
-		media-libs/imlib2[jpeg]
-		media-libs/imlib2[png]
-		media-libs/imlib2[tiff]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-DOCS=(
-	AUTHORS ChangeLog CONTRIBUTING.md README TODO
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	newbashcomp "${FILESDIR}"/${PN}-1.2.bash-completion ${PN}
-}
diff --git a/media-gfx/scrot/scrot-1.3-r1.ebuild b/media-gfx/scrot/scrot-1.3-r1.ebuild
deleted file mode 100644
index 61281f19b1fb..000000000000
--- a/media-gfx/scrot/scrot-1.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=media-libs/giblib-1.2.3
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	|| (
-		media-libs/imlib2[gif]
-		media-libs/imlib2[jpeg]
-		media-libs/imlib2[png]
-		media-libs/imlib2[tiff]
-	)
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-DOCS=(
-	AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
-)
-
-src_prepare() {
-	sed -i -e 's#-g -O3##g' src/Makefile.am || die
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	newbashcomp "${FILESDIR}"/${PN}-1.2.bash-completion ${PN}
-}
diff --git a/media-gfx/scrot/scrot-1.4.ebuild b/media-gfx/scrot/scrot-1.4.ebuild
index 956e5ff60f2c..741754ad3601 100644
--- a/media-gfx/scrot/scrot-1.4.ebuild
+++ b/media-gfx/scrot/scrot-1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV
 
 LICENSE="feh LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=media-libs/giblib-1.2.3
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 7e680490bdf5..224530d69c5c 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,4 +1,6 @@
 AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
 DIST simple-scan-3.36.4.tar.xz 914688 BLAKE2B ae972cf6b5085d0e79fdfa9250aed655051b97239988b410e175b3058dda3ed5dc19b6574c015dd9a7afcbefd4d05cce6120b3648c061ff1e52043f866769a62 SHA512 780eeabd9593f14b2b04b9474bb1faebe3a32a7fd7e6b067c144fe44ad9b880f307bf80a8a925fb2549ca0b8172357c9a393146dfabd4b68bfc4396c32de4fa8
+DIST simple-scan-3.36.7.tar.xz 914572 BLAKE2B dee363c08b0454bc6a4990fc14831069162f74365549a081421c286658cce130957b91030558d1232c979601be00e955996f702e8bafeeeb30710b89ee3e42c0 SHA512 ff0dd82d0db30dbfacfd8b04d7bcbc0599c1b1b47f845e1176ec7ffce0aa44253735431c2c531ef428dae0cee80818acfbba4fb2514f501623c0c0242aa8a7a2
 EBUILD simple-scan-3.36.4.ebuild 1325 BLAKE2B d7a8eb204425d66cd2fb1aaad25a91a8d8c2ae153066f1a828bdd416c37d204f747119cb252e7f778d05be51fef3ea290e737bfcbc1f7c78e994ac9b933890d9 SHA512 6d211475e250bcaa86eb452669062a5727cfcc6285927b6ba61cba7c68e07a0c9d1dd826c5b2b9b43cc7861e21af090750641aaf53a8f97b4298fbad19a00e62
+EBUILD simple-scan-3.36.7.ebuild 1329 BLAKE2B 21944ee06e8464b55a1ff8240f6e0c8816fb736093614b698ba7a964e013214aec8c3c010867dc7c3d5ac6688d8a21cb2d0a457dcbfd033d0e41bc203551d908 SHA512 accbc4335878c4c83b2e9dd98821fd5594683456750f3f169d38c261f6c4410f9b09856cd2c78d84df50787f1aa70446704f5ef567a145a252569b2d7af19362
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.36.7.ebuild b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
new file mode 100644
index 000000000000..a7a3d720bbeb
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.34"
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="colord webp"
+
+DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.22:3
+	>=sys-libs/zlib-1.2.3.1:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=dev-libs/libgusb-0.2.7
+	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+	webp? ( media-libs/libwebp )
+	>=media-gfx/sane-backends-1.0.20:=
+
+	virtual/jpeg:0=
+"
+# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils
+"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	dev-libs/libgusb[vala]
+	colord? ( x11-misc/colord[vala] )
+"
+
+PATCHES=(
+	# Add control for optional dependencies
+	"${FILESDIR}"/3.26-add-control-optional-deps.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use colord)
+		-Dpackagekit=false
+		$(meson_use webp)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0f72754e7044..8a7fdcbef884 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index f08de51c2981..a36f9b386ad4 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -14,5 +14,5 @@ DIST allegro-5.2.6.0.tar.gz 7867726 BLAKE2B 3f21372442e5b8c802ac179019a11648febd
 EBUILD allegro-4.4.2-r2.ebuild 2737 BLAKE2B 53d1da512860d07ae86685094c73795eff384dccac3bfdcaa14e766300043289163cf721ff53abcc826070182eb14bef098fcadb2cda4730cd6042ed76116d4c SHA512 947594d6b3dcc1df3cb7359d41ddac48b8095933aa82dc5e064c92534e94d380ff0b65896a5558b82c11b7149c5f4dd552017b247c35b233318a6e5b010cff0c
 EBUILD allegro-4.4.3.1.ebuild 2970 BLAKE2B 9286e322b7397b7ad99f42170b6e260d586e896af3396bb5e8d315d1a120ad0445dacf22825ea180264cec3236ffa967f5346695a13e2a934d70e63894619505 SHA512 caa42406b233bec316d1f57285cec04928f470cc4ac57c0a6b50a5ccf39816b43d4fc376bf06f46daa954af6795b06a811851a50124fc8259d2a93b293aaa594
 EBUILD allegro-5.2.5.0.ebuild 2824 BLAKE2B 53f03e63f58b50034696b81b90db488034c25907c2b30acb68432bcd1e8e1efb62dbb9133cdb5f368ddcb315475928b6c46232ac0a56a9a26b588f1e0f4ec189 SHA512 bef3abd2955fed7d934a0d7a674de507dd4072d0c85dd6e42564f079041acac54b3d6a5c72bc9572733137cadc827258beff93bccbbe744cc0a798540dba1bce
-EBUILD allegro-5.2.6.0.ebuild 2952 BLAKE2B 9d270d534e9305ee31b285d362b1492992bb929b76a5082d806f683324ca0f29138299dddd36de9269887d2d212d71942a4225cc08dce7d3b1d17b6d1dc8c2cb SHA512 70518f2d8cc59d5b4bd42810fc41236d6c1a13e34777f184bc184603a8a24994ef94a28522f85d6e41ee44601b1e339e687717c6b66f523152c65b4010ab0987
+EBUILD allegro-5.2.6.0.ebuild 2950 BLAKE2B e444a3eddd879ab79eed8c10068e07246bdf25250bb43fcce7a8a34beb886205549d0a79090bdd9b72750cc474a08f6c3901217307424d1ebfa3a21ed7a45100 SHA512 d71fb6f7ba7296c164bef8337a765f8bd05cc836fe673701093153552ef6b60eca089b121a48bb86c383683980dd4ca3440c8f8471a67185a37244e7416e5fed
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-5.2.6.0.ebuild b/media-libs/allegro/allegro-5.2.6.0.ebuild
index 0b19c66b087c..1ba05c1efe7c 100644
--- a/media-libs/allegro/allegro-5.2.6.0.ebuild
+++ b/media-libs/allegro/allegro-5.2.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.g
 
 LICENSE="BSD ZLIB"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 9fc21595ce7a..20bd2032a97d 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -4,5 +4,5 @@ DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f8
 DIST jbig2dec-0.18.tar.gz 148563 BLAKE2B a864fd5b00abca3ae0f847c1d8fd537d92d68a3c042c851b6bebd51bb674f5bc4a36811f2b4fd7753db4d3641e544e03ec184cb90d43da0247d8affd7cf62c11 SHA512 5931530ee3b811f9009c95d08ad65701564ef8ebf6511145acb969cc7c99dab5028daaee580dd83358b6bdc477cffe347712b9c9768c9b1a63395e366046267d
 DIST jbig2dec-0.19.tar.gz 149134 BLAKE2B 576f3a516499b6291d25dfdefe5af62899665167526dca11435bc07e04a3feb707f82d3a8bdda774f5cfe0d792c3147e77aa94fa57feac25ba1c0a7805c5fc58 SHA512 d5a27951cc9c06c184f454e258e81b6e4d5aa2742a4da821522b9a42ecc78e7e1b78058dabc23821618e62d62d8832011f16b5ef2d66beac463da6b809fd02af
 EBUILD jbig2dec-0.18.ebuild 1655 BLAKE2B d1039e26d0b0a7573b0a8c1c60b109a70d8d5e0d9aa2dd3918037405e6470ac3a6ff5d2b82fbb587526efd739bf55aad54a2c4314fb6a102a23537157b4452f1 SHA512 39af2ce59fe84344f6fc8a6b366af223a3c34d27e61e0bfa2b68081386c13fadc78311554a8ba404cab9ef0c16e4adf1ce56039c6e1bfe5e8c7d5de2e92215fc
-EBUILD jbig2dec-0.19.ebuild 1568 BLAKE2B 0dde5b8c8f032052b749255dfc2d61d256c6992453463018a999efb8c1bf6158be00ba22d5980d7a90480496d581e3018f0e6f06099d9bab9704a2222cbb8fff SHA512 dd67d0476da08d79a0abefe5f19c1a14953d7bfff20a89d32ef4cd8b79298aa5284d4e210a4ed726f356581bd7fe3b5859f443fd7f27e882b844fde9d207a82d
+EBUILD jbig2dec-0.19.ebuild 1564 BLAKE2B af610896ea59233b432c39f11cbc22232890b03c702e88c413c68af8abe5391d024d052635751774458ae5afea140301ddd48513b71c946d05f82e3912c82017 SHA512 19c22fefd8dedef4be1f6050fe414e723d760d7946c61f40cf201eab2e8d547fa223505690995ba3412eefccd7da4b7e7e38be508b5e47a65deb5be4c14dbe53
 MISC metadata.xml 347 BLAKE2B 6c6d66bb933731270b688e7f0d9174f3cac5e697d30af47398425b7f3789e6960f87a67c192d931603c0120622839a92ad93bb6154c1ceecf07ba2827488f001 SHA512 7472b2c0abdc9db46fc886ba58d9c9daf16efc76d306087b4ccec7bffdb1ddf034f433ede85681a7bb2b87d7959f7eef557743c9fbde7891efd4e3c5058aeda7
diff --git a/media-libs/jbig2dec/jbig2dec-0.19.ebuild b/media-libs/jbig2dec/jbig2dec-0.19.ebuild
index a93d96944e6d..297aaf13dead 100644
--- a/media-libs/jbig2dec/jbig2dec-0.19.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="AGPL-3"
 SLOT="0/$(ver_cut 1-2)" #698428
-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="png static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 93710803dd2d..8c595cf688fc 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -2,5 +2,5 @@ AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e
 DIST libexif-0.6.22.tar.gz 2741296 BLAKE2B df57aa0ff7d20faa47ea34f4d8164c33b113887bc2179405481b2c12c0d0336dc9e5321a260ffda64d974bfa9ac6af55c0cfb4cc9a57a941c17944a3d049befd SHA512 e399804c9d67072861988638349115c585546be20f15c4d26bb6f411ff4ee5bce979c1a41305c1456ecc2f830837349f93cfa4136b7a864e0486cecd3607b469
 DIST libexif-0.6.22_p20201105.tar.gz 1111695 BLAKE2B d4eb856ad950f8ae068a27088e54311789c7b8b646dd1c4851ef637b626015119b3b5ac9cbac58f9c79c37c07ba7d3e9a9a67dc52715187495aa824846ec2335 SHA512 5472bf2531d9147be5c6e681d0257325f6609d6aa3935243f887df0ab32e51242ff9d853fc2c183cf5c2709c89d5c52d8fecb9144343d6f959f4bed1062098ab
 EBUILD libexif-0.6.22.ebuild 1285 BLAKE2B 94bc4fad00f8c4ee923b70e18a875c1b061ead7b067572cadb36f2e7acf6664ce9149161bef4a4a24dad99558c76bc50e6b3e12dc082b5f9ca8ae8eea340d178 SHA512 4b4dd8ff2e2bf256b7791509217ca4c9011ca583668227d5176ca285ec11caaba0febd87234ac0fc5dbf297346d128798b4e7c331ab4e3a6edbe345d1efa1397
-EBUILD libexif-0.6.22_p20201105.ebuild 1483 BLAKE2B 456b435a9c77f6d4f24584c08e70e2fc89a3680d3e158a12cec1996269fdf81ac2cfab17e5597f55e0d87594c215c22c96a6aae4d8bf36d500cfe8e1ff303d99 SHA512 9e43f2b8d42c4104437c9a5b1232ccc60eca16a52f490a2a29e4b3157b5b2df4c05fa46356ae6fcaba30847d2382b4fc07f7edaa560ac14c82a29e914ab17caf
+EBUILD libexif-0.6.22_p20201105.ebuild 1482 BLAKE2B baaa877a0a09a2b918bb10c436d2ad4f5e60377cae2a43691c9012ec8d787e4c91c11705153627c4a1615c1491c6af04b1d2f08bbdcf6845e54aaf2c7a50ef57 SHA512 0c63015b81f2dafb0f0604712d2affca333822d5526adc978fe400be939c7798db39e5c4b18a39fb800505bdfceccdd06be9abc7f69657eb6a3d20bca5199715
 MISC metadata.xml 311 BLAKE2B 0109881067d004082c81401909d6605a6bc792700cabf760db3e62bda628664915647427a3034dbfb52e3f047ce692ec6f279df06dbe76be014c1b676cf796ac SHA512 3b3e7a9c989e72b817e59c9c35ca6cb81dcd00eb27001095f139b1a297f7f1e80d32eee11573344d42881641920aa6a1a2bffc85892f92b347f0d8326d97f7a0
diff --git a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
index 1c4bfaf15476..de9a5e1eb9c7 100644
--- a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
+++ b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
@@ -44,7 +44,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
-	emake DESTDIR="${ED}" install
+	emake DESTDIR="${D}" install
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 595d4269c2d8..bb8e71e691e7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,8 +3,8 @@ DIST mesa-20.2.4.tar.xz 13869928 BLAKE2B 078dc88be08d3b41d5144c4d72b0044512dc77c
 DIST mesa-20.2.6.tar.xz 13886924 BLAKE2B 2bc5d680979b58a77105a8058da5dfea81afe05166a44d08cf243e5760b8c66e418fd78046a2c88243f56aa85a610d052f3aaf259938668cd0f4a184e9edca46 SHA512 347b275d88c0d14cacef570ed736cac07f2e607bc4c89a16b915ec01ac57dbbe698ddf9a0ad70f034e00318403351e3c728e74c72c653acf1fc99720887fa888
 DIST mesa-20.3.1.tar.xz 14176916 BLAKE2B a557949f5cddedee1ee157d982ff74330984c8e1f3a60731397234a2154ee908d1fd38b6f436ea139ba28ba7b45b597bfcd99d1cebd1a0a84bce4c071e591fd6 SHA512 06638b8d2d866b5e27024c58a2ca03a73869221a7d536f7a8f1679d73708e5c1713446c8fedc594844b95596ae817bfceb88ace6b42423328189778e5036edf6
 EBUILD mesa-20.1.10.ebuild 14439 BLAKE2B 44180101e4e4c6692661cae16822ed29e292e86821df1361e733839bceeb8353883e5aff3893a91f5e09936aa8e5c0d2d14f8871f558c24590e61b78c6e8716a SHA512 d4474ce10d3cab18cc75ff5c0b9cfe2d05e0987e9c20a2a01ce2cf9873fac0b8e259fad1196327cf3426406e0a338ed326ff9309439af93403f458b104f0fde7
-EBUILD mesa-20.2.4.ebuild 14790 BLAKE2B 9ca2d00b39d3bb307ac2cc68ac3b531c2413e44dd902a6510c2b8dacbf8da09765129519e2d36e8e5972315b4b2c740402a5558775d8d22b7af63710fc54b0ac SHA512 f0852f53d8810d89ad2f84d4f6d49a749305a8ae120c9d06fa4cf7258dbf0630d74fd60074f53ec871bb658ba5d78ebcd90006c72be5706a7c156a2a1a13555b
+EBUILD mesa-20.2.4.ebuild 14788 BLAKE2B 9b13db0ef50671ba1fd81447e938b79fe61ff00660f679eaee07696a577e5f8f7f42ef32ed355decd46862d40b582b2d3308edf4e1cb18dd9edc8ef8e79bd20c SHA512 5c6e6e7aa09d118fe3287f83505b815aa09ea4a25d8e6ed56eeb2a05995dd7a178b48a0eaedfe41f8229856556865c2473bd21665687fb0f2645f24041310aed
 EBUILD mesa-20.2.6.ebuild 14794 BLAKE2B ab5f4a04e055c761db7bd0757b62d5e75d87288972780d5d24fed1d6da6cd17ae79f1427c2190a629b8c6b78471991f5d43dfe88a159416a6788b97ea33db11e SHA512 02e10dbb2a6e0e4542771ef543fd04cbca5d0bb6394382db6aced502e34955556ae00df2b62a8a0bc437f64668ab1f099fd71243c26f965a7e734d5b49ad1b95
 EBUILD mesa-20.3.1.ebuild 14877 BLAKE2B daf969be2dc77ab4d88c1656d01ce244b326aa4462836e3b8ab1402febb677100850ddec1b89c0e025cf3b0af582bf220b4f5f3cc7212fbf38677e2a79440435 SHA512 45e9652f9c8965f35bab368d2332a5aae72b93d5ceb44425bbc0b6781bc1f622f5f8bc79914170869490f896746dabf079a099feade2343928abfd6a6104bfe0
-EBUILD mesa-9999.ebuild 14818 BLAKE2B d196d517ea52bc878e43e96efb814f8a03a3b69746b4a6b134933c0efb5dc047909975f7bfc90882ba3b0148d09526e0992d56b8fde1dfbbab551c883dda730a SHA512 6008aac202f6b54914b637be9f6c4d25203579beb5f947b63fbd96c5b216eec58d9bd69343f913368dbe19193f2a7d0a99a4fd7d68e511f1cf096f89eeb08396
+EBUILD mesa-9999.ebuild 14825 BLAKE2B 9e2c13ca384c3cad4dfe19309bb4699c5795f2936e9b7c9e7645827bbaf71703c0db0db6bd6d7899546ae38f341739590a2071c193f981d58e16615de0ee46d1 SHA512 4260da1939ecb2492cf444911181ba423f5420ee02e91f74aba972a7e52793df43debe41cec89bd279b59a67d686b97152a4199c8ec1f2d39df813809c4af1c5
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.2.4.ebuild b/media-libs/mesa/mesa-20.2.4.ebuild
index 9c506a4c2497..562ba0c64e65 100644
--- a/media-libs/mesa/mesa-20.2.4.ebuild
+++ b/media-libs/mesa/mesa-20.2.4.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5c410fcd9811..a83701ae097f 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 65e335c218d2..205af35e75ea 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -1,5 +1,5 @@
 AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d41823ca073fb6b8edc1d35dee7b90ec79d52ef08affb0a1cb88b577e0fa3bc62844ded3c4e3235c268e31a0121a6 SHA512 71e6934f104d12bfb7bfb19812ff868dc22a323e2fbd7a480c270650a14842dd03e53e11853e7ddaa9469239a538d0bf09469770fd30f23601406011fe626ffd
 DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
 EBUILD speex-1.2.0-r1.ebuild 1641 BLAKE2B 5aa08d9dc5a676c1887d2e062f2c0f679fd89fad5f9360a2c2e0acc77c19622717f652c5793b2f0f1fbeaf514941240974490f661e5fc70e8e8fae66f7996f5f SHA512 298c786b759025d3752338bd8b115d3508febf0bcb0ace2daeae6a27bfc8998445e1355dbc7513a5989c44dccc849506ab2c56db5f7c151a1b083c0ede74138d
-EBUILD speex-1.2.0-r2.ebuild 1654 BLAKE2B 102f56c3b8f176914d55d48c6392077f6ffdcc5afeda4b9ac866a5c43dc895ba69c41aad6aab23b18b395c621e1de01708cd1e897f8bafa66a4d3142c9ea34ea SHA512 e2a87b73f1216d3d6a48c19e356a2b9d4d9453676acc4d4d08e7304b5116a3d454bc971c7476e4ea38551880105b766813c3d9738dedb7031629415743b2331e
+EBUILD speex-1.2.0-r2.ebuild 1653 BLAKE2B 49c6edfbd5a26681f534804659d295f3a4bd407dd05b893c34841e4b1e21f80f6ad92aac4c158c7aaf6ef9156821e73dd829c412f7a5085c0233693dd8acabd5 SHA512 403e997aa639b8143572aa27fe5ac14c4c16c062588c06ca71933f222bc5b38b90a6275b95065130c036197752c37a393a0d91bf409020ba491764294d748ff9
 MISC metadata.xml 495 BLAKE2B a93e81b5e5b7c39cd680dbd8294451e3b034f1506e0c48d36d2a6e7525638bfc7dee964541b0e03847e43a344689d97de94e245dc4bc8099674a24b12a0a4115 SHA512 6b6a16e69139c71477c76a96c2aec025992a28079a15db234bc624619dc6ee5b3d20025418a49a0119d75b9964dd91fb38459c642c53a98b6bb444c6698beeb8
diff --git a/media-libs/speex/speex-1.2.0-r2.ebuild b/media-libs/speex/speex-1.2.0-r2.ebuild
index c6d40ee3ccb8..4a46ec58cd0c 100644
--- a/media-libs/speex/speex-1.2.0-r2.ebuild
+++ b/media-libs/speex/speex-1.2.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 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="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils +vbr"
 
 RDEPEND="
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 42e8d8d964c7..38c53cec9cc7 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -3,5 +3,5 @@ AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60e
 AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
 DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
 EBUILD speexdsp-1.2_rc3-r2.ebuild 1464 BLAKE2B 9746d51418ef2f7043c14e8a9e7c2e278806deb2a69e4a23af0d1ffb35c1756748fb8beb57cea176b0334977d0d778eea2eec2291706dbe824f10335dc278e5b SHA512 aa31f8b6965be744dc03017b4df4ef8feec264a59e01f883ac8935df7f14765b74730b6cd719e16e73e994b2192748deff66ec51b69a91996eaabce51ace2488
-EBUILD speexdsp-1.2_rc3-r3.ebuild 1463 BLAKE2B 457eabce7049a8df49aada2424b3dfb492d02ccb4c2096e1b857693a227dfa45ab530902d69b5847433e63fd1d96d1253ff9b1dea736468de1d545c018484ce2 SHA512 ef11f99e2d007e0ef992db48f77fd5f2d192b9b519ca387c554a17a242e70af422c1e21caab5e984dbd1579c0515d3c308934cda73751f41c41639368d086d58
+EBUILD speexdsp-1.2_rc3-r3.ebuild 1462 BLAKE2B e5327ecbe9baea69d8659d4a0f291329d10a9bf8c79876cc199d57fb6be28dbef3cc49be1253daef36bcb86493b3a46df2de8dfb42ea63a1e8baf2465d316feb SHA512 73a7665281e8d5c6b92f3da2642c8e31d879d165a13f5f0a3db73732684ba0c9e1add7919a5d3fe4c91d2a1abd2873118b94512148f186a350d364dddffd012d
 MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
index c529f672be52..abc7431a1101 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 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="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon"
 
 RDEPEND="!<media-libs/speex-1.2.0"
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 9aa6f6cd35b0..b1e7e50893bc 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,3 +1,5 @@
 DIST tiff-4.1.0.tar.gz 2421581 BLAKE2B 1f9b92d08dc95633bb005a635bbcecd8fa5e4f30c14f059b42aafbb4a52b4fb1b84b1e97cea33f3102f5808cb28f93bc8fcbae2b041c6227c97f90b4f9b8e631 SHA512 fd541dcb11e3d5afaa1ec2f073c9497099727a52f626b338ef87dc93ca2e23ca5f47634015a4beac616d4e8f05acf7b7cd5797fb218758cc2ad31b390491c5a6
+DIST tiff-4.2.0.tar.gz 2809373 BLAKE2B 62178da595e7ff4041f33643a87698580cd3a32d4536b5c60c414c9497616258686cf61514e1d4e0f062cb1333190c39ce86896bf07c01532c07454745d89cd9 SHA512 d7d42e6e6dbda9604c638f28e6cfa4705191a4e8ea276d18031d50dbab0931ac91141e57a2cf294124487f1a2e6dfcb9be62431c1b69de5acf4d0e632f3322e5
 EBUILD tiff-4.1.0.ebuild 2078 BLAKE2B d2e050f9cd2d476534d583b920405d64bdaf0ed8dbca65f34cbcbee76f4a402ffe70bb10683bd2e26381d6d42e88e606bc80a285a25e71491e74bf45eda28019 SHA512 e87617f33a745bc88675157a77622525a7c78c7527d6e67744217320a3111eaf1dd3b37f2d2125b5de9f9416703621d8a690368fe7f9c7ef02a6568d07bc8d68
+EBUILD tiff-4.2.0.ebuild 2087 BLAKE2B cc81205d05fcb47145c1132e6b9ac2a1d8e2bfb6f7cb1a7f538cef67df5b35db2d5a0547b186d89d9a90e685532dc9029b0da8dc7b359673893c009d7e0a18b8 SHA512 cd25c17e934bb0a4155424a7f88d1db2ca1bf5d5bac5b678d90d307776474e4c0451fe3607602a06e0200ad0e779b01f81b223a2501a76d846ec7a8c0af5ae8e
 MISC metadata.xml 473 BLAKE2B 1e6cf7ddd4b5f23d1f11e098c81805c11db03233e32e870634184f7635e19455cf978e6f4fa032952210c83bb18c96af57b64c0b73507dce95f70f876e4651fb SHA512 ed81ec631fb4f136d6ed8da3f8159c11760150314e2b8150aa7d087ad865b4e6eb823708cd37de3423597e5bef023e464ead76e7f56a33432d87956e1cb11016
diff --git a/media-libs/tiff/tiff-4.2.0.ebuild b/media-libs/tiff/tiff-4.2.0.ebuild
new file mode 100644
index 000000000000..0b3eac297a91
--- /dev/null
+++ b/media-libs/tiff/tiff-4.2.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal
+
+DESCRIPTION="Tag Image File Format (TIFF) library"
+HOMEPAGE="http://libtiff.maptools.org"
+SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
+
+LICENSE="libtiff"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="test? ( jpeg )" #483132
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/tiffconf.h
+)
+
+src_prepare() {
+	default
+
+	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
+	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--without-x
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable cxx)
+		$(use_enable jbig)
+		$(use_enable jpeg)
+		$(use_enable lzma)
+		$(use_enable static-libs static)
+		$(use_enable webp)
+		$(use_enable zlib)
+		$(use_enable zstd)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	# remove useless subdirs
+	if ! multilib_is_native_abi ; then
+		sed -i \
+			-e 's/ tools//' \
+			-e 's/ contrib//' \
+			-e 's/ man//' \
+			-e 's/ html//' \
+			Makefile || die
+	fi
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		emake -C tools
+	fi
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
+}
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 7f4222698bd0..439148d9a97b 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,9 +1,6 @@
-AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1cf09efe1e57774280af501abf1a4214785dc875d6ca68515d48ebad37a90184b2db922034705df83592e1479741f15e726 SHA512 13badc72163f41a14fa85d84cbc835a396ab2bc195125025962257de4a41925e29c74159c3941472334f9eb10feee4278ea96288201689d5fcc48c494940ceb9
 DIST xine-lib-1.2.10.tar.xz 5226116 BLAKE2B e1bc088814c951ff56e55b626fe1f6f34c3da744e716de369a68e6c82a5adc414b452675ad19a5f82500bade6795b54efd503de8ffe4f1e65b534317ca0a26af SHA512 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
 DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
-DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
-EBUILD xine-lib-1.2.10.ebuild 5031 BLAKE2B 60b9c131b1c6667397255e8b9b21ee032964295ce34e2d41525eecdb1aff9bfd3080ae17d264faf46fa173ce47a682dc2e2a00064469bf441bf21b10e2588ac3 SHA512 7287b2ed1cbabc041565b6a8f9d02375bfdaf76a51c935a4ae29314165307b38e1d4429735aa110cab32a942c005270666be935ac19788fa65870570b0250cd0
+EBUILD xine-lib-1.2.10.ebuild 5029 BLAKE2B afe0f697c63d796399b38efa40c8a9ad3a6122f35481a3d2afd69cdbe2705e7157cba5929f70cf74726028b819f287ac402e791266342453a7989081c14f625e SHA512 94118d72ecdd8bd3ac0287f0da165d6c4a5f6923c8be63840edccfeb9e2c239595dd2e4d27e0721b92de4b88193781f5a83fb68049faed6dd97acd695591ffe8
 EBUILD xine-lib-1.2.11.ebuild 5044 BLAKE2B 907e269875cd3c06fef299e09701790c9aa14bcd1ed4b26919bdf1ecf7bb8bca66bc508f8a381b1d04755b649bf6807893f1a1a871c076dac78a2d3a84e3231a SHA512 aa8c17aaf9d1c3f2f8684ed2b930a50cb672b53f33c29aac72e6f0e9fc1a80fe2a72b0f75930312183316f60748681617524d3713f7a1fa52ef907137c4caa6c
-EBUILD xine-lib-1.2.9-r2.ebuild 5145 BLAKE2B 6fc935a7fe217bafcb1f9e9c02559da8ac2df0b56bc1200b7b29cd78445385a54f1ad463b9dbfa34c205486c23e8f2fa22c05aa34e52e226e8027988d940d261 SHA512 e98a1cb2efc4552e8b8d31c4b0a364e1ce97d9cfd8468abc7d76a741fef4a395f42510e6a63b2816a2afc2167219e825c44a9f182bb1562c6258512459bb73c7
 EBUILD xine-lib-1.2.9999.ebuild 5044 BLAKE2B 907e269875cd3c06fef299e09701790c9aa14bcd1ed4b26919bdf1ecf7bb8bca66bc508f8a381b1d04755b649bf6807893f1a1a871c076dac78a2d3a84e3231a SHA512 aa8c17aaf9d1c3f2f8684ed2b930a50cb672b53f33c29aac72e6f0e9fc1a80fe2a72b0f75930312183316f60748681617524d3713f7a1fa52ef907137c4caa6c
 MISC metadata.xml 2498 BLAKE2B 949a34fcf5204424c2a565ce2329b3f878e4ef817882839bbec09a6d721a8756be6dc37eff2a0bb7e007d333e2bc4896ac6c853f7fe5b1f9c8f4ed3a66ada640 SHA512 f975a8763a3f31a27a769e4649cd7c6ecd113cb4fcd36556f5f7830b9de989be219a0c9f90db4a4df87e9ffd584d4c2e86346da084c95d32dc17adcc30f98c28
diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch b/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch
deleted file mode 100644
index 34062222e32c..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1.2.6-imagemagick7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://git.pld-linux.org/?p=packages/xine-lib.git;a=blob;f=imagemagick7.patch;h=d050323cdf509c9bb5f8edbad90084e8ce5c1b38;hb=HEAD
-
---- xine-lib-1.2.6/src/video_dec/image.c
-+++ xine-lib-1.2.6/src/video_dec/image.c
-@@ -39,7 +39,7 @@
- #define LOG
- */
- 
--#include <wand/magick_wand.h>
-+#include <MagickWand/MagickWand.h>
- #ifdef PACKAGE_NAME
- #undef PACKAGE_BUGREPORT
- #undef PACKAGE_NAME
diff --git a/media-libs/xine-lib/xine-lib-1.2.10.ebuild b/media-libs/xine-lib/xine-lib-1.2.10.ebuild
index 1c6c377268c7..49cb170173da 100644
--- a/media-libs/xine-lib/xine-lib-1.2.10.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.10.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="amd64 arm64 ~hppa ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
deleted file mode 100644
index f1ccbed79848..000000000000
--- a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool
-
-if [[ ${PV} == *9999* ]]; then
-	EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
-	inherit autotools mercurial
-	unset NLS_IUSE
-	NLS_DEPEND="sys-devel/gettext"
-	NLS_RDEPEND="virtual/libintl"
-else
-	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86"
-	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-	NLS_IUSE="nls"
-	NLS_DEPEND="nls? ( sys-devel/gettext )"
-	NLS_RDEPEND="nls? ( virtual/libintl )"
-fi
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc ${NLS_IUSE}"
-
-RDEPEND="${NLS_RDEPEND}
-	dev-libs/libxdg-basedir
-	media-libs/libdvdnav
-	media-video/ffmpeg:0=
-	sys-libs/zlib:=
-	virtual/libiconv
-	a52? ( media-libs/a52dec )
-	aac? ( media-libs/faad2 )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( >=media-libs/libbluray-0.2.1:= )
-	css? ( >=media-libs/libdvdcss-1.2.10 )
-	dts? ( media-libs/libdca )
-	dxr3? ( media-libs/libfame )
-	flac? ( media-libs/flac )
-	gtk? ( x11-libs/gdk-pixbuf:2 )
-	imagemagick? ( virtual/imagemagick-tools )
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	libcaca? ( media-libs/libcaca )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-	)
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-	)
-	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva:0=[X,opengl] )
-	vcd? (
-		>=media-video/vcdimager-0.7.23
-		dev-libs/libcdio:0=[-minimal]
-	)
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	vpx? ( media-libs/libvpx:0= )
-	wavpack? ( media-sound/wavpack )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libxcb
-	)
-	xinerama? ( x11-libs/libXinerama )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-DEPEND="${RDEPEND}
-	${NLS_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/libtool-2.2.6b
-	virtual/pkgconfig
-	oss? ( virtual/os-headers )
-	v4l? ( virtual/os-headers )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXt
-	)
-	xv? ( x11-base/xorg-proto )
-	xvmc? ( x11-base/xorg-proto )
-	xinerama? ( x11-base/xorg-proto )
-"
-REQUIRED_USE="
-	vidix? ( || ( X fbcon ) )
-	xv? ( X )
-	xinerama? ( X )
-"
-
-src_prepare() {
-	default
-
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch"
-	fi
-
-	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
-
-	if [[ "${PV}" = *9999* ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	local x
-	for x in 0 1 2 3; do
-		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
-	done
-}
-
-src_configure() {
-	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
-
-	local win32dir #197236
-	if has_multilib_profile; then
-		win32dir=/usr/$(ABI="x86" get_libdir)/win32
-	else
-		win32dir=/usr/$(get_libdir)/win32
-	fi
-
-	local myconf=(
-		--disable-directfb
-		--disable-gnomevfs
-		--disable-optimizations
-		--disable-real-codecs
-		--disable-v4l
-		--disable-w32dll
-		--enable-avformat
-		--with-external-dvdnav
-		--with-real-codecs-path=/usr/$(get_libdir)/codecs
-		--with-w32-path=${win32dir}
-		--with-xv-path=/usr/$(get_libdir)
-		--without-esound
-		--without-fusionsound
-		$(use_enable a52 a52dec)
-		$(use_enable aac faad)
-		$(use_enable aalib)
-		$(use_enable altivec)
-		$(use_enable bluray)
-		$(use_enable dts)
-		$(use_enable dvb)
-		$(use_enable dxr3)
-		$(use_enable fbcon fb)
-		$(use_enable gtk gdkpixbuf)
-		$(use_enable ipv6)
-		$(use_enable jpeg libjpeg)
-		$(use_enable mad)
-		$(use_enable mmap)
-		$(use_enable mng)
-		$(use_enable modplug)
-		$(use_enable musepack)
-		$(use_enable opengl)
-		$(use_enable opengl glu)
-		$(use_enable oss)
-		$(use_enable samba)
-		$(use_enable v4l libv4l)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi)
-		$(use_enable vdpau)
-		$(use_enable vis)
-		$(use_enable vidix)
-		$(use_enable xinerama)
-		$(use_enable xvmc)
-		$(use_enable vcd)
-		$(use_enable vdr)
-		$(use_enable vpx)
-		$(use_with alsa)
-		$(use_with flac libflac)
-		$(use_with imagemagick)
-		$(use_with jack)
-		$(use_with libcaca caca)
-		$(use_with pulseaudio)
-		$(use_with sdl)
-		$(use_with speex)
-		$(use_with theora)
-		$(use_with truetype fontconfig)
-		$(use_with truetype freetype)
-		$(use_with vorbis)
-		$(use_with wavpack)
-		$(use_with X x)
-		$(use_with X xcb)
-	)
-	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	# enable verbose building, bug #448140
-	emake V=1
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	rm -f "${ED}"usr/share/doc/${PF}/COPYING || die
-}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index b0140b4a1a54..b8838e40bb45 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
index 85460e4827c0..a97869eb8997 100644
--- a/media-plugins/mythplugins/Manifest
+++ b/media-plugins/mythplugins/Manifest
@@ -1,3 +1,3 @@
 DIST mythplugins-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
-EBUILD mythplugins-31.0-r1.ebuild 4064 BLAKE2B 018f8a9a31c2efb39c14d49d7c687d1cb09e7969b487693e0f58ac4508fae3798fb5fb777e721053bb80bc26f072464a7ea0f28dd6b0f53fb4b5035a2717e086 SHA512 40499162fdc20be4bc120d7feee34ba7de2eb5fdde2eced6b6a773144cd610d0e00ae46019822b65b18869f8c276bd7b4ed4d3ed570055f20946c9eae042aa7b
+EBUILD mythplugins-31.0-r1.ebuild 4064 BLAKE2B 8813821d646e204bf5017e3fdaf0699fb198f3fc569ca0de225da53db7c982d918d5b840701358edec26c1143b83c9dff13dfee49c5e772ea45c9ddc906e7dc8 SHA512 a32678e849deb1e6dd3f27940bf3a6c8f1e39348dd114101ccf0cf20c09ba3c9e2e21a08945e9ef2d94b60131ed4cca5586be71eeb89a2098367318bdf1a6372
 MISC metadata.xml 1579 BLAKE2B 572a1791032bfe81701ecac3b48b90fac86f68e8f5aeda3d228068cdc33fd8d22fc192322f84e68f96fa5caedf86b5231ab6ff6bf308aa9cfb9b87c4c627af22 SHA512 847c7f1276c7848db254625b2e162dc59bf7d711e8b7602bb388032deb0f54532949bdc94037b9838ca99514bc58847e76b3e3ebd8022ebf2d2ee8eb029d105e
diff --git a/media-plugins/mythplugins/mythplugins-31.0-r1.ebuild b/media-plugins/mythplugins/mythplugins-31.0-r1.ebuild
index c943e976e8cd..5fb249aee59e 100644
--- a/media-plugins/mythplugins/mythplugins-31.0-r1.ebuild
+++ b/media-plugins/mythplugins/mythplugins-31.0-r1.ebuild
@@ -73,7 +73,7 @@ RDEPEND="
 		media-video/dvdauthor
 		media-video/mjpegtools[png]
 		media-video/transcode
-		virtual/cdrtools
+		app-cdr/cdrtools
 	)
 	mythbrowser? ( dev-qt/qtwebkit:5 )
 	mythgame? (
@@ -92,7 +92,7 @@ RDEPEND="
 		cdda? (
 			media-sound/cdparanoia
 			dev-libs/libcdio:=
-			cdr? ( virtual/cdrtools )
+			cdr? ( app-cdr/cdrtools )
 		)
 	)
 	mythnetvision? (
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 63403c9fb845..fc3d8b045de0 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index dec774014dbc..2dbaa119e788 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,4 +1,4 @@
 AUX abcde-2.9.3-Makefile.patch 528 BLAKE2B 7568595d6f67b47bbe6dd84cb829ac2b5f37c32a1a4c275cb073f0e6c03d78868b18821bd5ebc87aa8428708b94477c53e674ea9bfd051852a34ff866bad5815 SHA512 1438f8654f41e8681f0f2887d403ba6c2f85a70dc813f19c93c51aeea2e481dc80cde4d73807aad2e5f01f479224f4f9f4eec85bf6ed81ce442d873386b63d12
 DIST abcde-2.9.3.tar.gz 160876 BLAKE2B cb3ebc372b4bfcf002beda567c2aa91dba11e77fdaeee8ec0d351fe907d6209ccb9013135db2a3ea0f85148eeaaa91f06243c607ac732a1b13f7a0a54d721fb0 SHA512 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236
-EBUILD abcde-2.9.3-r1.ebuild 1840 BLAKE2B 355931c6aa85c0248d575ea5c340f6c51f6d538d8879f79887d960c78e389756e0e0539736c6ee45a7ba3680b74f0bbc931736f897b309e2153ba91a40730cbd SHA512 7f32e77d756653d3dcbbb826aebaab22787d0414c7bdd5bd32722aa9d1492f11397923bb97f544a5d0051819f5eb0555f87e50fccc507bb4cd3564efdf344b53
+EBUILD abcde-2.9.3-r1.ebuild 1840 BLAKE2B 1050a671bb6bc978e6cad570ac6b3364c673dfba63495c2d20818e169235ddfdaa3d4bf8ebc405825c2183805185d73777108fcf6092615f1faaa287d20cf30a SHA512 f87635ca4642c25c3f9f48cbf1bc4bc3f510a2e105e755c73c754bb358a911bccb75a0f10ac118728026dfec88a908dc4f2ef42ba06dca1b75adf2010ccbbdef
 MISC metadata.xml 687 BLAKE2B 003c2762435868462c70ea9a6d21e7c50b7db96f10cdf3ee68788d027f92e6e656046dcd070f3054888c473dc0fdc273462f36067c2ebbe48b64fe4a8cfa95cf SHA512 42995ba554653993a07ab04e6ad8f8a50ed2fcf3319869fc54b76480a61fe2c22c1186c39354f9a5920ed4b065cf8ef52fa10e67cfa258199dae6da9db3a9581
diff --git a/media-sound/abcde/abcde-2.9.3-r1.ebuild b/media-sound/abcde/abcde-2.9.3-r1.ebuild
index e33e9553b76b..2c0f83b27dd3 100644
--- a/media-sound/abcde/abcde-2.9.3-r1.ebuild
+++ b/media-sound/abcde/abcde-2.9.3-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 		)
 	)
 	aiff? ( media-video/ffmpeg )
-	cdr? ( virtual/cdrtools )
+	cdr? ( app-cdr/cdrtools )
 	flac? ( media-libs/flac )
 	id3tag? (
 		dev-python/eyeD3:0.7
diff --git a/media-sound/audiotools/Manifest b/media-sound/audiotools/Manifest
index 929a5b778895..3c0b0d412108 100644
--- a/media-sound/audiotools/Manifest
+++ b/media-sound/audiotools/Manifest
@@ -1,4 +1,4 @@
 AUX audiotools-3.1.1-libcdio-paranoia.patch 1337 BLAKE2B 2594bf98a09df1064009dfa27764f64aeda7d92e43c82aaff3e44f6742db28f6fa2e87bd19d1f7eba8b82ac8ab338c9d7e7e7817817d49985809b927383d218d SHA512 cabc5f86e2977171c6616722640fa271d3c339bb223e229ec31697c81bd2c06c620a4b3d7a9057d7a90e05a2db7e2c7ca4d26403d60612ceebaaca0370845e10
 DIST audiotools-3.1.1.tar.gz 6325408 BLAKE2B 065b5dc23796ea8d1dc72dc581a8929fe26e08180af2f0719470d80d5c82be2455ffda28fe8fd5ca63ae078f7fa5c6b5153e8fae496736da8f97a4eae38c4876 SHA512 dfba0dab8ef1573a12366bb4d46552eeb6c23c4abde34d9df51238fc97f573135b564cc3e5dbcaf7691c4502d8173dc926d8eb5ecd169fe619278ae89ff24c3a
-EBUILD audiotools-3.1.1.ebuild 1893 BLAKE2B 87e6e7d4242ffd3f9693b62c8fdd70fd17545067dcaabaced10e80dd543308497193a81271019f90359cfab2e856e1309ca41182d7f1768eb3a1aabf3495640d SHA512 9b663b487a482a8f303edfd791410511654ffdc8edc43a23084b2c7efe606652e10660148fe4722a2f0abd2cd504c4dea8ce7c6a38fdc1dc5f7daa6b4dbfdb26
+EBUILD audiotools-3.1.1.ebuild 1893 BLAKE2B 9388ef30f2786e2da888b21fc482617d06693f3dbcd9a63fa4276c91537c7019b0f75e6a14a71d25d68744a352593e1b0989bedda27b304e17b4dcc906318354 SHA512 8c3c0f6c588efc2e89a0334665ad126d954c869a3564d50920b66a3d183ce01483a774b2702f10b501db65298adb0e73893a35aaa5b42766c5153c7115f22d08
 MISC metadata.xml 533 BLAKE2B 6939a9b7aad9be3e1311136836118f5ef36b1b7a84edf2c7e8c5b859de02d46691fa74f1ed2e275e86964978d4da48247b0fd77a8aea0ad42d96293d7d26b7a0 SHA512 c28cd3c4297b399e7ea934b965abecd06dd3150827e7a5976d3ddd22f586c31ed08b1bbd46ac8ede21c362c2df3742ec58f524b0060eb94a4c18f5528abc1cab
diff --git a/media-sound/audiotools/audiotools-3.1.1.ebuild b/media-sound/audiotools/audiotools-3.1.1.ebuild
index 16e75ef9155c..24789992f77a 100644
--- a/media-sound/audiotools/audiotools-3.1.1.ebuild
+++ b/media-sound/audiotools/audiotools-3.1.1.ebuild
@@ -36,7 +36,7 @@ RDEPEND="${DEPEND}
 		media-libs/faad2
 		media-libs/faac
 	)
-	cdr? ( virtual/cdrtools )
+	cdr? ( app-cdr/cdrtools )
 	cue? ( app-cdr/cdrdao )
 	flac? ( media-libs/flac )
 	gui? (
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 9004978daac3..7acb53f1c3c1 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -4,5 +4,5 @@ AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476c
 DIST din-48.tar.gz 3673917 BLAKE2B 90e29efcc159936e7dca5b1deba07d6ddf23fc6878053283c1723eaf73c9b06903d274e471c3043d57fb2cb923eb9516a06362590a6b555884dc1b7cb7b6e9c1 SHA512 3d54c3db23fe909a3664412f1bbba3898b83184d19c4b04f4432cd0bff0dede01d017cebe36980a3f8158ffbb663e09dd83a0de7206247b47fcc1a9f3b4cc940
 DIST din-49.1.tar.gz 3677087 BLAKE2B 7b696597327493d354c5efd31df243c70f23ec8d68514892c79212b9d3d398c7debb28ad95b6ccb04dc76ac0a9b01ee57d8245260dd4af99cd3f3b27bc2ecbcf SHA512 8f72fd1dce7197135e174bc8c4fb5325e7755e656d7817bbd82c964083ca48b0b5cc939472acf3464fd0404631767bbea1f20b7dea073b6829582e76d2879e04
 EBUILD din-48.ebuild 1076 BLAKE2B 5fc293baa092bfe143a36ea2b46c8765e10add99708f628878eefd549f5d9a0fec9d4b8f1df5a1e88f8d8ec35d2a60b91b81802364166a5a7b2262a734fb67a1 SHA512 6d54111f3e24d870cb93996502989da83a7c2012680d35476e01056910b00ab1e651870bee1c9c5dfc4ab10ee105a0fd1d79dde6ec9a03fbf9b5ff6a1189d885
-EBUILD din-49.1.ebuild 1081 BLAKE2B 80438b401f1556255c5b4bdf591317ef3c2c0bc92e7521fdc97aef7fa4101444d72ac1a31976fb9f511cc6d6c6a274ba64b3af738e802f5826b99f7d6335e1b4 SHA512 f662ed9a7ceaf0159570a36ed5c7f81d598907307a2cb8a5c2a677938b975013e5607dfb8f5f46dceae8f8541fb4e9c28dc756f0638fd9700a00dbf5a2cb3202
+EBUILD din-49.1.ebuild 1080 BLAKE2B 36e9fa12d77c754afe7bc74ba7ded2e2b30b6cda8dc2181b2348268499be0b015d3508420248918f80ddfbf4f6075eb54b39d574aff5f3c897073bafa27a5a2e SHA512 67bf71cc6c1ba1529173e992d79889627473163f74649fe694171fe3fd064d14aea4d17c78272e8409692299f4cc8f138dde535ca537f5b42e41d38a3cd8a369
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-49.1.ebuild b/media-sound/din/din-49.1.ebuild
index b88be5f2c753..6872627e7dcb 100644
--- a/media-sound/din/din-49.1.ebuild
+++ b/media-sound/din/din-49.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack"
 
 RDEPEND="
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 05820d4e7b76..94675d38c543 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-music-3.36.4.1.tar.xz 979064 BLAKE2B e744bee915a48a5d2366350cda7ebb0c43382f46de07d9203d95675cad45d825f2d93cc07be7865eceb5be3554ab478ecf84c52d9b8f5defc198b4f1b6638926 SHA512 8b6b4a8a44158a724de82855ba781dd6ceb53a30a35160f477721a385a841697f9a7c97cdba9a5bcc5b36834d55c034eb4c892907d550205dc5b7f7af56133ca
+DIST gnome-music-3.36.7.tar.xz 971980 BLAKE2B f27d0eb49a1728873ef6d439eead83cc34fb6802afdba3b4e0ef8d15c88d2012634ec0a18a4df4ba18079915d4227f526a93ac7989ce6ea4a807b620722fad1e SHA512 3470563621c17004d0b92451950ebfca203e830cb9ffe481fef7fe4d5187afa36ccb33130695226d4db95a89af9fac592910d2a19e715af4dd0c0ffba081c3a4
 EBUILD gnome-music-3.36.4.1.ebuild 2045 BLAKE2B 6e3adace7160f1aa9a1d6ad9d3c36158326e3c055ac21a7c465e4e2d31e35c1ad06d001a21519b32fc745e56eec137d1533de54351dd267be3ed3476c15b29ac SHA512 817d8419483d631160fcf4bead6a54b6505f00422d2feba1445a8153ae29a94ba1cde7729117065d545d6148fcae6d68542016f79caf111be9e911feab113017
+EBUILD gnome-music-3.36.7.ebuild 2047 BLAKE2B c00989998335746d9afe6e9a81094a4d6af3e9e3b8972cc5c0822fe47d380ee6ebd267cc18c40c2c2cf090c33d4794577d21359afe67123013eea5cf332cede7 SHA512 e3ca6d511b0865946eb4f9193f2dea40344ac730782fa6a891bbeb599fba6c5844acc3dc5b9e63570b3b92e55cc9453bca3be2ffc0bf88f7cafd5af011273887
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.36.7.ebuild b/media-sound/gnome-music/gnome-music-3.36.7.ebuild
new file mode 100644
index 000000000000..333450fc479b
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.36.7.ebuild
@@ -0,0 +1,81 @@
+# 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 gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2
+	>=net-libs/gnome-online-accounts-3.35.90[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.24.7:3[introspection]
+	>=dev-libs/libdazzle-3.28.0[introspection]
+	>=media-libs/libmediaart-1.9.1:2.0[introspection]
+	net-libs/libsoup:2.4[introspection]
+	>=app-misc/tracker-2.3.0:=[introspection(+)]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/grilo-0.3.12:0.3[introspection]
+	>=media-plugins/grilo-plugins-0.3.10:0.3
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${DEPEND}
+	|| (
+		>=app-misc/tracker-miners-2.2.0[gstreamer]
+		>=app-misc/tracker-miners-2.2.0[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
+	xdg_src_prepare
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"/usr/bin/gnome-music
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/mp3c/Manifest b/media-sound/mp3c/Manifest
index 264c9fde3049..806bb5e10cd0 100644
--- a/media-sound/mp3c/Manifest
+++ b/media-sound/mp3c/Manifest
@@ -1,4 +1,4 @@
 AUX mp3c-buffer.patch 340 BLAKE2B 775e62f27d178ddf9af7e9b529ae83e4aeccdb8766fe387997f7968b1f56f8d427c0c26258a2119f1988d7fc737166f77a0b8c5d62609e08b20f25b7604d5236 SHA512 2f109b9307c9ddd8012f7f7e4ac967889e6aba4886f59aca1d785c0c24fbf3231174bb3dce41aa0f362115b98c0c9921f7d87676f467cf75267026bb23cf03c8
 DIST mp3c-0.31.tar.bz2 351015 BLAKE2B 0330471c56abd2659885ba2d9c35df1f7cb3b46772ff142c3246939ab45cfc96ee6051c535bb7ba04bec91072b4a0c50c7e534962f1420f6f68f528f92f8fcab SHA512 6c30573c2df86a019c0832b0f0dc83587af5f866ad29b84ac4f57cc61de03708363644d0b3ccc144fce12cb6209357eb1d5dad4e90d70a420f083f0ea4c36c7f
-EBUILD mp3c-0.31-r1.ebuild 803 BLAKE2B fff61bb6980b4d95a985b3d03d6c674969167fa7b4f5750c122fde6a126d396f51e8c4f05e58ae07ea934aa4bba363d6970a04970a829124f4eb9e2aedfe1cc1 SHA512 ff419422ec36d547c94fd0ead2ddf39ef5e71509f10f624b8e64575489363b4ca68dde626d9fd3e57ac06420ebae9a6ccb7dc0cb12c857bc9cd534c195cbb60d
+EBUILD mp3c-0.31-r1.ebuild 803 BLAKE2B 8904abfcee905f3702390a0ae58971e0b13a8831b7490b61b27996d0788d0b86c9510d8216f91d9a27ca858f3418bd811d78242493bb15b1e066ead4206c9b31 SHA512 54a04b298c17b17865c44e2cb989a7baed815274043b4cce3ba441c13a315d4ccc787d2f6e64aa337ec0b076d5c5929d237b8192c387b0ef1acb8c88018bea3b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mp3c/mp3c-0.31-r1.ebuild b/media-sound/mp3c/mp3c-0.31-r1.ebuild
index c81de5093efc..8ed587907721 100644
--- a/media-sound/mp3c/mp3c-0.31-r1.ebuild
+++ b/media-sound/mp3c/mp3c-0.31-r1.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
@@ -17,7 +17,7 @@ IUSE="mp3 vorbis"
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="
 	${DEPEND}
-	virtual/cdrtools
+	app-cdr/cdrtools
 	mp3? (
 		media-sound/lame
 		media-sound/mp3info
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 5ff02111e013..b4df00f0eb78 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -3,6 +3,6 @@ DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc0
 DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 EBUILD mumble-1.3.1-r1.ebuild 3812 BLAKE2B d17d1a107e33192f312fc6553ae1e1424e6956c2fd5b207250754877762dfd88522c2f1d8a5ce0d8766be8b3df485b619cc0916c31e47154cd1c209b816e746e SHA512 569d09b0cd7a4493f7a0b7b2e98abb39c67deaa3f24ef103d0fc1221d5a743e86c0ae9b3403ca8435e2ccce02ef5e225ff9887eaf48c4b3b669aacb0aefb91ba
 EBUILD mumble-1.3.2.ebuild 3816 BLAKE2B 873ba96b0f251c96a83aba14941a4b4b0964c367e87fee705b22b5f869398e4d3beec184f24a9365133cfd17f3131872bd514ec6d71b55c8a839bbe5cc128192 SHA512 a0b98e253c6a39b92b8acbf94842012b6e172cd778285d2e9fa70a6929357beac77539f3caa0552a4bd548c15187f61f9dbce6fbb6107fb291f09f5d2c14ec79
-EBUILD mumble-1.3.3.ebuild 3815 BLAKE2B 3eb4984ef93cb6ee08a851c5d4a1713703ffe6560b40dc4fc5bb13f186bff4029cd45ab599543ea0f0f907bc1db6166b697da2e87916d8bf73f3692a54b20983 SHA512 3edc9ceea6e1a69cd2a111312007178405e26fbaad6f42299e4940d4c2e879e2530483a1c3dc7234d5407923052f5e1551236f067a0a25bfd9212f60c826fee1
+EBUILD mumble-1.3.3.ebuild 3814 BLAKE2B f59c05d68a56cee5f840d6991718bf10cee2fe10bd70d78eeea5a87aea4ddf545c96807ccc52bb1c01615348695cdc166d94ebc6dd651042c0945337621f37a3 SHA512 7d7d42d1ce7b90b4f25522f4ea71696218b2b8c4addfc8f8c927ecfabf1493ab08d811136b24bfaeb708928d3b6e733e0f40c65103cc11ed87071e04bec12577
 EBUILD mumble-9999.ebuild 3057 BLAKE2B 8e2614ae3c594f82c09860adaf34a9186874d44e78faec04a3c209d50f13985c4930e6cba0c700a1d65265bb96e67b2b5767ea7d6e4ea819995fbc09e5a232a5 SHA512 6cdb85d603f3b1303e1caef0369dda4e7b7ed8e09a70a72ddd5eb1e33bd21f9ce11c87899dee90ca99b3b832252215ec182676ca4fe2ec9a2ac08e6f0b797254
 MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/mumble-1.3.3.ebuild b/media-sound/mumble/mumble-1.3.3.ebuild
index 48c7aff21f57..0da26f648ad4 100644
--- a/media-sound/mumble/mumble-1.3.3.ebuild
+++ b/media-sound/mumble/mumble-1.3.3.ebuild
@@ -21,7 +21,7 @@ else
 			https://dl.mumble.info/${MY_P}.tar.gz"
 		S="${WORKDIR}/${P/_*}"
 	fi
-	KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="BSD MIT"
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 9a7d3196c80b..9863aa13a50f 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -7,6 +7,6 @@ DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc0
 DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 EBUILD murmur-1.3.1.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57
 EBUILD murmur-1.3.2.ebuild 3690 BLAKE2B bc7a49642fd3389fc43fa5188c3bbb64d9818fefcbfe4bfd0920a79bf4128c88eee13f029ce79682874db637f51b012ab459424161edb6853b3ede252e90645a SHA512 d02b017155372a00c422bad3d79decb7563e857db1639cc80253d6e48cbfe0a412debf758009928611527305f52df928240c60f20abd11d35744da630b1f5101
-EBUILD murmur-1.3.3.ebuild 3689 BLAKE2B 26646b012d7c104a0dfec1f9829d1558c4a464b70bd6c906b7f32032a434a8e264a83c37ce6b63b581232acc9598d008e92915292de974ea7e9625e19c7eae19 SHA512 d8743685b61d4baa2bb72538dc3e05feb41c7bf7b01f76fa6a482eac5f5ca9906ba7aff4fd1fbed6d44117651f6f9eb72c5717d88e61065044ff78f93c9f7627
+EBUILD murmur-1.3.3.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57
 EBUILD murmur-9999.ebuild 3748 BLAKE2B 220d4e0fd63cf2464fe0586938525c8c3c8c8b26f3b08c55d5c8e5dd4f9a7a996567fb28f7fb9bef6a602c3f041b743180445f0fd1024583dc68b4a81d472b23 SHA512 0cfb9421a3c7e389ea3dea6a536e49485fd586a6785d0813435165ece1401597b7e7858f6378bf1ca7793ddbdaecdbf9410e0bc5ffbdfcc13d392ba59156c404
 MISC metadata.xml 530 BLAKE2B a6618cb804deee82cf3f88ee683a5b406eee1317e9ca815f7f4e363a0e14c7c8cc2bcf4400d3a79b62f5652881e46be4405d0ac88afe610187419978ac57c9a6 SHA512 ef162d69805d3262f9f4f1732e9d8a031cac73e130f04013123d8f8e1d8e48132df243653ef2464bda1d8b8c0b88485fd32edaab8b3e62555a6295c676c1f5b5
diff --git a/media-sound/murmur/murmur-1.3.3.ebuild b/media-sound/murmur/murmur-1.3.3.ebuild
index 18faea156060..606e4379065a 100644
--- a/media-sound/murmur/murmur-1.3.3.ebuild
+++ b/media-sound/murmur/murmur-1.3.3.ebuild
@@ -24,7 +24,7 @@ else
 			https://dl.mumble.info/${MY_P}.tar.gz"
 		S="${WORKDIR}/${MY_PN}-${PV/_*}"
 	fi
-	KEYWORDS="~amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 LICENSE="BSD"
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 3b63b0e49968..d0e0cc7e890a 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,4 +1,6 @@
 DIST qjackctl-0.6.3.tar.gz 1033664 BLAKE2B 98d80d0fea3db359b732fad14711352ba688e605b7225daad64d7df1dabf1d19e24b4d643581f1936afa0df0c84350cf5727686246bd8a850e09da969a228e44 SHA512 72a9218b3b8a6b72470656e774f5cfbfe6670059e9f1a85a394345f4689c5d5c05af23b5e37d5f8dfc6159e591f64249006936069dde1632ef9d74b6f8355e0b
+DIST qjackctl-0.9.0.tar.gz 1088061 BLAKE2B 3be89091b6efb34d2dffee92fdfda5dabadc8b6e9f9a248cc5cd60df423482dc65342e9758a98f34c5c01bfba74eac64039e3ec2de157df0e03f8bf09a7a14fc SHA512 5aa6f3e86b6a5c528daa5fdb71b5400d5882fea6569d585a86bb6b9fa66b62699472fd82999a6f4eb1a375c70e684a20214240c1fc3b44239c22d182e3ae1b1c
 EBUILD qjackctl-0.6.3.ebuild 1137 BLAKE2B 0616937f3234b42d65432618a5cc680f3f60bf5976abae18d150629acfec3c0d2bfa1f85daf1275dd673d90185e33398be590b8ee3710f62a5521672c7584ad7 SHA512 7a1c88562d8a11da98dd492e13640d1dd99279f9f3075ca6f73dac0585535dd84a78cb565ef5fb85545fde1f764ac37aacd0aca231d8eca40c2e631f0731117d
-EBUILD qjackctl-9999.ebuild 1132 BLAKE2B e675b9c24d2b977e169778b9e42b22f916194c1e994c9d1ba1b6472ba4662f1043904f3130052b36dcf2ed6a16596cb7fe0f45e19044258409f1fed2fe58e201 SHA512 4e324f6923fdd1508b2c0515814191ccec6212234ae4994ffcdcb9beb6014e43985191c169b6441c88ff223dee53013483f2e1a3f841f1ec8eb497c6028bf680
+EBUILD qjackctl-0.9.0.ebuild 1139 BLAKE2B 9c19a21f674eebb33a0a02f4481f19c4c6af47669a3f45a6f121107a8f225f4202c59b92ed741e75067cf5fc1bf20dca8df21048f8add1eb22fa52715ad04f5a SHA512 8a4964eafbf9c342624474f856baab8ae30aaf0075e6a6b6ca43ca4b89c8ab641803b9eb49e259886d28e77c77e135bd2cbe8a8885a64efdf063446b5cd04eff
+EBUILD qjackctl-9999.ebuild 1190 BLAKE2B 07f1dd83705cd04140dfb771d32c03d8e81733d84ac5bf92e8d419d1fa1563357aaf0254fcac2fd776d7a59528dc5d0acd506daa2f5832dbc1909b35d5688ddd SHA512 4c5553ca1e7a4e9c79492d94281aa5c0a91680ed2fbe4fd356f05fbf72b717502b3d15648abfbcc7537b3703aab7db2c6c45ab361d6724d9b3022c1812b094f2
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/qjackctl-0.9.0.ebuild b/media-sound/qjackctl/qjackctl-0.9.0.ebuild
new file mode 100644
index 000000000000..f91e1e16e544
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils xdg
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="https://qjackctl.sourceforge.io/"
+SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus debug portaudio"
+
+BDEPEND="dev-qt/linguist-tools:5"
+RDEPEND="
+	app-arch/gzip
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	append-cxxflags -std=c++11
+	local myeconfargs=(
+		$(use_enable alsa alsa-seq)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable portaudio)
+		--enable-jack-version
+	)
+	econf "${myeconfargs[@]}"
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_compile() {
+	emake -f ${PN}.mak
+}
+
+src_install() {
+	default
+
+	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
+	gunzip "${D}/usr/share/man/fr/man1/qjackctl.1.gz" || die
+}
diff --git a/media-sound/qjackctl/qjackctl-9999.ebuild b/media-sound/qjackctl/qjackctl-9999.ebuild
index 1601c3b1ea75..55ceab1b20dc 100644
--- a/media-sound/qjackctl/qjackctl-9999.ebuild
+++ b/media-sound/qjackctl/qjackctl-9999.ebuild
@@ -54,4 +54,5 @@ src_install() {
 	default
 
 	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
+	gunzip "${D}/usr/share/man/fr/man1/qjackctl.1.gz" || die
 }
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 103220589abc..8992bcec40b0 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,9 +1,6 @@
-AUX qsampler-0.5.3-Makefile.patch 466 BLAKE2B 17d8ac1e29f6668a02fc7734d51f40e9f5a161da799fdeb2ddc5eaa89a69c607de6183fab78a13f4bec5a0efc002081589ca141f3232f37cc0051218f440fd5b SHA512 6f02c41941bacce8b49837471f5699960b069bd48e99b116402afa5452116890fa26da340a2e85b036d2051906b5eb828832598925b1d314de2a866eec47f155
 AUX qsampler-0.6.3-Makefile.patch 515 BLAKE2B b12882524ac5e0500a6c07804ed8b50ae085ac14873b723ca4ec2a71797da76711c5516ca0f6866994a1172d3f19ae671009d270be4429850e8bff0893044123 SHA512 0d49e0d178e638cddd69677c064368b5e6dc214c173286c3f6f82b1c469a875559bb25538ed8433d4e842d98418d344dc349ac454239983006b7cd4f195b1751
 AUX qsampler-9999-Makefile.patch 701 BLAKE2B cc95a22d6e003d3b25993e2068e2101684a85da1b8ac47c35ae330dcebd9f72ab3cc2931f1ec840d484c3f1871c0991ab90d45e1744de9fabcec293a3e260f28 SHA512 7f582fa7103d77f79c14671551ffe9ce83ac4ac0a12ee76f5fd63a670d5838af6a2b7718b8de27946b8e1234081b7316fbc4837a94ceb28063797027f54cddb3
-DIST qsampler-0.5.6.tar.gz 260607 BLAKE2B 52002ad95fe11266337f058124e7ae33947eb50ce5b12574c9091c10827bff2a8135a52bd53dd030be0394fdb39c2bd034308ae9d615c0b74ad660a06573446b SHA512 2a3a322fec31d9c66d7d1e9b4a7f74629e4b2bcf3ee2350bca8d450d2f68c41ac80563f8e28bd5314f00f0387503aa1e33c0b94ff518cca27b2ca93d9d72334e
 DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae
-EBUILD qsampler-0.5.6.ebuild 1018 BLAKE2B 8a350360a4d6bc54ae75a3f2e895a4711cc50532f62cf3d260a38a25142ee7531b4641bbeb539e41b35864ad5d37834d7fda94f827eb8c3dbac3a34057cf6c36 SHA512 254e07e7188f7fa5a381e04826f2a5aa0c636c74fcbbcec66cd144b3575c1d813021309acc8843ddd31f62677054d5ecd71d915195ccd611c64cab9a8bf4a004
-EBUILD qsampler-0.6.3.ebuild 1000 BLAKE2B 7bb7b8ef05cec4637340b639dfd562e2d16c0fae437aa987c50caccc62e8544d6c8b8cd33b4b1a5318acb395cd37cd8aa9d51a7236793b9aefa8e51601dc4274 SHA512 efdd00dd01f36a78e72f251a10e97816af5a18daa41135c488e8731e9a8fa93f8358088c41597b4426d33d319f5581a4df2d8f6f9c75fbe54b5801adfd55a27e
+EBUILD qsampler-0.6.3.ebuild 999 BLAKE2B 3799e7cf4eb2c7695e532e3e2dbb8790a8715937d74108f4a83367d4a885d965e9f3b2f2beba21b0ca587ba6219f30022807b887a260666e461e22a2580eb03f SHA512 2818e544b0b51e87812f60d0bf02a6033faff016ef2e0ed6574dbc599786329b0fa5ad637def0b1cb1787ac8ee17a39e3c40398ed2e22a8580a9e72473702493
 EBUILD qsampler-9999.ebuild 1072 BLAKE2B 756a2fa86b6e39d464018c6873017f8c914c59b08a9d3ae702af01fd20549daf7e2249591045b1a3ce6cdf6f3acf24f4be567749ee943c09a6fafd6dcbd8a2bd SHA512 9a58651e257148e1d13979573d036047acea54a60566dc2e979d7008b34e11e11e756220f816af0e70ca20facddef6869c615a3f30a7ea66d79443a56a0011cf
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch b/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch
deleted file mode 100644
index 7f23e78b669a..000000000000
--- a/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.in	2018-12-16 23:40:26.001395069 +0100
-+++ b/Makefile.in	2018-12-16 23:46:00.210638503 +0100
-@@ -109,7 +109,6 @@
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- 	@install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
--	@gzip -vf $(DESTDIR)$(mandir)/man1/$(name)*.1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qsampler/qsampler-0.5.6.ebuild b/media-sound/qsampler/qsampler-0.5.6.ebuild
deleted file mode 100644
index ab5a0073a2c5..000000000000
--- a/media-sound/qsampler/qsampler-0.5.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Graphical frontend to the LinuxSampler engine"
-HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug +libgig"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=media-sound/linuxsampler-0.5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.3-Makefile.patch" )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable libgig)
-	)
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf "${myeconfargs[@]}"
-
-	cd src || die
-	eqmake5 src.pro -o Makefile
-}
diff --git a/media-sound/qsampler/qsampler-0.6.3.ebuild b/media-sound/qsampler/qsampler-0.6.3.ebuild
index 6cb59ab6dfc0..049457c6e582 100644
--- a/media-sound/qsampler/qsampler-0.6.3.ebuild
+++ b/media-sound/qsampler/qsampler-0.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug +libgig"
 
 DEPEND="
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 7db2ab5fa087..89ae3c827fb4 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -8,9 +8,9 @@ AUX ts3server_mariadb.ini.sample-r1 764 BLAKE2B 3d8b9e88194b54cddb945860c77d497f
 AUX ts3server_mariadb.ini.sample-r2 762 BLAKE2B c70d4c7e375a9ab43ca9c1c4cadea9843009e7004f38734f7f2d8da3e3e86d83a2301d713b6bffee4e14ad04ef08c05bdae5e7daec4a8678ef3b9b5348824d2b SHA512 c2a4468288251e39e4061363016f6146aceae4c7f19c0e962341748ada5127e0b80380c75d217b1a2d1716c6e53c669aed34d75258b22f32c7f0ffb50b759288
 AUX ts3server_postgresql.ini.sample 768 BLAKE2B a8a8e9255012dda70d2096c793c44f22978cab1e2a632f3abbb81f288d9d8716e76727c6edde33146ff4e7dc08da43c7996565c8c05a27ca4f17e1bb02f095d3 SHA512 293917b6310d456e51fc72cf967cb2a0f99ec38b7a62550f2358d1996841d1aa15c0169945884a10799fb72f9831d9d12d4f2a535d1480f8fbaa6b23c9f4cf21
 DIST teamspeak3-server_linux_amd64-3.12.1.tar.bz2 9428301 BLAKE2B aeab07edc31d1ee57ffd34b218aeb3f7e23f31ffb5b8b940cbc46bca91b6ef9caffb67f1a52c059439a64d73ceb8fce124c0e8101d3e04d752782344ff6c1843 SHA512 58bfb582deddc4137245fe73d3aabfbcd84c3c346fe5fd3db8c7756014fcdd1f0bd7798ee029aa9beebe454fa8021dd180dd577f147cc5f02c833b68d9253fc7
-DIST teamspeak3-server_linux_amd64-3.13.2.tar.bz2 9945659 BLAKE2B bb3d10e5824aab613b5713c86845ce86405de351ee8e1ab378b35b57da5458a007c3663bb5c70b8e02ab1c3554d1bb7c74a8df0535d47dff6ed15e5068a1e14a SHA512 40c8630ed05eb46cd3d1eb870f2ab66b185b68b9d3118789de99a2ad817e5cb38fdd9f1bc16607f850cc5f0823c3f306d7cb9ab544fe41e5a1fbc8cddd977d9b
+DIST teamspeak3-server_linux_amd64-3.13.3.tar.bz2 9945408 BLAKE2B d714a046279c8cac11ff373a66ba41010e5839704030ae29f8d7f429759126dff8675b8b0b37b584115ad44d9e216cb5449d4b159dae53ece72f9e5bbe119f84 SHA512 39ad3a00f5e38a0601ed9e9df4227a7f00b4cb9bdaed6562ccf05e0fce22ed040cfd5a2ea36e9e97a18a74c335e90c0c080106cdaf5c0b32859819286727cb58
 DIST teamspeak3-server_linux_x86-3.12.1.tar.bz2 9268349 BLAKE2B 61d0794944775e4e9bfb57bc2ac331c5cc9da04d6a3956d4c1ec6c6d36ef87cb04ea1f0004d75251adc4baa1b9be999373d08ea36ca9f86e10b00e03d0f20f38 SHA512 83222586ff6e157af7242afc151c900eb339f05813f8b5fef602f9989a109b80de46bc86c7381b6acce240c62e9859b86df655a0b0219225162315337ca609ef
-DIST teamspeak3-server_linux_x86-3.13.2.tar.bz2 9780711 BLAKE2B c6749062abd4d23aa86be0348f973b3a4cba85f990845f63a9b175545daa707e443b01699690994843480028b5f44797096b6624266756ca3ff00faf1e8003d2 SHA512 8ed1bd7aebcea214b33209d1330fd6f9701aeefd804d2e1d69d4219e15eea580ec5c2e492312065f9150f48629a7c86490519b37a8fb333d3632a76c56e31086
+DIST teamspeak3-server_linux_x86-3.13.3.tar.bz2 9779788 BLAKE2B 1ddb466dfc6a7d19dacfa05a0608487a8b086963186eb48e2480b83fb9eaa408ca45bc80bfc6fbfd1623c21caeb27e516f6d893ab84e442ba75c9f59daf4fa79 SHA512 9b14e1fd8b969c32ca63e3b9665e0941c3d1e67b3e49d5f2d6cc701aa4ee10a80f1c10428ef2d59bb3767cd03ad5503a527c47b1db11ea525cca8c7e07787621
 EBUILD teamspeak-server-3.12.1.ebuild 3083 BLAKE2B 2790ceaad0373faf5fb5b6e7ebcb997590ac3916021efabedcd4573c5c785351a1c617e418b2075bc10545c79ca64106c4506bc3844d007dab4aa6add16deb86 SHA512 8c4f7e56d0b035946b02a236d1488be1f2052332012724ef0158f00e58c1c0a7a0b7037a59a838a283e905c72b9194de483c0633c5095097c5920c1307dbbab3
-EBUILD teamspeak-server-3.13.2.ebuild 3512 BLAKE2B b58690672fdab82da1f31cc1ca0707c7aec578719454bb80f141f9d996e512d20495bc5fe6a0c6a6b15176ab7c57af50c17deee6c85b905f2304aae44b05279f SHA512 a426856348012da8589a4d3c65c2fac8a87e1582a9aae66bf6176a67f3724e189e1f21187837cbc345ffbe4ed1e2d62058ffd6b39e109bce776d1cd32e4f226c
+EBUILD teamspeak-server-3.13.3.ebuild 3512 BLAKE2B b58690672fdab82da1f31cc1ca0707c7aec578719454bb80f141f9d996e512d20495bc5fe6a0c6a6b15176ab7c57af50c17deee6c85b905f2304aae44b05279f SHA512 a426856348012da8589a4d3c65c2fac8a87e1582a9aae66bf6176a67f3724e189e1f21187837cbc345ffbe4ed1e2d62058ffd6b39e109bce776d1cd32e4f226c
 MISC metadata.xml 703 BLAKE2B 854016d14783720f4467dead33469909e5777915947a72a03d0c2789fe37633cd93db11fdf2c59429e7a58f44825ecde3094c1dab7dd765634f46b80894b5af6 SHA512 959deb886af18a0260a0a0530eb914a42a21acac711cfd3ca6c2724ee78e3b697786e85a387ce7c9dae34b1922d3d96953265c80497602a4e94b05988d776a9c
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.2.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.3.ebuild
similarity index 100%
rename from media-sound/teamspeak-server/teamspeak-server-3.13.2.ebuild
rename to media-sound/teamspeak-server/teamspeak-server-3.13.3.ebuild
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 35f237b0f9ed..c780c8d1fe34 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index 7ba28fe527df..e4bf4acb6bd2 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1,4 +1,4 @@
 AUX devedeng-4.14.0-no_compress_man.patch 878 BLAKE2B f3460e0b28e1a1a80c3f9c1c41e26e608f203e4f9fa59ed93ff837e430ad14231b7375efaf14886fba16ac4f1a1f7247f03a43775441579c364ab91e6b830515 SHA512 d669cd0f55215e90f622acb1ec1895e25b29850ecb1ec5ebe2c5cbf9283f63f8448d064a5938cef250c748feeee0c0da25cdd5370f85d9a61b89532b2e5915cb
 DIST devedeng-4.16.0.tar.bz2 1763318 BLAKE2B ab3e5b3a94ed8f1dfe0482218786a8ab131c16259635c1297c7fb01a0eb7f7106d53ff24665e056f18796d87cf0430d375278e1c074026b134be9308aa8a3f3f SHA512 032c276eeecc3d85b53bf72ee2a3132aac41c2496cabfd1e30cbee7316f1ce3136c8b476bf03bb88930a532a06f6fad7a098d91f0b9a85e4ecabf9f728783f8a
-EBUILD devedeng-4.16.0-r1.ebuild 1153 BLAKE2B 4b9e797c72982028e95c64bb7ff8267b47f4da2c578758899227abca3e191d92a6f036e847e542f1554f152ea73d3b48f58e6c54a7087467f471263da362d77d SHA512 f7df38a6ee4d178fc50d8838dc395960f0f0b18f236bc86a999767f285223aa669b1c481e9fd28e57456ac6a5cbdda9b76e72fccebc262d96edccfde681ee1b0
+EBUILD devedeng-4.16.0-r1.ebuild 1155 BLAKE2B bf20936eb59d77a9fe8aa0c6441bd2eb8c99611f4fe8c36cabe4cd05ebd67cfa2d9a1c2a156a3f1a17e9e69182f1302179f425522e3d8b77297ea4fb43acdb2d SHA512 aa68a01d9c99b47a88cf18481b7fed9bf24297f34b32c04b4cf907d538f9047b26a60a2bfaf92a1756300db57e7d2bde938fd679114923fe683b0c7b4026aee3
 MISC metadata.xml 943 BLAKE2B e1e02dde0b9b21f3d398d1b38cb302842b6f5748405709ba2066dc5497c699f3d7daae40c4daf00eec37a739b5f3ab9d54a78c7e2d700f677abfaeceae75ed09 SHA512 9c5cf515b958e7125d383fc9513546f9a663ea45e4c60308fb20e85eb6eedf22c71a94561721ebffd156ee5b61d5ac309c66c9a7782d905b98a95c2ad8b7b545
diff --git a/media-video/devedeng/devedeng-4.16.0-r1.ebuild b/media-video/devedeng/devedeng-4.16.0-r1.ebuild
index ebc7d38d6cb4..54884ef59be8 100644
--- a/media-video/devedeng/devedeng-4.16.0-r1.ebuild
+++ b/media-video/devedeng/devedeng-4.16.0-r1.ebuild
@@ -16,14 +16,15 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
+RDEPEND="
+	app-cdr/cdrtools
+	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3
 	|| ( media-video/vlc media-video/mpv media-video/mplayer )
 	media-video/ffmpeg
 	media-video/dvdauthor
 	media-video/vcdimager
-	virtual/cdrtools
 	|| ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn )"
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 8dce596fd2c8..b91b9550f835 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,4 +1,4 @@
 AUX ffmpeg4.patch 541 BLAKE2B ff2ad556e881009ff5ba79b252fd55eb9054ea273f20d4af1bd76440b70d351b03f204ad1ff7648694cab950c49082728b6370a93610dd40c09c10a8609ae5bd SHA512 3ad427f51e5ab24231309f01d410e213df874d01567417ea66bcb88cd39e60d672b4771d8c3f210690eb6d145f3d6f7ff81bca8e1b9c841fb2b895f63070ed11
 DIST DVDStyler-3.0.4.tar.bz2 8870498 BLAKE2B c1ec7651d90613cebbd8d4e62b4626b8a7e2069eadc07bfe9a91e51bf33638135ca975f4857242b3f9ff34606a4e6084200059c82ebc3aa146f446f9b77483ae SHA512 2747e6a494d331b6f35405d7d2ed47789f4452bb3d4e86b0c68cf0fafffb4e6de452b28fac0e9995c312017c7e4e8a3f89ad42bf0a0c99ce19c5d6c0ca6e351a
-EBUILD dvdstyler-3.0.4.ebuild 1713 BLAKE2B 255f9ea3506b6ee50c6400f254c574be3b7a3e098746eab7850cd611e48b5f8be45c57dc9032a3a0b5112813fda531064af30b361b8859cc26871be66cb89a78 SHA512 b0eaa4118079406f85338a9eaf9963c8531d3f63459a266d6d910dd1047ccdae8d407fae0b531e77830790f90619f48a9def255650f8d1f88bfc3311e409a535
+EBUILD dvdstyler-3.0.4.ebuild 1713 BLAKE2B 58af318ed962ecbde9aa69ee0e52340d3235633a302eec9889eb72005b6b6e28994fc8e1739abcf410f42116d16e2dece0a1ddbbd188d3fef60fcbd40e311d8f SHA512 0d6cb6784398df0bfee6b22b8ae535b543304900042a3e33151f2b3512e7c976c967e122bedf147f5e2501d2eb60dc238973601551e70b8599e6d35d10df8853
 MISC metadata.xml 302 BLAKE2B 2e58ce53fb249f7e8c837a58561ac4724b7ca19ae8002465e2c98da67674103bfc4d949cebabc8fb11e313d2eda33a476482e253fb8d3d55bc00b79f3c63e633 SHA512 ebc7b7d7e9d24c31f2e6f3cd811dbf7b36e142974cb909bace0929882230be34552aca8741e471374e62ffed749675440d2ee9b723bfd774a1c503d2a5bd40c2
diff --git a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
index a2c8db9c5ebb..f34dcb86924f 100644
--- a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
+++ b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
@@ -18,13 +18,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug +udev"
 
 COMMON_DEPEND="
+	app-cdr/cdrtools
 	>=app-cdr/dvd+rw-tools-7.1
 	media-libs/libexif:=
 	>=media-libs/wxsvg-1.5.11:=
 	>=media-video/dvdauthor-0.7.1
 	>=media-video/ffmpeg-2.6:0=[encode]
 	>=media-video/xine-ui-0.99.7
-	virtual/cdrtools
 	virtual/jpeg:0
 	x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
 	sys-apps/dbus
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 336ef7cb59a7..a3c623c5df62 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,6 +6,6 @@ DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917
 DIST ffmpeg-4.2.4.tar.bz2 10959430 BLAKE2B 932bc0046edab5587063bbc04d6ef0149876bd1001ad185384fcabb3d0ae196c9ba591e680823b3c7b6e0ef9a0a9e9575a8b08439fdd89ef0e4dabb9d4a7f4e6 SHA512 5c74e3fe77ddf8ffede0e4692d574858dd0626e542380a819ab79c0f669c6c1329ffbccb872502f60306e561f10aa8bc1e61d09b2bea829870fe4a48b76460c6
 DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 3b0eb332459921435b60e72f5c572034abf65d4ab79ef4cfae94fe594048eaa37eec47724d119863102a7211c2178f5a2382a6d4016b792818079b8241bde084 SHA512 831a187d8b8f2715a9f11c93c8d3ec126ff579d470797da452d3395178877de113af7ae90ed27fca0b223791ad257972570481e6dbb8361d2b7f3b010924bee8
 EBUILD ffmpeg-4.2.4.ebuild 18169 BLAKE2B b771bf50bfce5c754963f431f085c29b962bed73e55e805e112986281abf025cf7723e8cdc5f15829d06424aadbc6899c644f5e4ca56a2a113920a13c5c8b13b SHA512 b26527dc7e5c46dbe8b958efd4d5ebd51d91e258c2a6b23d1d9c9fcc4ddbbe72f1ad9751b8dd9273ebd0840003db83db16babc15ca844e33df2a06ac16add793
-EBUILD ffmpeg-4.3.1.ebuild 18225 BLAKE2B 243639ef4e19df4a57cdf3084687dd4bd6e37a3d59b17b8bdc5ee4b5b03113cce262929f0ecb546912145a47d3554fc3fdd34cb51774648f55e509ea5f359431 SHA512 9b08a306c5b2dda66b4721eb714ff1c61a32ebc221ace8b7e9b38223c7ce0f7b40fb64d42c10453b9e4dae2f7a19afa1516d9332df1aea91a27f13d46d91fd7f
+EBUILD ffmpeg-4.3.1.ebuild 18224 BLAKE2B 67ac5b26eb652cf77fb1e20ee3c2ef4f0deda817f36375c6136a4603d427da4b38a5381e25e2b6c2a9ac19c0f979dfdb3d73b34d6bd1e0d7ffb9c21d948b2b86 SHA512 18907fc38bffbe9067a5ca059044075bfc9fee8891a33db8297f811bd7317b6c63a628e861387f5df51a5ac17915e4dadf0b2875a2dee41816b140d8c65a5ea0
 EBUILD ffmpeg-9999.ebuild 18049 BLAKE2B 3d1ebb9b9ce4abc8e5db6da31e600a9db93580a4fa876dde23e0ae4623a3aceba9351b40637d8a6ecc60f0f15c62c438fd8445633e325eaff25c69b64438927a SHA512 dce9ed532ac8a084c03e4d27898de3d5b9fc9afa577d1312e1c157657a3f372faaa594aa83006ec6397ef9cc35b684ce37865a2a0c59624ee88481026be00d1f
 MISC metadata.xml 5868 BLAKE2B afe06c266a6dce5dc2b13a1dcaae85c4288a4f45ef493d9b865bf476a624fb188ebab686708049149f1eac94e434b926b185d1bf0467f26f62f641a0f832dd22 SHA512 8b85ed0ba2d98135b3b2f7f4e13b7fcff52cd4238fa429e355c4e2033e51d945d8363ecf2bf73c0569e5a071a793bb01cd716113e4672603867a01d258d4aa77
diff --git a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
index 2fd3ea1ba4c1..ad1f9fb2b883 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	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"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
deleted file mode 100644
index ff46c98ead14..000000000000
--- a/media-video/kmplayer/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX kmplayer-0.12.0b-cmake.patch 1494 BLAKE2B 51ce1dd8118e36f864588a02107868493cefab78e0a1cb17751eb6bc5bd4d9b04795c849973be465429b6574050d94facad3aa569bae2b4ddc731a51718931ef SHA512 ea899817fc49fea549b4b2e2a180d2db2cb3310d88d9ff5464dbe19334428fb2afbec0228ccaf320229f8102f66f29dd64533f529021bba4a93933bc1f6e09d4
-AUX kmplayer-0.12.0b-desktop.patch 1629 BLAKE2B 09640d28334f91753a01b9f799ad3929f578f0127cf2012b0fea96f342d389661ac06719ef78d8ca12386658e051433ba6a8a1b0b2ea20c82901e454cb240a6d SHA512 bf85ab238afae771ba99299d719bf398444efacdf3092ff93c0472b831a4996b11762573d9cd9ecba88e882cb7bb801780afe87652a1657afe7903d639d1678e
-AUX kmplayer-0.12.0b-devpixelratio.patch 1290 BLAKE2B 1b076e616f6a8bc645b4505101f95b0c30422f83ffd01c01277196eef9f69f2be5f73880dddf55700f3b94aec7fadc45582b42b93dd68b419c883274980a3220 SHA512 4090efd279df4f106e197886eaacce73a24b60edf6eebdd1811f84ff3eb4798505278d397327b1b07c3423774a45fe6de02455a8f0ba20548c074840c89ac0fa
-AUX kmplayer-0.12.0b-qfile.patch 1387 BLAKE2B 6c04f0dc3eeed0635397a22fe5dc5b6fe5215c16a03f6c1f05a77353daac5c6b1f77d277e746b5283feaf5ba50eab68947c16cee9b6ac6f0642ba3051323c85f SHA512 3cee584d1560e4b9cf7ba621c907e3e521f0e778f728728f476cee98babb49122428605468d65d366fd382ee79746dffb5002cd6a9205f1eff3c827b77152753
-AUX kmplayer-0.12.0b-qt-5.11b3.patch 943 BLAKE2B db0b5bbf4e36859693645cde5aa67b90e2b5ab5a2658a2ef5b944ffa2973be9ab2674506260cca9d6b63bc3b7dd6c4c48469539cea0530d922cf3b7bd5514b07 SHA512 74f7e835e918d5e44147bb23ce7ac2f03385825ef049557ef983c028602a04cabb59988f2a594ccc88147d24db2c9fb3cf85b31f4fd25a67801daccddb97844c
-AUX kmplayer-0.12.0b-qt-5.9.patch 1097 BLAKE2B 093961b12c4482303c43b603ad30c5fb49a97550da77641c4cb306eded8849df76eac0dcc441c2febf5523eb07abd1a494eee2335e02bd9d1bceacc87ccdf826 SHA512 137733705a879e87c59d26b1cb609aa9246d4543f758a0987fb1dee013d47ea469cdf7a19fa8aebe01a4643c5d7ed8b5e5f9057e9f80eaa3d3f5504fccaa48e9
-AUX kmplayer-0.12.0b-schedulerepaint.patch 2085 BLAKE2B a8c51d503de212b375cf77c41cf1c581c80decfdfe30cdd98ac0ff3f4b8a7bc335e921762808994c298db47e6327bb768838c00b41e8d20e6bb211a2c62ef6ff SHA512 e3c874ca5886d3a16eab0f10169009317214c8c196d9ce70b797f97f1ed2ed9143fb31e7f99d711a2c9ede26cb957f767fabbeb3c6670d430b1d4061a02982f1
-DIST kmplayer-0.12.0b.tar.bz2 599496 BLAKE2B c27b54cf05c52ffbb78c8f623b7cab066901f647c14364da1de2fcedd96329439521ad329fc15be58491b570de17fd151c95f266738e049501a5a22ba8dd9c93 SHA512 d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882
-EBUILD kmplayer-0.12.0b-r4.ebuild 2052 BLAKE2B 6bf6975098f2f6190da3c88824b53f7bce877aa5cf23b763d9d98c5a72eeefe9bb7d11da9e868fb2566ce6ede4bb4200fb5f5e99e586f829b852f048ebb1af60 SHA512 5e36be168e75a2d2098d4c15fbbc96291a2e1e312eeaefc89d85731f99a42c304bfb9a9d176bba60168c7f7e2513a31acfb48f0f055ec280ef1a5464a35a594f
-MISC metadata.xml 369 BLAKE2B 2aa133972dd0e135637cde16aa084542c31a85793cc055af814e27eafb8902dbb239dbf2df2bbe41cbfedd61db66be66f3fea1450d169c1aee18a5312664dd30 SHA512 3464b912770a6e66976021b81ea22d04be45800542c6fee0c5d74c3e16d8572d0bed5a94665933d4ffd405da6b744a200d991d0ecd0bd652a984277d05a459cd
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch
deleted file mode 100644
index a99b1149f8c3..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 2a5df7b875a8c5acb99be05baf84e5c9800d52a3 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sat, 13 May 2017 18:57:15 +0200
-Subject: cmake: fix endif syntax
-
-it does not match the if condition, so just remove it (also to ease
-reading it)
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 057fcc4..14a55d2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,7 +81,7 @@ add_subdirectory(src)
- add_subdirectory(icons)
- if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc" AND KF5DocTools_VERSION)
-   add_subdirectory(doc)
--endif(KF5DocTools_VERSION)
-+endif()
- add_subdirectory(data)
- 
- if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-
-From 41a284a0f5f728556280b9f942961631566ad7ff Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sat, 13 May 2017 19:04:47 +0200
-Subject: cmake: use NO_POLICY_SCOPE for KDECompilerSettings
-
-just like done for all the other projects
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 14a55d2..5a58a35 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,7 +15,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_D
- 
- include(KDEInstallDirs)
- include(KDECMakeSettings)
--include(KDECompilerSettings)
-+include(KDECompilerSettings NO_POLICY_SCOPE)
- include(ECMInstallIcons)
- #include(ECMSetupVersion)
- include(FeatureSummary)
--- 
-cgit v0.11.2
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch
deleted file mode 100644
index c84944effc29..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2126d76b8f16381e576de779b94b5b4555e562c2 Mon Sep 17 00:00:00 2001
-From: Luigi Toscano <luigi.toscano@tiscali.it>
-Date: Sat, 13 May 2017 21:13:43 +0200
-Subject: Fix .desktop: Qt5 apps accept qwindowtitle, not caption
-
----
- src/org.kde.kmplayer.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/org.kde.kmplayer.desktop b/src/org.kde.kmplayer.desktop
-index fcc5255..2b5435c 100644
---- a/src/org.kde.kmplayer.desktop
-+++ b/src/org.kde.kmplayer.desktop
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Type=Application
--Exec=kmplayer -caption %c %i %U
-+Exec=kmplayer -qwindowtitle %c %i %U
- Icon=kmplayer
- X-DocPath=kmplayer/index.html
- Comment=KDE interface for MPlayer
-
-From 6b7757397c6181664d58d0a9e09cc329f279cc72 Mon Sep 17 00:00:00 2001
-From: Luigi Toscano <luigi.toscano@tiscali.it>
-Date: Sat, 13 May 2017 21:13:36 +0200
-Subject: Add org namespace to the desktop file
-
-Required by the Desktop Entry Specification for desktop file
-with Type=Application.
----
- src/CMakeLists.txt           |   2 +-
- src/kmplayer_part.desktop    |   2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7a05382..f675d9a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -122,7 +122,7 @@ install(TARGETS kdeinit_kmplayer  ${INSTALL_TARGETS_DEFAULT_ARGS} )
- 
- install(TARGETS kmplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
--install(FILES kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-+install(FILES org.kde.kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
- 
- #qt5_add_dbus_interface(kmplayer_SRCS org.kde.Konqueror.Main.xml kmplayer_interface)
- 
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch
deleted file mode 100644
index 0dea98084e3e..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 93fa2c2587fa8b2f1b0da4ab7f7f2978f105fac2 Mon Sep 17 00:00:00 2001
-From: Koos Vriezen <koos.vriezen@gmail.com>
-Date: Sun, 30 Oct 2016 12:58:05 +0100
-Subject: Update pixel_device_ratio before painting instead on app startup
-
-Only used for adding a few pixels to text bounds. So if dragging the app
-from a low res to a hires display, that could cause text being tuncated.
----
- src/viewarea.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/viewarea.cpp b/src/viewarea.cpp
-index e407c95..77a260f 100644
---- a/src/viewarea.cpp
-+++ b/src/viewarea.cpp
-@@ -1892,9 +1892,6 @@ KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (QWidget *, View * view, bool paint_bg)
-    m_minimal (false),
-    m_updaters_enabled (true),
-    m_paint_background (paint_bg) {
--#if QT_VERSION >= 0x050600
--    pixel_device_ratio = devicePixelRatioF();
--#endif
-     if (!paint_bg)
-         setAttribute (Qt::WA_NoSystemBackground, true);
-     QPalette palette;
-@@ -2030,6 +2027,7 @@ KDE_NO_EXPORT void ViewArea::mouseMoveEvent (QMouseEvent * e) {
- 
- KDE_NO_EXPORT void ViewArea::syncVisual () {
- #if QT_VERSION >= 0x050600
-+    pixel_device_ratio = devicePixelRatioF();
-     int w = (int)(width() * devicePixelRatioF());
-     int h = (int)(height() * devicePixelRatioF());
- #else
--- 
-cgit v0.11.2
-
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch
deleted file mode 100644
index 32b645cd0a00..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7dce8e00c8e48cc08d3cc39909681643aa36ed62 Mon Sep 17 00:00:00 2001
-From: Luigi Toscano <luigi.toscano@tiscali.it>
-Date: Mon, 8 May 2017 18:07:40 +0200
-Subject: Use QFile to copy a file instead of /bin/cp
-
-The code has been there probably way before QFile gained the copy
-functionality.
----
- src/kmplayerpartbase.cpp | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
-index fd7b363..f718496 100644
---- a/src/kmplayerpartbase.cpp
-+++ b/src/kmplayerpartbase.cpp
-@@ -124,12 +124,8 @@ PartBase::PartBase (QWidget * wparent, QObject * parent, KSharedConfigPtr config
-     QString bmfile = KStandardDirs::locate ("data", "kmplayer/bookmarks.xml");
-     QString localbmfile = KStandardDirs::locateLocal ("data", "kmplayer/bookmarks.xml");
-     if (localbmfile != bmfile) {
--        QProcess p;
--        QStringList args;
--        args << QFile::encodeName (bmfile) << QFile::encodeName (localbmfile);
--        p.start ("/bin/cp", args);
--        kDebug () << "cp " << args.join (" ");
--        p.waitForFinished ();
-+        bool bmfileCopied = QFile(bmfile).copy(localbmfile);
-+        kDebug() << "bookmarks.xml copied successfully?" << bmfileCopied;
-     }
-     m_bookmark_manager = KBookmarkManager::managerForFile (localbmfile, "kmplayer");
-     m_bookmark_owner = new BookmarkOwner (this);
--- 
-cgit v0.11.2
-
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch
deleted file mode 100644
index 8c91fa6c2ff3..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 66b262c344deb6ac4924966a584e8aeb3d899180 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 17 Apr 2018 12:07:04 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-
----
- src/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f675d9a..57af1ed 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -161,9 +161,9 @@ qt5_add_dbus_adaptor(kphononplayer_SRCS org.kde.kmplayer.streamslave.xml
- 
- add_executable(kphononplayer ${kphononplayer_SRCS})
- 
--qt5_use_modules(kphononplayer Core DBus Widgets X11Extras)
--
--target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES})
-+target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES}
-+    Qt5::Core Qt5::DBus Qt5::Widgets Qt5::X11Extras
-+)
- 
- install(TARGETS kphononplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
--- 
-2.17.0
-
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch
deleted file mode 100644
index 80f3bee6ee88..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3def65075c09af4961cd399e8e78ed78cca72e65 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bauer <wbauer@tmo.at>
-Date: Wed, 11 Oct 2017 22:16:02 +0200
-Subject: Fix build with Qt 5.9
-
-Summary:
-moc 5.9 errors out when building:
-Error: Plugin Metadata file "" could not be opened: file to open is a directory
-
-Same issue and fix as https://phabricator.kde.org/D5392 for khtml.
-
-CCBUG: 377490
-
-Test Plan: builds fine now with Qt 5.9.0rc and also earlier versions.
-
-Reviewers: vriezen, pino
-
-Reviewed By: pino
-
-Subscribers: pino
-
-Differential Revision: https://phabricator.kde.org/D5985
----
- src/kmplayer_part.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h
-index f90f85d..0fddbaa 100644
---- a/src/kmplayer_part.h
-+++ b/src/kmplayer_part.h
-@@ -36,7 +36,7 @@ namespace KMPlayer {
- 
- class KMPlayerFactory : public KPluginFactory {
-     Q_OBJECT
--    Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "")
-+    Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory")
-     Q_INTERFACES(KPluginFactory)
- public:
-     KMPlayerFactory();
--- 
-cgit v0.11.2
-
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch
deleted file mode 100644
index 02bf9f38b561..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 5517262a2a328518dd42a8aa0e37a34152a06282 Mon Sep 17 00:00:00 2001
-From: Koos Vriezen <koos.vriezen@gmail.com>
-Date: Sun, 30 Oct 2016 12:50:03 +0100
-Subject: scheduleRepaint should be called with pixel coordinates
-
----
- src/viewarea.cpp | 31 ++++++++++++++++++++++++++-----
- 1 file changed, 26 insertions(+), 5 deletions(-)
-
-diff --git a/src/viewarea.cpp b/src/viewarea.cpp
-index 24f68cf..e4df941 100644
---- a/src/viewarea.cpp
-+++ b/src/viewarea.cpp
-@@ -2117,9 +2117,20 @@ KDE_NO_EXPORT void ViewArea::syncVisual () {
- 
- KDE_NO_EXPORT void ViewArea::paintEvent (QPaintEvent * pe) {
- #ifdef KMPLAYER_WITH_CAIRO
--    if (surface->node)
--        scheduleRepaint (IRect (pe->rect ().x (), pe->rect ().y (), pe->rect ().width (), pe->rect ().height ()));
--    else
-+    if (surface->node) {
-+#if QT_VERSION >= 0x050600
-+        int x = (int)(pe->rect().x() * devicePixelRatioF());
-+        int y = (int)(pe->rect().y() * devicePixelRatioF());
-+        int w = (int)(pe->rect().width() * devicePixelRatioF());
-+        int h = (int)(pe->rect().height() * devicePixelRatioF());
-+#else
-+        int x = pe->rect().x();
-+        int y = pe->rect().y();
-+        int w = pe->rect().width();
-+        int h = pe->rect().height();
-+#endif
-+        scheduleRepaint(IRect(x, y, w, h));
-+    } else
- #endif
-         if (m_fullscreen || m_paint_background)
-     {
-@@ -2647,8 +2658,18 @@ void VideoOutput::setGeometry (const IRect &rect) {
- void VideoOutput::setAspect (float a) {
-     m_aspect = a;
-     QRect r = geometry ();
--    m_view->viewArea ()->scheduleRepaint (
--            IRect (r.x (), r.y (), r.width (), r.height ()));
-+#if QT_VERSION >= 0x050600
-+    int x = (int)(r.x() * devicePixelRatioF());
-+    int y = (int)(r.y() * devicePixelRatioF());
-+    int w = (int)(r.width() * devicePixelRatioF());
-+    int h = (int)(r.height() * devicePixelRatioF());
-+#else
-+    int x = r.x();
-+    int y = r.y();
-+    int w = r.width();
-+    int h = r.height();
-+#endif
-+    m_view->viewArea()->scheduleRepaint(IRect(x, y, w, h));
- }
- 
- KDE_NO_EXPORT void VideoOutput::map () {
--- 
-cgit v0.11.2
-
diff --git a/media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild b/media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild
deleted file mode 100644
index 6feb296bfb3c..000000000000
--- a/media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend"
-HOMEPAGE="https://kmplayer.kde.org https://apps.kde.org/en/kmplayer"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
-SLOT="5"
-IUSE="cairo"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kmediaplayer-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	x11-libs/libX11
-	x11-libs/libxcb
-	cairo? ( x11-libs/cairo[X,xcb(+)] )
-"
-RDEPEND="${DEPEND}
-	media-video/mplayer
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-schedulerepaint.patch
-	"${FILESDIR}"/${P}-devpixelratio.patch
-	"${FILESDIR}"/${P}-qfile.patch
-	"${FILESDIR}"/${P}-cmake.patch
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-qt-5.9.patch
-	"${FILESDIR}"/${P}-qt-5.11b3.patch
-)
-
-src_prepare() {
-	# Prerequisite for ${P}-desktop.patch:
-	mv src/kmplayer.desktop src/org.kde.kmplayer.desktop || die
-	ecm_src_prepare
-}
-
-src_configure() {
-	# 0.12: expat build broken, check in later releases
-	local mycmakeargs=(
-		-DKMPLAYER_BUILT_WITH_EXPAT=OFF
-		-DKMPLAYER_BUILT_WITH_NPP=OFF
-		-DKMPLAYER_BUILT_WITH_CAIRO=$(usex cairo)
-	)
-	ecm_src_configure
-}
diff --git a/media-video/kmplayer/metadata.xml b/media-video/kmplayer/metadata.xml
deleted file mode 100644
index e68bcea066c3..000000000000
--- a/media-video/kmplayer/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>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-		<name>Gentoo Video project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
index e37aef70ad93..eaebce8ff0b3 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -234,6 +234,6 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST y4m-0.5.3.crate 11447 BLAKE2B d3a7081899f12a50907ecbce6f63f1b1119618aefdc97bf967d5fe5b908b234552aac0fe96cc359f12aad7018af8b47b34b6219e0d87d036c8b4df1c1bcf1a27 SHA512 2d414d178c4bc16db7f5804987494629d12b85b409327012db2e9e868a7bb952cb630a86190fb455228ae40776b2c30c042eca65a1d3730e8425daf53f034991
 EBUILD rav1e-0.3.3.ebuild 4153 BLAKE2B 96f69c97721839eb9eaf7249780a50c95f3eaf7acc59d405cc618a8502bcfc480f93faa7518fb38a4e75fbeb1a1b09f910917dd1123de0b1cd8b7f2ec972f194 SHA512 dfdeccc66fba51e839cacc73c6c6502b86c30d6e7e771e186f7803cc5e82633858b2dba88b7baf73fa144ede00e1dc96a7f02314d286b05be11c9a92bf0efbf7
-EBUILD rav1e-0.3.4.ebuild 4207 BLAKE2B f96c5dd91fadedead85b22ef5cef1550e8fdabf07773bcc5070bc8aa4e713bf392d723f92c2c9791e2822518c8cce8c560b10a1f838b23ce43c17703ae0ce7ff SHA512 9709337f7e8260be75bc98b363e176978d0022c5878973b7eec8350fa698e5b24ec8260951b44220b76397f2517123a13066d40e18a5fc438c0e9293ff1c903f
+EBUILD rav1e-0.3.4.ebuild 4204 BLAKE2B 7ac7a8f83ba51e84e3af9efb10e7d933af07f98089ac5083fb6583c8d8500d8923a6616e9ae4be8b4250eae7ce5c9fdf63617ca4dae29cac6849510fb0864d1f SHA512 103e3bd77c98ce7ded5d4c2aaa242b0e2acf239c248a0f6e3e7fd27f76faabce48992a70726ed332b108a8e28472b7bde41e1d73713ab49ad692610e3c1ede8b
 EBUILD rav1e-9999.ebuild 1361 BLAKE2B 8eaf63b69c5eef56c0e7fb725aea974e688da362dec3cfe1bac18562f281102e0f4430c1dd612c66425e60d7146b2b8e5504717229cd19e260834c2d2bd6e74b SHA512 e0f16779f8646fe7f283a5f0a07b3374aa5db1f31155637780a0dc3d25148664373e92907e27d4a1259e063d7a392c8a9e320a21bf05c4bbc4fe756fa5b8d1c9
 MISC metadata.xml 396 BLAKE2B 3f15123aeeca6df02c1b6a886418af6cfd4e4e977a5a93b2cc13301ae8e5a17a918a9e8116e19ae120cc27e42bcdaeb5e6c546f99b0333144bbc4aa9960b862e SHA512 4d650221196a5f48b12f2dcd6ccd3ea56abc7ec205e78d470aae267c7706cf81f03a691ca916d5c2a8c9e09a62c07b0802b5c688bc60bbc09d74ea7a135278ed
diff --git a/media-video/rav1e/rav1e-0.3.4.ebuild b/media-video/rav1e/rav1e-0.3.4.ebuild
index 3058a80e498c..3cf9015a2eaf 100644
--- a/media-video/rav1e/rav1e-0.3.4.ebuild
+++ b/media-video/rav1e/rav1e-0.3.4.ebuild
@@ -180,7 +180,7 @@ else
 		https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		$(cargo_crate_uris ${CRATES})
 		"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ppc64 x86"
 fi
 
 DESCRIPTION="The fastest and safest AV1 encoder"
diff --git a/media-video/streamdvd/Manifest b/media-video/streamdvd/Manifest
index 8fc94982adb6..d3cfc3e0371d 100644
--- a/media-video/streamdvd/Manifest
+++ b/media-video/streamdvd/Manifest
@@ -5,5 +5,5 @@ AUX streamdvd-0.4-libdvdread.patch 1460 BLAKE2B 68577f49d3c837c9d2148838459e3e3b
 AUX streamdvd-0.4-makefile.patch 1378 BLAKE2B d8a244cb91f246eefa9da4f39a861f9f6bef84580a0b2faff3f01d0ad7c0c7ecc2f8a62711b4f5abca8c6e985a6d70934f49724bb052be8e284c506fe70d59c3 SHA512 5234433fd985ef561c43420a6f7a1ee30c4748ce5a4c04e3a6864e95f42fae1b97c8c0e1a6adb0c6c395500a7f007263621cab8779dc57535287a6ba81a32988
 AUX streamdvd-0.4.patch 785 BLAKE2B 665bf98e78727abeba771b5dc84eaaccadc14fafe8978e21bde1480630d197a6dfa213e9f8d662d4813078d1ab66ffd4f33bc2513f99e6d93684cb3aa086eebb SHA512 81edce3f825c38a28aeafe25fcd1dad3b71413fdc22892fcbe5d0af32235b43f2256a6f38b3997dfea1306f492d2f4c96e0b85fe39802111502bea4af17013a7
 DIST streamdvd-0.4.tar.gz 152669 BLAKE2B 700ce4f03eabf3e3531bac4ab7b618c55a96e636c459368740597124353f9639cfd7c6b00a5a4eacfd438c3a6a7966c0c8dd42dedd3ab877ad96317a8658aa1e SHA512 81e8fdaf028799be7269c239ec5717bd5da58254b7eeef35ee5d436c4408fb02f9badbc5ff8a661903d10ec43bbaca68d8792f729293f6330c2a9e92ee0c48a5
-EBUILD streamdvd-0.4-r2.ebuild 1509 BLAKE2B a0c78477a3e6013ef698da81af49a3deeb7a72d1da7e866743065cb674e9550dbb01cc17867cbc076e0ee46ec11e3304dc8df740fe74bbe8ecf813804a72ece8 SHA512 1fb72131f1cc5b1ef74f56b648135179fdf06656c421c5964c75f1e80777a8102ba05d6e4337c4fc78d9012229daba8001ea9c283246d22d17f9edde25316e1f
+EBUILD streamdvd-0.4-r2.ebuild 1511 BLAKE2B f4236a3382bf6cdc1a0731987a80e109dcfa56caa84a8bd02f02f4b5411c7b9c981cd99c9bd2b965ee7f93a543cc3ebe608c13b5bd246770cf3a0eca1dd9385c SHA512 47990c7a782feb3e75ad68fc0e6dfb4a59eb3ecfb84384868565b80cf3317d6435cfc2c46523be8d10788d67dfa8d70b5eaebc05b7500d071d50dfc4c5cc3012
 MISC metadata.xml 559 BLAKE2B d5dd932f55599c1f38b5c68472a7e635852dd846d3c4cb85bf99f783c861be56cf5f846da27fb81460e68b97666b2bcd229655e987380a84c74c352f20668516 SHA512 17ff5079ade1e6a7c74298fe8e6f5737cb3fd0822f3318b198c32af761043c218739bb90865c616229ffba5698711a970d48f83df02716e7f82ab819c3c8fa98
diff --git a/media-video/streamdvd/streamdvd-0.4-r2.ebuild b/media-video/streamdvd/streamdvd-0.4-r2.ebuild
index 9c889d779a06..c235978a8e29 100644
--- a/media-video/streamdvd/streamdvd-0.4-r2.ebuild
+++ b/media-video/streamdvd/streamdvd-0.4-r2.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,11 +15,12 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="X"
 
-DEPEND="media-libs/libdvdread
+DEPEND="
+	app-cdr/cdrtools
+	media-libs/libdvdread
 	media-video/lsdvd
 	X? ( dev-perl/Tk
 	dev-perl/Tk-JPEG-Lite
-	virtual/cdrtools
 	>=media-video/dvdauthor-0.6.5
 	>=app-cdr/dvd+rw-tools-5.13.4.7.4 )"
 
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 7e0f8cce0c27..692db9f6748c 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,7 +1,4 @@
 AUX xine-ui-0.99.10-desktop.patch 996 BLAKE2B 3ea4d4f4c3a9c3fd93f211c949694abef94d9f115d41f45afce07632f96473912e393b14de8fba714f9d11bb351ff8df41d056d6c4aebd680f03f84b5498d60a SHA512 f4d40ff11f851ab2e56e902fd9c5cf51f530c76308d6f7f6675cd5b90486a1e265d29b12375c10a57a8a825b45132fef9ca471dad056c5524e817678ce79626f
-AUX xine-ui-0.99.10-libcaca.patch 977 BLAKE2B f91dd8813b549ea00db0028e6a86d04ff7a27575f749509e27e331cfa9d76ac50349e52bc74ebdf4b7ae9b357209e5da292f2eee24c0a79204202417adfa9c98 SHA512 edde19d900c19ca6530877041a0d78d9a0d7fad44d3ec62f76e5907c8907ffe338434161d1c59066ddce132b61ee6072981ef00899588bb6adebbdb461d0d2ce
-DIST xine-ui-0.99.10.tar.xz 1762968 BLAKE2B eede1a7b43f3fca37c092541145a4d13813185a740c396503bdfc93fd96d4d3bf52ad2daed4389634e2a517972c1233e3d9b1af74b718dd9def58eb2e702d967 SHA512 73cbc72375b27335e9d5f5527c35dab12d1ae40539b587630b3d8709471e4c61ce7b619062b75f587252c0647c234ffcf611f3b4e38e0447f7041b7ca5d7289e
 DIST xine-ui-0.99.12.tar.xz 1980672 BLAKE2B ac1a9b17b48005c667d53129e51f4db2cfe2933c0fca9ba8b6f1d999f903568217a061c84806abfec31d4afcc238579c232a1ae6f4b04afcac465c340826f037 SHA512 bc04cb8df730abce147485b488250331a304e4318fc28ebab890c6485242a5edeafd953547c637622e2312c65aa1e36aaae6117d608dd668781d841804f2ae86
-EBUILD xine-ui-0.99.10.ebuild 2028 BLAKE2B 153fb6819a95fab8058fc3d7241419ac9f5b5797042ba077088bec627f3906017da9f349c3af63da76b3a1a74505c2d5a3103ac5689411177355116cd46a12fc SHA512 ae9301c83a7d404229d6b7714f5b761e1224f173f01666ce9fd47c6be74fb765ffc091717674e484af2c15d7954acf1d559c5563eb1f730b6cc23c7da12fa64f
-EBUILD xine-ui-0.99.12.ebuild 2005 BLAKE2B 3072fedaa78ea505244d7f78be11bf0d6dbfb8d65b55bebd8c6e3e3dd05dada5d06b9e876c3b5611355d1a0283f8ad804c96be4a7f629d669b49594dd57e18f6 SHA512 0225ec4ea2382f308d7af15d7d925b702b3473f440487d5ddaa65fa907594548812a9d117cc2484590e8541d9d17e47d962ebd71a7bbbe084d94dfd0d7b0b9d6
+EBUILD xine-ui-0.99.12.ebuild 2003 BLAKE2B 8e0d1e5e84f1950b83d31c134f8f9e9e410271fdd3980801d05025ca540400511630869d7b9ff4beaa3991c6aacf757067d6227edafc921cc5cbc4f9095635d9 SHA512 bcdca5162cd33839d715dec37be63e15d80c9b0e5f8e063ab64cf4eca8e8f87a73b4629aaf26ac4e7623749995d39ed08203a3c0ea31ad7e81385f2cac46a1c7
 MISC metadata.xml 386 BLAKE2B 8874545c1b0a0b9f60505dc08c933e3268f42b64fb1eed4e889d30af4ba3b6c74b1b1986f06425aa00ca81ab91e993a37e2c723ec4f53bbf69a2ccae8ba3ed69 SHA512 ead8587493161ece36b38168e0c628a05a97d1dfc7dddec3d7a966a783621634be28bd661a6e0d65e370dd7066ef49019265967f7394aa4026b3ae97de26a820
diff --git a/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch b/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
deleted file mode 100644
index c5a359758d4a..000000000000
--- a/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r efe11fb1562e configure.ac
---- a/configure.ac	Thu Dec 28 18:08:02 2017 +0200
-+++ b/configure.ac	Sun Apr 01 23:00:22 2018 -0600
-@@ -374,7 +374,7 @@
-    if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
-       AC_MSG_ERROR([CACA support requested, but libcaca 0.99 not found])
-    fi
--   if test test "x$have_caca" = "xyes"; then
-+   if test "x$have_caca" = "xyes"; then
-      AM_DL()
-    fi
-    AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <caca.h> 
-
---- a/configure 	Thu Dec 28 18:08:02 2017 +0200
-+++ b/configure 	Sun Apr 01 23:00:22 2018 -0600
-@@ -12651,7 +12651,7 @@
-    if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
-       as_fn_error $? "CACA support requested, but libcaca 0.99 not found" "$LINENO" 5
-    fi
--   if test test "x$have_caca" = "xyes"; then
-+   if test "x$have_caca" = "xyes"; then
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
- $as_echo_n "checking for dlopen in -lc... " >&6; }
diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild
deleted file mode 100644
index eacab2930ba0..000000000000
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg-utils
-
-DESCRIPTION="Xine movie player"
-HOMEPAGE="https://xine-project.org/home"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
-
-RDEPEND="
-	|| ( app-arch/tar app-arch/libarchive )
-	media-libs/libpng:0=
-	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
-	virtual/jpeg:0
-	aalib? ( media-libs/aalib:= )
-	curl? ( >=net-misc/curl-7.10.2:= )
-	libcaca? ( media-libs/libcaca:= )
-	lirc? ( app-misc/lirc:= )
-	nls? ( virtual/libintl )
-	readline? ( >=sys-libs/readline-6.2:= )
-	X? (
-		x11-libs/libICE:=
-		x11-libs/libSM:=
-		x11-libs/libX11:=
-		x11-libs/libXext:=
-		x11-libs/libXft:=
-		x11-libs/libXrender:=
-		x11-libs/libXScrnSaver:=
-		x11-libs/libXtst:=
-		x11-libs/libXv:=
-		x11-libs/libXxf86vm:=
-		xinerama? ( x11-libs/libXinerama:= )
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.18.3 )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-libcaca.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	rm misc/xine-bugreport || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable lirc) \
-		$(use_enable vdr vdr-keys) \
-		--disable-nvtvsimple \
-		$(use_enable debug) \
-		$(use_with X x) \
-		$(use_with readline) \
-		$(use_with curl) \
-		$(use_with aalib) \
-		$(use_with libcaca caca) \
-		--without-fb
-}
-
-src_install() {
-	# xine-list apparently may cause sandbox violation, bug 654394
-	addpredict /dev/dri
-
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		docsdir="/usr/share/doc/${PF}" \
-		install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/xine-ui/xine-ui-0.99.12.ebuild b/media-video/xine-ui/xine-ui-0.99.12.ebuild
index b4b3da98ab25..f1ab7d8539fa 100644
--- a/media-video/xine-ui/xine-ui-0.99.12.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
 
 RDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 61d29950d826..32540a6e6c8d 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 6e9dcaf3d8d0..33efc54e44ae 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Dec 2020 06:08:40 +0000
+Mon, 21 Dec 2020 11:38:25 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index b610ef96f34c..7bdd5fee0ea2 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 491803 BLAKE2B 78c7b315718b290681f17c40a54b26e436d02ce9c07c7af217a95b8ba814d80acc88d2663352de1ae84551e2ca2c3599522f47f220f7729a6058ea3424c7371f SHA512 ab40e1589be1f2a6217a23c90ec3460c0358c487f815e9eedbe4164a7eadf4bd9b00bc1444285fbffeeff87fdc732a5321cd9e70839cc4622c40fa254a9b51a2
-TIMESTAMP 2020-12-18T06:08:43Z
+TIMESTAMP 2020-12-21T11:38:28Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/cR2tfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/giTRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCLdRAAhCDg1sUsJjhE/NuHgpFfM+EgD2+haTAhbMaKv+9pNzRcvalo0FGCbhNI
-MiABFXQxQdN70fqQMvyUzRi6vBZMHju9ju5nFhFMakvq6bnPGJE4GLaqnD3tewe/
-iwQjW9OH2QYbMwuetzc12Y99O6lRIfo2zY6TGARgLp9UIa/Bxmawu/0/icywJ7yS
-2sDRau6KH+mqW9fhWj/0d8xUSbFZeMJ+xGjUSQsS7k6pu7j33JfzdJEqHjlaNovK
-/ZdF4BrQtttyHQcljc771RVS2FKCprA4qc07KtnUdy4LA3u7/LW60RHYNOpL7b62
-gkiRINUp4R1EgIPJyMIbPLyiXVE8hxIZlUrbX6TDYILzjeJz1XyRGfrIDmtwXaup
-1d6/0Jgg/115O49AD1X0mActkSR+qH2ZsnAKOzPw2XQcHuZ1IaPbxc1HEoPVUDfy
-Aq/TANH6LfBrOqVOiDhpKgnCYN9ILpE3HkdyIFEV6V20Bm94rtn1LkmFjtpGJehw
-uuu4n+3ODn7R2ra2dYVdPNZJu4xViEFBo40lshXJfRWG2mkJD9Jj0Q/NZmKe24oM
-IrkbtMtgoT0RUXEp66jUYH8rriRQJ50ejAXfx/W84bKLUo3krbLPU+6a1lisZaSr
-zPoxJc96WJhwJnZ9pPB+wUp2X0K78UnU9iLSBsmdHdJvpUI/dzE=
-=lpvh
+klCUoQ/+NRNyj2QH4eQGELBMbyzkJnPs3dNy+szRFIluRIhPRI8A87+fw60z15EC
+8LExRf4nMS8K/i7huFp06THFZdBqvPSdCYv/XGuclivW6Utw80gnCUS9lkyueaji
+bgXSkthK3GpHv+/1kZHKbuEeMF+waGCBdnitXv4V8adVLYizcNyXhtbwcrUKflGQ
+5mdOz3pcjRLJogRohDKIcVJ5td28PLoxAWa6TDo6ZQU33fYdu0jrSiZPfNLCCzz0
+BoAjRV9I3GXRRk9tshQ0wMpoLErkBUb2qh01/C2NixFSAety8n6iliupGxt9jClW
+4l/iBl52FIwEwMnlbaLXvNmfe/oRQuusqBLIQbWDuDOdoS7HyKk1dQ6ChuPa93uU
+xWaipPm8PocwZl6NFlJOF/D3RoJAKFWMDPDCmJEIRHxTGcKGagQtPp5hEUvrSBQ0
+8BMEu/acUK6RHG8/hYO+uQXDQU03NNQKEyWut+bSFlmPpgAaoBOqjLkn2WAFJ/OV
+m2pUWDhBhab91kTRP5IA8o6K7LGwlzEpHmcw69wUM4/mdcuBti3u3mfZ40BwSjYd
+CFYiewPnyqwaILqkbPU2RnUgZVqmdvQ5MDIKH+GuhvrxESXZWATXkaMNHBODlhfV
+ne8Pvlw0MNX2I4l2cGhrarcM/NCQyKNUgu0Ge3DmhbXx225Uj2c=
+=uvvP
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 6e9dcaf3d8d0..33efc54e44ae 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Dec 2020 06:08:40 +0000
+Mon, 21 Dec 2020 11:38:25 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 15ec8ea14735..28d3132db2b4 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index b8738a07d426..e742063836fd 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/postgrey-0 b/metadata/md5-cache/acct-group/postgrey-0
new file mode 100644
index 000000000000..064570c55a3f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postgrey-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the postgrey mail daemon
+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
+SLOT=0
+_eclasses_=acct-group	074f6fd7ac19dbf5e1ab9bc58c92af5d	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=bb3e3877afacabcceadf15a9d204fd1e
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index e6e2e111f73b..0f3c634faff7 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/postgrey-0 b/metadata/md5-cache/acct-user/postgrey-0
new file mode 100644
index 000000000000..f450ec1baceb
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postgrey-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for the postgrey mail daemon
+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=acct-group/postgrey
+SLOT=0
+_eclasses_=acct-user	0d24c8dbb9e192bb2307b3086e8abb6d	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=4767857bebd808f8ab37545c9b9e2a2f
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index fde76244d293..7e4e56887dc3 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/orca-3.36.6 b/metadata/md5-cache/app-accessibility/orca-3.36.6
new file mode 100644
index 000000000000..f0cb1c76c658
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/orca-3.36.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=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] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-accessibility/at-spi2-atk-2.34:2 >=app-accessibility/at-spi2-core-2.36:2[introspection] >=dev-libs/atk-2.36 >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_6? ( dev-python/gst-python:1.0[python_targets_python3_6(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/gst-python:1.0[python_targets_python3_7(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_8(-)] ) braille? ( python_single_target_python3_6? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_6(-)] dev-libs/liblouis[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_7(-)] dev-libs/liblouis[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_8(-)] dev-libs/liblouis[python,python_targets_python3_8(-)] ) ) dev-util/itstool >=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
+DESCRIPTION=Extensible screen reader that provides access to the desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Orca
+IUSE=+braille python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+ CC-BY-SA-3.0
+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] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-accessibility/at-spi2-atk-2.34:2 >=app-accessibility/at-spi2-core-2.36:2[introspection] >=dev-libs/atk-2.36 >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_6? ( dev-python/gst-python:1.0[python_targets_python3_6(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/gst-python:1.0[python_targets_python3_7(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_8(-)] ) braille? ( python_single_target_python3_6? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_6(-)] dev-libs/liblouis[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_7(-)] dev-libs/liblouis[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_8(-)] dev-libs/liblouis[python,python_targets_python3_8(-)] ) ) dev-libs/atk[introspection] python_single_target_python3_6? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_6(-)] >=dev-python/pyatspi-2.36[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_7(-)] >=dev-python/pyatspi-2.36[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_8(-)] >=dev-python/pyatspi-2.36[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] ) x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/orca/3.36/orca-3.36.6.tar.xz
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c2baf8d8ced608f4965bf694dbfca41e
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 0630a659e951..f2db9dbfe5fd 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/ansible-2.10.4 b/metadata/md5-cache/app-admin/ansible-2.10.4
index ff0b25891eef..47ba5b8f9c0f 100644
--- a/metadata/md5-cache/app-admin/ansible-2.10.4
+++ b/metadata/md5-cache/app-admin/ansible-2.10.4
@@ -1,10 +1,10 @@
 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
-DEPEND=>=dev-python/packaging-16.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(-)] app-admin/ansible-base doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx-notfound-page[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.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(-)] ) test? ( dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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/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/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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/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/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base 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/mock-1.0.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/passlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_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 )
+DEPEND=>=dev-python/packaging-16.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(-)] app-admin/ansible-base test? ( dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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/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/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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/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/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base 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/mock-1.0.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/passlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_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 )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
-IUSE=doc test 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 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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/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/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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/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/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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(-)]
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-2.10.4.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=42f8990dbcbe2ab89b0c2242939114df
+_md5_=7aad628b1ca76fbcb5219a0bec7c5662
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index 53634f7fdc0c..be56ff7ff9cb 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -1,10 +1,10 @@
 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(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!app-admin/ansible-base >=dev-python/packaging-16.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(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx-notfound-page[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.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(-)] ) test? ( dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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/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/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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/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/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base 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/mock-1.0.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/passlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_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 )
+DEPEND=!app-admin/ansible-base >=dev-python/packaging-16.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(-)] test? ( dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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/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/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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/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/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base 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/mock-1.0.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/passlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_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 )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
-IUSE=doc test 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=GPL-3
 PROPERTIES=live
 RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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/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/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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/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/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6f2df48de80aa92913dc4aba0fec3d93
+_md5_=ccbf8ed211bbe37d55bf45a6dee428ea
diff --git a/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.23.1 b/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.23.1
index 75fb11d0b6d6..74ed320eeaaa 100644
--- a/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.23.1
+++ b/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.23.1
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-crypt/libsecret dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
 SLOT=0
 SRC_URI=https://github.com/bitwarden/desktop/releases/download/v1.23.1/Bitwarden-1.23.1-amd64.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb1566af76fb2d2f46aeed67a946b1c0
diff --git a/metadata/md5-cache/app-admin/clsync-0.4.5 b/metadata/md5-cache/app-admin/clsync-0.4.5
index e794eb6d6012..c33788c36ce1 100644
--- a/metadata/md5-cache/app-admin/clsync-0.4.5
+++ b/metadata/md5-cache/app-admin/clsync-0.4.5
@@ -5,11 +5,11 @@ DESCRIPTION=Live sync tool based on inotify, written in GNU C
 EAPI=7
 HOMEPAGE=https://github.com/clsync/clsync http://ut.mephi.ru/oss/clsync
 IUSE=apidoc +caps +clsync cluster control-socket cgroups doc debug examples extra-debug extra-hardened gio +hardened +highload-locks +inotify +lto mhash namespaces seccomp socket-library static-libs kernel_linux
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=caps? ( sys-libs/libcap ) cgroups? ( dev-libs/libcgroup ) clsync? ( dev-libs/glib:2 ) mhash? ( app-crypt/mhash ) !app-doc/clsync-docs !dev-libs/libclsync
 REQUIRED_USE=|| ( clsync socket-library ) || ( gio inotify ) mhash? ( cluster ) seccomp? ( caps )
 SLOT=0
 SRC_URI=https://github.com/clsync/clsync/archive/v0.4.5.tar.gz -> clsync-0.4.5.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4e47e98ba228b13a2e663afc4708b2b1
+_md5_=6579f3b9e106a1709acd90edff535e22
diff --git a/metadata/md5-cache/app-admin/consul-1.7.11 b/metadata/md5-cache/app-admin/consul-1.7.11
new file mode 100644
index 000000000000..8ebdfb2db9a2
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.7.11
@@ -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.7.11.tar.gz -> consul-1.7.11.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.7.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.7.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.mod 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/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/!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/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 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-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.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.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 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.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/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/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/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/digitalocean/godo/@v/v1.1.1.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.zip 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/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/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/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 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.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 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/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.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip 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-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-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.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip 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.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip 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/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/mock/@v/v1.1.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.zip 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/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 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.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip 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/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 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.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.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip 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/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.zip mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.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/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.0.0-20180828235145-f29afc2cceca.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.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/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-20191202160150-7ec2cfbda7a2.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.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.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip 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.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 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-version/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip 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.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.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.0.mod -> github.com%2Fhashicorp%2Fmdns%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.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 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.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/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/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.zip 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/json-iterator/go/@v/v1.1.5.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.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.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/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.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/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.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 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/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/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.16.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.16.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.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/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.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/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.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%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.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip 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.0.3.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.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.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.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-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/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/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/onsi/ginkgo/@v/v1.6.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip 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/gomega/@v/v1.4.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.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/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/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.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/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.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip 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/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.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip 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.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-20181126121408-4724e9255275.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip 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.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.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip 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.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/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/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/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/sirupsen/logrus/@v/v1.0.6.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip 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/smartystreets/assertions/@v/v0.0.0-20180820201707-7c9eb446e3cf.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.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/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 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/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/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/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/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/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//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-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-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-20191106202628-ed6320f186d4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.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-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.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-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-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-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.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip 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/oauth2/@v/v0.0.0-20170807180024-9a379c6b3e95.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip 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/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-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-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-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-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-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-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-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.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.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.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-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.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-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-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/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.0.0-20180829000535-087779f1d2c9.zip -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.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.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 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/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-20190404172233-64821d5d2107.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip 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-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.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.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip 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-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.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 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.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip 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/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 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.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-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20180806132203-61b11ee65332.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20180806132203-61b11ee65332.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20180821005732-488889b0007f.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20180821005732-488889b0007f.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.mod mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.zip -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.zip mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.mod -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.mod
+_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=144f5ccc17ead1ce7d79bf068f24c1a6
diff --git a/metadata/md5-cache/app-admin/consul-1.7.7 b/metadata/md5-cache/app-admin/consul-1.7.7
deleted file mode 100644
index 7d574cb0b68d..000000000000
--- a/metadata/md5-cache/app-admin/consul-1.7.7
+++ /dev/null
@@ -1,14 +0,0 @@
-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.7.7.tar.gz -> consul-1.7.7.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.7.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.7.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.mod 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/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/!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/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 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-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.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.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 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.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/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/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/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/digitalocean/godo/@v/v1.1.1.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.zip 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/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/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/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 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.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 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/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.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip 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-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-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.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip 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.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip 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/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/mock/@v/v1.1.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.zip 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/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 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.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip 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/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 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.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.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip 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/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.zip mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.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/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.0.0-20180828235145-f29afc2cceca.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.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/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-20191202160150-7ec2cfbda7a2.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.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.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip 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.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 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-version/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip 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.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.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.0.mod -> github.com%2Fhashicorp%2Fmdns%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.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 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.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/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/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.zip 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/json-iterator/go/@v/v1.1.5.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.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.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/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.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/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.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 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/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/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.16.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.16.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.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/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.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/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.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%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.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip 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.0.3.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.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.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.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-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/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/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/onsi/ginkgo/@v/v1.6.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip 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/gomega/@v/v1.4.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.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/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/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.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/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.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip 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/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.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip 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.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-20181126121408-4724e9255275.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip 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.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.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip 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.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/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/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/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/sirupsen/logrus/@v/v1.0.6.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip 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/smartystreets/assertions/@v/v0.0.0-20180820201707-7c9eb446e3cf.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.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/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 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/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/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/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/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/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//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-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-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-20191106202628-ed6320f186d4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.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-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.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-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-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-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.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip 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/oauth2/@v/v0.0.0-20170807180024-9a379c6b3e95.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip 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/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-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-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-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-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-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-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-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.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.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.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-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.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-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-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/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.0.0-20180829000535-087779f1d2c9.zip -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.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.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 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/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-20190404172233-64821d5d2107.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip 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-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.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.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip 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-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.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 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.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip 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/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 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.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-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20180806132203-61b11ee65332.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20180806132203-61b11ee65332.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20180821005732-488889b0007f.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20180821005732-488889b0007f.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.mod mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.zip -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.zip mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.mod -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.mod
-_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=80a7d7175a260e9cd8c3a474cea16209
diff --git a/metadata/md5-cache/app-admin/consul-1.8.3 b/metadata/md5-cache/app-admin/consul-1.8.3
deleted file mode 100644
index a6b353615243..000000000000
--- a/metadata/md5-cache/app-admin/consul-1.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-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.3.tar.gz -> consul-1.8.3.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.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.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	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0fc34b62738b0363fc554e7bc8498303
diff --git a/metadata/md5-cache/app-admin/consul-1.8.7 b/metadata/md5-cache/app-admin/consul-1.8.7
new file mode 100644
index 000000000000..9a656dddf754
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.8.7
@@ -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.7.tar.gz -> consul-1.8.7.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.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.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.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.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/frankban/quicktest/@v/v1.11.1.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.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-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.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/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.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-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.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/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.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.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.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-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.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.6.6.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.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/serf/@v/v0.9.4.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.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/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.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.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.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/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+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/v2.20.9+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.9+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.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//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.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-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.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-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.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/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.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/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.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/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.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/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.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/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201007082116-8445cc04cbdf.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201007082116-8445cc04cbdf.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.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.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/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.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/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.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/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.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-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.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.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.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-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/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.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.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	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a479c8d22ec216e2423a70220f0af60e
diff --git a/metadata/md5-cache/app-admin/consul-1.9.1 b/metadata/md5-cache/app-admin/consul-1.9.1
new file mode 100644
index 000000000000..4bc90a05f603
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.9.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.9.1.tar.gz -> consul-1.9.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.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-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.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.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.5-0.20201104215618-6fd5a4ddf425.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.5-0.20201104215618-6fd5a4ddf425.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.5-0.20201104215618-6fd5a4ddf425.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.5-0.20201104215618-6fd5a4ddf425.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.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.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/frankban/quicktest/@v/v1.11.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.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-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.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/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.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.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.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.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.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-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.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/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.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/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.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.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.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.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.3.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.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.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.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-hclog/@v/v0.14.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.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.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.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.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.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.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.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.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.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.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-20200423225030-a18a1cd20038.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.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/mdns/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.3.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.2.0.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.1.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.1.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.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.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-20200609203250-aecfd211c9ce.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20200609203250-aecfd211c9ce.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20200609203250-aecfd211c9ce.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.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.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.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.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.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.27.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.31.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.31.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.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.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.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.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 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/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+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.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.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.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.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.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.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/v3/@v/v3.20.10.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.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.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.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//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.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.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.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-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.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-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.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.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200930160638-afb6bcd081ae.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200930160638-afb6bcd081ae.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.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/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.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.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200930145003-4acb6c075d10.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200930145003-4acb6c075d10.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200930145003-4acb6c075d10.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200930145003-4acb6c075d10.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.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.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.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.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.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.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.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.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.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.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.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200513154647-78b527d18275.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200513154647-78b527d18275.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-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.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.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.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-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.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/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.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.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//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.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	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=62146fb35da959010f7db06ef9906c45
diff --git a/metadata/md5-cache/app-admin/cygwin-rebase-4.4.4 b/metadata/md5-cache/app-admin/cygwin-rebase-4.4.4
index 427f76efd692..983a4a4d2889 100644
--- a/metadata/md5-cache/app-admin/cygwin-rebase-4.4.4
+++ b/metadata/md5-cache/app-admin/cygwin-rebase-4.4.4
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure install preinst prepare
 DESCRIPTION=Core of the automatic rebase facility during postinstall on Cygwin
 EAPI=7
 HOMEPAGE=https://cygwin.com
-KEYWORDS=-* ~x64-cygwin ~x86-cygwin
+KEYWORDS=-* ~x64-cygwin
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/haubi/cygwin-rebase/archive/rebase-4-4-4.tar.gz -> cygwin-rebase-4.4.4.tar.gz https://github.com/haubi/cygwin-rebase/compare/rebase-4-4-4...rebase-4-4-4_merge-files-flag-0.patch -> cygwin-rebase-4.4.4_merge-files-flag-0.patch
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=75267505d7ed4883651cd15dbaf5126d
+_md5_=24a144a8bc76923745fd79d94db8c15d
diff --git a/metadata/md5-cache/app-admin/cygwin-rebase-9999 b/metadata/md5-cache/app-admin/cygwin-rebase-9999
index f8aa64c0b386..56f652c8f5f3 100644
--- a/metadata/md5-cache/app-admin/cygwin-rebase-9999
+++ b/metadata/md5-cache/app-admin/cygwin-rebase-9999
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=75267505d7ed4883651cd15dbaf5126d
+_md5_=24a144a8bc76923745fd79d94db8c15d
diff --git a/metadata/md5-cache/app-admin/entr-4.6 b/metadata/md5-cache/app-admin/entr-4.6
index baaed109bf62..8d222fd89b8e 100644
--- a/metadata/md5-cache/app-admin/entr-4.6
+++ b/metadata/md5-cache/app-admin/entr-4.6
@@ -3,10 +3,10 @@ DESCRIPTION=Run arbitrary commands when files change
 EAPI=7
 HOMEPAGE=http://entrproject.org
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=ISC
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://entrproject.org/code/entr-4.6.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2c9ae9642d54fbd3048e727a905419ac
+_md5_=657d809257d2fc92db59e333eb3dd7bd
diff --git a/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1 b/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
index bb7f0b7d8a01..7df572869aa5 100644
--- a/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
+++ b/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/unzip dev-perl/DateTime dev-perl/Digest-CRC dev-perl/DateTime dev-perl/Carp-Assert dev-perl/Data-Hexify dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://computer.forensikblog.de/files/evtx/Parse-Evtx-1.1.1.zip
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fab8d9c3f3917bd54e96c78d303e49d5
diff --git a/metadata/md5-cache/app-admin/graylog-3.3.9 b/metadata/md5-cache/app-admin/graylog-3.3.9
new file mode 100644
index 000000000000..d9f8f850215e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/graylog-3.3.9
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Free and open source log management
+EAPI=7
+HOMEPAGE=https://www.graylog.org
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=!app-admin/graylog2 acct-group/graylog acct-user/graylog >=virtual/jdk-1.8:*
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://downloads.graylog.org/releases/graylog/graylog-3.3.9.tgz
+_md5_=8146b6e3f2efaff05b9a1b873e06b410
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1 b/metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1
index f65209e030b3..72f695b52aa0 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haskell-updater-1.2.12/haskell-updater-1.2.12.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9223addbc585a25b90d2e48e8136fa62
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.3.1 b/metadata/md5-cache/app-admin/haskell-updater-1.3.1
index 4ef89405d162..0acaa9540b8f 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.3.1
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haskell-updater-1.3.1/haskell-updater-1.3.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dbb7bd7603ab3c3d8ab8fa65bd322c3f
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.3.2 b/metadata/md5-cache/app-admin/haskell-updater-1.3.2
index 4ab4b4464c6d..d8df4be63a65 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.3.2
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haskell-updater-1.3.2/haskell-updater-1.3.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dbb7bd7603ab3c3d8ab8fa65bd322c3f
diff --git a/metadata/md5-cache/app-admin/psmon-1.39-r1 b/metadata/md5-cache/app-admin/psmon-1.39-r1
index 4f3455d3ef8d..d30d3630e96f 100644
--- a/metadata/md5-cache/app-admin/psmon-1.39-r1
+++ b/metadata/md5-cache/app-admin/psmon-1.39-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://www.psmon.com/psmon-1.39.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=638281d7f812ac993c8e8dc03cc218b8
diff --git a/metadata/md5-cache/app-admin/puppet-7.1.0 b/metadata/md5-cache/app-admin/puppet-7.1.0
new file mode 100644
index 000000000000..e0389907b9af
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-7.1.0
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) 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_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) 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_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_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DESCRIPTION=A system automation and configuration management software.
+EAPI=6
+HOMEPAGE=https://puppet.com/
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.1.0.tar.gz
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2ad155a373ba0271d01b7a6152f3f44e
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.15.0 b/metadata/md5-cache/app-admin/puppet-agent-6.15.0
deleted file mode 100644
index dea4b42aaab3..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-6.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install unpack
-DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet acct-group/puppet app-admin/augeas
-DESCRIPTION=general puppet client utils along with hiera and facter
-EAPI=7
-HOMEPAGE=https://puppetlabs.com/
-IUSE=puppetdb selinux
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet acct-group/puppet app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/7 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.15.0-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.15.0-1stretch_i386.deb )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0f8a4e7bbef2a39a6f64cbe7dbab22ff
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.18.0 b/metadata/md5-cache/app-admin/puppet-agent-6.18.0
index 07ea6739cb1d..1cc46283edb5 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.18.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.18.0
@@ -11,5 +11,5 @@ RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-w
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_6.18.0-1focal_amd64.deb
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7e5db47de6d5d3bd56c74478135edec9
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1 b/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
index 5f41e4fbf74c..a36641b1620c 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
@@ -11,5 +11,5 @@ RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-w
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_6.19.1-1focal_amd64.deb
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=367965848c0c3b6c8880f01a4d31a545
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.1.0 b/metadata/md5-cache/app-admin/puppet-agent-7.1.0
new file mode 100644
index 000000000000..8080256be4e9
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.1.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install unpack
+DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet app-admin/augeas
+DESCRIPTION=general puppet client utils along with hiera and facter
+EAPI=7
+HOMEPAGE=https://puppetlabs.com/
+IUSE=puppetdb selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/libxcrypt sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.1.0-1focal_amd64.deb
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ce561f3ce0f151b0c79b5bb150ed1096
diff --git a/metadata/md5-cache/app-admin/puppetdb-7.0.1 b/metadata/md5-cache/app-admin/puppetdb-7.0.1
new file mode 100644
index 000000000000..40a5ad1ce31c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetdb-7.0.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/puppetdb acct-group/puppetdb
+DESCRIPTION=PuppetDB collects data generated by Puppet.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-7.0.1.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4776119ce214f1fe4704f8096506d5ba
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.12.1 b/metadata/md5-cache/app-admin/puppetserver-6.12.1
new file mode 100644
index 000000000000..f7c2de028442
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetserver-6.12.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/puppet acct-group/puppet
+DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
+IUSE=puppetdb
+KEYWORDS=amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.12.1.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ab029b221ad00eb5e1626282b54bd0c3
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.13.0 b/metadata/md5-cache/app-admin/puppetserver-6.13.0
index 6831eff6fee5..7d02ba9d4f20 100644
--- a/metadata/md5-cache/app-admin/puppetserver-6.13.0
+++ b/metadata/md5-cache/app-admin/puppetserver-6.13.0
@@ -5,10 +5,10 @@ DESCRIPTION=Puppet Server is the next-generation application for managing Puppet
 EAPI=7
 HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
 IUSE=puppetdb
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.13.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=877c34d1e198cd2d10b7bd42ea575f3b
+_md5_=ab029b221ad00eb5e1626282b54bd0c3
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.14.0 b/metadata/md5-cache/app-admin/puppetserver-6.14.0
index aaa5e623529d..50cfcb2ce4b2 100644
--- a/metadata/md5-cache/app-admin/puppetserver-6.14.0
+++ b/metadata/md5-cache/app-admin/puppetserver-6.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Puppet Server is the next-generation application for managing Puppet
 EAPI=7
 HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
 IUSE=puppetdb
-KEYWORDS=amd64 x86
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.14.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=877c34d1e198cd2d10b7bd42ea575f3b
+_md5_=ab029b221ad00eb5e1626282b54bd0c3
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.0.1 b/metadata/md5-cache/app-admin/puppetserver-7.0.1
new file mode 100644
index 000000000000..300f49e01103
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetserver-7.0.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/puppet acct-group/puppet
+DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
+IUSE=puppetdb
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-7.0.1.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=699a31c2e6896eb8ddc876208e4734b3
diff --git a/metadata/md5-cache/app-admin/selint-1.1.0 b/metadata/md5-cache/app-admin/selint-1.1.0
index 4df1e797a396..36ea9dced10d 100644
--- a/metadata/md5-cache/app-admin/selint-1.1.0
+++ b/metadata/md5-cache/app-admin/selint-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Policy Analysis Tools for SELinux
 EAPI=7
 HOMEPAGE=https://github.com/TresysTechnology/selint/wiki
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/confuse:= dev-libs/uthash
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TresysTechnology/selint/releases/download/v1.1.0/selint-1.1.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b117de49898ac67a3f8c107b1a7ea539
+_md5_=6d28c9908d278541cce8ac21480b0646
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.4 b/metadata/md5-cache/app-admin/sudo-1.9.4_p1
similarity index 92%
rename from metadata/md5-cache/app-admin/sudo-1.9.4
rename to metadata/md5-cache/app-admin/sudo-1.9.4_p1
index f48c6cb12f49..0aeaf610ee41 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.4
+++ b/metadata/md5-cache/app-admin/sudo-1.9.4_p1
@@ -10,6 +10,6 @@ LICENSE=ISC BSD
 RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.4.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.4.tar.gz
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.4p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.4p1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=062546a59bc897f609ebce9aee4ef435
+_md5_=d02e9c181c1cddd9eb7907e35cdb6f91
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.4_p2 b/metadata/md5-cache/app-admin/sudo-1.9.4_p2
new file mode 100644
index 000000000000..32db57c4ff90
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.9.4_p2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] )
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=7
+HOMEPAGE=https://www.sudo.ws/
+IUSE=gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris
+LICENSE=ISC BSD
+RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
+REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
+SLOT=0
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.4p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.4p2.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d02e9c181c1cddd9eb7907e35cdb6f91
diff --git a/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1 b/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
index ae2f9205f674..81a83fe8b35c 100644
--- a/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
+++ b/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Date-Manip dev-perl/Date-Calc dev-perl/File-Tail dev-perl/TimeDate >=virtual/perl-Time-HiRes-1.12 !app-admin/swatch dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/swatch/swatchdog-3.2.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=afe296f9c4283c547da5473261a1a22a
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 3a1d102ac231..4bcea177e8a9 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/file-roller-3.38.0 b/metadata/md5-cache/app-arch/file-roller-3.38.0
new file mode 100644
index 000000000000..9a31e25a98cf
--- /dev/null
+++ b/metadata/md5-cache/app-arch/file-roller-3.38.0
@@ -0,0 +1,14 @@
+BDEPEND=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=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.22.0:3 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Archive manager for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
+IUSE=libnotify nautilus
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.22.0:3 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/file-roller/3.38/file-roller-3.38.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=383b73aecb66510da80323e31c53e324
diff --git a/metadata/md5-cache/app-arch/libarchive-3.5.0 b/metadata/md5-cache/app-arch/libarchive-3.5.0
index 92496e11dbad..51e17285a736 100644
--- a/metadata/md5-cache/app-arch/libarchive-3.5.0
+++ b/metadata/md5-cache/app-arch/libarchive-3.5.0
@@ -11,4 +11,4 @@ RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 SLOT=0/13
 SRC_URI=https://www.libarchive.org/downloads/libarchive-3.5.0.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1cf07b2edb6e19acaa9c48bbccc73d6b
+_md5_=8b2c6911886386d70c5a38129016b2bb
diff --git a/metadata/md5-cache/app-arch/lz4-1.9.2 b/metadata/md5-cache/app-arch/lz4-1.9.2
deleted file mode 100644
index d90027a20937..000000000000
--- a/metadata/md5-cache/app-arch/lz4-1.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extremely Fast Compression algorithm
-EAPI=7
-HOMEPAGE=https://github.com/lz4/lz4
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2 GPL-2
-SLOT=0/r132
-SRC_URI=https://github.com/lz4/lz4/archive/v1.9.2.tar.gz -> lz4-1.9.2.tar.gz
-_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f0396817faa9b62f093c900daf89d78c
diff --git a/metadata/md5-cache/app-arch/lz4-1.9.3 b/metadata/md5-cache/app-arch/lz4-1.9.3
index edefda8e89b5..61675778be23 100644
--- a/metadata/md5-cache/app-arch/lz4-1.9.3
+++ b/metadata/md5-cache/app-arch/lz4-1.9.3
@@ -4,9 +4,9 @@ DESCRIPTION=Extremely Fast Compression algorithm
 EAPI=7
 HOMEPAGE=https://github.com/lz4/lz4
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-2
 SLOT=0/r132
 SRC_URI=https://github.com/lz4/lz4/archive/v1.9.3.tar.gz -> lz4-1.9.3.tar.gz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=66a1275b9936135f1a88303a1e83da80
+_md5_=8f013e0d904eb403f0e49b0347b92082
diff --git a/metadata/md5-cache/app-arch/makeself-2.2.0-r2 b/metadata/md5-cache/app-arch/makeself-2.2.0-r2
index 15f4b5a433eb..d2668dea26ad 100644
--- a/metadata/md5-cache/app-arch/makeself-2.2.0-r2
+++ b/metadata/md5-cache/app-arch/makeself-2.2.0-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://github.com/megastep/makeself/archive/release-2.2.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=588602b5a4e68bcd8f766613b6088d9d
diff --git a/metadata/md5-cache/app-arch/pax-20161104 b/metadata/md5-cache/app-arch/pax-20161104
index e2a12b3de396..94e21c726c64 100644
--- a/metadata/md5-cache/app-arch/pax-20161104
+++ b/metadata/md5-cache/app-arch/pax-20161104
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libbsd elibc_musl? ( sys-libs/fts-standalone )
 SLOT=0
 SRC_URI=https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-20161104.cpio.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b04bd098ddad95d6604a0ce01c418d50
diff --git a/metadata/md5-cache/app-arch/pixz-1.0.7 b/metadata/md5-cache/app-arch/pixz-1.0.7
index 45fd4282c556..adbb10b8fc17 100644
--- a/metadata/md5-cache/app-arch/pixz-1.0.7
+++ b/metadata/md5-cache/app-arch/pixz-1.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=Parallel Indexed XZ compressor
 EAPI=7
 HOMEPAGE=https://github.com/vasi/pixz
 IUSE=static
-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=BSD-2
 RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
 SLOT=0
 SRC_URI=https://github.com/vasi/pixz/releases/download/v1.0.7/pixz-1.0.7.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=109dc9d9ee65c82f5285264079e31c4f
+_md5_=a498b411f7b59a4d70b8e980f83ca5ab
diff --git a/metadata/md5-cache/app-arch/stormlib-9.23-r1 b/metadata/md5-cache/app-arch/stormlib-9.23-r1
new file mode 100644
index 000000000000..9b9df8e79230
--- /dev/null
+++ b/metadata/md5-cache/app-arch/stormlib-9.23-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/bzip2:= dev-libs/libtomcrypt:=[libtommath] sys-libs/zlib:=
+DESCRIPTION=Library to read and write MPQ archives (Diablo, StarCraft)
+EAPI=7
+HOMEPAGE=http://www.zezula.net/en/mpq/stormlib.html https://github.com/ladislav-zezula/StormLib
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-arch/bzip2:= dev-libs/libtomcrypt:=[libtommath] sys-libs/zlib:=
+SLOT=0
+SRC_URI=https://github.com/ladislav-zezula/StormLib/archive/v9.23.tar.gz -> StormLib-9.23.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=272e8a5e83e32afc66e66c97adc39086
diff --git a/metadata/md5-cache/app-arch/xar-1.8-r4 b/metadata/md5-cache/app-arch/xar-1.8-r4
new file mode 100644
index 000000000000..46f38a5449d8
--- /dev/null
+++ b/metadata/md5-cache/app-arch/xar-1.8-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=elibc_musl? ( sys-libs/fts-standalone ) kernel_linux? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=An easily extensible archive format
+EAPI=7
+HOMEPAGE=https://opensource.apple.com/source/xar/
+IUSE=libressl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=elibc_musl? ( sys-libs/fts-standalone ) kernel_linux? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://opensource.apple.com/tarballs/xar/xar-417.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2b43d7c36469cdc920712abe59585c12
diff --git a/metadata/md5-cache/app-arch/zstd-1.4.5 b/metadata/md5-cache/app-arch/zstd-1.4.5
index 820663590ff6..3ab25b79f89d 100644
--- a/metadata/md5-cache/app-arch/zstd-1.4.5
+++ b/metadata/md5-cache/app-arch/zstd-1.4.5
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=7
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=lz4 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.4.5.tar.gz -> zstd-1.4.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4fb969b17cbf22646a415a914a3e8cdc
+_md5_=09865c4efa463e81bc4a7f4fc5e505eb
diff --git a/metadata/md5-cache/app-arch/zstd-1.4.7 b/metadata/md5-cache/app-arch/zstd-1.4.8
similarity index 92%
rename from metadata/md5-cache/app-arch/zstd-1.4.7
rename to metadata/md5-cache/app-arch/zstd-1.4.8
index 2ade06ec40b2..db899a1cd64f 100644
--- a/metadata/md5-cache/app-arch/zstd-1.4.7
+++ b/metadata/md5-cache/app-arch/zstd-1.4.8
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~s
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.4.7.tar.gz -> zstd-1.4.7.tar.gz
+SRC_URI=https://github.com/facebook/zstd/archive/v1.4.8.tar.gz -> zstd-1.4.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=497cf3c58deb0f269adec52a434fd496
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 989f943b194c..bfdbef73bf8c 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/amanda-3.3.9 b/metadata/md5-cache/app-backup/amanda-3.3.9
index 2e280c49ddfc..48255ec2de03 100644
--- a/metadata/md5-cache/app-backup/amanda-3.3.9
+++ b/metadata/md5-cache/app-backup/amanda-3.3.9
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.3.9.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=498c097f6ef59f994923ec392ab7bcb5
diff --git a/metadata/md5-cache/app-backup/cdbkup-1.0-r2 b/metadata/md5-cache/app-backup/cdbkup-1.0-r2
index 4b41a02903e7..d40c510457fb 100644
--- a/metadata/md5-cache/app-backup/cdbkup-1.0-r2
+++ b/metadata/md5-cache/app-backup/cdbkup-1.0-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=net-misc/openssh virtual/cdrtools virtual/eject
+DEPEND=app-cdr/cdrtools net-misc/openssh virtual/eject
 DESCRIPTION=performs full/incremental backups of local/remote filesystems onto CD-R(W)s
 EAPI=6
 HOMEPAGE=http://cdbkup.sourceforge.net/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=net-misc/openssh virtual/cdrtools virtual/eject !app-misc/cdcat
+RDEPEND=app-cdr/cdrtools net-misc/openssh virtual/eject !app-misc/cdcat
 SLOT=0
 SRC_URI=mirror://sourceforge/cdbkup/cdbkup-1.0.tar.gz
-_md5_=5d6404a4d7695af61a00aa3ce03e0ee7
+_md5_=5ceb7abdb1740d4b47bf7e806fa497d2
diff --git a/metadata/md5-cache/app-backup/rear-2.4 b/metadata/md5-cache/app-backup/rear-2.4
index bcb08b0b56ab..6babaca0a089 100644
--- a/metadata/md5-cache/app-backup/rear-2.4
+++ b/metadata/md5-cache/app-backup/rear-2.4
@@ -5,7 +5,7 @@ HOMEPAGE=http://relax-and-recover.org/
 IUSE=libressl udev samba
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/sed sys-apps/util-linux sys-block/parted sys-boot/syslinux virtual/cdrtools !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) samba? ( net-fs/cifs-utils ) udev? ( virtual/udev )
+RDEPEND=app-cdr/cdrtools net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/sed sys-apps/util-linux sys-block/parted sys-boot/syslinux !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) samba? ( net-fs/cifs-utils ) udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://github.com/rear/rear/archive/2.4.tar.gz -> rear-2.4.tar.gz
-_md5_=d530de456773b61eb131eb9ec1683e4a
+_md5_=acc91a63eafe2e54feb1280660b91980
diff --git a/metadata/md5-cache/app-backup/rear-2.6 b/metadata/md5-cache/app-backup/rear-2.6
index a0487d2842cd..62c6d54698ee 100644
--- a/metadata/md5-cache/app-backup/rear-2.6
+++ b/metadata/md5-cache/app-backup/rear-2.6
@@ -6,8 +6,8 @@ HOMEPAGE=http://relax-and-recover.org/ https://github.com/rear/rear/
 IUSE=udev
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
-RDEPEND=app-shells/bash net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/sed sys-apps/util-linux sys-block/parted sys-boot/syslinux virtual/cdrtools udev? ( virtual/udev )
+RDEPEND=app-cdr/cdrtools app-shells/bash net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/sed sys-apps/util-linux sys-block/parted sys-boot/syslinux udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://github.com/rear/rear/archive/2.6.tar.gz -> rear-2.6.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=f3ba11138f2939905eecf38108d382cc
+_md5_=466ecf361e40a452fa5d3fd9517015ac
diff --git a/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1 b/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
index 2085d8e4cada..fb0ec3db303c 100644
--- a/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
+++ b/metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/mit-krb5[keyutils] media-libs/libpng-compat:1.2 dbus? ( sys-ap
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( https://spideroak.com/release/spideroak/deb_x86 -> spideroak-bin-7.5.0_x86.deb ) amd64? ( https://spideroak.com/release/spideroak/deb_x64 -> spideroak-bin-7.5.0_amd64.deb )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8f8e5d233b8c29f2c409b247892a4970
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 6dca1e14a855..4539f9c13542 100644
Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ
diff --git a/metadata/md5-cache/app-cdr/bashburn-3.1.0-r1 b/metadata/md5-cache/app-cdr/bashburn-3.1.0-r1
index d78ecdb758f8..c69d80a255d8 100644
--- a/metadata/md5-cache/app-cdr/bashburn-3.1.0-r1
+++ b/metadata/md5-cache/app-cdr/bashburn-3.1.0-r1
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=http://bashburn.dose.se/ https://gitlab.com/anders.linden/BashBurn
 KEYWORDS=amd64 ppc ~ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=app-shells/bash app-cdr/cdrdao app-cdr/dvd+rw-tools media-libs/flac || ( dev-libs/libcdio-paranoia media-sound/cdparanoia ) media-sound/lame || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/normalize media-sound/vorbis-tools virtual/cdrtools virtual/eject
+RDEPEND=app-cdr/cdrtools app-shells/bash app-cdr/cdrdao app-cdr/dvd+rw-tools media-libs/flac || ( dev-libs/libcdio-paranoia media-sound/cdparanoia ) media-sound/lame || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/normalize media-sound/vorbis-tools virtual/eject
 SLOT=0
 SRC_URI=http://bashburn.dose.se/index.php?s=file_download&id=25 -> BashBurn-3.1.0.tar.gz
-_md5_=9f588d8e6ff48bb28f20c03a757bff29
+_md5_=cb54aaa637fdba65a5308b33ea739d5e
diff --git a/metadata/md5-cache/app-cdr/brasero-3.12.2-r1 b/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
index af09d8f4304b..da06dbc1070d 100644
--- a/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
+++ b/metadata/md5-cache/app-cdr/brasero-3.12.2-r1
@@ -7,9 +7,9 @@ IUSE=+css +introspection +libburn mp3 nautilus packagekit playlist test tracker
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
 PDEPEND=gnome-base/gvfs
-RDEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( >=app-misc/tracker-1:0= ) media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0[mp3?] x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) !libburn? ( app-cdr/cdrdao app-cdr/dvd+rw-tools virtual/cdrtools ) packagekit? ( app-admin/packagekit-base )
+RDEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( >=app-misc/tracker-1:0= ) media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0[mp3?] x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) !libburn? ( app-cdr/cdrdao app-cdr/cdrtools app-cdr/dvd+rw-tools ) packagekit? ( app-admin/packagekit-base )
 RESTRICT=!test? ( test )
 SLOT=0/3.1
 SRC_URI=mirror://gnome/sources/brasero/3.12/brasero-3.12.2.tar.xz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b05165c3a7228f4db3b15877649f9ae8
+_md5_=70080859fdfce1db0e5c05eb1691d15e
diff --git a/metadata/md5-cache/app-cdr/burncdda-1.8.3 b/metadata/md5-cache/app-cdr/burncdda-1.8.3
index 4aebe1f636b2..e91166cc1292 100644
--- a/metadata/md5-cache/app-cdr/burncdda-1.8.3
+++ b/metadata/md5-cache/app-cdr/burncdda-1.8.3
@@ -5,7 +5,7 @@ HOMEPAGE=http://burncdda.sourceforge.net/
 IUSE=flac mp3 vorbis
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=app-cdr/cdrdao dev-util/dialog media-sound/normalize media-sound/sox virtual/cdrtools flac? ( media-libs/flac ) mp3? ( media-sound/mpg123 media-sound/mp3_check ) vorbis? ( media-sound/vorbis-tools )
+RDEPEND=app-cdr/cdrdao app-cdr/cdrtools dev-util/dialog media-sound/normalize media-sound/sox flac? ( media-libs/flac ) mp3? ( media-sound/mpg123 media-sound/mp3_check ) vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/burncdda/burncdda-1.8.3.tar.gz
-_md5_=adaf55034dc0352c06983bdc1a076b59
+_md5_=73466a072822ccbc2d9238f3c0d86211
diff --git a/metadata/md5-cache/app-cdr/cdrdao-1.2.4 b/metadata/md5-cache/app-cdr/cdrdao-1.2.4
index ebcd3f33e3bd..e0e456be06d3 100644
--- a/metadata/md5-cache/app-cdr/cdrdao-1.2.4
+++ b/metadata/md5-cache/app-cdr/cdrdao-1.2.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure prepare
-DEPEND=virtual/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) 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=app-cdr/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) 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=Burn CDs in disk-at-once mode -- with optional GUI frontend
 EAPI=6
 HOMEPAGE=http://cdrdao.sourceforge.net/
 IUSE=encode mad vorbis
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=virtual/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) !app-cdr/cue2toc !dev-util/pccts
+RDEPEND=app-cdr/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) !app-cdr/cue2toc !dev-util/pccts
 SLOT=0
 SRC_URI=mirror://sourceforge/cdrdao/cdrdao-1.2.4.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9883404330b68f2c9fc6a62b811ca7b4
+_md5_=ba790237276439fe0d6340b4c2a2e9e1
diff --git a/metadata/md5-cache/app-cdr/cdw-0.8.1 b/metadata/md5-cache/app-cdr/cdw-0.8.1
index 8a6c005fc11c..62fa047d8a6b 100644
--- a/metadata/md5-cache/app-cdr/cdw-0.8.1
+++ b/metadata/md5-cache/app-cdr/cdw-0.8.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses:*[unicode] virtual/pkgconfig
+DEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses:*[unicode] virtual/pkgconfig
 DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
 EAPI=6
 HOMEPAGE=http://cdw.sourceforge.net
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
-RDEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses:*[unicode]
+RDEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses:*[unicode]
 SLOT=0
 SRC_URI=mirror://sourceforge/cdw/cdw-0.8.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1d8c3ac244d148aa0ab89c50d75418cf
+_md5_=5b920159d24949c35a66d04a10999a1d
diff --git a/metadata/md5-cache/app-cdr/cdw-0.8.1-r1 b/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
index 777d896fa21d..03cb153563ef 100644
--- a/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
+++ b/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
@@ -1,13 +1,13 @@
 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=configure prepare
-DEPEND=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
+DEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode]
 DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
 EAPI=7
 HOMEPAGE=http://cdw.sourceforge.net
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2+
-RDEPEND=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
+RDEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode]
 SLOT=0
 SRC_URI=mirror://sourceforge/cdw/cdw-0.8.1.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ea7a3725bf565167fd2b8a14ac754f2e
+_md5_=7220fc47fafad3be9fab740c5ddb2bc1
diff --git a/metadata/md5-cache/app-cdr/cdw-9999 b/metadata/md5-cache/app-cdr/cdw-9999
index 569ab35ba200..e6a253ff1f2e 100644
--- a/metadata/md5-cache/app-cdr/cdw-9999
+++ b/metadata/md5-cache/app-cdr/cdw-9999
@@ -1,12 +1,12 @@
 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 dev-vcs/cvs
 DEFINED_PHASES=configure prepare unpack
-DEPEND=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
+DEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode]
 DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
 EAPI=7
 HOMEPAGE=http://cdw.sourceforge.net
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
+RDEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode]
 SLOT=0
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	cvs	bda24999586324ba1c7266a9b89622fd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1f1d2d03bc17e383003f1288b73db7da
+_md5_=a5a0c7ac314bbbc17574262cdad70363
diff --git a/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3 b/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
index ad6a0c44bb28..a194dd7b82a6 100644
--- a/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
+++ b/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=virtual/cdrtools sys-devel/m4
+DEPEND=app-cdr/cdrtools sys-devel/m4
 DESCRIPTION=A set of tools for DVD+RW/-RW drives
 EAPI=6
 HOMEPAGE=http://fy.chalmers.se/~appro/linux/DVD+RW/
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=virtual/cdrtools
+RDEPEND=app-cdr/cdrtools
 SLOT=0
 SRC_URI=http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c8af1e9de84332d7fd1374e2e8f39290
+_md5_=e13e392925de92fafe02151753e4465e
diff --git a/metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10 b/metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10
index 5b8f9f36d46b..e25048ab2311 100644
--- a/metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10
+++ b/metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10
@@ -5,8 +5,8 @@ HOMEPAGE=http://dvdshrink.sourceforge.net
 IUSE=gtk
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/transcode-1.0.2-r2[dvd] >=media-video/mjpegtools-1.8.0-r1 >=media-video/subtitleripper-0.3.4-r1 >=media-video/dvdauthor-0.6.11 >=app-cdr/dvd+rw-tools-6.1 gtk? ( >=dev-perl/Gtk2-1.104 ) >=app-text/gocr-0.40 virtual/cdrtools
+RDEPEND=app-cdr/cdrtools >=app-cdr/dvd+rw-tools-6.1 >=app-text/gocr-0.40 >=media-video/dvdauthor-0.6.11 >=media-video/mjpegtools-1.8.0-r1 >=media-video/subtitleripper-0.3.4-r1 >=media-video/transcode-1.0.2-r2[dvd] gtk? ( >=dev-perl/Gtk2-1.104 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dvdshrink/dvdshrink-2.6.1-10mdk.tar.gz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a
-_md5_=2503233608104cefe437e36d1fdd2680
+_md5_=1fa864303735d65bd84cc666cdc9cae5
diff --git a/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2 b/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
index 980838824fd8..68b4fa3e5622 100644
--- a/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
+++ b/metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-cdr/cdrdao >=dev-libs/glib-2.4:2 >=gnome-base/libglade-2.4:2.0 media-libs/libmng:= virtual/cdrtools x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 dvdr? ( app-cdr/dvd+rw-tools ) flac? ( media-libs/flac ) mp3? ( media-libs/libid3tag media-libs/libmad media-sound/sox ) nls? ( virtual/libintl ) vorbis? ( media-libs/libogg media-libs/libvorbis media-sound/sox ) dev-util/intltool virtual/pkgconfig 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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-cdr/cdrdao app-cdr/cdrtools >=dev-libs/glib-2.4:2 >=gnome-base/libglade-2.4:2.0 media-libs/libmng:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 dvdr? ( app-cdr/dvd+rw-tools ) flac? ( media-libs/flac ) mp3? ( media-libs/libid3tag media-libs/libmad media-sound/sox ) nls? ( virtual/libintl ) vorbis? ( media-libs/libogg media-libs/libvorbis media-sound/sox ) dev-util/intltool virtual/pkgconfig 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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2
 EAPI=6
 HOMEPAGE=http://graveman.tuxfamily.org/
 IUSE=debug dvdr flac mp3 nls vorbis
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=app-cdr/cdrdao >=dev-libs/glib-2.4:2 >=gnome-base/libglade-2.4:2.0 media-libs/libmng:= virtual/cdrtools x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 dvdr? ( app-cdr/dvd+rw-tools ) flac? ( media-libs/flac ) mp3? ( media-libs/libid3tag media-libs/libmad media-sound/sox ) nls? ( virtual/libintl ) vorbis? ( media-libs/libogg media-libs/libvorbis media-sound/sox )
+RDEPEND=app-cdr/cdrdao app-cdr/cdrtools >=dev-libs/glib-2.4:2 >=gnome-base/libglade-2.4:2.0 media-libs/libmng:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 dvdr? ( app-cdr/dvd+rw-tools ) flac? ( media-libs/flac ) mp3? ( media-libs/libid3tag media-libs/libmad media-sound/sox ) nls? ( virtual/libintl ) vorbis? ( media-libs/libogg media-libs/libvorbis media-sound/sox )
 SLOT=0
 SRC_URI=http://graveman.tuxfamily.org/sources/graveman-0.3.12-5.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9602a60b7b915f50c093bbea031ae09a
+_md5_=1b314d8a5b2766a1fe93902e99771b66
diff --git a/metadata/md5-cache/app-cdr/mp3burn-0.4.2 b/metadata/md5-cache/app-cdr/mp3burn-0.4.2
index d67c202fa2cb..5c9bdb6f9139 100644
--- a/metadata/md5-cache/app-cdr/mp3burn-0.4.2
+++ b/metadata/md5-cache/app-cdr/mp3burn-0.4.2
@@ -5,8 +5,8 @@ EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/mp3burn
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl media-sound/mpg123 media-libs/flac media-sound/vorbis-tools virtual/cdrtools dev-perl/MP3-Info dev-perl/Ogg-Vorbis-Header dev-perl/String-ShellQuote
+RDEPEND=dev-lang/perl app-cdr/cdrtools media-sound/mpg123 media-libs/flac media-sound/vorbis-tools dev-perl/MP3-Info dev-perl/Ogg-Vorbis-Header dev-perl/String-ShellQuote
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3burn/mp3burn-0.4.2.tar.gz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0e1f9c67cf4394ef53dab8f8c30f3482
+_md5_=8b0dee5ebc3f92998dace5b521aff31f
diff --git a/metadata/md5-cache/app-cdr/multicd-1.7.5-r1 b/metadata/md5-cache/app-cdr/multicd-1.7.5-r1
index fd65df28e0a6..66104501c95d 100644
--- a/metadata/md5-cache/app-cdr/multicd-1.7.5-r1
+++ b/metadata/md5-cache/app-cdr/multicd-1.7.5-r1
@@ -4,7 +4,7 @@ EAPI=6
 HOMEPAGE=http://danborn.net/multicd/
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.8.6 virtual/cdrtools
+RDEPEND=app-cdr/cdrtools >=dev-lang/perl-5.8.6
 SLOT=0
 SRC_URI=http://danborn.net/multicd/multicd-1.7.5.tar.gz
-_md5_=18c650fc3086fa7e78654081847528da
+_md5_=a32c25436484575ed795689b68e6968a
diff --git a/metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1 b/metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1
index 6a7d26eaeb15..de1ef8cc0ed3 100644
--- a/metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1
+++ b/metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1
@@ -4,8 +4,8 @@ EAPI=5
 HOMEPAGE=http://regis.damongeot.free.fr/tkdvd/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=app-cdr/dvd+rw-tools dev-lang/tcl:0 dev-lang/tk:0 virtual/cdrtools
+RDEPEND=app-cdr/cdrtools app-cdr/dvd+rw-tools dev-lang/tcl:0 dev-lang/tk:0
 SLOT=0
 SRC_URI=http://regis.damongeot.free.fr/tkdvd/dl/tkdvd-4.0.9.tar.gz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e3967c8021df6cca126114255f154ffc
+_md5_=584c2ccad994765a2906472218a352b7
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 352a8ffa1f10..adfff53d5ccf 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/debian-archive-keyring-2018.1 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2018.1
index cce555b12e91..ee28e2875e50 100644
--- a/metadata/md5-cache/app-crypt/debian-archive-keyring-2018.1
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2018.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2018.1_all.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=d82f4f8942ddaa5c91284ddb599cc5e5
diff --git a/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1
index e7e0cf70ac78..d4f518ad8935 100644
--- a/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2019.1_all.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=58dd817cc06301c302bc95e8296693f6
diff --git a/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1
index 5104abd7108a..cb25571c8f6d 100644
--- a/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2019.1_all.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=539c5b462329635e1792047a55afe2bf
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.0 b/metadata/md5-cache/app-crypt/libmd-1.0.0
deleted file mode 100644
index 82c212338fc7..000000000000
--- a/metadata/md5-cache/app-crypt/libmd-1.0.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Message Digest functions from BSD systems
-EAPI=6
-HOMEPAGE=https://www.hadrons.org/software/libmd/
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
-SLOT=0
-SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.0.tar.xz
-_md5_=ae239665f4e53ba2002161352bdc238f
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.0-r1 b/metadata/md5-cache/app-crypt/libmd-1.0.0-r1
deleted file mode 100644
index 8f40f6d28d45..000000000000
--- a/metadata/md5-cache/app-crypt/libmd-1.0.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Message Digest functions from BSD systems
-EAPI=6
-HOMEPAGE=https://www.hadrons.org/software/libmd/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
-SLOT=0
-SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.0.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8b2b2550c7321c665fbc20de5324b9fc
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.1 b/metadata/md5-cache/app-crypt/libmd-1.0.1
index 57b6034343cf..e7b6af3094ed 100644
--- a/metadata/md5-cache/app-crypt/libmd-1.0.1
+++ b/metadata/md5-cache/app-crypt/libmd-1.0.1
@@ -3,9 +3,9 @@ DESCRIPTION=Message Digest functions from BSD systems
 EAPI=6
 HOMEPAGE=https://www.hadrons.org/software/libmd/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
 SLOT=0
 SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.1.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=02390bab956dcf873c28abfa9ec6f9fe
+_md5_=76d0bae38387fa567a0c4b64460d8623
diff --git a/metadata/md5-cache/app-crypt/rhash-1.4.0 b/metadata/md5-cache/app-crypt/rhash-1.4.0
index c93619fa6ec7..aa9fe4a484d5 100644
--- a/metadata/md5-cache/app-crypt/rhash-1.4.0
+++ b/metadata/md5-cache/app-crypt/rhash-1.4.0
@@ -11,4 +11,4 @@ RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,ab
 SLOT=0
 SRC_URI=mirror://sourceforge/rhash/rhash-1.4.0-src.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2cd2cfa44cad7a7df644e6d4ab5f384b
+_md5_=1bb8de325b23c6bc7fb69e9a8e340efa
diff --git a/metadata/md5-cache/app-crypt/signify-30 b/metadata/md5-cache/app-crypt/signify-30
index 85225a93b025..5934c6e101ae 100644
--- a/metadata/md5-cache/app-crypt/signify-30
+++ b/metadata/md5-cache/app-crypt/signify-30
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libbsd-0.7
 DESCRIPTION=Cryptographically sign and verify files
 EAPI=7
 HOMEPAGE=http://www.openbsd.org/ https://github.com/aperezdc/signify
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD-1
 RDEPEND=>=dev-libs/libbsd-0.7
 SLOT=0
 SRC_URI=https://github.com/aperezdc/signify/archive/v30.tar.gz -> signify-30.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1fcf07b226b7262c1493cf73a5aec507
+_md5_=43f0389cb4764623ed26ea319a67b0c0
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 5abbae84a8f3..0cf04d7022a9 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/dictd-wn-3.0_p33 b/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
index 8130d3f7e553..d2a17c78dcd1 100644
--- a/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
+++ b/metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=Princeton
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/wordnet/dict-wn_3.0-33_all.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=247b7e277af3b96a1f943cde15d42e5f
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 9df97c26cf29..8dcd664dbf3f 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/NaturalDocs-1.52-r1 b/metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
index 6319620836d9..291a11a63635 100644
--- a/metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
+++ b/metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/naturaldocs/NaturalDocs-1.52.zip
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dff8050f040a0c3ff4661d1f3922439e
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 9be168e1e5e9..95045d740a26 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/moe-1.10 b/metadata/md5-cache/app-editors/moe-1.10
index a4df83310b2b..f1c096235fad 100644
--- a/metadata/md5-cache/app-editors/moe-1.10
+++ b/metadata/md5-cache/app-editors/moe-1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gnu/moe/moe-1.10.tar.lz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=dc29d46c2c60c29238cf7319fad92bbc
diff --git a/metadata/md5-cache/app-editors/moe-1.9 b/metadata/md5-cache/app-editors/moe-1.9
index 98f6e7dab8d0..22ccc6423662 100644
--- a/metadata/md5-cache/app-editors/moe-1.9
+++ b/metadata/md5-cache/app-editors/moe-1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gnu/moe/moe-1.9.tar.lz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=661cef3a72d6b1aa18608f54ad40360a
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index ede893d931be..eccee0005550 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/crossover-bin-19.0.1-r1 b/metadata/md5-cache/app-emulation/crossover-bin-19.0.1-r1
index e3d4353a51cc..8f3a7af6ca91 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-19.0.1-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-19.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-19.0.1.bin
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=673d7f2e7c14276b69b1fbd0e2cf0e72
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.13 b/metadata/md5-cache/app-emulation/libguestfs-1.36.13
index b99304088b86..249d0839463e 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.13
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.36.13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) >=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=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) >=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=Tools for accessing, inspect and modifying virtual machine (VM) disk images
 EAPI=6
 HOMEPAGE=http://libguestfs.org/
 IUSE=bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0/1.36
 SRC_URI=http://libguestfs.org/download/1.36-stable/libguestfs-1.36.13.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6ccaf5af40b5d4376735aff8a07a27eb
+_md5_=1c8bd1bc04a39345590f13a83932d6e8
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.15 b/metadata/md5-cache/app-emulation/libguestfs-1.36.15
index 432525336f96..ba330cde3747 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.15
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.36.15
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=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=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=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=Tools for accessing, inspect and modifying virtual machine (VM) disk images
 EAPI=6
 HOMEPAGE=http://libguestfs.org/
 IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0/1.36
 SRC_URI=http://libguestfs.org/download/1.36-stable/libguestfs-1.36.15.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d02f3fe64b337b14500f78db960a12d
+_md5_=64b6bf06370ca3ea85b81624f28b0ce9
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.38.6 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6
index 40a43bdf3295..a38f11ca69b4 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.38.6
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.38.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=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=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=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=Tools for accessing, inspect and modifying virtual machine (VM) disk images
 EAPI=6
 HOMEPAGE=http://libguestfs.org/
 IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:0= ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0/1.38
 SRC_URI=http://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a8e14ab676bcb3a3ab68bf7a3a15c05
+_md5_=dfb036784f3aa575580dda3e80ce82ce
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r100 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r100
index 7d2eac08f753..172269d019f1 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r100
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r100
@@ -1,16 +1,16 @@
 BDEPEND=lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=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 prepare setup
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) )
+DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) )
 DESCRIPTION=Tools for accessing, inspect and modifying virtual machine (VM) disk images
 EAPI=7
 HOMEPAGE=https://libguestfs.org/
 IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux +lua_single_target_lua5-1 +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= app-cdr/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0/1.38
 SRC_URI=https://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67a7dad2e267ef18537b4d13dd20882e
+_md5_=56b8168778c6159b7eb7a950db8be3b3
diff --git a/metadata/md5-cache/app-emulation/qemu-riscv64-bin-3.1.0-r4 b/metadata/md5-cache/app-emulation/qemu-riscv64-bin-3.1.0-r4
deleted file mode 100644
index 09989b0f7e5f..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-riscv64-bin-3.1.0-r4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Statically linked x86-64 binary of app-emulation/qemu, riscv64 emulator
-EAPI=7
-HOMEPAGE=http://www.qemu.org
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!app-emulation/qemu[qemu_user_targets_riscv64]
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/qemu-riscv64-bin-3.1.0-r4.tar.xz
-_md5_=661e9c1aa3735c7bffc016e1794bccee
diff --git a/metadata/md5-cache/app-emulation/xen-4.13.2-r3 b/metadata/md5-cache/app-emulation/xen-4.13.2-r3
new file mode 100644
index 000000000000..2f7b44bbb3e7
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.13.2-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.13.2
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.13.2/xen-4.13.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.13.2-upstream-patches-2.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.13.2-upstream-patches-2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=50c7794da8200bdebc4eaeecbf174288
diff --git a/metadata/md5-cache/app-emulation/xen-4.14.0-r6 b/metadata/md5-cache/app-emulation/xen-4.14.0-r7
similarity index 87%
rename from metadata/md5-cache/app-emulation/xen-4.14.0-r6
rename to metadata/md5-cache/app-emulation/xen-4.14.0-r7
index a4cdd03a268a..35db4abb9bb0 100644
--- a/metadata/md5-cache/app-emulation/xen-4.14.0-r6
+++ b/metadata/md5-cache/app-emulation/xen-4.14.0-r7
@@ -10,6 +10,6 @@ PDEPEND=~app-emulation/xen-tools-4.14.0
 REQUIRED_USE=arm? ( debug )
 RESTRICT=test splitdebug strip
 SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.14.0-upstream-patches-5.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.0-upstream-patches-5.tar.xz
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.14.0-upstream-patches-6.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.0-upstream-patches-6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3777cef0113f17ea6e85e6e1b2c613b8
+_md5_=548c6daba8a377ee1d951f42dfd454b6
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.13.2-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.13.2-r2
new file mode 100644
index 000000000000..9ae94127a303
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.13.2-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=sys-kernel/linux-headers-4.11 python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] pam? ( dev-python/pypam[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] pam? ( dev-python/pypam[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] pam? ( dev-python/pypam[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] pam? ( dev-python/pypam[python_targets_python3_9(-)] ) ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_6? ( dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) python? ( >=dev-lang/swig-4.0.0 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.13
+SRC_URI=https://downloads.xenproject.org/release/xen/4.13.2/xen-4.13.2.tar.gz https://github.com/qemu/seabios/archive/rel-1.12.1.tar.gz -> seabios-1.12.1.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.13.2-upstream-patches-2.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.13.2-upstream-patches-2.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-security-patches-29.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-security-patches-29.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-21.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-21.tar.xz
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=497e6312cf95fd2ff1eadf65eabe2d5a
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r4 b/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r5
similarity index 97%
rename from metadata/md5-cache/app-emulation/xen-tools-4.14.0-r4
rename to metadata/md5-cache/app-emulation/xen-tools-4.14.0-r5
index db12a06697cc..91ff028003b5 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r4
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r5
@@ -10,6 +10,6 @@ RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
 RESTRICT=test
 SLOT=0/4.14
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz https://github.com/qemu/seabios/archive/rel-1.13.0.tar.gz -> seabios-1.13.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.14.0-upstream-patches-4.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.0-upstream-patches-4.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-security-patches-28.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-security-patches-28.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-22.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-22.tar.xz
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz https://github.com/qemu/seabios/archive/rel-1.13.0.tar.gz -> seabios-1.13.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/06dc822d045c2bb42e497487935485302486e151.tar.gz -> edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1g.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.14.0-upstream-patches-6.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.0-upstream-patches-6.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-security-patches-28.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-security-patches-28.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-22.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-22.tar.xz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=897a8ab28f7e5384e78033645e7219ea
+_md5_=250f20fb386eff1441e2e2b9a88045d5
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index e0f9ebf04cbb..22c8bbd30bb1 100644
Binary files a/metadata/md5-cache/app-forensics/Manifest.gz and b/metadata/md5-cache/app-forensics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-forensics/quickfuzz-0.1_p20160920 b/metadata/md5-cache/app-forensics/quickfuzz-0.1_p20160920
index 2c92feea4cc7..c46d2d181a2e 100644
--- a/metadata/md5-cache/app-forensics/quickfuzz-0.1_p20160920
+++ b/metadata/md5-cache/app-forensics/quickfuzz-0.1_p20160920
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-haskell/abstract-par:= dev-haskell/argparser:= dev-haskell/derive:= dev-haskell/linear:= dev-haskell/monad-par:= dev-haskell/mtl:= dev-haskell/parallel-io:= dev-haskell/primitive:= dev-haskell/process-extras:= dev-haskell/quickcheck:2= dev-haskell/quickcheck-unicode:= dev-haskell/random:= dev-haskell/split:= dev-haskell/text:= dev-haskell/vector:= dev-haskell/wl-pprint:= >=dev-lang/ghc-7.8.2:= archs? ( dev-haskell/base16-bytestring:= >=dev-haskell/tar-0.5:= dev-haskell/zip-archive:= ) !archs? ( net? ( dev-haskell/base16-bytestring:= ) ) codes? ( dev-haskell/haxml:= dev-haskell/json:= dev-haskell/language-bash:= dev-haskell/language-css:= dev-haskell/language-dot:= dev-haskell/language-ecmascript:= dev-haskell/language-glsl:= dev-haskell/language-lua:= dev-haskell/language-python:= dev-haskell/shell-escape:= dev-haskell/uniplate:= ) docs? ( app-text/pandoc:= dev-haskell/data-default:= dev-haskell/hcg-minus:= dev-haskell/hps:= dev-haskell/icalendar:= dev-haskell/pandoc-types:= ) imgs? ( dev-haskell/ac-ppm:= dev-haskell/memory:= dev-haskell/attoparsec:= dev-haskell/lens:= dev-haskell/scientific:= dev-haskell/thyme:= dev-haskell/xml:= >=dev-haskell/zlib-0.6:= ) !imgs? ( archs? ( >=dev-haskell/zlib-0.6:= ) ) media? ( dev-haskell/hcodecs:= dev-haskell/hunit:= dev-haskell/mtl:= dev-haskell/old-locale:= dev-haskell/random:= dev-haskell/idiii:= dev-haskell/bitwise:= dev-haskell/monad-loops:= dev-haskell/mtl:= dev-haskell/wavy:= ) net? ( dev-haskell/concurrent-extra:= dev-haskell/dns:= dev-haskell/http:= dev-haskell/iproute:= dev-haskell/network:= dev-haskell/network-uri:= dev-haskell/unbounded-delays:= ) pki? ( dev-haskell/hourglass:= dev-haskell/asn1-types:= dev-haskell/asn1-parse:= dev-haskell/cryptonite:= dev-haskell/hourglass:= dev-haskell/memory:= )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/quickfuzz-0.1_p20160920.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d31ef5ca50af38fe5f8249703ec5f312
diff --git a/metadata/md5-cache/app-forensics/quickfuzz-9999 b/metadata/md5-cache/app-forensics/quickfuzz-9999
index 3ad4e17ec427..2e64a5b3f531 100644
--- a/metadata/md5-cache/app-forensics/quickfuzz-9999
+++ b/metadata/md5-cache/app-forensics/quickfuzz-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-haskell/abstract-par:= dev-haskell/argparser:= dev-haskell/derive:= dev-haskell/linear:= dev-haskell/monad-par:= dev-haskell/mtl:= dev-haskell/parallel-io:= dev-haskell/primitive:= dev-haskell/process-extras:= dev-haskell/quickcheck:2= dev-haskell/quickcheck-unicode:= dev-haskell/random:= dev-haskell/split:= dev-haskell/text:= dev-haskell/vector:= dev-haskell/wl-pprint:= >=dev-lang/ghc-7.8.2:= archs? ( dev-haskell/base16-bytestring:= >=dev-haskell/tar-0.5:= dev-haskell/zip-archive:= ) !archs? ( net? ( dev-haskell/base16-bytestring:= ) ) codes? ( dev-haskell/haxml:= dev-haskell/json:= dev-haskell/language-bash:= dev-haskell/language-css:= dev-haskell/language-dot:= dev-haskell/language-ecmascript:= dev-haskell/language-glsl:= dev-haskell/language-lua:= dev-haskell/language-python:= dev-haskell/shell-escape:= dev-haskell/uniplate:= ) docs? ( app-text/pandoc:= dev-haskell/data-default:= dev-haskell/hcg-minus:= dev-haskell/hps:= dev-haskell/icalendar:= dev-haskell/pandoc-types:= ) imgs? ( dev-haskell/ac-ppm:= dev-haskell/memory:= dev-haskell/attoparsec:= dev-haskell/lens:= dev-haskell/scientific:= dev-haskell/thyme:= dev-haskell/xml:= >=dev-haskell/zlib-0.6:= ) !imgs? ( archs? ( >=dev-haskell/zlib-0.6:= ) ) media? ( dev-haskell/hcodecs:= dev-haskell/hunit:= dev-haskell/mtl:= dev-haskell/old-locale:= dev-haskell/random:= dev-haskell/idiii:= dev-haskell/bitwise:= dev-haskell/monad-loops:= dev-haskell/mtl:= dev-haskell/wavy:= ) net? ( dev-haskell/concurrent-extra:= dev-haskell/dns:= dev-haskell/http:= dev-haskell/iproute:= dev-haskell/network:= dev-haskell/network-uri:= dev-haskell/unbounded-delays:= ) pki? ( dev-haskell/hourglass:= dev-haskell/asn1-types:= dev-haskell/asn1-parse:= dev-haskell/cryptonite:= dev-haskell/hourglass:= dev-haskell/memory:= )
 SLOT=0
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	git-r3	3e7ec3d6619213460c85e2aa48398441	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	git-r3	3e7ec3d6619213460c85e2aa48398441	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=91d18d130ef2cb304705ff6bd4aa58ea
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index afac351e6b38..cd103c404f3f 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-typing-booster-2.10.1 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.1
index 3637552931bf..78232433ab53 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.1
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.1
@@ -5,7 +5,7 @@ DESCRIPTION=Completion input method for IBus
 EAPI=7
 HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) >=dev-db/m17n-db-1.7
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.10.1/ibus-typing-booster-2.10.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b324c564bd840dc2c47b73b1768e052
+_md5_=d25e5b76d6c8b3a0610941e40173e70c
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.2 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.2
new file mode 100644
index 000000000000..39c2ddff510a
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Completion input method for IBus
+EAPI=7
+HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) >=dev-db/m17n-db-1.7
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.10.2/ibus-typing-booster-2.10.2.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d6906b786f40809c7aac148026cda25c
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.7 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.7
deleted file mode 100644
index 7680d4f0fb30..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Completion input method for IBus
-EAPI=7
-HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) >=dev-db/m17n-db-1.7
-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.9.7/ibus-typing-booster-2.9.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d25e5b76d6c8b3a0610941e40173e70c
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 855000969fe7..62257a33be32 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/beancounter-0.8.10-r1 b/metadata/md5-cache/app-misc/beancounter-0.8.10-r1
index c9875f03c2d2..fb74d2a40ff1 100644
--- a/metadata/md5-cache/app-misc/beancounter-0.8.10-r1
+++ b/metadata/md5-cache/app-misc/beancounter-0.8.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Date-Manip dev-perl/Statistics-Descriptive dev-perl/Finance-YahooQuote dev-perl/libwww-perl mysql? ( dev-perl/DBD-mysql ) sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) dev-perl/DBI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://eddelbuettel.com/dirk/code/beancounter/beancounter_0.8.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=93e01a44c03ac03769c4e3acd30f8eb0
diff --git a/metadata/md5-cache/app-misc/cdcat-0.3-r1 b/metadata/md5-cache/app-misc/cdcat-0.3-r1
index baa96fbc909c..a5d5390e92cd 100644
--- a/metadata/md5-cache/app-misc/cdcat-0.3-r1
+++ b/metadata/md5-cache/app-misc/cdcat-0.3-r1
@@ -4,7 +4,7 @@ EAPI=7
 HOMEPAGE=http://cdcatalog.sourceforge.net/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=virtual/cdrtools !app-backup/cdbkup
+RDEPEND=app-cdr/cdrtools !app-backup/cdbkup
 SLOT=0
 SRC_URI=mirror://sourceforge/cdcatalog/cdcat-0.3.tar.gz
-_md5_=071e2a6133996b603a030aae66d93dac
+_md5_=c492a377f145370668a9d2c0a3c489e7
diff --git a/metadata/md5-cache/app-misc/conmux-0.15.1-r3 b/metadata/md5-cache/app-misc/conmux-0.15.1-r3
index f2dd2f23ee1c..d145ce4304de 100644
--- a/metadata/md5-cache/app-misc/conmux-0.15.1-r3
+++ b/metadata/md5-cache/app-misc/conmux-0.15.1-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/IO-Multiplex dev-perl/URI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/conmux-0.15.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8280378113f25868b549af4eec4dc06a
diff --git a/metadata/md5-cache/app-misc/flirc-3.22.4 b/metadata/md5-cache/app-misc/flirc-3.22.4
index 2b982a43a6f2..743359ddfad9 100644
--- a/metadata/md5-cache/app-misc/flirc-3.22.4
+++ b/metadata/md5-cache/app-misc/flirc-3.22.4
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 d
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.22.4-amd64 -> flirc-3.22.4_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.22.4-armhf -> flirc-3.22.4_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.22.4-i386 -> flirc-3.22.4_x86.deb )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=afb9a76ecd44a8d387d55d390d214b15
diff --git a/metadata/md5-cache/app-misc/flirc-3.24.0 b/metadata/md5-cache/app-misc/flirc-3.24.0
index 8f150d92187c..7a49da1b1f3f 100644
--- a/metadata/md5-cache/app-misc/flirc-3.24.0
+++ b/metadata/md5-cache/app-misc/flirc-3.24.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 d
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.24.0-amd64 -> flirc-3.24.0_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.24.0-armhf -> flirc-3.24.0_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.24.0-i386 -> flirc-3.24.0_x86.deb )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=b79d4e41373be6763fac26614bc31e5c
diff --git a/metadata/md5-cache/app-misc/flirc-3.25.2 b/metadata/md5-cache/app-misc/flirc-3.25.2
index c978b06a1026..f8ca2eb3cec5 100644
--- a/metadata/md5-cache/app-misc/flirc-3.25.2
+++ b/metadata/md5-cache/app-misc/flirc-3.25.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 d
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.25.2-amd64 -> flirc-3.25.2_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.25.2-armhf -> flirc-3.25.2_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.25.2-i386 -> flirc-3.25.2_x86.deb )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=b79d4e41373be6763fac26614bc31e5c
diff --git a/metadata/md5-cache/app-misc/golly-3.4 b/metadata/md5-cache/app-misc/golly-3.4
deleted file mode 100644
index edf7d57ad17e..000000000000
--- a/metadata/md5-cache/app-misc/golly-3.4
+++ /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
-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_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=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_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.4-src.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77ebf8271ad094022222eab2c999a4d7
diff --git a/metadata/md5-cache/app-misc/mc-4.8.24 b/metadata/md5-cache/app-misc/mc-4.8.24
deleted file mode 100644
index ddc9b1f35839..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.24
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst pretend test
-DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=7
-HOMEPAGE=https://www.midnight-commander.org
-IUSE=+edit gpm nls samba sftp +slang spell test unicode X +xdg
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://ftp.midnight-commander.org/mc-4.8.24.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f9dd60ca18a69ece965d662a143739c
diff --git a/metadata/md5-cache/app-misc/note-1.3.3-r1 b/metadata/md5-cache/app-misc/note-1.3.3-r1
index 852ce37ea0ec..03ed1614aa4b 100644
--- a/metadata/md5-cache/app-misc/note-1.3.3-r1
+++ b/metadata/md5-cache/app-misc/note-1.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.daemon.de/files/mirror/ftp.daemon.de/scip/Apps/note/note-1.3.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e5c176a29e116c418090423f9e0ae9fa
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.7 b/metadata/md5-cache/app-misc/pax-utils-1.2.7
new file mode 100644
index 000000000000..51ed7dd02105
--- /dev/null
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.7
@@ -0,0 +1,15 @@
+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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp ) kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.11 ) )
+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
+IUSE=caps debug kernel_linux python seccomp python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=mirror://gentoo/pax-utils-1.2.7.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.7.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1957a4469a6a24ce14290f7d417101b9
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.8 b/metadata/md5-cache/app-misc/pax-utils-1.2.8
new file mode 100644
index 000000000000..c4593adf0cac
--- /dev/null
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.8
@@ -0,0 +1,15 @@
+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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp ) kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.11 ) )
+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
+IUSE=caps debug kernel_linux python seccomp python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) 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(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=mirror://gentoo/pax-utils-1.2.8.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.8.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1957a4469a6a24ce14290f7d417101b9
diff --git a/metadata/md5-cache/app-misc/prog-express-3.8.8 b/metadata/md5-cache/app-misc/prog-express-3.8.8
index e1cb45c68509..f7f8d6c0671c 100644
--- a/metadata/md5-cache/app-misc/prog-express-3.8.8
+++ b/metadata/md5-cache/app-misc/prog-express-3.8.8
@@ -8,5 +8,5 @@ LICENSE=prog-express
 RDEPEND=dev-db/sqlite:3 dev-dotnet/gtk-sharp:2 dev-dotnet/libgdiplus dev-lang/mono dev-lang/mono-basic virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.8.8-1.amd64.deb ) x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.8.8-1.i386.deb )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=048c8a6199474747fb02aeb4082015e2
diff --git a/metadata/md5-cache/app-misc/smtm-1.6.10-r1 b/metadata/md5-cache/app-misc/smtm-1.6.10-r1
index 8bdc441942fa..184c55d2eaba 100644
--- a/metadata/md5-cache/app-misc/smtm-1.6.10-r1
+++ b/metadata/md5-cache/app-misc/smtm-1.6.10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://eddelbuettel.com/dirk/code/smtm/smtm_1.6.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b712cd565f594542b15252943bfc602a
diff --git a/metadata/md5-cache/app-misc/tracker-2.3.4 b/metadata/md5-cache/app-misc/tracker-2.3.4
index 3d8d8906ae71..912998ddb9fe 100644
--- a/metadata/md5-cache/app-misc/tracker-2.3.4
+++ b/metadata/md5-cache/app-misc/tracker-2.3.4
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) gtk-doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+BDEPEND=dev-util/glib-utils || ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) gtk-doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer ) sys-apps/util-linux dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A tagging metadata database, search tool and indexer
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspe
 SLOT=0/2.0
 SRC_URI=mirror://gnome/sources/tracker/2.3/tracker-2.3.4.tar.xz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0768850ba8756ed65dcc8e6557a46ed1
+_md5_=893926f0a8ef9d642131b14360854103
diff --git a/metadata/md5-cache/app-misc/tracker-2.3.5 b/metadata/md5-cache/app-misc/tracker-2.3.5
new file mode 100644
index 000000000000..06b19e3ac0ec
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tracker-2.3.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) gtk-doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer ) sys-apps/util-linux dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A tagging metadata database, search tool and indexer
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
+IUSE=gtk-doc +miners networkmanager stemmer kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+PDEPEND=miners? ( >=app-misc/tracker-miners-2.3 )
+RDEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer ) sys-apps/util-linux
+SLOT=0/2.0
+SRC_URI=mirror://gnome/sources/tracker/2.3/tracker-2.3.5.tar.xz
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8823c1d9e7fa348d3e32a2c5d0dd16a3
diff --git a/metadata/md5-cache/app-misc/tracker-miners-2.3.4 b/metadata/md5-cache/app-misc/tracker-miners-2.3.4
new file mode 100644
index 000000000000..e8184f8403e4
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tracker-miners-2.3.4
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils dev-util/gdbus-codegen >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) gstreamer? ( media-libs/gstreamer:1.0[introspection] || ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-openh264:1.0 ) ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.2.0:= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Collection of data extractors for Tracker/Nepomuk
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
+IUSE=cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.2.0:= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
+REQUIRED_USE=cue? ( gstreamer )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/tracker-miners/2.3/tracker-miners-2.3.4.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9d1a9c9e93800b23c2a99dbeca08daaa
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 8f6346393fc9..e160045f95cd 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/scribus-1.5.6.1 b/metadata/md5-cache/app-office/scribus-1.5.6.1
index 2d255f2a88ac..27018c18f3f2 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.6.1
+++ b/metadata/md5-cache/app-office/scribus-1.5.6.1
@@ -5,11 +5,11 @@ DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=7
 HOMEPAGE=https://www.scribus.net/
 IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= x11-libs/cairo[X,svg] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_6? ( dev-python/pillow[tk?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[tk?,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) ) app-text/ghostscript-gpl
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) tk? ( scripts )
 SLOT=0
 SRC_URI=https://github.com/scribusproject/scribus/archive/aa84120d97003a03d883db33ea9a6ad28550e59a.tar.gz -> scribus-1.5.6.1.tar.gz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99009d96b479053f04026ef6af2d4ce6
+_md5_=436940ec7acf7dca0cd5d221de7efed6
diff --git a/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580 b/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
index 132597de452f..6043c8b32b42 100644
--- a/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
+++ b/metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
@@ -7,5 +7,5 @@ LICENSE=worklog-assistant
 RESTRICT=fetch bindist strip
 SLOT=0
 SRC_URI=https://worklogassistant.com/downloads/worklog-assistant-v2_2.1.3580_amd64.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=ddef9d08d29a671e81a22fd0b6301d14
diff --git a/metadata/md5-cache/app-office/wps-office-11.1.0.9615 b/metadata/md5-cache/app-office/wps-office-11.1.0.9615
index eb801aa62d9f..89dcc8837763 100644
--- a/metadata/md5-cache/app-office/wps-office-11.1.0.9615
+++ b/metadata/md5-cache/app-office/wps-office-11.1.0.9615
@@ -9,5 +9,5 @@ RDEPEND=app-arch/bzip2:0 app-arch/xz-utils app-arch/lz4 dev-libs/atk dev-libs/ex
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9615/wps-office_11.1.0.9615.XA_amd64.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f591aa2769cd847915ffe10898ca52de
diff --git a/metadata/md5-cache/app-office/wps-office-11.1.0.9719 b/metadata/md5-cache/app-office/wps-office-11.1.0.9719
index 95711b2818cc..c0525ccb162c 100644
--- a/metadata/md5-cache/app-office/wps-office-11.1.0.9719
+++ b/metadata/md5-cache/app-office/wps-office-11.1.0.9719
@@ -9,5 +9,5 @@ RDEPEND=app-arch/bzip2:0 app-arch/xz-utils app-arch/lz4 dev-libs/atk dev-libs/ex
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9719/wps-office_11.1.0.9719.XA_amd64.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f591aa2769cd847915ffe10898ca52de
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index 2e0c2a5de749..f90c06e951c0 100644
Binary files a/metadata/md5-cache/app-pda/Manifest.gz and b/metadata/md5-cache/app-pda/Manifest.gz differ
diff --git a/metadata/md5-cache/app-pda/gnupod-0.99.8-r2 b/metadata/md5-cache/app-pda/gnupod-0.99.8-r2
index 4d816c6268cc..15e0be93f073 100644
--- a/metadata/md5-cache/app-pda/gnupod-0.99.8-r2
+++ b/metadata/md5-cache/app-pda/gnupod-0.99.8-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-perl/TimeDate dev-perl/XML-Parser >=dev-perl/MP3-Info-1.01 dev-perl/Unicode-String dev-perl/Digest-SHA1 dev-perl/libwww-perl ffmpeg? ( media-video/ffmpeg ) flac? ( dev-perl/Audio-FLAC-Header media-libs/flac aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) ogg? ( dev-perl/Ogg-Vorbis-Header-PurePerl media-sound/vorbis-tools aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://blinkenlights.ch/gnupod-dist/stable/gnupod-0.99.8.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=54d95adaa297ab978f0d76c978ebd9db
diff --git a/metadata/md5-cache/app-pda/libimobiledevice-1.2.0-r1 b/metadata/md5-cache/app-pda/libimobiledevice-1.2.0-r1
deleted file mode 100644
index c0c51de8a60b..000000000000
--- a/metadata/md5-cache/app-pda/libimobiledevice-1.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=app-pda/libplist-1.11:= >=app-pda/libusbmuxd-1.0.9:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-pda/libplist[python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) virtual/pkgconfig python? ( >=dev-python/cython-0.17[python_targets_python3_6(-)?,-python_single_target_python3_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
-DESCRIPTION=Support library to communicate with Apple iPhone/iPod Touch devices
-EAPI=6
-HOMEPAGE=http://www.libimobiledevice.org/
-IUSE=gnutls libressl python static-libs python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-pda/libplist-1.11:= >=app-pda/libusbmuxd-1.0.9:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-pda/libplist[python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-SLOT=0/6
-SRC_URI=http://www.libimobiledevice.org/downloads/libimobiledevice-1.2.0.tar.bz2 https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0001-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch -> libimobiledevice-1.2.0-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0002-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch -> libimobiledevice-1.2.0-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/344409e1d1ad917d377b256214c5411dda82e6b0...5a85432719fb3d18027d528f87d2a44b76fd3e12.patch -> libimobiledevice-1.2.0-git.patch
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e937e5ebc98c51f15a27766520b38ea4
diff --git a/metadata/md5-cache/app-pda/libimobiledevice-1.2.1_pre20200220 b/metadata/md5-cache/app-pda/libimobiledevice-1.2.1_pre20200220
deleted file mode 100644
index 6726b59e3214..000000000000
--- a/metadata/md5-cache/app-pda/libimobiledevice-1.2.1_pre20200220
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) python? ( >=dev-python/cython-0.17[python_targets_python3_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-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=>=app-pda/libplist-1.11:= >=app-pda/libusbmuxd-1.1.0:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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(-)] app-pda/libplist[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(-)] )
-DESCRIPTION=Support library to communicate with Apple iPhone/iPod Touch devices
-EAPI=7
-HOMEPAGE=https://www.libimobiledevice.org/
-IUSE=doc gnutls libressl python static-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-pda/libplist-1.11:= >=app-pda/libusbmuxd-1.1.0:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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(-)] app-pda/libplist[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(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
-SLOT=0/6
-SRC_URI=https://cgit.libimobiledevice.org/libimobiledevice.git/snapshot/libimobiledevice-3d8d13f0a70cefc1b12571b7f6aa2d1d4c58cffb.tar.bz2 -> libimobiledevice-1.2.1_pre20200220.tar.bz2
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a4ab98bb363864fe07d576caa00642c8
diff --git a/metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1 b/metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1
index 6efd5c341028..2214dc0f606a 100644
--- a/metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1
+++ b/metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Support library to communicate with Apple iPhone/iPod Touch devices
 EAPI=7
 HOMEPAGE=https://www.libimobiledevice.org/
 IUSE=doc gnutls libressl python static-libs python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=app-pda/libplist-2.2.0:= >=app-pda/libusbmuxd-2.0.2:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) python? ( python_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(-)] app-pda/libplist[python(-),python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0/1.0-6
 SRC_URI=https://github.com/libimobiledevice/libimobiledevice/releases/download/1.3.0/libimobiledevice-1.3.0.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=624b86a1aff6e8b1ef951227e858a5c5
+_md5_=a495b98d53c0dbe89b01aa537a201b65
diff --git a/metadata/md5-cache/app-pda/libplist-2.1.0 b/metadata/md5-cache/app-pda/libplist-2.1.0
deleted file mode 100644
index a6f266293b88..000000000000
--- a/metadata/md5-cache/app-pda/libplist-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig python? ( >=dev-python/cython-0.17[python_targets_python3_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-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? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_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=Support library to deal with Apple Property Lists (Binary & XML)
-EAPI=7
-HOMEPAGE=https://www.libimobiledevice.org/
-IUSE=python static-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2 LGPL-2.1
-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 ) )
-SLOT=0/3
-SRC_URI=https://cgit.libimobiledevice.org/libplist.git/snapshot/libplist-2.1.0.tar.bz2
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ad3e98439df72d5649c5bd44d3c05d85
diff --git a/metadata/md5-cache/app-pda/libplist-2.2.0-r1 b/metadata/md5-cache/app-pda/libplist-2.2.0-r1
deleted file mode 100644
index 486c0019f0d6..000000000000
--- a/metadata/md5-cache/app-pda/libplist-2.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig python? ( >=dev-python/cython-0.17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=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? ( python_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(-)] )
-DESCRIPTION=Support library to deal with Apple Property Lists (Binary & XML)
-EAPI=7
-HOMEPAGE=https://www.libimobiledevice.org/
-IUSE=python static-libs python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python? ( python_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? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
-SLOT=0/2.0-3
-SRC_URI=https://cgit.libimobiledevice.org/libplist.git/snapshot/libplist-2.2.0.tar.bz2
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=25786c71956c9bd4d731f90d054b5613
diff --git a/metadata/md5-cache/app-pda/libplist-2.2.0-r2 b/metadata/md5-cache/app-pda/libplist-2.2.0-r2
index c212e963c946..1d513682f34c 100644
--- a/metadata/md5-cache/app-pda/libplist-2.2.0-r2
+++ b/metadata/md5-cache/app-pda/libplist-2.2.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Support library to deal with Apple Property Lists (Binary & XML)
 EAPI=7
 HOMEPAGE=https://www.libimobiledevice.org/
 IUSE=python static-libs python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python? ( python_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? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0/2.0-3
 SRC_URI=https://cgit.libimobiledevice.org/libplist.git/snapshot/libplist-2.2.0.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b949d50a821039202a512a9fb0711a3a
+_md5_=bf3bdb6487fbe4939fd749bf47eb3779
diff --git a/metadata/md5-cache/app-pda/libusbmuxd-1.0.10-r1 b/metadata/md5-cache/app-pda/libusbmuxd-1.0.10-r1
deleted file mode 100644
index 6ff9e29d1a71..000000000000
--- a/metadata/md5-cache/app-pda/libusbmuxd-1.0.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/os-headers virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=>=app-pda/libplist-1.11:= virtual/libusb:1 !<app-pda/usbmuxd-1.0.8_p1
-DESCRIPTION=USB multiplex daemon for use with Apple iPhone/iPod Touch devices
-EAPI=7
-HOMEPAGE=http://www.libimobiledevice.org/
-IUSE=kernel_linux static-libs
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-pda/libplist-1.11:= virtual/libusb:1 !<app-pda/usbmuxd-1.0.8_p1
-SLOT=0/4
-SRC_URI=http://www.libimobiledevice.org/downloads/libusbmuxd-1.0.10.tar.bz2
-_md5_=5f7ee66ce9b1f6be655199ed792c913d
diff --git a/metadata/md5-cache/app-pda/libusbmuxd-2.0.1 b/metadata/md5-cache/app-pda/libusbmuxd-2.0.1
deleted file mode 100644
index 16908643b542..000000000000
--- a/metadata/md5-cache/app-pda/libusbmuxd-2.0.1
+++ /dev/null
@@ -1,14 +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=configure install prepare
-DEPEND=>=app-pda/libplist-2.1.0:= !<app-pda/usbmuxd-1.0.8_p1
-DESCRIPTION=USB multiplex daemon for use with Apple iPhone/iPod Touch devices
-EAPI=7
-HOMEPAGE=https://www.libimobiledevice.org/
-IUSE=static-libs
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-pda/libplist-2.1.0:= !<app-pda/usbmuxd-1.0.8_p1
-SLOT=0/6
-SRC_URI=https://cgit.libimobiledevice.org/libusbmuxd.git/snapshot/libusbmuxd-2.0.1.tar.bz2
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5925e812483bc745148c2a3f442219c2
diff --git a/metadata/md5-cache/app-pda/libusbmuxd-2.0.2-r1 b/metadata/md5-cache/app-pda/libusbmuxd-2.0.2-r1
index 429490b420dc..145d8fdd04ad 100644
--- a/metadata/md5-cache/app-pda/libusbmuxd-2.0.2-r1
+++ b/metadata/md5-cache/app-pda/libusbmuxd-2.0.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=USB multiplex daemon for use with Apple iPhone/iPod Touch devices
 EAPI=7
 HOMEPAGE=https://www.libimobiledevice.org/
 IUSE=static-libs
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=app-pda/libplist-2.2.0:=
 SLOT=0/2.0-6
 SRC_URI=https://cgit.libimobiledevice.org/libusbmuxd.git/snapshot/libusbmuxd-2.0.2.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=74fc33be0292ebe3bd4f9619b3a6473a
+_md5_=5db5ab023ec444b140f04fc7e3102fd5
diff --git a/metadata/md5-cache/app-pda/usbmuxd-1.1.1 b/metadata/md5-cache/app-pda/usbmuxd-1.1.1
index 0936ed563a03..ab0ab81bf86b 100644
--- a/metadata/md5-cache/app-pda/usbmuxd-1.1.1
+++ b/metadata/md5-cache/app-pda/usbmuxd-1.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=USB multiplex daemon for use with Apple iPhone/iPod Touch devices
 EAPI=7
 HOMEPAGE=https://www.libimobiledevice.org/
 IUSE=systemd
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-2 GPL-3 LGPL-2.1+
 RDEPEND=acct-user/usbmux >=app-pda/libimobiledevice-1.0:= >=app-pda/libplist-2.0:= virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=https://github.com/libimobiledevice/usbmuxd/releases/download/1.1.1/usbmuxd-1.1.1.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=dcf76887191d04c6c92c59848641e3dc
+_md5_=8237bdea0456678da553ae23fbeb4c2a
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 8ee2014e0011..44a6f200af39 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/eix-0.34.10 b/metadata/md5-cache/app-portage/eix-0.34.10
deleted file mode 100644
index 5ce8fe2f294c..000000000000
--- a/metadata/md5-cache/app-portage/eix-0.34.10
+++ /dev/null
@@ -1,14 +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
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) app-arch/xz-utils nls? ( sys-devel/gettext )
-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
-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.10/eix-0.34.10.tar.xz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=65e4fc79b8445e455bd6f7226a23cedc
diff --git a/metadata/md5-cache/app-portage/eix-0.34.11 b/metadata/md5-cache/app-portage/eix-0.34.11
index fd6158defc84..c0f51449c1e5 100644
--- a/metadata/md5-cache/app-portage/eix-0.34.11
+++ b/metadata/md5-cache/app-portage/eix-0.34.11
@@ -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.11/eix-0.34.11.tar.xz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=957168e52ce73301efaa9c878bb055d0
+_md5_=3708b3063e4ba6d3f8d104d1d8073bba
diff --git a/metadata/md5-cache/app-portage/eix-0.34.9 b/metadata/md5-cache/app-portage/eix-0.34.9
deleted file mode 100644
index 53eb84cf43e3..000000000000
--- a/metadata/md5-cache/app-portage/eix-0.34.9
+++ /dev/null
@@ -1,14 +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
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) app-arch/xz-utils nls? ( sys-devel/gettext )
-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
-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.9/eix-0.34.9.tar.xz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3708b3063e4ba6d3f8d104d1d8073bba
diff --git a/metadata/md5-cache/app-portage/elt-patches-20170317 b/metadata/md5-cache/app-portage/elt-patches-20170317
index 05ddbbdb0e20..dccccdfef7e1 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20170317
+++ b/metadata/md5-cache/app-portage/elt-patches-20170317
@@ -3,8 +3,8 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Collection of patches for libtool.eclass
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170317.tar.xz
-_md5_=521ebb75783b1c577d6de544def3f640
+_md5_=24a7582a6e7b3e4fe2dce86b019546f7
diff --git a/metadata/md5-cache/app-portage/elt-patches-20170422 b/metadata/md5-cache/app-portage/elt-patches-20170422
index 7e8fce0dfd0e..01bda10ff2cc 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20170422
+++ b/metadata/md5-cache/app-portage/elt-patches-20170422
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Collection of patches for libtool.eclass
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170422.tar.xz
-_md5_=67706a6d21e57d18d6fb417a312e0a18
+_md5_=1185c543a60acd852efbe936dc030c64
diff --git a/metadata/md5-cache/app-portage/elt-patches-20170815 b/metadata/md5-cache/app-portage/elt-patches-20170815
index ed26bff76aa9..aed189eb936a 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20170815
+++ b/metadata/md5-cache/app-portage/elt-patches-20170815
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Collection of patches for libtool.eclass
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170815.tar.xz
-_md5_=ebc20465beaa298b31fe904ea04bd596
+_md5_=5d171121d3b1000915d41d55f36e04aa
diff --git a/metadata/md5-cache/app-portage/elt-patches-20170826.1 b/metadata/md5-cache/app-portage/elt-patches-20170826.1
index 40ed9db95cca..3ebe568e00d5 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20170826.1
+++ b/metadata/md5-cache/app-portage/elt-patches-20170826.1
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Collection of patches for libtool.eclass
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170826.1.tar.xz
-_md5_=d967b35067fafed67e7ca390b8e24802
+_md5_=9c98c53e51187b3f2f8815285906ae2a
diff --git a/metadata/md5-cache/app-portage/elt-patches-20201205 b/metadata/md5-cache/app-portage/elt-patches-20201205
index 8d3290a8b79d..5702ff5601f3 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20201205
+++ b/metadata/md5-cache/app-portage/elt-patches-20201205
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Collection of patches for libtool.eclass
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grobian/distfiles/elt-patches-20201205.tar.xz
-_md5_=0f4a71b290dec0c80970431a00a27954
+_md5_=cde0f755a06d3af7b0b8ce286ed49e35
diff --git a/metadata/md5-cache/app-portage/fquery-0.2.3 b/metadata/md5-cache/app-portage/fquery-0.2.3
index 3a30c601486e..7871c6f1c7b4 100644
--- a/metadata/md5-cache/app-portage/fquery-0.2.3
+++ b/metadata/md5-cache/app-portage/fquery-0.2.3
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=dev-haskell/hashtables:= dev-haskell/parsec:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/fquery-0.2.3/fquery-0.2.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=79081b3a69ce1aae49cebbe429b09418
diff --git a/metadata/md5-cache/app-portage/fquery-0.2.3-r1 b/metadata/md5-cache/app-portage/fquery-0.2.3-r1
index d1a13869202d..9bdc0ae3c732 100644
--- a/metadata/md5-cache/app-portage/fquery-0.2.3-r1
+++ b/metadata/md5-cache/app-portage/fquery-0.2.3-r1
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=dev-haskell/hashtables:= dev-haskell/parsec:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/fquery-0.2.3/fquery-0.2.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e0629fdc36fc818aa5191e45de023043
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.6 b/metadata/md5-cache/app-portage/gentoolkit-0.4.6
deleted file mode 100644
index 60f9600f0aed..000000000000
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Collection of administration scripts for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
-IUSE=python_targets_python3_6 python_targets_python3_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
-LICENSE=GPL-2
-RDEPEND=sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/gawk sys-apps/gentoo-functions python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),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=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.6.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8e369e409bcb3736a58a01057c6e193c
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.7 b/metadata/md5-cache/app-portage/gentoolkit-0.4.7
deleted file mode 100644
index 97f1a118a6e9..000000000000
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+),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(-)]
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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=Collection of administration scripts for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
-IUSE=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 ~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-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+),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 )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.7.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=97311a33d6e42ab83e8df7efa19a7c18
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.8 b/metadata/md5-cache/app-portage/gentoolkit-0.4.8
deleted file mode 100644
index 969e380f23b5..000000000000
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+),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(-)]
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_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=Collection of administration scripts for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
-IUSE=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 ~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-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+),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 )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.8.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=06296208bac1822c7477c841098c248e
diff --git a/metadata/md5-cache/app-portage/grs-0.7 b/metadata/md5-cache/app-portage/grs-0.7
index 063a81083b3f..9822f4405fef 100644
--- a/metadata/md5-cache/app-portage/grs-0.7
+++ b/metadata/md5-cache/app-portage/grs-0.7
@@ -6,9 +6,9 @@ HOMEPAGE=https://dev.gentoo.org/~blueness/grs
 IUSE=server python_targets_python3_7 python_targets_python3_8 kernel_linux
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=GPL-2
-RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools virtual/cdrtools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) python_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(-)]
+RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-cdr/cdrtools app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) python_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=https://dev.gentoo.org/~blueness/grs/grs-0.7.tar.gz https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d1e88f9d001f4cb9503ebeb02a0536ed
+_md5_=0ee2986c4fab61e09ae10ebc79c1554a
diff --git a/metadata/md5-cache/app-portage/grs-9999 b/metadata/md5-cache/app-portage/grs-9999
index ddd8322534cc..fa1cbe792ac1 100644
--- a/metadata/md5-cache/app-portage/grs-9999
+++ b/metadata/md5-cache/app-portage/grs-9999
@@ -6,9 +6,9 @@ HOMEPAGE=https://dev.gentoo.org/~blueness/grs
 IUSE=server python_targets_python3_7 python_targets_python3_8 kernel_linux
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools virtual/cdrtools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) python_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(-)]
+RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-cdr/cdrtools app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) python_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=https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b33fd69682d931e2a691d368dc001ab8
+_md5_=daf4489f488daee93482886eca15245d
diff --git a/metadata/md5-cache/app-portage/hackport-0.6.6 b/metadata/md5-cache/app-portage/hackport-0.6.6
index dba68d3f299b..0d270c066f44 100644
--- a/metadata/md5-cache/app-portage/hackport-0.6.6
+++ b/metadata/md5-cache/app-portage/hackport-0.6.6
@@ -10,5 +10,5 @@ RDEPEND=app-portage/repoman >=dev-haskell/async-2.0:= >=dev-haskell/base16-bytes
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hackport-0.6.6/hackport-0.6.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5687c286fbd8c2669a632933b8cdbfb0
diff --git a/metadata/md5-cache/app-portage/hackport-9999 b/metadata/md5-cache/app-portage/hackport-9999
index ad8c52542537..0792ba9f6606 100644
--- a/metadata/md5-cache/app-portage/hackport-9999
+++ b/metadata/md5-cache/app-portage/hackport-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=app-portage/repoman dev-haskell/async:= dev-haskell/base16-bytestring:= dev-haskell/base64-bytestring:= dev-haskell/cryptohash:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= dev-haskell/hashable:= >=dev-haskell/http-4000.0.3:= dev-haskell/missingh:= dev-haskell/mtl:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= dev-haskell/old-time:= dev-haskell/parsec:= dev-haskell/random:= dev-haskell/regex-compat:= dev-haskell/split:= dev-haskell/stm:= >=dev-haskell/tar-0.5:= >=dev-haskell/xml-1.3.7:= dev-haskell/zlib:= >=dev-lang/ghc-7.8.2:=
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	git-r3	3e7ec3d6619213460c85e2aa48398441	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	git-r3	3e7ec3d6619213460c85e2aa48398441	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e330fd0646d3f5140899a6d67606f7fa
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index c0e1fbac3eaf..79f1edc8c19a 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/bash-5.1_p4 b/metadata/md5-cache/app-shells/bash-5.1_p4
new file mode 100644
index 000000000000..3ca39dac67c6
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-5.1_p4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.1:0= )
+DESCRIPTION=The standard GNU Bourne again shell
+EAPI=7
+HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
+IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
+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=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.1:0= )
+SLOT=0
+SRC_URI=mirror://gnu/bash/bash-5.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004 mirror://gnu/bash/bash-5.1-patches/bash51-001 mirror://gnu/bash/bash-5.1-patches/bash51-002 mirror://gnu/bash/bash-5.1-patches/bash51-003 mirror://gnu/bash/bash-5.1-patches/bash51-004
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8c55a4ff06d2cb92598f5a95a56e34a0
diff --git a/metadata/md5-cache/app-shells/dash-0.5.11.2 b/metadata/md5-cache/app-shells/dash-0.5.11.2
index a45db4ff715f..7d232b1e3ea9 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.11.2
+++ b/metadata/md5-cache/app-shells/dash-0.5.11.2
@@ -11,4 +11,4 @@ RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
 SLOT=0
 SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b24104da3dcc7118e05ad7cf168e2fa8
+_md5_=50d1948cfd36801666704fc05c501c2b
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 8ea19279893f..cf1e421a198f 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/an-1.2_p6 b/metadata/md5-cache/app-text/an-1.2_p6
index 59feaa1e00ba..190e4540f965 100644
--- a/metadata/md5-cache/app-text/an-1.2_p6
+++ b/metadata/md5-cache/app-text/an-1.2_p6
@@ -3,10 +3,10 @@ DEPEND=dev-libs/icu:= sys-apps/miscfiles[-minimal] virtual/pkgconfig
 DESCRIPTION=Very fast anagram generator with dictionary lookup
 EAPI=7
 HOMEPAGE=https://packages.debian.org/unstable/games/an
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
+KEYWORDS=amd64 hppa ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/icu:= sys-apps/miscfiles[-minimal]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/an/an_1.2.orig.tar.xz mirror://debian/pool/main/a/an/an_1.2-6.debian.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4d51fd669976e7e1e423ef7066c40281
+_md5_=f432983eccaf935d95f451f17694d38a
diff --git a/metadata/md5-cache/app-text/chasen-2.4.4-r3 b/metadata/md5-cache/app-text/chasen-2.4.4-r3
index dfb3d914e5ea..2ff4d737f66f 100644
--- a/metadata/md5-cache/app-text/chasen-2.4.4-r3
+++ b/metadata/md5-cache/app-text/chasen-2.4.4-r3
@@ -10,5 +10,5 @@ PDEPEND=>=app-dicts/ipadic-2.7.0
 RDEPEND=>=dev-libs/darts-0.32 perl? ( !dev-perl/Text-ChaSen ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/chasen-legacy/32224/chasen-2.4.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d8be9bab283cacad5ea1f6195e0ab458
diff --git a/metadata/md5-cache/app-text/diction-1.14 b/metadata/md5-cache/app-text/diction-1.14
index 39a12454d3ec..2fd0dc8a89c9 100644
--- a/metadata/md5-cache/app-text/diction-1.14
+++ b/metadata/md5-cache/app-text/diction-1.14
@@ -3,8 +3,8 @@ DEPEND=sys-devel/gettext virtual/libintl
 DESCRIPTION=Diction and style checkers for english and german texts
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/diction/diction.html
-KEYWORDS=amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://www.moria.de/~michael/diction/diction-1.14.tar.gz
-_md5_=bc092d0c09affa6427d403e119329e08
+_md5_=08b92319b453f5721344c85910f812bc
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r1 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r1
index 2b963d06dbe9..16b42447af6f 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r1
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r1
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41
 DESCRIPTION=Docbook SGML DTD 4.5
 EAPI=7
 HOMEPAGE=https://docbook.org/sgml/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=docbook
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=4.5
 SRC_URI=https://docbook.org/sgml/4.5/docbook-4.5.zip
 _eclasses_=sgml-catalog-r1	e6ff98989cdecb4311b67afb96edb6f8
-_md5_=3d7bd4e530942b1c56680b644c6a3bcb
+_md5_=7f31065a2d46a666720c9cbb6d19678f
diff --git a/metadata/md5-cache/app-text/dvipng-1.17 b/metadata/md5-cache/app-text/dvipng-1.17
index 8b74d40e01c8..163b4fc24178 100644
--- a/metadata/md5-cache/app-text/dvipng-1.17
+++ b/metadata/md5-cache/app-text/dvipng-1.17
@@ -4,11 +4,11 @@ DESCRIPTION=Translate DVI files into PNG or GIF graphics
 EAPI=7
 HOMEPAGE=http://dvipng.sourceforge.net/
 IUSE=truetype test
-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 ~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 ~x86-solaris
 LICENSE=LGPL-3+ Texinfo-manual
 RDEPEND=>=dev-libs/kpathsea-6.2.1:= media-libs/gd:2=[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/dvipng/dvipng-1.17.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bbc917d3db55f51867f58bff10eb4c8d
+_md5_=443695da8e8afa2e679124263e397b65
diff --git a/metadata/md5-cache/app-text/epspdf-0.6.3-r1 b/metadata/md5-cache/app-text/epspdf-0.6.3-r1
index a45b39301d33..52faf5aa0431 100644
--- a/metadata/md5-cache/app-text/epspdf-0.6.3-r1
+++ b/metadata/md5-cache/app-text/epspdf-0.6.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GUI and command-line converter for [e]ps and pdf
 EAPI=7
 HOMEPAGE=http://tex.aanhet.net/epspdf/
 IUSE=doc tk
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!<dev-texlive/texlive-pictures-2011-r1 >=dev-texlive/texlive-basic-2011 app-text/ghostscript-gpl tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=http://tex.aanhet.net/epspdf/epspdf.0.6.3.tgz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665
-_md5_=338d0f82b646d1d0838030ab48ebf076
+_md5_=9836eb775474d2765807f4696fb7310b
diff --git a/metadata/md5-cache/app-text/epstool-3.09 b/metadata/md5-cache/app-text/epstool-3.09
index 3e1d5a24a34c..33f3747d8e86 100644
--- a/metadata/md5-cache/app-text/epstool-3.09
+++ b/metadata/md5-cache/app-text/epstool-3.09
@@ -3,10 +3,10 @@ DEPEND=app-text/ghostscript-gpl
 DESCRIPTION=Creates or extracts preview images in EPS files, fixes bounding boxes
 EAPI=7
 HOMEPAGE=http://www.ghostgum.com.au/software/epstool.htm
-KEYWORDS=amd64 arm arm64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=http://www.ghostgum.com.au/download/epstool-3.09.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=16ec2b55e2ce1a20fc593c376937f7e6
+_md5_=41be801efc36e44bf7c5d6070f19c4cc
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r4 b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r4
index 09c596fa8fe4..200e716c2e90 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r4
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r4
@@ -5,10 +5,10 @@ DESCRIPTION=Interpreter for the PostScript language and PDF
 EAPI=7
 HOMEPAGE=https://ghostscript.com/
 IUSE=cups dbus gtk l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=AGPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:0= >=sys-libs/zlib-1.2.7 virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn:0= ) X? ( x11-libs/libXt x11-libs/libXext ) app-text/poppler-data >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
 SLOT=0
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/ghostscript-9.53.3.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.53-patchset-01.tar.xz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ac6f847011695a2f282e97f2b015662e
+_md5_=b6f3671c8d042b0255f4046d1f965bf1
diff --git a/metadata/md5-cache/app-text/grutatxt-2.0.16-r1 b/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
index 1535b1688c84..17257ded10b4 100644
--- a/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
+++ b/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://www.triptico.com/download/Grutatxt-2.0.16.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1cc592c4e3fd40f366c5e617a93d2150
diff --git a/metadata/md5-cache/app-text/gspell-1.6.1 b/metadata/md5-cache/app-text/gspell-1.8.4
similarity index 52%
rename from metadata/md5-cache/app-text/gspell-1.6.1
rename to metadata/md5-cache/app-text/gspell-1.8.4
index f16cbc3f48d3..9a4a98b76efe 100644
--- a/metadata/md5-cache/app-text/gspell-1.6.1
+++ b/metadata/md5-cache/app-text/gspell-1.8.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/iso-codes >=app-text/enchant-1.6.0:0/0 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) dev-libs/libxml2:2 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.4 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.50[vapigen(+)] 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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEPEND=app-text/iso-codes >=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) dev-libs/libxml2:2 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.6 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.50[vapigen(+)] 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(+)] ) ) test? ( app-text/enchant:2[hunspell] || ( app-dicts/myspell-en[l10n_en(+)] app-dicts/myspell-en[l10n_en-US(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DESCRIPTION=Spell check library for GTK+ applications
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gspell
 IUSE=+introspection +vala test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=app-text/iso-codes >=app-text/enchant-1.6.0:0/0 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+RDEPEND=app-text/iso-codes >=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
 REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=mirror://gnome/sources/gspell/1.6/gspell-1.6.1.tar.xz
+SLOT=0/2
+SRC_URI=mirror://gnome/sources/gspell/1.8/gspell-1.8.4.tar.xz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56b6193b0b72c00344bf0cda6479dfea
+_md5_=8883b97d71c5c2d74e345774c22e6cf1
diff --git a/metadata/md5-cache/app-text/highlight-3.57-r1 b/metadata/md5-cache/app-text/highlight-3.57-r1
index 818ad19e824a..1b03415315ba 100644
--- a/metadata/md5-cache/app-text/highlight-3.57-r1
+++ b/metadata/md5-cache/app-text/highlight-3.57-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with synt
 EAPI=7
 HOMEPAGE=http://www.andre-simon.de/
 IUSE=examples qt5
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=|| ( dev-lang/lua:0 dev-lang/lua:5.3 dev-lang/lua:5.2 dev-lang/lua:5.1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-3.57.tar.bz2
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2bee23b7b72f4de5c215f027d6bb9c41
+_md5_=3e6a97a7c513dea64fd1aa482d4b1391
diff --git a/metadata/md5-cache/app-text/htag-0.0.24-r1 b/metadata/md5-cache/app-text/htag-0.0.24-r1
index c2b65712489e..7026ce99fe03 100644
--- a/metadata/md5-cache/app-text/htag-0.0.24-r1
+++ b/metadata/md5-cache/app-text/htag-0.0.24-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.earth.li/projectpurple/files/htag-0.0.24.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7ce376dbdb9966fdafe4638e04ff97e6
diff --git a/metadata/md5-cache/app-text/mandoc-1.14.5-r1 b/metadata/md5-cache/app-text/mandoc-1.14.5-r1
index dbe8fcf9d21c..39345b623fe4 100644
--- a/metadata/md5-cache/app-text/mandoc-1.14.5-r1
+++ b/metadata/md5-cache/app-text/mandoc-1.14.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Suite of tools compiling mdoc and man
 EAPI=7
 HOMEPAGE=https://mdocml.bsd.lv/
 IUSE=cgi system-man
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=ISC
 RDEPEND=sys-libs/zlib system-man? ( !sys-apps/man-db )
 SLOT=0
 SRC_URI=https://mdocml.bsd.lv/snapshots/mandoc-1.14.5.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=90b340e630dd8f8e1c73367b71c4fde9
+_md5_=d6d60d67dd80db77f0b03e48fa61e956
diff --git a/metadata/md5-cache/app-text/ocrad-0.26 b/metadata/md5-cache/app-text/ocrad-0.26
index 48b0c7812575..8ebf9d739cae 100644
--- a/metadata/md5-cache/app-text/ocrad-0.26
+++ b/metadata/md5-cache/app-text/ocrad-0.26
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://nongnu/ocrad/ocrad-0.26.tar.lz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=1c8c3738d05bd63acdb864a28441e795
diff --git a/metadata/md5-cache/app-text/ocrad-0.27 b/metadata/md5-cache/app-text/ocrad-0.27
index bb82f214515a..8d1e710fa381 100644
--- a/metadata/md5-cache/app-text/ocrad-0.27
+++ b/metadata/md5-cache/app-text/ocrad-0.27
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://nongnu/ocrad/ocrad-0.27.tar.lz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=9fb54145bc902f4b341957e667ea8503
diff --git a/metadata/md5-cache/app-text/pandoc-2.9.2.1 b/metadata/md5-cache/app-text/pandoc-2.9.2.1
index d00c2782e41e..4aebd5756d6c 100644
--- a/metadata/md5-cache/app-text/pandoc-2.9.2.1
+++ b/metadata/md5-cache/app-text/pandoc-2.9.2.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Conversion between markup formats
 EAPI=7
 HOMEPAGE=https://pandoc.org
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb5336639ac3e4582f53ebc476a3a883
diff --git a/metadata/md5-cache/app-text/rnv-1.7.11-r1 b/metadata/md5-cache/app-text/rnv-1.7.11-r1
index 4a10dba3c3a4..c1f0369e4d72 100644
--- a/metadata/md5-cache/app-text/rnv-1.7.11-r1
+++ b/metadata/md5-cache/app-text/rnv-1.7.11-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/expat dev-scheme/scm[libscm]
 SLOT=0
 SRC_URI=mirror://sourceforge/rnv/rnv-1.7.11.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=7300efb2c06eb0abeecce9f659cad466
diff --git a/metadata/md5-cache/app-text/tree-1.8.0 b/metadata/md5-cache/app-text/tree-1.8.0
index f3cd482983eb..f80118422fb8 100644
--- a/metadata/md5-cache/app-text/tree-1.8.0
+++ b/metadata/md5-cache/app-text/tree-1.8.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Lists directories recursively, and produces an indented listing of files
 EAPI=7
 HOMEPAGE=http://mama.indstate.edu/users/ice/tree/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.8.0.tgz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ac7a0c19f529b7c5469f1a12f1be450f
+_md5_=9cb0c194669f090778d688e79df927b3
diff --git a/metadata/md5-cache/app-text/txt2man-1.7.1 b/metadata/md5-cache/app-text/txt2man-1.7.1
index 6bf235e15bca..27b0647d8bc2 100644
--- a/metadata/md5-cache/app-text/txt2man-1.7.1
+++ b/metadata/md5-cache/app-text/txt2man-1.7.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Scripts to convert regular ASCII text to man pages
 EAPI=7
 HOMEPAGE=https://github.com/mvertes/txt2man
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=app-shells/bash sys-apps/gawk
 SLOT=0
 SRC_URI=https://github.com/mvertes/txt2man/archive/txt2man-1.7.1.tar.gz
-_md5_=9493107bc66ba9acadea8cd48d493bd1
+_md5_=675ff37ad3c597eb5fa53fdfff993ea4
diff --git a/metadata/md5-cache/app-text/txt2tags-3.3 b/metadata/md5-cache/app-text/txt2tags-3.3
deleted file mode 100644
index 214d913675d3..000000000000
--- a/metadata/md5-cache/app-text/txt2tags-3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-DESCRIPTION=Generate marked up documents (HTML, etc.)from a plain text file with markup
-EAPI=7
-HOMEPAGE=https://txt2tags.org
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-2
-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 )
-SLOT=0
-SRC_URI=https://github.com/jendrikseipp/txt2tags/archive/3.3.tar.gz -> txt2tags-3.3.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ef825e4bf634c3b685f37b1beb243694
diff --git a/metadata/md5-cache/app-text/txt2tags-3.7 b/metadata/md5-cache/app-text/txt2tags-3.7
index b91923f84129..a465282dd950 100644
--- a/metadata/md5-cache/app-text/txt2tags-3.7
+++ b/metadata/md5-cache/app-text/txt2tags-3.7
@@ -4,11 +4,11 @@ DESCRIPTION=Generate marked up documents (HTML, etc.)from a plain text file with
 EAPI=7
 HOMEPAGE=https://txt2tags.org
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-2
 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 )
 SLOT=0
 SRC_URI=https://codeload.github.com/txt2tags/txt2tags/tar.gz/3.7 -> txt2tags-3.7.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aba4d440a8cc2b911830c46a7370a541
+_md5_=959e74c879bdc60397af912ef62417c7
diff --git a/metadata/md5-cache/app-text/wdiff-1.2.2-r1 b/metadata/md5-cache/app-text/wdiff-1.2.2-r1
index 4bb04ff44284..7c9022e10837 100644
--- a/metadata/md5-cache/app-text/wdiff-1.2.2-r1
+++ b/metadata/md5-cache/app-text/wdiff-1.2.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Create a diff disregarding formatting
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/wdiff/
 IUSE=experimental test
-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
+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
 LICENSE=GPL-3
 RDEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wdiff/wdiff-1.2.2.tar.gz
-_md5_=efe69f5ad950f008162fa3f7e538272f
+_md5_=00d9946f2ee862b00625318fef05a6d1
diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.8 b/metadata/md5-cache/app-text/zathura-djvu-0.2.8
deleted file mode 100644
index 24033ec4aa65..000000000000
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DESCRIPTION=DjVu plug-in for zathura
-EAPI=6
-HOMEPAGE=https://pwmt.org/projects/zathura-djvu/
-KEYWORDS=amd64 arm x86
-LICENSE=ZLIB
-RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
-SLOT=0
-SRC_URI=https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-0.2.8.tar.xz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41cd223d1d1e6596a503773c2a7f6f91
diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.9 b/metadata/md5-cache/app-text/zathura-djvu-0.2.9
index 733f4f6437cd..1133d67c97bc 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.9
+++ b/metadata/md5-cache/app-text/zathura-djvu-0.2.9
@@ -4,10 +4,10 @@ DEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x1
 DESCRIPTION=DjVu plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-djvu/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 arm x86
 LICENSE=ZLIB
 RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-0.2.9.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80cf3e716aa34bceb852ed1a1c150886
+_md5_=4cf3826bb7fb820981e92dd81a7d5372
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index cd1ccb736b14..c8ce9ab3d5e2 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0 b/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0
index 214d027055ef..2bc26bcf7cb0 100644
--- a/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0
+++ b/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0
@@ -5,10 +5,10 @@ DESCRIPTION=Provides C++ support for the HOCON configuration file format
 EAPI=7
 HOMEPAGE=https://github.com/puppetlabs/cpp-hocon
 IUSE=debug
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/boost-1.54:=[nls] >=dev-libs/leatherman-0.9.3:=
 SLOT=0/0.3.0
 SRC_URI=https://github.com/puppetlabs/cpp-hocon/archive/0.3.0.tar.gz -> cpp-hocon-0.3.0.tar.gz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1287e1aaa27b9fce81fc60a18c47f4be
+_md5_=6215e42a096df4d0d7a2ab2a01147b5e
diff --git a/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r2 b/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r2
deleted file mode 100644
index 54eded35d60d..000000000000
--- a/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=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=A portable C++ preprocessor
-EAPI=6
-HOMEPAGE=http://mcpp.sourceforge.net
-IUSE=static-libs
-KEYWORDS=amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/mcpp/mcpp-2.7.2.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5d7dad56945da7faa190f7bda0cfbbd4
diff --git a/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r3 b/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r3
index c54447ebf9da..c977c394ab2d 100644
--- a/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r3
+++ b/metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r3
@@ -4,9 +4,9 @@ DESCRIPTION=A portable C++ preprocessor
 EAPI=6
 HOMEPAGE=http://mcpp.sourceforge.net
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/mcpp/mcpp-2.7.2.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=173f5d65b0c34ee36861caa857d90c74
+_md5_=48f9e0fc76b02fd0119375519e88100f
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 8273e2eddca9..6bd8a16901ce 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/bucardo-5.4.1 b/metadata/md5-cache/dev-db/bucardo-5.4.1
index 3137c5c7a0b2..89fc00d7b879 100644
--- a/metadata/md5-cache/dev-db/bucardo-5.4.1
+++ b/metadata/md5-cache/dev-db/bucardo-5.4.1
@@ -9,5 +9,5 @@ RDEPEND=dev-perl/DBIx-Safe dev-lang/perl:=[-build(-)]
 RESTRICT=test
 SLOT=0
 SRC_URI=http://bucardo.org/downloads/Bucardo-5.4.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b73bab92ca8470a8b0dd6fd2aed6a446
diff --git a/metadata/md5-cache/dev-db/mtop-0.6.6-r3 b/metadata/md5-cache/dev-db/mtop-0.6.6-r3
index e916fababd46..eaab2ae6b815 100644
--- a/metadata/md5-cache/dev-db/mtop-0.6.6-r3
+++ b/metadata/md5-cache/dev-db/mtop-0.6.6-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Curses dev-perl/DBI dev-perl/DBD-mysql virtual/perl-libnet dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/mtop/mtop-0.6.6.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=541b72bf1ad1eefceba3ac44369a4c62
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.22 b/metadata/md5-cache/dev-db/mysql-8.0.22
index 8970aeeeb95f..6c09dc0a8d7f 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.22
+++ b/metadata/md5-cache/dev-db/mysql-8.0.22
@@ -12,6 +12,6 @@ RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/z
 REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa? ( server ) profiling? ( server ) router? ( server ) tcmalloc? ( server )
 RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=8.0
-SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.22.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.22.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.22.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.22-patches-01.tar.xz
+SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.22.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.22.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.22.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.22-patches-02.tar.xz
 _eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=adea020b6ae445fdb5ccd272a05a1fc3
+_md5_=33bf592447b2b72414046a7e9a7f894f
diff --git a/metadata/md5-cache/dev-db/percona-server-5.7.27.30-r1 b/metadata/md5-cache/dev-db/percona-server-5.7.27.30-r1
deleted file mode 100644
index 13a2e3f584e1..000000000000
--- a/metadata/md5-cache/dev-db/percona-server-5.7.27.30-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=sys-libs/zlib-1.2.3:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:= dev-libs/protobuf:= net-libs/libtirpc:= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) rocksdb? ( app-arch/zstd:= dev-libs/protobuf:= ) tokudb? ( app-arch/snappy:= app-arch/xz-utils:= ) tokudb-backup-plugin? ( dev-util/valgrind ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) !yassl? ( client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) dev-libs/protobuf virtual/yacc server? ( dev-libs/libevent experimental? ( net-libs/rpcsvc-proto ) ) static? ( sys-libs/ncurses[static-libs] ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON || ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysqlclient[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysql-python[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
-EAPI=6
-HOMEPAGE=https://www.percona.com/software/mysql-database/percona-server
-IUSE=cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa pam +perl profiling rocksdb selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin yassl kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
-RDEPEND=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=sys-libs/zlib-1.2.3:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:= dev-libs/protobuf:= net-libs/libtirpc:= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) rocksdb? ( app-arch/zstd:= dev-libs/protobuf:= ) tokudb? ( app-arch/snappy:= app-arch/xz-utils:= ) tokudb-backup-plugin? ( dev-util/valgrind ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) !yassl? ( client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster !dev-db/percona-server:0 !dev-db/percona-server:8.0 client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= ) selinux? ( sec-policy/selinux-mysql ) server? ( !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts ) )
-REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
-RESTRICT=!test? ( test ) libressl? ( test )
-SLOT=5.7/18
-SRC_URI=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.27-30/source/tarball/percona-server-5.7.27-30.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e26268f57cae4961730bd9053a6bebc5
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.19.10-r1 b/metadata/md5-cache/dev-db/percona-server-8.0.19.10-r1
deleted file mode 100644
index 14fa23f94e9e..000000000000
--- a/metadata/md5-cache/dev-db/percona-server-8.0.19.10-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
-DEPEND=>=app-arch/lz4-0_p131:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:= >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
-DESCRIPTION=Fully compatible, enhanced and open source drop-in replacement for MySQL
-EAPI=7
-HOMEPAGE=https://www.percona.com/software/mysql-database/percona-server https://github.com/percona/percona-server
-IUSE=cjk cracklib debug jemalloc latin1 libressl numa pam +perl profiling rocksdb router selinux +server tcmalloc test tokudb tokudb-backup-plugin kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
-RDEPEND=>=app-arch/lz4-0_p131:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:= >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster !dev-db/percona-server:0 !dev-db/percona-server:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
-REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa? ( server ) profiling? ( server ) router? ( server ) tcmalloc? ( server )
-RESTRICT=!test? ( test ) libressl? ( test )
-SLOT=8.0
-SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.19-10/source/tarball/percona-server-8.0.19-10.tar.gz https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.19.10-patches-01.tar.xz
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1267f684ca3edd75d320ed5d4b7c0a7c
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.21.12 b/metadata/md5-cache/dev-db/percona-server-8.0.21.12
index 63c287e6db28..e610bd199bbd 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.21.12
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.21.12
@@ -12,6 +12,6 @@ RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/z
 REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa? ( server ) profiling? ( server ) router? ( server ) tcmalloc? ( server )
 RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=8.0
-SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.21-12/source/tarball/percona-server-8.0.21-12.tar.gz https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.21.12-patches-01.tar.xz
+SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.21-12/source/tarball/percona-server-8.0.21-12.tar.gz https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.21.12-patches-02.tar.xz
 _eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6463232be8914a3f51afa28375fcbf0
+_md5_=94090fbf49bed11d7aef68f5f88d25e2
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.20.11-r2 b/metadata/md5-cache/dev-db/percona-server-8.0.22.13
similarity index 58%
rename from metadata/md5-cache/dev-db/percona-server-8.0.20.11-r2
rename to metadata/md5-cache/dev-db/percona-server-8.0.22.13
index 0dc1e15b810f..0629f730c3ee 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.20.11-r2
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.22.13
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
-DEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:= >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
+DEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
 DESCRIPTION=Fully compatible, enhanced and open source drop-in replacement for MySQL
 EAPI=7
 HOMEPAGE=https://www.percona.com/software/mysql-database/percona-server https://github.com/percona/percona-server
@@ -8,10 +8,10 @@ IUSE=cjk cracklib debug jemalloc latin1 ldap libressl numa pam +perl profiling r
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
-RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:= >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster !dev-db/percona-server:0 !dev-db/percona-server:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
+RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster !dev-db/percona-server:0 !dev-db/percona-server:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
 REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa? ( server ) profiling? ( server ) router? ( server ) tcmalloc? ( server )
 RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=8.0
-SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.20-11/source/tarball/percona-server-8.0.20-11.tar.gz https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.20.11-patches-02.tar.xz
+SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.22-13/source/tarball/percona-server-8.0.22-13.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.22.13-patches-01.tar.xz
 _eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8866aa28bb0f1f034087b5877f02b356
+_md5_=35c9ba852eed3578602afc0a3fc43f47
diff --git a/metadata/md5-cache/dev-db/pgadmin4-4.29 b/metadata/md5-cache/dev-db/pgadmin4-4.29
new file mode 100644
index 000000000000..e22d4670fa80
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgadmin4-4.29
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/libsodium[-minimal] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) ) virtual/imagemagick-tools[png] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GUI administration and development platform for PostgreSQL
+EAPI=7
+HOMEPAGE=https://www.pgadmin.org/
+IUSE=doc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=POSTGRESQL
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/libsodium[-minimal] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 python_single_target_python3_6? ( >=dev-python/blinker-1.4[python_targets_python3_6(-)] >=dev-python/flask-1.0.2[python_targets_python3_6(-)] >=dev-python/flask-compress-1.4.0[python_targets_python3_6(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_6(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_6(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_6(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_6(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_6(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_6(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_6(-)] >=dev-python/flask-sqlalchemy-2.4.1[python_targets_python3_6(-)] >=dev-python/flask-wtf-0.14.3[python_targets_python3_6(-)] >=dev-python/ldap3-2.5.1[python_targets_python3_6(-)] >=dev-python/passlib-1.7.2[python_targets_python3_6(-)] >=dev-python/psutil-5.7.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_6(-)] >=dev-python/pytz-2020.1[python_targets_python3_6(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_6(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)] >=dev-python/speaklater-1.3[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.13[python_targets_python3_6(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_6(-)] >=dev-python/sshtunnel-0.1.5[python_targets_python3_6(-)] >=dev-python/werkzeug-0.15.0[python_targets_python3_6(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_6(-)] dev-python/bcrypt[python_targets_python3_6(-)] dev-python/cryptography[python_targets_python3_6(-)] dev-python/python-email-validator[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/blinker-1.4[python_targets_python3_7(-)] >=dev-python/flask-1.0.2[python_targets_python3_7(-)] >=dev-python/flask-compress-1.4.0[python_targets_python3_7(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_7(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_7(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_7(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_7(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_7(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_7(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_7(-)] >=dev-python/flask-sqlalchemy-2.4.1[python_targets_python3_7(-)] >=dev-python/flask-wtf-0.14.3[python_targets_python3_7(-)] >=dev-python/ldap3-2.5.1[python_targets_python3_7(-)] >=dev-python/passlib-1.7.2[python_targets_python3_7(-)] >=dev-python/psutil-5.7.0[python_targets_python3_7(-)] >=dev-python/psycopg-2.8[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_7(-)] >=dev-python/pytz-2020.1[python_targets_python3_7(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_7(-)] >=dev-python/six-1.12.0[python_targets_python3_7(-)] >=dev-python/speaklater-1.3[python_targets_python3_7(-)] >=dev-python/sqlalchemy-1.3.13[python_targets_python3_7(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_7(-)] >=dev-python/sshtunnel-0.1.5[python_targets_python3_7(-)] >=dev-python/werkzeug-0.15.0[python_targets_python3_7(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_7(-)] dev-python/bcrypt[python_targets_python3_7(-)] dev-python/cryptography[python_targets_python3_7(-)] dev-python/python-email-validator[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/blinker-1.4[python_targets_python3_8(-)] >=dev-python/flask-1.0.2[python_targets_python3_8(-)] >=dev-python/flask-compress-1.4.0[python_targets_python3_8(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_8(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_8(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_8(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_8(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_8(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_8(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_8(-)] >=dev-python/flask-sqlalchemy-2.4.1[python_targets_python3_8(-)] >=dev-python/flask-wtf-0.14.3[python_targets_python3_8(-)] >=dev-python/ldap3-2.5.1[python_targets_python3_8(-)] >=dev-python/passlib-1.7.2[python_targets_python3_8(-)] >=dev-python/psutil-5.7.0[python_targets_python3_8(-)] >=dev-python/psycopg-2.8[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)] >=dev-python/pytz-2020.1[python_targets_python3_8(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_8(-)] >=dev-python/six-1.12.0[python_targets_python3_8(-)] >=dev-python/speaklater-1.3[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.13[python_targets_python3_8(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_8(-)] >=dev-python/sshtunnel-0.1.5[python_targets_python3_8(-)] >=dev-python/werkzeug-0.15.0[python_targets_python3_8(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_8(-)] dev-python/bcrypt[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] dev-python/python-email-validator[python_targets_python3_8(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v4.29/source/pgadmin4-4.29.tar.gz
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=df16d9dd6d9ebd59281b998e09c7e864
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.1.2 b/metadata/md5-cache/dev-db/pgrouting-3.1.2
new file mode 100644
index 000000000000..14b547146d72
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgrouting-3.1.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
+DESCRIPTION=pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality.
+EAPI=7
+HOMEPAGE=https://pgrouting.org/
+IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 MIT Boost-1.0
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.1.2.tar.gz -> pgrouting-3.1.2.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	postgres	2a85ebea21ca1da22ccc419fe84a8788	postgres-multi	563baf0dc59ded7d888047ea17689f21	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=142f24f30d6f01091687143a52b9df88
diff --git a/metadata/md5-cache/dev-db/postgis-3.0.3 b/metadata/md5-cache/dev-db/postgis-3.0.3-r1
similarity index 98%
rename from metadata/md5-cache/dev-db/postgis-3.0.3
rename to metadata/md5-cache/dev-db/postgis-3.0.3-r1
index 65b2dd544db2..4fba4ad998aa 100644
--- a/metadata/md5-cache/dev-db/postgis-3.0.3
+++ b/metadata/md5-cache/dev-db/postgis-3.0.3-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.0.3.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	postgres	2a85ebea21ca1da22ccc419fe84a8788	postgres-multi	563baf0dc59ded7d888047ea17689f21	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=848ab87ed98c847c82c0859715e6d8fc
+_md5_=aad72e76203ac4e96bf458553e4ab549
diff --git a/metadata/md5-cache/dev-db/postgis-3.1.0_alpha3 b/metadata/md5-cache/dev-db/postgis-3.1.0_alpha3-r1
similarity index 98%
rename from metadata/md5-cache/dev-db/postgis-3.1.0_alpha3
rename to metadata/md5-cache/dev-db/postgis-3.1.0_alpha3-r1
index 638eb896179f..59bd05ac09ce 100644
--- a/metadata/md5-cache/dev-db/postgis-3.1.0_alpha3
+++ b/metadata/md5-cache/dev-db/postgis-3.1.0_alpha3-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.1.0alpha3.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	postgres	2a85ebea21ca1da22ccc419fe84a8788	postgres-multi	563baf0dc59ded7d888047ea17689f21	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=cafebda1e4a8c52054154ae9124e9c5e
+_md5_=75bd3d44e84186969beb3c39469c9cc7
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index eb4e0e913092..5e74dfdbfd73 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/goatee-0.3.1.2 b/metadata/md5-cache/dev-games/goatee-0.3.1.2
index c62cd136724a..e8b46d48a1b4 100644
--- a/metadata/md5-cache/dev-games/goatee-0.3.1.2
+++ b/metadata/md5-cache/dev-games/goatee-0.3.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A monadic take on a 2,500-year-old board game - library
 EAPI=6
 HOMEPAGE=http://khumba.net/projects/goatee
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev
 RESTRICT=!test? ( test )
 SLOT=0/0.3.1.2
 SRC_URI=https://hackage.haskell.org/package/goatee-0.3.1.2/goatee-0.3.1.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c33743bf7c2475ce7e6184d4e1715ad2
diff --git a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2 b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2
index 4a92335cc03d..a24b4f95fdf7 100644
--- a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2
+++ b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2
@@ -8,5 +8,5 @@ RDEPEND=games-misc/games-envd
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake4/source/linux/quake4-linux-1.4.2-sdk.x86.run
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98dc43073c2dc5815dc8ec70839cb33c
diff --git a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1 b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
index cfbd5730b4e6..a2a0e6f21d5b 100644
--- a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
+++ b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
@@ -7,5 +7,5 @@ LICENSE=QUAKE4
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake4/source/linux/quake4-linux-1.4.2-sdk.x86.run
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=7fd8522f27dd4318b7e77c6307b71c21
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index b4535699bfe8..ae7e07bc932d 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/abstract-deque-0.3 b/metadata/md5-cache/dev-haskell/abstract-deque-0.3
index cc074d999694..47373e3b8704 100644
--- a/metadata/md5-cache/dev-haskell/abstract-deque-0.3
+++ b/metadata/md5-cache/dev-haskell/abstract-deque-0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= usecas? ( >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= usecas? ( >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] ) >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Abstract, parameterized interface to mutable Deques
 EAPI=7
 HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= usecas? ( >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] )
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/abstract-deque-0.3/abstract-deque-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=83df5b2508b46c057e3e10d52b954362
diff --git a/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3 b/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
index 06f3c69dfca9..6b699a3c695a 100644
--- a/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
+++ b/metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/test-framework-0.6:=[profile?] >=dev-haskell/test-framework-hunit-0.2.7:=[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 )
+DEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/test-framework-0.6:=[profile?] >=dev-haskell/test-framework-hunit-0.2.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A test-suite for any queue or double-ended queue satisfying an interface
 EAPI=7
 HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] dev-haskell/hunit:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/abstract-deque-tests-0.3/abstract-deque-tests-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=31a2ca0eeb42e954085e5b0005f98476
diff --git a/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1 b/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
index 054f9b764598..d865119741b4 100644
--- a/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
+++ b/metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Type classes generalizing the functionality of the 'monad-par' library
 EAPI=7
 HOMEPAGE=https://github.com/simonmar/monad-par
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/abstract-par-0.3.3/abstract-par-0.3.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65daf1de9f320e79c539e13876da75cd
diff --git a/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1 b/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1
index 2b2a138dc897..ef9ff609a2f8 100644
--- a/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1
+++ b/metadata/md5-cache/dev-haskell/ac-ppm-1.1.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Trivial package for writing PPM images
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/AC-PPM
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.1
 SRC_URI=https://hackage.haskell.org/package/AC-PPM-1.1.1/AC-PPM-1.1.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22691d32fdef3a5394fa1b941d4a7c6f
diff --git a/metadata/md5-cache/dev-haskell/adjunctions-4.4 b/metadata/md5-cache/dev-haskell/adjunctions-4.4
index ac9413be8f0b..c2a7d55e821a 100644
--- a/metadata/md5-cache/dev-haskell/adjunctions-4.4
+++ b/metadata/md5-cache/dev-haskell/adjunctions-4.4
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Adjunctions and representable functors
 EAPI=6
 HOMEPAGE=https://github.com/ekmett/adjunctions/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/4.4
 SRC_URI=https://hackage.haskell.org/package/adjunctions-4.4/adjunctions-4.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 4af9f0f99697..2026c4c76997 100644
--- a/metadata/md5-cache/dev-haskell/aeson-1.4.7.1
+++ b/metadata/md5-cache/dev-haskell/aeson-1.4.7.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast JSON parsing and encoding
 EAPI=7
 HOMEPAGE=https://github.com/bos/aeson
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index e336db650c9b..d1001ca230c1 100644
--- a/metadata/md5-cache/dev-haskell/aeson-compat-0.3.9-r2
+++ b/metadata/md5-cache/dev-haskell/aeson-compat-0.3.9-r2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Compatibility layer for aeson
 EAPI=7
 HOMEPAGE=https://github.com/phadej/aeson-compat#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.5:=[profile
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index af31a0f5f1e8..14a08bef4508 100644
--- a/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.8
+++ b/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.8
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Extract and apply patches to JSON documents
 EAPI=7
 HOMEPAGE=https://github.com/thsutton/aeson-diff
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/edit-distance-vector:=[profile
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=45fcab3f6e5de4d2c75679bac6aedc84
diff --git a/metadata/md5-cache/dev-haskell/aeson-pretty-0.8.8 b/metadata/md5-cache/dev-haskell/aeson-pretty-0.8.8
index 9481d2b58f09..72f7f0a2c339 100644
--- a/metadata/md5-cache/dev-haskell/aeson-pretty-0.8.8
+++ b/metadata/md5-cache/dev-haskell/aeson-pretty-0.8.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/cmdargs-0.7:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/cmdargs-0.7:=[profile?] ) >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=JSON pretty-printing library and command-line tool
 EAPI=7
 HOMEPAGE=https://github.com/informatikr/aeson-pretty
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.1.3.0:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= !lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/cmdargs-0.7:=[profile?] )
 SLOT=0/0.8.8
 SRC_URI=https://hackage.haskell.org/package/aeson-pretty-0.8.8/aeson-pretty-0.8.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=251c4ef4caea147ac70afb53ef989865
diff --git a/metadata/md5-cache/dev-haskell/aeson-qq-0.8.3 b/metadata/md5-cache/dev-haskell/aeson-qq-0.8.3
index f0e069c32c71..264ebe561063 100644
--- a/metadata/md5-cache/dev-haskell/aeson-qq-0.8.3
+++ b/metadata/md5-cache/dev-haskell/aeson-qq-0.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.6:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base-compat:=[profile?] >=dev-haskell/haskell-src-meta-0.1.0:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base-compat:=[profile?] >=dev-haskell/haskell-src-meta-0.1.0:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=JSON quasiquoter for Haskell
 EAPI=7
 HOMEPAGE=https://github.com/sol/aeson-qq#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] dev-haskell/attoparsec:=[profile?] d
 RESTRICT=!test? ( test )
 SLOT=0/0.8.3
 SRC_URI=https://hackage.haskell.org/package/aeson-qq-0.8.3/aeson-qq-0.8.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=972d0fa6e2d974985b30a83b99ab7658
diff --git a/metadata/md5-cache/dev-haskell/alex-3.2.5 b/metadata/md5-cache/dev-haskell/alex-3.2.5
index 99ae9c0737ea..b0ddcc4d9922 100644
--- a/metadata/md5-cache/dev-haskell/alex-3.2.5
+++ b/metadata/md5-cache/dev-haskell/alex-3.2.5
@@ -11,5 +11,5 @@ 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	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=68e79e66addc68413d82bd9b616491a3
diff --git a/metadata/md5-cache/dev-haskell/alex-tools-0.4 b/metadata/md5-cache/dev-haskell/alex-tools-0.4
index 27b725342f8b..81b3a3ddce92 100644
--- a/metadata/md5-cache/dev-haskell/alex-tools-0.4
+++ b/metadata/md5-cache/dev-haskell/alex-tools-0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/text-1.2:=[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 )
+DEPEND=>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A set of functions for a common use case of Alex
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/alex-tools
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.4
 SRC_URI=https://hackage.haskell.org/package/alex-tools-0.4/alex-tools-0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a7761ed4a1fd56021b8e0493fcecaff
diff --git a/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2 b/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
index f9926b978d72..27527619552e 100644
--- a/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
+++ b/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/alsa-lib >=dev-haskell/cabal-1.8 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/alsa-lib >=dev-haskell/cabal-1.8 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Binding to the ALSA Library API (Exceptions)
 EAPI=7
 HOMEPAGE=https://www.haskell.org/haskellwiki/ALSA
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/alsa-lib
 SLOT=0/0.5.0.1
 SRC_URI=https://hackage.haskell.org/package/alsa-core-0.5.0.1/alsa-core-0.5.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1ce89bc54c869c8543312c67f4ffeb23
diff --git a/metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0 b/metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0
index cf08eb81216d..246c2d5bbc0a 100644
--- a/metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0
+++ b/metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-lang/ghc-7.6.1:= media-libs/alsa-lib dev-haskell/c2hs >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-lang/ghc-7.6.1:= media-libs/alsa-lib dev-haskell/c2hs >=dev-haskell/cabal-1.16.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Bindings to the ALSA simple mixer API
 EAPI=7
 HOMEPAGE=https://github.com/ttuegel/alsa-mixer
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-lang/ghc-7.6.1:= media-libs/alsa-lib
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/alsa-mixer-0.3.0/alsa-mixer-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ea867112cc1b18015ddb4a5c2db107de
diff --git a/metadata/md5-cache/dev-haskell/alut-2.4.0.3 b/metadata/md5-cache/dev-haskell/alut-2.4.0.3
index 0af4ea6ef85e..0f497c09ff9f 100644
--- a/metadata/md5-cache/dev-haskell/alut-2.4.0.3
+++ b/metadata/md5-cache/dev-haskell/alut-2.4.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/openal-1.7:=[profile?] <dev-haskell/openal-1.8:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= media-libs/freealut >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/openal-1.7:=[profile?] <dev-haskell/openal-1.8:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= media-libs/freealut >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A binding for the OpenAL Utility Toolkit
 EAPI=7
 HOMEPAGE=https://github.com/haskell-openal/ALUT
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/openal-1.7:=[profile?] <dev-haskell/openal-1.8:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= media-libs/freealut
 SLOT=0/2.4.0.3
 SRC_URI=https://hackage.haskell.org/package/ALUT-2.4.0.3/ALUT-2.4.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1e6d1b926014a847440597fea560a0a0
diff --git a/metadata/md5-cache/dev-haskell/annotated-wl-pprint-0.7.0 b/metadata/md5-cache/dev-haskell/annotated-wl-pprint-0.7.0
index c2843d0274f1..6447de0c5926 100644
--- a/metadata/md5-cache/dev-haskell/annotated-wl-pprint-0.7.0
+++ b/metadata/md5-cache/dev-haskell/annotated-wl-pprint-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.10.2:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.10.2:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=The Wadler/Leijen Pretty Printer, with annotation support
 EAPI=6
 HOMEPAGE=https://github.com/david-christiansen/annotated-wl-pprint
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.10.2:=
 SLOT=0/0.7.0
 SRC_URI=https://hackage.haskell.org/package/annotated-wl-pprint-0.7.0/annotated-wl-pprint-0.7.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d4148e82b4e5eddf402e11be63fdb80
diff --git a/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3 b/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
index 4656d5e1a5ac..608db3f152fd 100644
--- a/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
+++ b/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-haskell/colour-2.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple ANSI terminal support, with Windows compatibility
 EAPI=7
 HOMEPAGE=https://github.com/feuerbach/ansi-terminal
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=25585e0c26d6be3c5a4a5df525a412da
diff --git a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.8.2-r1 b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.8.2-r1
index b9a2f1478a2f..33f0876258af 100644
--- a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.8.2-r1
+++ b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.8.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-0.19:=[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 )
+DEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=The Wadler/Leijen Pretty Printer for colored ANSI terminal output
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/ansi-wl-pprint
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.8.2
 SRC_URI=https://hackage.haskell.org/package/ansi-wl-pprint-0.6.8.2/ansi-wl-pprint-0.6.8.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c9fbf085f79c490dc69c10c53b080f96
diff --git a/metadata/md5-cache/dev-haskell/appar-0.1.8 b/metadata/md5-cache/dev-haskell/appar-0.1.8
index a185c31731a4..721980670e51 100644
--- a/metadata/md5-cache/dev-haskell/appar-0.1.8
+++ b/metadata/md5-cache/dev-haskell/appar-0.1.8
@@ -1,5 +1,5 @@
 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.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A simple applicative parser
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/appar
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.8
 SRC_URI=https://hackage.haskell.org/package/appar-0.1.8/appar-0.1.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ace09dc04ed47fa81e6cd4d6266d5671
diff --git a/metadata/md5-cache/dev-haskell/argparser-0.3.4 b/metadata/md5-cache/dev-haskell/argparser-0.3.4
index 62d359ee6c8a..869e17e774d8 100644
--- a/metadata/md5-cache/dev-haskell/argparser-0.3.4
+++ b/metadata/md5-cache/dev-haskell/argparser-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >dev-haskell/htf-0.9 dev-haskell/hunit ) 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.8 test? ( >dev-haskell/htf-0.9 dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Command line parsing framework for console applications
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/argparser
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.3.4
 SRC_URI=https://hackage.haskell.org/package/argparser-0.3.4/argparser-0.3.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0dfe64b0757506c2a449ee6bfa74d54
diff --git a/metadata/md5-cache/dev-haskell/arithmoi-0.11.0.1 b/metadata/md5-cache/dev-haskell/arithmoi-0.11.0.1
index 7aeddcf68341..0329a99e01aa 100644
--- a/metadata/md5-cache/dev-haskell/arithmoi-0.11.0.1
+++ b/metadata/md5-cache/dev-haskell/arithmoi-0.11.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/chimera-0.3:=[profile?] dev-haskell/constraints:=[profile?] >=dev-haskell/exact-pi-0.5:=[profile?] >=dev-haskell/integer-logarithms-1.0:=[profile?] >=dev-haskell/integer-roots-1.0:=[profile?] dev-haskell/mod:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/semirings-0.5.2:=[profile?] >=dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( >=dev-haskell/quickcheck-2.10 >=dev-haskell/quickcheck-classes-0.6.3 >=dev-haskell/smallcheck-1.2 <dev-haskell/smallcheck-1.3 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 >=dev-haskell/tasty-rerun-1.1.17 >=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/chimera-0.3:=[profile?] dev-haskell/constraints:=[profile?] >=dev-haskell/exact-pi-0.5:=[profile?] >=dev-haskell/integer-logarithms-1.0:=[profile?] >=dev-haskell/integer-roots-1.0:=[profile?] dev-haskell/mod:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/semirings-0.5.2:=[profile?] >=dev-haskell/vector-0.12:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( >=dev-haskell/quickcheck-2.10 >=dev-haskell/quickcheck-classes-0.6.3 >=dev-haskell/smallcheck-1.2 <dev-haskell/smallcheck-1.3 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 >=dev-haskell/tasty-rerun-1.1.17 >=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Efficient basic number-theoretic functions. Primes, powers, integer logarithms
 EAPI=7
 HOMEPAGE=https://github.com/Bodigrim/arithmoi
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/chimera-0.3:=[profile?] dev-haskell/constraints:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/0.11.0.1
 SRC_URI=https://hackage.haskell.org/package/arithmoi-0.11.0.1/arithmoi-0.11.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=276841ad1318ab78719aa944550592c7
diff --git a/metadata/md5-cache/dev-haskell/arrows-0.4.4.2 b/metadata/md5-cache/dev-haskell/arrows-0.4.4.2
index 6378c9f340f5..b8566a181df2 100644
--- a/metadata/md5-cache/dev-haskell/arrows-0.4.4.2
+++ b/metadata/md5-cache/dev-haskell/arrows-0.4.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/stream:=[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 )
+DEPEND=dev-haskell/stream:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Arrow classes and transformers
 EAPI=6
 HOMEPAGE=https://www.haskell.org/arrows/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/stream:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.4.2
 SRC_URI=https://hackage.haskell.org/package/arrows-0.4.4.2/arrows-0.4.4.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c2213cbe9811b92b68b815341f41d25c
diff --git a/metadata/md5-cache/dev-haskell/ascii-progress-0.3.3.0 b/metadata/md5-cache/dev-haskell/ascii-progress-0.3.3.0
index b73292136a56..1314c061fa61 100644
--- a/metadata/md5-cache/dev-haskell/ascii-progress-0.3.3.0
+++ b/metadata/md5-cache/dev-haskell/ascii-progress-0.3.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/async-2.0.1.5:=[profile?] >=dev-haskell/concurrent-output-1.7:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] >=dev-lang/ghc-7.6.1:= examples? ( >=dev-haskell/conduit-1.2:=[profile?] dev-haskell/http:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] ) >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/async-2.0.1.5:=[profile?] >=dev-haskell/concurrent-output-1.7:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] >=dev-lang/ghc-7.6.1:= examples? ( >=dev-haskell/conduit-1.2:=[profile?] dev-haskell/http:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] ) >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.6 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A simple progress bar for the console
 EAPI=6
 HOMEPAGE=https://github.com/yamadapc/haskell-ascii-progress
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/async-2.0.1.5:=[profile?] >=dev-haskell/concurrent-output-
 RESTRICT=!test? ( test )
 SLOT=0/0.3.3.0
 SRC_URI=https://hackage.haskell.org/package/ascii-progress-0.3.3.0/ascii-progress-0.3.3.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e55f10afd24880e44b746cdfe7f4f945
diff --git a/metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6 b/metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6
index 607366c4f425..14f1cc245d17 100644
--- a/metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6
+++ b/metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/hourglass-0.2.6:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/mtl dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/hourglass-0.2.6:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/mtl dev-haskell/tasty dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=ASN1 data reader and writer in RAW, BER and DER forms
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-asn1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.6
 SRC_URI=https://hackage.haskell.org/package/asn1-encoding-0.9.6/asn1-encoding-0.9.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4553abbb8d9ce2a7308a0ece16e060d9
diff --git a/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5 b/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5
index f7c1f904f8ff..c4419e9a7430 100644
--- a/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5
+++ b/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[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 )
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple monadic parser for ASN1 stream types
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-asn1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.9.5
 SRC_URI=https://hackage.haskell.org/package/asn1-parse-0.9.5/asn1-parse-0.9.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=43a609a3a9ea1b8037ff2d1223d4392d
diff --git a/metadata/md5-cache/dev-haskell/asn1-types-0.3.3 b/metadata/md5-cache/dev-haskell/asn1-types-0.3.3
index ad5a59aa1ef8..1237178986d6 100644
--- a/metadata/md5-cache/dev-haskell/asn1-types-0.3.3
+++ b/metadata/md5-cache/dev-haskell/asn1-types-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[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 )
+DEPEND=dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=ASN.1 types
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-asn1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/asn1-types-0.3.3/asn1-types-0.3.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=36728c6cd14f6d4188f1f389f85b9f83
diff --git a/metadata/md5-cache/dev-haskell/async-2.2.2 b/metadata/md5-cache/dev-haskell/async-2.2.2
index 2248656116e5..9958a7f49e32 100644
--- a/metadata/md5-cache/dev-haskell/async-2.2.2
+++ b/metadata/md5-cache/dev-haskell/async-2.2.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Run IO operations asynchronously and wait for their results
 EAPI=7
 HOMEPAGE=https://github.com/simonmar/async
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.4:=[p
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a479d77f1c3ade7508261bc033db9b12
diff --git a/metadata/md5-cache/dev-haskell/atomic-primops-0.8.3 b/metadata/md5-cache/dev-haskell/atomic-primops-0.8.3
index b5d2dd05ff40..00ece9a16638 100644
--- a/metadata/md5-cache/dev-haskell/atomic-primops-0.8.3
+++ b/metadata/md5-cache/dev-haskell/atomic-primops-0.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/primitive:=[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 )
+DEPEND=dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A safe approach to CAS and other atomic ops in Haskell
 EAPI=7
 HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/primitive:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.8.3
 SRC_URI=https://hackage.haskell.org/package/atomic-primops-0.8.3/atomic-primops-0.8.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=14367d12c16de325a20dca345c71c3da
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-0.13.2.3 b/metadata/md5-cache/dev-haskell/attoparsec-0.13.2.3
index 2c39f0bea3d4..fd66a1309a10 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-0.13.2.3
+++ b/metadata/md5-cache/dev-haskell/attoparsec-0.13.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-1.1.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 )
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-1.1.1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast combinator parsing for bytestrings and text
 EAPI=7
 HOMEPAGE=https://github.com/bos/attoparsec
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 RESTRICT=test
 SLOT=0/0.13.2.3
 SRC_URI=https://hackage.haskell.org/package/attoparsec-0.13.2.3/attoparsec-0.13.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7b2040f3327975a84647395550f8d0f8
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0 b/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0
index 79dc68f19f02..29da37d024ba 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0
+++ b/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/conduit-1.1:=[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 )
+DEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Consume attoparsec parsers via conduit. (deprecated)
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/conduit
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/attoparsec-conduit-1.1.0/attoparsec-conduit-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ed269df425b392e77388827c4a8348a0
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4 b/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
index ee101beaa12b..205d8d77f6b0 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
+++ b/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] dev-haskell/text:=[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 )
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Pass input from an enumerator to an Attoparsec parser
 EAPI=7
 HOMEPAGE=https://john-millikin.com/software/attoparsec-enumerator/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.4
 SRC_URI=https://hackage.haskell.org/package/attoparsec-enumerator-0.3.4/attoparsec-enumerator-0.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f7308fc6177b0fb16f22c5ea69f49481
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
index 9c3fe78a7f30..312670e17a88 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parsing of ISO 8601 dates, originally from aeson
 EAPI=7
 HOMEPAGE=https://github.com/bos/aeson
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cbf1eb9c75f5bea8759fe1f80832118a
diff --git a/metadata/md5-cache/dev-haskell/authenticate-1.3.5 b/metadata/md5-cache/dev-haskell/authenticate-1.3.5
index bd7ff84b0424..be6d3c96b1ca 100644
--- a/metadata/md5-cache/dev-haskell/authenticate-1.3.5
+++ b/metadata/md5-cache/dev-haskell/authenticate-1.3.5
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Authentication methods for Haskell web applications
 EAPI=7
 HOMEPAGE=https://github.com/yesodweb/authenticate
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 6f1a2406726f..8d1fc475787c 100644
--- a/metadata/md5-cache/dev-haskell/authenticate-oauth-1.6.0.1
+++ b/metadata/md5-cache/dev-haskell/authenticate-oauth-1.6.0.1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Library to authenticate with OAuth for Haskell web applications
 EAPI=7
 HOMEPAGE=https://github.com/yesodweb/authenticate
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4518c92e86c83de7944ca550700e714d
diff --git a/metadata/md5-cache/dev-haskell/auto-update-0.1.6 b/metadata/md5-cache/dev-haskell/auto-update-0.1.6
index adea9aeecda2..7daf22af5e09 100644
--- a/metadata/md5-cache/dev-haskell/auto-update-0.1.6
+++ b/metadata/md5-cache/dev-haskell/auto-update-0.1.6
@@ -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 test? ( dev-haskell/exceptions dev-haskell/hspec dev-haskell/hunit dev-haskell/retry ) 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 test? ( dev-haskell/exceptions dev-haskell/hspec dev-haskell/hunit dev-haskell/retry ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Efficiently run periodic, on-demand actions
 EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.6
 SRC_URI=https://hackage.haskell.org/package/auto-update-0.1.6/auto-update-0.1.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=17161b5d53e1f0420b6bbdb364f93acb
diff --git a/metadata/md5-cache/dev-haskell/aws-0.22-r1 b/metadata/md5-cache/dev-haskell/aws-0.22-r1
index ecd590c13f63..fc00a0ab490e 100644
--- a/metadata/md5-cache/dev-haskell/aws-0.22-r1
+++ b/metadata/md5-cache/dev-haskell/aws-0.22-r1
@@ -1,5 +1,5 @@
 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 )
+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 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Amazon Web Services (AWS) for Haskell
 EAPI=7
 HOMEPAGE=https://github.com/aristidb/aws
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[prof
 RESTRICT=test
 SLOT=0/0.22
 SRC_URI=https://hackage.haskell.org/package/aws-0.22/aws-0.22.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 682761ccc39c..f4b59e665919 100644
--- a/metadata/md5-cache/dev-haskell/base-compat-0.11.1
+++ b/metadata/md5-cache/dev-haskell/base-compat-0.11.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A compatibility layer for base
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/base-compat
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3c4e9cccf5b2a94228a85ea01b36f933
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
index 0f8d79c72a04..5701dedb1152 100644
--- a/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
+++ b/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=base-compat with extra batteries
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/base-compat-batteries
@@ -10,5 +10,5 @@ RDEPEND=~dev-haskell/base-compat-0.11.1:=[profile?] >=dev-haskell/bifunctors-5.5
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ccf08d266b226a39f37bd2528cdc620c
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
index 2c0aa7a2ba28..0c8c97d346e7 100644
--- a/metadata/md5-cache/dev-haskell/base-noprelude-4.13.0.0
+++ b/metadata/md5-cache/dev-haskell/base-noprelude-4.13.0.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-8.8.1:= >=dev-haskell/cabal-2.2.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION="base" package sans "Prelude" module
 EAPI=7
 HOMEPAGE=https://github.com/hvr/base-noprelude
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e4ac3ae3ce273ae4cc5e77551520395d
diff --git a/metadata/md5-cache/dev-haskell/base-orphans-0.8.4 b/metadata/md5-cache/dev-haskell/base-orphans-0.8.4
index 9ce0ae8e1960..161daa83fb1c 100644
--- a/metadata/md5-cache/dev-haskell/base-orphans-0.8.4
+++ b/metadata/md5-cache/dev-haskell/base-orphans-0.8.4
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Backwards-compatible orphan instances for base
 EAPI=7
 HOMEPAGE=https://github.com/haskell-compat/base-orphans#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.8.4
 SRC_URI=https://hackage.haskell.org/package/base-orphans-0.8.4/base-orphans-0.8.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=37ab137528349fa6f3296999b71145ae
diff --git a/metadata/md5-cache/dev-haskell/base-prelude-1.3 b/metadata/md5-cache/dev-haskell/base-prelude-1.3
index e04b88c973a0..993cd287da7d 100644
--- a/metadata/md5-cache/dev-haskell/base-prelude-1.3
+++ b/metadata/md5-cache/dev-haskell/base-prelude-1.3
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=The most complete prelude formed solely from the "base" package
 EAPI=6
 HOMEPAGE=https://github.com/nikita-volkov/base-prelude
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27e40cded3c734f7d12e22637a38e7b1
diff --git a/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.4.2 b/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.4.2
index df73482f2049..b8c43c04119c 100644
--- a/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.4.2
+++ b/metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.4.2
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Unicode alternatives for common functions and operators
 EAPI=7
 HOMEPAGE=https://haskell.org/haskellwiki/Unicode-symbols
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.4.2
 SRC_URI=https://hackage.haskell.org/package/base-unicode-symbols-0.2.4.2/base-unicode-symbols-0.2.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=33384d4af0056f56017083d20e54852f
diff --git a/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7 b/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7
index 75d2dea98b17..83078408097e 100644
--- a/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7
+++ b/metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast base16 (hex) encoding and decoding for ByteStrings
 EAPI=7
 HOMEPAGE=https://github.com/haskell/base16-bytestring
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.7
 SRC_URI=https://hackage.haskell.org/package/base16-bytestring-0.1.1.7/base16-bytestring-0.1.1.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6db2e6b6e6e3eab02d77f584a0168cce
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
index 70bcb34b34e7..d69b08a378c9 100644
--- a/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3
+++ b/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast base64 encoding and decoding for ByteStrings
 EAPI=7
 HOMEPAGE=https://github.com/haskell/base64-bytestring
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e53f6b838c5629c0c2f15bc96884f082
diff --git a/metadata/md5-cache/dev-haskell/basement-0.0.11 b/metadata/md5-cache/dev-haskell/basement-0.0.11
index 0233189662db..4a17bf6a536c 100644
--- a/metadata/md5-cache/dev-haskell/basement-0.0.11
+++ b/metadata/md5-cache/dev-haskell/basement-0.0.11
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Foundation scrap box of array & string
 EAPI=7
 HOMEPAGE=https://github.com/haskell-foundation/foundation#readme
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.0.1:=
 SLOT=0/0.0.11
 SRC_URI=https://hackage.haskell.org/package/basement-0.0.11/basement-0.0.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=899278eee12714379c3a6b7772554869
diff --git a/metadata/md5-cache/dev-haskell/basic-prelude-0.7.0 b/metadata/md5-cache/dev-haskell/basic-prelude-0.7.0
index a70fa6a220a1..2ce023ae1ed2 100644
--- a/metadata/md5-cache/dev-haskell/basic-prelude-0.7.0
+++ b/metadata/md5-cache/dev-haskell/basic-prelude-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/hashable:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[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 )
+DEPEND=dev-haskell/hashable:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=An enhanced core prelude; a common foundation for alternate preludes
 EAPI=6
 HOMEPAGE=https://github.com/snoyberg/basic-prelude#readme
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/hashable:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.7.0
 SRC_URI=https://hackage.haskell.org/package/basic-prelude-0.7.0/basic-prelude-0.7.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=916c2e8cfbf9ddfc77afa7f22c5cd8aa
diff --git a/metadata/md5-cache/dev-haskell/bencode-0.6.1.1 b/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
index 5c1e495deef6..17f72980884e 100644
--- a/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
+++ b/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parser and printer for bencoded data
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/bencode
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/parsec:=[profile?] >=dev-haskell/transformers-compat-0.4:=[p
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=82186cf79d64aeb3c3e1a402c52391fb
diff --git a/metadata/md5-cache/dev-haskell/bifunctors-5.5.6 b/metadata/md5-cache/dev-haskell/bifunctors-5.5.6
index ac17854bd215..04e3fa43a683 100644
--- a/metadata/md5-cache/dev-haskell/bifunctors-5.5.6
+++ b/metadata/md5-cache/dev-haskell/bifunctors-5.5.6
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell98 bifunctors package
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/bifunctors/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 52144cbbdd85..8519de80a281 100644
--- a/metadata/md5-cache/dev-haskell/binary-0.8.7.0
+++ b/metadata/md5-cache/dev-haskell/binary-0.8.7.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Binary serialisation for Haskell values using lazy ByteStrings
 EAPI=7
 HOMEPAGE=https://github.com/kolmodin/binary
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4522cd0af214c4c2d99437d9b3550385
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0210dda539e8e9f9596797b3126c060a
diff --git a/metadata/md5-cache/dev-haskell/binary-instances-1.0.0.1 b/metadata/md5-cache/dev-haskell/binary-instances-1.0.0.1
index 2d94731cfb76..f700c437d9a3 100644
--- a/metadata/md5-cache/dev-haskell/binary-instances-1.0.0.1
+++ b/metadata/md5-cache/dev-haskell/binary-instances-1.0.0.1
@@ -1,5 +1,5 @@
 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/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?] >=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.2.2:=[profile?] >=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/scientific-0.3.3.8:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.8.7:=[profile?] >=dev-haskell/text-1.2.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-binary-0.2.1.1:=[profile?] <dev-haskell/text-binary-0.3:=[profile?] >=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1.0:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14 >=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4 >=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?] >=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.2.2:=[profile?] >=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/scientific-0.3.3.8:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.8.7:=[profile?] >=dev-haskell/text-1.2.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-binary-0.2.1.1:=[profile?] <dev-haskell/text-binary-0.3:=[profile?] >=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1.0:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14 >=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4 >=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Orphan instances for binary
 EAPI=7
 HOMEPAGE=https://github.com/phadej/binary-instances#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.5:=[profile
 RESTRICT=test
 SLOT=0/1.0.0.1
 SRC_URI=https://hackage.haskell.org/package/binary-instances-1.0.0.1/binary-instances-1.0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=efe37556de5228842544dbba65f1783d
diff --git a/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1 b/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1
index 0c2e04c5d11a..cce99bc1b35b 100644
--- a/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1
+++ b/metadata/md5-cache/dev-haskell/binary-orphans-1.0.1
@@ -1,5 +1,5 @@
 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/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/semigroups-0.18.5:=[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/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14 >=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4 >=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.8.7 >=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/fail-4.9:=[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.5:=[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/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14 >=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4 >=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.8.7 >=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Orphan instances for binary
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/binary-orphans
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.1
 SRC_URI=https://hackage.haskell.org/package/binary-orphans-1.0.1/binary-orphans-1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7e4c26653aad86d38f35ec165b7b37f8
diff --git a/metadata/md5-cache/dev-haskell/binary-tagged-0.2 b/metadata/md5-cache/dev-haskell/binary-tagged-0.2
index b9c7788ba50c..7c05592f6c8e 100644
--- a/metadata/md5-cache/dev-haskell/binary-tagged-0.2
+++ b/metadata/md5-cache/dev-haskell/binary-tagged-0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/cryptohash-sha1-0.11.100.1:=[profile?] <dev-haskell/cryptohash-sha1-0.12:=[profile?] >=dev-haskell/generics-sop-0.3.2.0:=[profile?] <dev-haskell/generics-sop-0.6:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.7:=[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:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/bifunctors >=dev-haskell/binary-instances-1 <dev-haskell/binary-instances-1.1 dev-haskell/quickcheck-instances 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 )
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/cryptohash-sha1-0.11.100.1:=[profile?] <dev-haskell/cryptohash-sha1-0.12:=[profile?] >=dev-haskell/generics-sop-0.3.2.0:=[profile?] <dev-haskell/generics-sop-0.6:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.7:=[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:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/bifunctors >=dev-haskell/binary-instances-1 <dev-haskell/binary-instances-1.1 dev-haskell/quickcheck-instances dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Tagged binary serialisation
 EAPI=7
 HOMEPAGE=https://github.com/phadej/binary-tagged#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/0.2
 SRC_URI=https://hackage.haskell.org/package/binary-tagged-0.2/binary-tagged-0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50a357b56d98595fe749579e68b10e1d
diff --git a/metadata/md5-cache/dev-haskell/biocore-0.3.1 b/metadata/md5-cache/dev-haskell/biocore-0.3.1
index a8c2c2a50de3..18c2df338004 100644
--- a/metadata/md5-cache/dev-haskell/biocore-0.3.1
+++ b/metadata/md5-cache/dev-haskell/biocore-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/stringable:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/stringable:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A bioinformatics library
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/biocore
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-haskell/stringable:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/biocore-0.3.1/biocore-0.3.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=63b817f99576d441cf4df298025a466c
diff --git a/metadata/md5-cache/dev-haskell/biofasta-0.0.3 b/metadata/md5-cache/dev-haskell/biofasta-0.0.3
index e7c2a189e0f6..6486ebe955af 100644
--- a/metadata/md5-cache/dev-haskell/biofasta-0.0.3
+++ b/metadata/md5-cache/dev-haskell/biofasta-0.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/biocore-0.3.1:=[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 )
+DEPEND=>=dev-haskell/biocore-0.3.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Library for reading fasta sequence files
 EAPI=7
 HOMEPAGE=https://patch-tag.com/r/dfornika/biofasta/home
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/biocore-0.3.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.3
 SRC_URI=https://hackage.haskell.org/package/biofasta-0.0.3/biofasta-0.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d5dce0dd43834ff9038b6072a64d1877
diff --git a/metadata/md5-cache/dev-haskell/biosff-0.3.7.1 b/metadata/md5-cache/dev-haskell/biosff-0.3.7.1
index d1cebce7efee..c61b1476d357 100644
--- a/metadata/md5-cache/dev-haskell/biosff-0.3.7.1
+++ b/metadata/md5-cache/dev-haskell/biosff-0.3.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/biocore-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= flower? ( dev-haskell/cmdargs:=[profile?] >=dev-haskell/mtl-2:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/biocore-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= flower? ( dev-haskell/cmdargs:=[profile?] >=dev-haskell/mtl-2:=[profile?] ) >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Library and executables for working with SFF files
 EAPI=7
 HOMEPAGE=http://biohaskell.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/biocore-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= flower? ( dev-haskell/cmdargs:=[profile?] >=dev-haskell/mtl-2:=[profile?] )
 SLOT=0/0.3.7.1
 SRC_URI=https://hackage.haskell.org/package/biosff-0.3.7.1/biosff-0.3.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8567600b22f61d278a363158ea70b4e9
diff --git a/metadata/md5-cache/dev-haskell/bitarray-0.0.1.1 b/metadata/md5-cache/dev-haskell/bitarray-0.0.1.1
index bc887b834c77..61e857b1229d 100644
--- a/metadata/md5-cache/dev-haskell/bitarray-0.0.1.1
+++ b/metadata/md5-cache/dev-haskell/bitarray-0.0.1.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Mutable and immutable bit arrays
 EAPI=6
 HOMEPAGE=http://code.haskell.org/~bkomuves/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1.1
 SRC_URI=https://hackage.haskell.org/package/bitarray-0.0.1.1/bitarray-0.0.1.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=edba6f0f544a8021e59cddfea565f392
diff --git a/metadata/md5-cache/dev-haskell/bits-atomic-0.1.3-r1 b/metadata/md5-cache/dev-haskell/bits-atomic-0.1.3-r1
index a2a4ba8bfa86..b67185046ce1 100644
--- a/metadata/md5-cache/dev-haskell/bits-atomic-0.1.3-r1
+++ b/metadata/md5-cache/dev-haskell/bits-atomic-0.1.3-r1
@@ -1,5 +1,5 @@
 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/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 )
+DEPEND=>=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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Atomic bit operations on memory locations for low-level synchronization
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/bits-atomic
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/bits-atomic-0.1.3/bits-atomic-0.1.3.tar.gz https://dev.gentoo.org/~slyfox/patches/bits-atomic-0.1.3-gcc-5.patch
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b1d058dc5c03487218b8a6d4e2a544b
diff --git a/metadata/md5-cache/dev-haskell/bitwise-1.0.0.1 b/metadata/md5-cache/dev-haskell/bitwise-1.0.0.1
index b5e5ba204eca..86a1df54482d 100644
--- a/metadata/md5-cache/dev-haskell/bitwise-1.0.0.1
+++ b/metadata/md5-cache/dev-haskell/bitwise-1.0.0.1
@@ -1,5 +1,5 @@
 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/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=fast multi-dimensional unboxed bit packed Bool arrays
 EAPI=7
 HOMEPAGE=https://code.mathr.co.uk/bitwise
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0.1
 SRC_URI=https://hackage.haskell.org/package/bitwise-1.0.0.1/bitwise-1.0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=350e8d5065b45d05905299b34ba1a913
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
index 260f15f17e9e..3fec5cdcc5c2 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Efficient buffered output
 EAPI=6
 HOMEPAGE=https://github.com/lpsmith/blaze-builder
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/semigroups-0.16
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b3d1ccf3d1a431bfed7fc6868afd9e95
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.1.0 b/metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.1.0
index f345d4857a45..de7025c806d0 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.1.0
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/conduit-1.1:=[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 )
+DEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Convert streams of builders to streams of bytestrings. (deprecated)
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/conduit
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/blaze-builder-conduit-1.1.0/blaze-builder-conduit-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=222a3c84ace92f045eaf53602d247003
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
index 18258141ee58..66093ab88065 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A blazingly fast HTML combinator library for Haskell
 EAPI=7
 HOMEPAGE=https://jaspervdj.be/blaze
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=62f8e09f037e7bf8624cf45f69fa2365
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
index 0d6cf51b4ee3..d9ea0cb7ea40 100644
--- a/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4
+++ b/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A blazingly fast markup combinator library for Haskell
 EAPI=7
 HOMEPAGE=https://jaspervdj.be/blaze
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8da098cae56fd211650df6067e311190
diff --git a/metadata/md5-cache/dev-haskell/blaze-textual-0.2.1.0 b/metadata/md5-cache/dev-haskell/blaze-textual-0.2.1.0
index 62cdf19fdea3..4421b37a3a9a 100644
--- a/metadata/md5-cache/dev-haskell/blaze-textual-0.2.1.0
+++ b/metadata/md5-cache/dev-haskell/blaze-textual-0.2.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/double-conversion-0.2.0.1:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/double-conversion-0.2.0.1:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast rendering of common datatypes
 EAPI=7
 HOMEPAGE=https://github.com/bos/blaze-textual
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/double-con
 RESTRICT=test
 SLOT=0/0.2.1.0
 SRC_URI=https://hackage.haskell.org/package/blaze-textual-0.2.1.0/blaze-textual-0.2.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4904ea50d8df8cdef4ea0afbaba4274
diff --git a/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0 b/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0
index b66257d85238..208971f4fad9 100644
--- a/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0
+++ b/metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.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.8 test? ( >=dev-haskell/quickcheck-2.5 dev-haskell/random dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 ) 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.8 test? ( >=dev-haskell/quickcheck-2.5 dev-haskell/random dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Pure and impure Bloom Filter implementations
 EAPI=7
 HOMEPAGE=https://github.com/bos/bloomfilter
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.0.1.0
 SRC_URI=https://hackage.haskell.org/package/bloomfilter-2.0.1.0/bloomfilter-2.0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0de5adcafd0fe21e1ec6f3ae24435da4
diff --git a/metadata/md5-cache/dev-haskell/boolean-0.2.4 b/metadata/md5-cache/dev-haskell/boolean-0.2.4
index 42398faf83f6..3f06454aad50 100644
--- a/metadata/md5-cache/dev-haskell/boolean-0.2.4
+++ b/metadata/md5-cache/dev-haskell/boolean-0.2.4
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generalized booleans and numbers
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/Boolean
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/Boolean-0.2.4/Boolean-0.2.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5cf2078b7b79ae805b846b98f2cefd06
diff --git a/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0 b/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0
index 8ee4ce93cb60..5187e7edde59 100644
--- a/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0
+++ b/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.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.6 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.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Implementation of bounded channels
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/BoundedChan
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a15d7848e25177503663c7d3e340d875
diff --git a/metadata/md5-cache/dev-haskell/boxes-0.1.5 b/metadata/md5-cache/dev-haskell/boxes-0.1.5
index d4e3727a4a93..a8bc0ed38512 100644
--- a/metadata/md5-cache/dev-haskell/boxes-0.1.5
+++ b/metadata/md5-cache/dev-haskell/boxes-0.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=2D text pretty-printing library
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/boxes
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/0.1.5
 SRC_URI=https://hackage.haskell.org/package/boxes-0.1.5/boxes-0.1.5.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f89299e7bd0a8fe6ed9092b6b0a09ab0
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
index 704dd59c1cb1..4fd291b102b2 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Chunked HTTP transfer encoding for bytestring builders
 EAPI=6
 HOMEPAGE=https://github.com/sjakobi/bsb-http-chunked
@@ -10,5 +10,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f1aedffeca95e4a1afe692e473968811
diff --git a/metadata/md5-cache/dev-haskell/byteable-0.1.1 b/metadata/md5-cache/dev-haskell/byteable-0.1.1
index 8532585b8e00..7640498721ba 100644
--- a/metadata/md5-cache/dev-haskell/byteable-0.1.1
+++ b/metadata/md5-cache/dev-haskell/byteable-0.1.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Type class for sequence of bytes
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-byteable
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/byteable-0.1.1/byteable-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=20c5a39a81ce10325c5ac40b98e4e5ee
diff --git a/metadata/md5-cache/dev-haskell/bytedump-1.0 b/metadata/md5-cache/dev-haskell/bytedump-1.0
index ad1e6a43ae25..830a00b48e5b 100644
--- a/metadata/md5-cache/dev-haskell/bytedump-1.0
+++ b/metadata/md5-cache/dev-haskell/bytedump-1.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.6 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.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Flexible byte dump helpers for human readers
 EAPI=6
 HOMEPAGE=https://github.com/vincenthz/hs-bytedump
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0
 SRC_URI=https://hackage.haskell.org/package/bytedump-1.0/bytedump-1.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f134c61318901ed1ac9922e1466e9322
diff --git a/metadata/md5-cache/dev-haskell/byteorder-1.0.4 b/metadata/md5-cache/dev-haskell/byteorder-1.0.4
index 621ca8cbbdee..4860afa3d329 100644
--- a/metadata/md5-cache/dev-haskell/byteorder-1.0.4
+++ b/metadata/md5-cache/dev-haskell/byteorder-1.0.4
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Exposes the native endianness or byte ordering of the system
 EAPI=7
 HOMEPAGE=http://community.haskell.org/~aslatter/code/byteorder
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.4
 SRC_URI=https://hackage.haskell.org/package/byteorder-1.0.4/byteorder-1.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7016caa59a040705abe1a1de8c6b5125
diff --git a/metadata/md5-cache/dev-haskell/bytes-0.17 b/metadata/md5-cache/dev-haskell/bytes-0.17
index 5fe12ac4852a..43959f937103 100644
--- a/metadata/md5-cache/dev-haskell/bytes-0.17
+++ b/metadata/md5-cache/dev-haskell/bytes-0.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?] >=dev-haskell/cereal-0.5.2:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.0:=[profile?] <dev-haskell/scientific-1:=[profile?] >=dev-haskell/semigroups-0.5:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.6.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[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? ( 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 )
+DEPEND=>=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?] >=dev-haskell/cereal-0.5.2:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.0:=[profile?] <dev-haskell/scientific-1:=[profile?] >=dev-haskell/semigroups-0.5:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.6.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[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? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Sharing code for serialization between binary and cereal
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/bytes
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orpha
 RESTRICT=test
 SLOT=0/0.17
 SRC_URI=https://hackage.haskell.org/package/bytes-0.17/bytes-0.17.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=698c31cdd6db246cf27ef9848f7db59f
diff --git a/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0 b/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0
index 0dfc8dce1c78..7c134acfa78b 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0
+++ b/metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.10.8.2.0
 SRC_URI=https://hackage.haskell.org/package/bytestring-builder-0.10.8.2.0/bytestring-builder-0.10.8.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c55439bdcad75e3d9e07d36235f56842
diff --git a/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.6 b/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.6
index e9e46ad14f22..b489a0302a6a 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.6
+++ b/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=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.1.2 >=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.0 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.5 <dev-haskell/test-framework-quickcheck2-0.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.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2.1.2 >=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.0 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.5 <dev-haskell/test-framework-quickcheck2-0.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=ByteString-backed Handles
 EAPI=7
 HOMEPAGE=https://hub.darcs.net/ganesh/bytestring-handle
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.6
 SRC_URI=https://hackage.haskell.org/package/bytestring-handle-0.1.0.6/bytestring-handle-0.1.0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0f2e9858632fad66f413521f8e653978
diff --git a/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1 b/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
index 384d9daf1ab9..c48753ba9e9b 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
+++ b/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=mmap support for strict ByteStrings
 EAPI=7
 HOMEPAGE=http://code.haskell.org/~dons/code/bytestring-mmap/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/bytestring-mmap-0.2.2/bytestring-mmap-0.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=999d6fbd822ab4d389c82304680a0159
diff --git a/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.6-r1 b/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.6-r1
index e67069fff57a..505cc1fa29aa 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.6-r1
+++ b/metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/binary:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/binary:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Efficient conversion of values into readable byte strings
 EAPI=7
 HOMEPAGE=http://code.haskell.org/~dolio/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.5.6
 SRC_URI=https://hackage.haskell.org/package/bytestring-show-0.3.5.6/bytestring-show-0.3.5.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3cfb31423bbd4779c6e727712fecdb59
diff --git a/metadata/md5-cache/dev-haskell/bzlib-0.5.1.0 b/metadata/md5-cache/dev-haskell/bzlib-0.5.1.0
index a401faaec03e..50ea9e2ce6b2 100644
--- a/metadata/md5-cache/dev-haskell/bzlib-0.5.1.0
+++ b/metadata/md5-cache/dev-haskell/bzlib-0.5.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=app-arch/bzip2 >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[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 )
+DEPEND=app-arch/bzip2 >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Compression and decompression in the bzip2 format
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/bzlib
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/bzip2 >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5.1.0
 SRC_URI=https://hackage.haskell.org/package/bzlib-0.5.1.0/bzlib-0.5.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b19c96b7be91768ea2dfeec7dc1f7c5
diff --git a/metadata/md5-cache/dev-haskell/c2hs-0.28.6 b/metadata/md5-cache/dev-haskell/c2hs-0.28.6
index 208105409e0f..217e75663eb3 100644
--- a/metadata/md5-cache/dev-haskell/c2hs-0.28.6
+++ b/metadata/md5-cache/dev-haskell/c2hs-0.28.6
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/dlist:= dev-haskell/fail:= >=dev-haskell/language-c-0.7.1:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/c2hs-0.28.6/c2hs-0.28.6.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c480c1b0bc4d42c5392d595da25d4b3
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.18.1.2 b/metadata/md5-cache/dev-haskell/cabal-1.18.1.2
index 01b713819a82..4512f1d3c709 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.18.1.2
+++ b/metadata/md5-cache/dev-haskell/cabal-1.18.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-6.12.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.18.1.2
 SRC_URI=https://hackage.haskell.org/package/Cabal-1.18.1.2/Cabal-1.18.1.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f7f30b248d6c39f6695c33c3d3776e72
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.18.1.3 b/metadata/md5-cache/dev-haskell/cabal-1.18.1.3
index c161cf279c20..0cfad19b510e 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.18.1.3
+++ b/metadata/md5-cache/dev-haskell/cabal-1.18.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-6.12.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.18.1.3
 SRC_URI=https://hackage.haskell.org/package/Cabal-1.18.1.3/Cabal-1.18.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=03d14d2641ef2cf5913ec0d967558d5f
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.18.1.5 b/metadata/md5-cache/dev-haskell/cabal-1.18.1.5
index a11236a1b231..a8c7f04e108c 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.18.1.5
+++ b/metadata/md5-cache/dev-haskell/cabal-1.18.1.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-6.12.1:=
 RESTRICT=test
 SLOT=0/1.18.1.5
 SRC_URI=https://hackage.haskell.org/package/Cabal-1.18.1.5/Cabal-1.18.1.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=86520484e07d92474aaa4b7ed5e7de9e
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.20.0.2 b/metadata/md5-cache/dev-haskell/cabal-1.20.0.2
index a8c5ac7b34ab..17881d03e69b 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.20.0.2
+++ b/metadata/md5-cache/dev-haskell/cabal-1.20.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.20.0.2
 SRC_URI=https://hackage.haskell.org/package/Cabal-1.20.0.2/Cabal-1.20.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd94e0dbed688c1c60704b15da13818c
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.22.8.0 b/metadata/md5-cache/dev-haskell/cabal-1.22.8.0
index beaf29391496..4510b0cb50c0 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.22.8.0
+++ b/metadata/md5-cache/dev-haskell/cabal-1.22.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.1:=
 RESTRICT=test
 SLOT=0/1.22.8.0
 SRC_URI=https://hackage.haskell.org/package/Cabal-1.22.8.0/Cabal-1.22.8.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1d246f419f201dd42bb5c32f98a7531d
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.24.2.0 b/metadata/md5-cache/dev-haskell/cabal-1.24.2.0
index 55099bf8b66b..ad7241e62bad 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.24.2.0
+++ b/metadata/md5-cache/dev-haskell/cabal-1.24.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.1:=
 RESTRICT=test
 SLOT=0/1.24.2.0
 SRC_URI=https://hackage.haskell.org/package/Cabal-1.24.2.0/Cabal-1.24.2.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=18f62c5d12475016f12a14c0acf48ef8
diff --git a/metadata/md5-cache/dev-haskell/cabal-2.0.0.2 b/metadata/md5-cache/dev-haskell/cabal-2.0.0.2
index 2b94c647843f..24bde51122e6 100644
--- a/metadata/md5-cache/dev-haskell/cabal-2.0.0.2
+++ b/metadata/md5-cache/dev-haskell/cabal-2.0.0.2
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/ghc-7.8.1:=
 RESTRICT=test
 SLOT=0/2.0.0.2
 SRC_URI=https://hackage.haskell.org/package/Cabal-2.0.0.2/Cabal-2.0.0.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f662cffb225db0d55c76d2d76ac6d127
diff --git a/metadata/md5-cache/dev-haskell/cabal-2.4.0.1 b/metadata/md5-cache/dev-haskell/cabal-2.4.0.1
index 375e493c4384..730e69547fa6 100644
--- a/metadata/md5-cache/dev-haskell/cabal-2.4.0.1
+++ b/metadata/md5-cache/dev-haskell/cabal-2.4.0.1
@@ -9,5 +9,5 @@ RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev
 RESTRICT=test
 SLOT=0/2.4.0.1
 SRC_URI=https://hackage.haskell.org/package/Cabal-2.4.0.1/Cabal-2.4.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5c056ed748460b134ff5631ce79c6b9
diff --git a/metadata/md5-cache/dev-haskell/cabal-3.0.1.0 b/metadata/md5-cache/dev-haskell/cabal-3.0.1.0
index a6b0b17541e6..a7b028e407e3 100644
--- a/metadata/md5-cache/dev-haskell/cabal-3.0.1.0
+++ b/metadata/md5-cache/dev-haskell/cabal-3.0.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=542459d828419f1849235f07b9ba3ffe
diff --git a/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8 b/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8
index c1eb6757dd66..8130ddefefe8 100644
--- a/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8
+++ b/metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.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 )
+DEPEND=>=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Setup.hs helper for doctests running
 EAPI=7
 HOMEPAGE=https://github.com/phadej/cabal-doctest
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.8
 SRC_URI=https://hackage.haskell.org/package/cabal-doctest-1.0.8/cabal-doctest-1.0.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=339fb2f73a158d84b74dff3b65f05366
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
index f34af93d374a..d6674dadc62a 100644
--- a/metadata/md5-cache/dev-haskell/cabal-install-3.0.0.0
+++ b/metadata/md5-cache/dev-haskell/cabal-install-3.0.0.0
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=445017a12a0f07e89409b9c06b28865f
diff --git a/metadata/md5-cache/dev-haskell/cairo-0.13.6.1 b/metadata/md5-cache/dev-haskell/cairo-0.13.6.1
index 71d8c195ba8c..091e214a3938 100644
--- a/metadata/md5-cache/dev-haskell/cairo-0.13.6.1
+++ b/metadata/md5-cache/dev-haskell/cairo-0.13.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.10.1:= x11-libs/cairo >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.1 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.10.1:= x11-libs/cairo >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.1 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Binding to the Cairo library
 EAPI=7
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.10.1:= x11-libs/cairo
 SLOT=0/0.13.6.1
 SRC_URI=https://hackage.haskell.org/package/cairo-0.13.6.1/cairo-0.13.6.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f8463cc757fd7d0b3ff8daf22646d2f3
diff --git a/metadata/md5-cache/dev-haskell/call-stack-0.2.0 b/metadata/md5-cache/dev-haskell/call-stack-0.2.0
index 4d46a810c788..40b15869a5e6 100644
--- a/metadata/md5-cache/dev-haskell/call-stack-0.2.0
+++ b/metadata/md5-cache/dev-haskell/call-stack-0.2.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.12 test? ( dev-haskell/nanospec ) 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.12 test? ( dev-haskell/nanospec ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Use GHC call-stacks in a backward compatible way
 EAPI=7
 HOMEPAGE=https://github.com/sol/call-stack#readme
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 19297c969393..c09bab3f233b 100644
--- a/metadata/md5-cache/dev-haskell/casa-client-0.0.1
+++ b/metadata/md5-cache/dev-haskell/casa-client-0.0.1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Client for Casa
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/casa-client
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc75c0ebacb6b07da6b500cf870b4776
diff --git a/metadata/md5-cache/dev-haskell/casa-types-0.0.1 b/metadata/md5-cache/dev-haskell/casa-types-0.0.1
index 9bfb3040c509..094526d09da7 100644
--- a/metadata/md5-cache/dev-haskell/casa-types-0.0.1
+++ b/metadata/md5-cache/dev-haskell/casa-types-0.0.1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Types for Casa
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/casa-types
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ac0d7469aeb3f502bb1441882f67bbb0
diff --git a/metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0 b/metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0
index be14b37d247a..008ead24599e 100644
--- a/metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0
+++ b/metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/hashable-1.0:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] >=dev-haskell/text-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2.2 >=dev-haskell/test-framework-0.2.4 >=dev-haskell/test-framework-hunit-0.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/hashable-1.0:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] >=dev-haskell/text-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2.2 >=dev-haskell/test-framework-0.2.4 >=dev-haskell/test-framework-hunit-0.2.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Case insensitive string comparison
 EAPI=7
 HOMEPAGE=https://github.com/basvandijk/case-insensitive
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hashable-1.0:=[profile?] >=dev-haskell/semigroups-0.18:=[p
 RESTRICT=!test? ( test )
 SLOT=0/1.2.1.0
 SRC_URI=https://hackage.haskell.org/package/case-insensitive-1.2.1.0/case-insensitive-1.2.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b15f6f66d7306c0afe9c62777380a8be
diff --git a/metadata/md5-cache/dev-haskell/cassava-0.5.2.0 b/metadata/md5-cache/dev-haskell/cassava-0.5.2.0
index af9c5dd9417c..8a0d3359ddb0 100644
--- a/metadata/md5-cache/dev-haskell/cassava-0.5.2.0
+++ b/metadata/md5-cache/dev-haskell/cassava-0.5.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?] >=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14 >=dev-haskell/quickcheck-instances-0.3.12 <dev-haskell/quickcheck-instances-0.4 >=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 )
+DEPEND=>=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?] >=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14 >=dev-haskell/quickcheck-instances-0.3.12 <dev-haskell/quickcheck-instances-0.4 >=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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A CSV parsing and encoding library
 EAPI=7
 HOMEPAGE=https://github.com/hvr/cassava
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.
 RESTRICT=!test? ( test )
 SLOT=0/0.5.2.0
 SRC_URI=https://hackage.haskell.org/package/cassava-0.5.2.0/cassava-0.5.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=29c0a4aaf1f3f01b2edc58955e2c52fc
diff --git a/metadata/md5-cache/dev-haskell/cereal-0.5.8.1 b/metadata/md5-cache/dev-haskell/cereal-0.5.8.1
index d7f0aaef08d9..13d91fb81fb1 100644
--- a/metadata/md5-cache/dev-haskell/cereal-0.5.8.1
+++ b/metadata/md5-cache/dev-haskell/cereal-0.5.8.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A binary serialization library
 EAPI=7
 HOMEPAGE=https://github.com/GaloisInc/cereal
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestr
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=31b918aba2b3bd1f7fcb9a4f61d2e169
diff --git a/metadata/md5-cache/dev-haskell/cereal-vector-0.2.0.1 b/metadata/md5-cache/dev-haskell/cereal-vector-0.2.0.1
index 21de660cfa6f..0e45fc6b5190 100644
--- a/metadata/md5-cache/dev-haskell/cereal-vector-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/cereal-vector-0.2.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Serialize instances for Data.Vector types
 EAPI=6
 HOMEPAGE=https://github.com/acfoltzer/cereal-vector
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0.1
 SRC_URI=https://hackage.haskell.org/package/cereal-vector-0.2.0.1/cereal-vector-0.2.0.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0916e79bebe17da833dfe45cda6275b7
diff --git a/metadata/md5-cache/dev-haskell/cgi-3001.5.0.0 b/metadata/md5-cache/dev-haskell/cgi-3001.5.0.0
index 73b66e2a5c86..164cdb3a065d 100644
--- a/metadata/md5-cache/dev-haskell/cgi-3001.5.0.0
+++ b/metadata/md5-cache/dev-haskell/cgi-3001.5.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/exceptions-0.10:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >dev-haskell/mtl-2.2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.3:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[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 )
+DEPEND=>=dev-haskell/exceptions-0.10:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >dev-haskell/mtl-2.2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.3:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library for writing CGI programs
 EAPI=7
 HOMEPAGE=https://github.com/cheecheeo/haskell-cgi
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/exceptions-0.10:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >dev-haskell/mtl-2.2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.3:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/3001.5.0.0
 SRC_URI=https://hackage.haskell.org/package/cgi-3001.5.0.0/cgi-3001.5.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=29420492e903bd28ed9420db54d1917a
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
index 1b74b149b8a6..fc58a9d012f9 100644
--- a/metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1
+++ b/metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast unicode character sets based on complemented PATRICIA tries
 EAPI=6
 HOMEPAGE=https://github.com/ekmett/charset
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=39dd362f834d98ddb3d172a87c39adcd
diff --git a/metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5 b/metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5
index eed553587de5..f08dfdbb5438 100644
--- a/metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5
+++ b/metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] <dev-haskell/abstract-deque-0.4:=[profile?] >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/abstract-deque-tests-0.3 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 )
+DEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] <dev-haskell/abstract-deque-0.4:=[profile?] >=dev-haskell/atomic-primops-0.5.0.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/abstract-deque-tests-0.3 dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Chase & Lev work-stealing lock-free double-ended queues (deques)
 EAPI=7
 HOMEPAGE=https://github.com/rrnewton/haskell-lockfree/wiki
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/abstract-deque-0.3:=[profile?] <dev-haskell/abstract-deque
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0.5
 SRC_URI=https://hackage.haskell.org/package/chaselev-deque-0.5.0.5/chaselev-deque-0.5.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f3d438498b269bb80c562c495d33151
diff --git a/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9 b/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9
index 6900c0135ead..7ff7d85bd71e 100644
--- a/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9
+++ b/metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=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 )
+DEPEND=>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.16.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=For testing partial and infinite values
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/ChasingBottoms
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-h
 RESTRICT=!test? ( test )
 SLOT=0/1.3.1.9
 SRC_URI=https://hackage.haskell.org/package/ChasingBottoms-1.3.1.9/ChasingBottoms-1.3.1.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3118f6e3fdf9a7b8a0efd446f39b6b9e
diff --git a/metadata/md5-cache/dev-haskell/chell-0.4.0.2 b/metadata/md5-cache/dev-haskell/chell-0.4.0.2
index fddb752e2ee4..acb3fe8f51e0 100644
--- a/metadata/md5-cache/dev-haskell/chell-0.4.0.2
+++ b/metadata/md5-cache/dev-haskell/chell-0.4.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?] >=dev-haskell/patience-0.1:=[profile?] <dev-haskell/patience-0.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.8.2:= color-output? ( >=dev-haskell/ansi-terminal-0.5:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?] >=dev-haskell/patience-0.1:=[profile?] <dev-haskell/patience-0.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.8.2:= color-output? ( >=dev-haskell/ansi-terminal-0.5:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A simple and intuitive library for automated testing
 EAPI=6
 HOMEPAGE=https://john-millikin.com/software/chell/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?] >=dev-haskell/patience-0.1:=[profile?] <dev-haskell/patience-0.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.8.2:= color-output? ( >=dev-haskell/ansi-terminal-0.5:=[profile?] )
 SLOT=0/0.4.0.2
 SRC_URI=https://hackage.haskell.org/package/chell-0.4.0.2/chell-0.4.0.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27113fb5a8fbf909d101a84bbd25b0fb
diff --git a/metadata/md5-cache/dev-haskell/chimera-0.3.1.0 b/metadata/md5-cache/dev-haskell/chimera-0.3.1.0
index 47ad0c2e17bc..2ddccdcfc3ce 100644
--- a/metadata/md5-cache/dev-haskell/chimera-0.3.1.0
+++ b/metadata/md5-cache/dev-haskell/chimera-0.3.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:= representable? ( dev-haskell/adjunctions:=[profile?] dev-haskell/distributive:=[profile?] dev-haskell/mtl:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/quickcheck-2.10 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck dev-haskell/tasty-smallcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:= representable? ( dev-haskell/adjunctions:=[profile?] dev-haskell/distributive:=[profile?] dev-haskell/mtl:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/quickcheck-2.10 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck dev-haskell/tasty-smallcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Lazy infinite streams with O(1) indexing
 EAPI=7
 HOMEPAGE=https://github.com/Bodigrim/chimera#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:= representable? ( d
 RESTRICT=!test? ( test )
 SLOT=0/0.3.1.0
 SRC_URI=https://hackage.haskell.org/package/chimera-0.3.1.0/chimera-0.3.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dd0c3d6506a9d603aa4837ff5d38d8ff
diff --git a/metadata/md5-cache/dev-haskell/chunked-data-0.3.0 b/metadata/md5-cache/dev-haskell/chunked-data-0.3.0
index 073ea896e8d7..e63b2dc6414b 100644
--- a/metadata/md5-cache/dev-haskell/chunked-data-0.3.0
+++ b/metadata/md5-cache/dev-haskell/chunked-data-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/semigroups:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/vector:=[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 )
+DEPEND=dev-haskell/semigroups:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Typeclasses for dealing with various chunked data representations
 EAPI=6
 HOMEPAGE=https://github.com/snoyberg/mono-traversable
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/semigroups:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/chunked-data-0.3.0/chunked-data-0.3.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6faa5b313a7c864a377d88146636b23e
diff --git a/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11 b/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
index f7a5aead6513..821512478783 100644
--- a/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
+++ b/metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.6:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/crypto-cipher-tests-0.0.8 >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.6:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/crypto-cipher-tests-0.0.8 >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast AES cipher implementation with advanced mode of operations
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-cipher-aes
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.6
 RESTRICT=!test? ( test )
 SLOT=0/0.2.11
 SRC_URI=https://hackage.haskell.org/package/cipher-aes-0.2.11/cipher-aes-0.2.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=564ec9f2ce2c909ba9c7ad230ec4c30f
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
index 984027a7ba02..201e9a9acf6b 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=AES and common modes using AES-NI when available
 EAPI=7
 HOMEPAGE=https://github.com/TomMD/cipher-aes128
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8df3e3492c5ee1807964093cc53a306b
diff --git a/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2 b/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2
index 5a25e038c461..9b5947a3b73e 100644
--- a/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2
+++ b/metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/crypto-cipher-tests >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/crypto-cipher-tests >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Camellia block cipher primitives
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3
 RESTRICT=!test? ( test )
 SLOT=0/0.0.2
 SRC_URI=https://hackage.haskell.org/package/cipher-camellia-0.0.2/cipher-camellia-0.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=93f5bd893e8f5af83e2ff6f5acf5893d
diff --git a/metadata/md5-cache/dev-haskell/cipher-des-0.0.6 b/metadata/md5-cache/dev-haskell/cipher-des-0.0.6
index 20c07edfa58b..f671df1497cc 100644
--- a/metadata/md5-cache/dev-haskell/cipher-des-0.0.6
+++ b/metadata/md5-cache/dev-haskell/cipher-des-0.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/crypto-cipher-tests >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/crypto-cipher-tests >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=DES and 3DES primitives
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3
 RESTRICT=!test? ( test )
 SLOT=0/0.0.6
 SRC_URI=https://hackage.haskell.org/package/cipher-des-0.0.6/cipher-des-0.0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=56c349c54de50f546e5e8b272447cd15
diff --git a/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4 b/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4
index 361a82c65c46..9df3bee02789 100644
--- a/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4
+++ b/metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.5:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/crypto-cipher-tests-0.0.7 >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.5:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/crypto-cipher-tests-0.0.7 >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast RC4 cipher implementation
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-cipher-rc4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.5
 RESTRICT=!test? ( test )
 SLOT=0/0.1.4
 SRC_URI=https://hackage.haskell.org/package/cipher-rc4-0.1.4/cipher-rc4-0.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9444852d47030bc05d884ba90454eb7f
diff --git a/metadata/md5-cache/dev-haskell/classy-prelude-1.5.0 b/metadata/md5-cache/dev-haskell/classy-prelude-1.5.0
index 977fe6a60f07..cb75de3460e9 100644
--- a/metadata/md5-cache/dev-haskell/classy-prelude-1.5.0
+++ b/metadata/md5-cache/dev-haskell/classy-prelude-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/basic-prelude-0.7:=[profile?] dev-haskell/bifunctors:=[profile?] >=dev-haskell/chunked-data-0.3:=[profile?] >=dev-haskell/dlist-0.7:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/mono-traversable-1.0:=[profile?] dev-haskell/mono-traversable-instances:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/say:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/stm-chans-3:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unliftio-0.2.1.0:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/basic-prelude-0.7:=[profile?] dev-haskell/bifunctors:=[profile?] >=dev-haskell/chunked-data-0.3:=[profile?] >=dev-haskell/dlist-0.7:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/mono-traversable-1.0:=[profile?] dev-haskell/mono-traversable-instances:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/say:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/stm-chans-3:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unliftio-0.2.1.0:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A typeclass-based Prelude
 EAPI=6
 HOMEPAGE=https://github.com/snoyberg/mono-traversable#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/basic-prelude-0.7:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/1.5.0
 SRC_URI=https://hackage.haskell.org/package/classy-prelude-1.5.0/classy-prelude-1.5.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=135ee6ea6198a87602879a706b63094f
diff --git a/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2 b/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
index 6cb328c1c292..5a85d3b76cf7 100644
--- a/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
+++ b/metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/base64-bytestring-0.1.1.1:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/cipher-aes-0.1.7:=[profile?] >=dev-haskell/cprng-aes-0.2:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] dev-haskell/crypto-random:=[profile?] >=dev-haskell/entropy-0.2.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/skein-1.0:=[profile?] <dev-haskell/skein-1.1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit >=dev-haskell/quickcheck-2 dev-haskell/transformers ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/base64-bytestring-0.1.1.1:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/cipher-aes-0.1.7:=[profile?] >=dev-haskell/cprng-aes-0.2:=[profile?] >=dev-haskell/crypto-api-0.8:=[profile?] dev-haskell/crypto-random:=[profile?] >=dev-haskell/entropy-0.2.1:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/skein-1.0:=[profile?] <dev-haskell/skein-1.1:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit >=dev-haskell/quickcheck-2 dev-haskell/transformers ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Securely store session data in a client-side cookie
 EAPI=6
 HOMEPAGE=https://github.com/yesodweb/clientsession/tree/master
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base64-bytestring-0.1.1.1:=[profile?] >=dev-haskell/cereal
 RESTRICT=!test? ( test )
 SLOT=0/0.9.1.2
 SRC_URI=https://hackage.haskell.org/package/clientsession-0.9.1.2/clientsession-0.9.1.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=61254601780da2cd91b361f908182bab
diff --git a/metadata/md5-cache/dev-haskell/clock-0.7.2 b/metadata/md5-cache/dev-haskell/clock-0.7.2
index 5558b60d834e..76be3b80acb7 100644
--- a/metadata/md5-cache/dev-haskell/clock-0.7.2
+++ b/metadata/md5-cache/dev-haskell/clock-0.7.2
@@ -1,14 +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/tasty-0.10 dev-haskell/tasty-quickcheck ) 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.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=High-resolution clock functions: monotonic, realtime, cputime
 EAPI=6
 HOMEPAGE=https://github.com/corsis/clock
-IUSE=doc hscolour profile test
+IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.7.2
 SRC_URI=https://hackage.haskell.org/package/clock-0.7.2/clock-0.7.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9e5b05e9fc6bf57c4efd1bc55aa320f6
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=97f2e61d85994ce4273ef4c931f07baf
diff --git a/metadata/md5-cache/dev-haskell/cmark-0.6 b/metadata/md5-cache/dev-haskell/cmark-0.6
index 2ea9af26c757..0191b7a093fc 100644
--- a/metadata/md5-cache/dev-haskell/cmark-0.6
+++ b/metadata/md5-cache/dev-haskell/cmark-0.6
@@ -1,5 +1,5 @@
 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:= system-cmark? ( app-text/cmark ) >=dev-haskell/cabal-1.14 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 ) system-cmark? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= system-cmark? ( app-text/cmark ) >=dev-haskell/cabal-1.14 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 ) system-cmark? ( virtual/pkgconfig ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast, accurate CommonMark (Markdown) parser and renderer
 EAPI=7
 HOMEPAGE=https://github.com/jgm/cmark-hs
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=d
 RESTRICT=!test? ( test )
 SLOT=0/0.6
 SRC_URI=https://hackage.haskell.org/package/cmark-0.6/cmark-0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5b27f315631a19ad2d188438e0e62d16
diff --git a/metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1 b/metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1
index bdf3da66ccdf..8321d6a78bd4 100644
--- a/metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1
+++ b/metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast, accurate GitHub Flavored Markdown parser and renderer
 EAPI=7
 HOMEPAGE=https://github.com/kivikakk/cmark-gfm-hs
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=d
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=839883ce18022b62f30b578cc69d4dcb
diff --git a/metadata/md5-cache/dev-haskell/cmdargs-0.10.20 b/metadata/md5-cache/dev-haskell/cmdargs-0.10.20
index 47d168e97cb9..f26de5d3a1e0 100644
--- a/metadata/md5-cache/dev-haskell/cmdargs-0.10.20
+++ b/metadata/md5-cache/dev-haskell/cmdargs-0.10.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/semigroups-0.18:=[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 )
+DEPEND=>=dev-haskell/semigroups-0.18:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Command line argument processing
 EAPI=6
 HOMEPAGE=https://github.com/ndmitchell/cmdargs#readme
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroups-0.18:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.10.20
 SRC_URI=https://hackage.haskell.org/package/cmdargs-0.10.20/cmdargs-0.10.20.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d57d51d8c6858ed82c88ddf83a8790c9
diff --git a/metadata/md5-cache/dev-haskell/code-page-0.1.3 b/metadata/md5-cache/dev-haskell/code-page-0.1.3
index cb90d37d209a..61197dff3dd8 100644
--- a/metadata/md5-cache/dev-haskell/code-page-0.1.3
+++ b/metadata/md5-cache/dev-haskell/code-page-0.1.3
@@ -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 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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Windows code page library for Haskell
 EAPI=6
 HOMEPAGE=https://github.com/RyanGlScott/code-page
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/code-page-0.1.3/code-page-0.1.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=939c8762018d4085602e8be836c3b5dc
diff --git a/metadata/md5-cache/dev-haskell/colour-2.3.5 b/metadata/md5-cache/dev-haskell/colour-2.3.5
index 9d281e220c4c..c7cefd0170ba 100644
--- a/metadata/md5-cache/dev-haskell/colour-2.3.5
+++ b/metadata/md5-cache/dev-haskell/colour-2.3.5
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A model for human colour/color perception
 EAPI=7
 HOMEPAGE=https://www.haskell.org/haskellwiki/Colour
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.0.1:=
 RESTRICT=test
 SLOT=0/2.3.5
 SRC_URI=https://hackage.haskell.org/package/colour-2.3.5/colour-2.3.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c47fcf559a35c2c9934911cc562df0aa
diff --git a/metadata/md5-cache/dev-haskell/comonad-5.0.7 b/metadata/md5-cache/dev-haskell/comonad-5.0.7
index 8920528fb6d0..2c2c6c77b619 100644
--- a/metadata/md5-cache/dev-haskell/comonad-5.0.7
+++ b/metadata/md5-cache/dev-haskell/comonad-5.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=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:= indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[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.18 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=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:= indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[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.18 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell package providing comonads
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/comonad/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1
 RESTRICT=test
 SLOT=0/5.0.7
 SRC_URI=https://hackage.haskell.org/package/comonad-5.0.7/comonad-5.0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d095532c6e85dd13aabb5b29c1e5cb3a
diff --git a/metadata/md5-cache/dev-haskell/comonad-transformers-4.0 b/metadata/md5-cache/dev-haskell/comonad-transformers-4.0
index c59533cc081f..61b992cf4ddb 100644
--- a/metadata/md5-cache/dev-haskell/comonad-transformers-4.0
+++ b/metadata/md5-cache/dev-haskell/comonad-transformers-4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/comonad-4:=[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 )
+DEPEND=>=dev-haskell/comonad-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=This package has been merged into comonad 4.0
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/comonad-transformers/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/4.0
 SRC_URI=https://hackage.haskell.org/package/comonad-transformers-4.0/comonad-transformers-4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35a2a57a4bc1dd40e2adc950968ae2fa
diff --git a/metadata/md5-cache/dev-haskell/comonads-fd-4.0 b/metadata/md5-cache/dev-haskell/comonads-fd-4.0
index f97aafa60b81..77a22344b22b 100644
--- a/metadata/md5-cache/dev-haskell/comonads-fd-4.0
+++ b/metadata/md5-cache/dev-haskell/comonads-fd-4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/comonad-4:=[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 )
+DEPEND=>=dev-haskell/comonad-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=This package has been merged into comonad 4.0
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/comonads-fd/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/4.0
 SRC_URI=https://hackage.haskell.org/package/comonads-fd-4.0/comonads-fd-4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b73c2133f66c10e14b6754b8f6294e0
diff --git a/metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.12 b/metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.12
index efb06e6aa340..503378b2b2cb 100644
--- a/metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.12
+++ b/metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/stm-2.1.2.1:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/async-2.0 >=dev-haskell/hunit-1.2.2 >=dev-haskell/random-1.0 >=dev-haskell/test-framework-0.2.4 >=dev-haskell/test-framework-hunit-0.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/stm-2.1.2.1:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/async-2.0 >=dev-haskell/hunit-1.2.2 >=dev-haskell/random-1.0 >=dev-haskell/test-framework-0.2.4 >=dev-haskell/test-framework-hunit-0.2.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Extra concurrency primitives
 EAPI=6
 HOMEPAGE=https://github.com/basvandijk/concurrent-extra
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/stm-2.1.2.1:=[profile?] >=dev-haskell/unbounded-delays-0.1
 RESTRICT=test
 SLOT=0/0.7.0.12
 SRC_URI=https://hackage.haskell.org/package/concurrent-extra-0.7.0.12/concurrent-extra-0.7.0.12.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b3dfb01a6afa2fed559a8d2e7e9f944e
diff --git a/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11 b/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
index 77ce25e2217e..1d03b94785f7 100644
--- a/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
+++ b/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Ungarble output from several threads or commands
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/concurrent-output
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4b43f94cac107ca35dedbaea0578068
diff --git a/metadata/md5-cache/dev-haskell/conduit-1.3.4 b/metadata/md5-cache/dev-haskell/conduit-1.3.4
index eb33f298df71..e05a76b273bd 100644
--- a/metadata/md5-cache/dev-haskell/conduit-1.3.4
+++ b/metadata/md5-cache/dev-haskell/conduit-1.3.4
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Streaming data processing library
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/conduit
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/exceptions:=[profile?] >=dev-haskell/mono-traversable-1.0.7:
 RESTRICT=!test? ( test )
 SLOT=0/1.3.4
 SRC_URI=https://hackage.haskell.org/package/conduit-1.3.4/conduit-1.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=779ac11c649cf6887616d90aa65c3e56
diff --git a/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0 b/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
index 66d9add1eed7..975f54645b59 100644
--- a/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
+++ b/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 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
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 99ea89f6d4af..9a13bbee6000 100644
--- a/metadata/md5-cache/dev-haskell/conduit-extra-1.3.4
+++ b/metadata/md5-cache/dev-haskell/conduit-extra-1.3.4
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Batteries included conduit: adapters for common libraries
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/conduit
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?]
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aa35331dac65cb519f3b125ceefac2bd
diff --git a/metadata/md5-cache/dev-haskell/configfile-1.1.4 b/metadata/md5-cache/dev-haskell/configfile-1.1.4
index e37aaa7f8376..d5bf1f2ad44d 100644
--- a/metadata/md5-cache/dev-haskell/configfile-1.1.4
+++ b/metadata/md5-cache/dev-haskell/configfile-1.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/missingh-1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=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 )
+DEPEND=>=dev-haskell/missingh-1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Configuration file reading & writing
 EAPI=7
 HOMEPAGE=http://software.complete.org/configfile
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/missingh-1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.4
 SRC_URI=https://hackage.haskell.org/package/ConfigFile-1.1.4/ConfigFile-1.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6990f88a16ca87a9c788ea8cefd73546
diff --git a/metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1 b/metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1
index a55801e08a1c..861a52960991 100644
--- a/metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.10.0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/text-0.11.1.0:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 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 )
+DEPEND=>=dev-haskell/attoparsec-0.10.0.2:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/text-0.11.1.0:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Configuration management
 EAPI=6
 HOMEPAGE=https://github.com/bos/configurator
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10.0.2:=[profile?] dev-haskell/hashable:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0.0
 SRC_URI=https://hackage.haskell.org/package/configurator-0.3.0.0/configurator-0.3.0.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=963a9855d0913414af94a32bea793822
diff --git a/metadata/md5-cache/dev-haskell/connection-0.3.1 b/metadata/md5-cache/dev-haskell/connection-0.3.1
index 3d568340a253..5d3af563494c 100644
--- a/metadata/md5-cache/dev-haskell/connection-0.3.1
+++ b/metadata/md5-cache/dev-haskell/connection-0.3.1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple and easy network connections API
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-connection
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b853cb919f73194bfd2872f90ccb4508
diff --git a/metadata/md5-cache/dev-haskell/constraints-0.11.2 b/metadata/md5-cache/dev-haskell/constraints-0.11.2
index d8bdde975402..9d8db6884875 100644
--- a/metadata/md5-cache/dev-haskell/constraints-0.11.2
+++ b/metadata/md5-cache/dev-haskell/constraints-0.11.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Constraint manipulation
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/constraints/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profi
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9bd6e36f705aa9b1750fa3d1c769977d
diff --git a/metadata/md5-cache/dev-haskell/contravariant-1.5.2 b/metadata/md5-cache/dev-haskell/contravariant-1.5.2
index f6ff64cf1539..1ff40ec0672a 100644
--- a/metadata/md5-cache/dev-haskell/contravariant-1.5.2
+++ b/metadata/md5-cache/dev-haskell/contravariant-1.5.2
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Contravariant functors
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/contravariant/
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fbdf1f96309dd03fa67d5c944e04d068
diff --git a/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2 b/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2
index bed46d5c0edb..51687236184e 100644
--- a/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2
+++ b/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2
@@ -1,5 +1,5 @@
 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.4:=[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 )
+DEPEND=>=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/template-haskell-compat-v0208-0.1.4:=[profile?] <dev-haskell/template-haskell-compat-v0208-2:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Extras for the "contravariant" package
 EAPI=7
 HOMEPAGE=https://github.com/nikita-volkov/contravariant-extras
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/template-haskell-compat-v0208-0.1.4:=[profile?] <dev-haskell/template-haskell-compat-v0208-2:=[profile?] >=dev-lang/ghc-8.2.1:=
 SLOT=0/0.3.5.2
 SRC_URI=https://hackage.haskell.org/package/contravariant-extras-0.3.5.2/contravariant-extras-0.3.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0e2c783a85b58e03c065e5bcb17687c7
diff --git a/metadata/md5-cache/dev-haskell/control-monad-loop-0.1 b/metadata/md5-cache/dev-haskell/control-monad-loop-0.1
index 2b2d5cb0bfc0..cafc7e8ead2e 100644
--- a/metadata/md5-cache/dev-haskell/control-monad-loop-0.1
+++ b/metadata/md5-cache/dev-haskell/control-monad-loop-0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/transformers-base:=[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 )
+DEPEND=dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple monad transformer for imperative-style loops
 EAPI=7
 HOMEPAGE=https://github.com/joeyadams/haskell-control-monad-loop
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/control-monad-loop-0.1/control-monad-loop-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9b7d89044c192ac1342dd0a97ea99655
diff --git a/metadata/md5-cache/dev-haskell/convertible-1.1.1.0 b/metadata/md5-cache/dev-haskell/convertible-1.1.1.0
index d0b4c8c0b5dc..b04691416e68 100644
--- a/metadata/md5-cache/dev-haskell/convertible-1.1.1.0
+++ b/metadata/md5-cache/dev-haskell/convertible-1.1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/text-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 )
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Typeclasses and instances for converting between types
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/convertible
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.1.1.0
 SRC_URI=https://hackage.haskell.org/package/convertible-1.1.1.0/convertible-1.1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=56c16b1163236be4a5cfd5688d9d9bf8
diff --git a/metadata/md5-cache/dev-haskell/cookie-0.4.4 b/metadata/md5-cache/dev-haskell/cookie-0.4.4
index 6fe3d0b4849c..56510f7053a6 100644
--- a/metadata/md5-cache/dev-haskell/cookie-0.4.4
+++ b/metadata/md5-cache/dev-haskell/cookie-0.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/data-default-class:=[profile?] >=dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/hunit dev-haskell/quickcheck 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 )
+DEPEND=dev-haskell/data-default-class:=[profile?] >=dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=HTTP cookie parsing and rendering
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/cookie
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-haskell/text-1.1:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/0.4.4
 SRC_URI=https://hackage.haskell.org/package/cookie-0.4.4/cookie-0.4.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=501d043f768cd13d86a962d0f01bd7a1
diff --git a/metadata/md5-cache/dev-haskell/cpphs-1.20.8 b/metadata/md5-cache/dev-haskell/cpphs-1.20.8
index 33da1ccee470..532c39f29c8a 100644
--- a/metadata/md5-cache/dev-haskell/cpphs-1.20.8
+++ b/metadata/md5-cache/dev-haskell/cpphs-1.20.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/polyparse-1.9:=[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 )
+DEPEND=dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A liberalised re-implementation of cpp, the C pre-processor
 EAPI=6
 HOMEPAGE=http://projects.haskell.org/cpphs/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.20.8
 SRC_URI=https://hackage.haskell.org/package/cpphs-1.20.8/cpphs-1.20.8.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6bfb20590d30757ecb3e677af3748cbb
diff --git a/metadata/md5-cache/dev-haskell/cpphs-1.20.9.1 b/metadata/md5-cache/dev-haskell/cpphs-1.20.9.1
index 8a4c9007f823..295037deadca 100644
--- a/metadata/md5-cache/dev-haskell/cpphs-1.20.9.1
+++ b/metadata/md5-cache/dev-haskell/cpphs-1.20.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/polyparse-1.13:=[profile?] <dev-haskell/polyparse-1.14:=[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 )
+DEPEND=>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/polyparse-1.13:=[profile?] <dev-haskell/polyparse-1.14:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A liberalised re-implementation of cpp, the C pre-processor
 EAPI=7
 HOMEPAGE=http://projects.haskell.org/cpphs/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/polyparse-1.13:=[profile?] <dev-haskell/polyparse-1.14:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.20.9.1
 SRC_URI=https://hackage.haskell.org/package/cpphs-1.20.9.1/cpphs-1.20.9.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a500cfced350c9b97cdb9d6ede8da60b
diff --git a/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1 b/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
index 691d8ab06c9d..7f734a6ef10d 100644
--- a/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
+++ b/metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cipher-aes-0.2.9:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[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 )
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cipher-aes-0.2.9:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Crypto Pseudo Random Number Generator using AES in counter mode
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-cprng-aes
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cipher-aes-0.2.9:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.1
 SRC_URI=https://hackage.haskell.org/package/cprng-aes-0.6.1/cprng-aes-0.6.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50a3104f6267bc58beefd0c7e532d31a
diff --git a/metadata/md5-cache/dev-haskell/cpu-0.1.2 b/metadata/md5-cache/dev-haskell/cpu-0.1.2
index 91ec984679a4..ce895126a70d 100644
--- a/metadata/md5-cache/dev-haskell/cpu-0.1.2
+++ b/metadata/md5-cache/dev-haskell/cpu-0.1.2
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Cpu information and properties helpers
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-cpu
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.2
 SRC_URI=https://hackage.haskell.org/package/cpu-0.1.2/cpu-0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9691ce3c778b46d20eaeecc56ae6f3c3
diff --git a/metadata/md5-cache/dev-haskell/criterion-1.5.6.2 b/metadata/md5-cache/dev-haskell/criterion-1.5.6.2
index b3a495bcd0f6..67ad9fa97ffe 100644
--- a/metadata/md5-cache/dev-haskell/criterion-1.5.6.2
+++ b/metadata/md5-cache/dev-haskell/criterion-1.5.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?] >=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?] >=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] dev-haskell/code-page:=[profile?] >=dev-haskell/criterion-measurement-0.1.1.0:=[profile?] <dev-haskell/criterion-measurement-0.2:=[profile?] >=dev-haskell/exceptions-0.8.2:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] dev-haskell/js-flot:=[profile?] dev-haskell/js-jquery:=[profile?] >=dev-haskell/microstache-1.0.1:=[profile?] <dev-haskell/microstache-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.13:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/statistics-0.14:=[profile?] <dev-haskell/statistics-0.16:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-compat-0.6.4:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/base-compat dev-haskell/hunit >=dev-haskell/quickcheck-2.4 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 )
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?] >=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?] >=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?] >=dev-haskell/cassava-0.3.0.0:=[profile?] dev-haskell/code-page:=[profile?] >=dev-haskell/criterion-measurement-0.1.1.0:=[profile?] <dev-haskell/criterion-measurement-0.2:=[profile?] >=dev-haskell/exceptions-0.8.2:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/glob-0.7.2:=[profile?] dev-haskell/js-flot:=[profile?] dev-haskell/js-jquery:=[profile?] >=dev-haskell/microstache-1.0.1:=[profile?] <dev-haskell/microstache-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/mwc-random-0.8.0.3:=[profile?] >=dev-haskell/optparse-applicative-0.13:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/statistics-0.14:=[profile?] <dev-haskell/statistics-0.16:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-compat-0.6.4:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/base-compat dev-haskell/hunit >=dev-haskell/quickcheck-2.4 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Robust, reliable performance measurement and analysis
 EAPI=7
 HOMEPAGE=http://www.serpentine.com/criterion
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.7.2
 RESTRICT=!test? ( test )
 SLOT=0/1.5.6.2
 SRC_URI=https://hackage.haskell.org/package/criterion-1.5.6.2/criterion-1.5.6.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b84dc875c6d28be7928a9f93121079f
diff --git a/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0 b/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
index 2afd33c5321d..9f5c21ee9325 100644
--- a/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/vector-0.7.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 )
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Criterion measurement functionality and associated types
 EAPI=7
 HOMEPAGE=https://github.com/bos/criterion
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/vector-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/criterion-measurement-0.1.2.0/criterion-measurement-0.1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c5447d778c9e94e8863b7c8ac8029329
diff --git a/metadata/md5-cache/dev-haskell/crypto-4.2.5.1-r1 b/metadata/md5-cache/dev-haskell/crypto-4.2.5.1-r1
index 99b1b24a61db..ff1a6b055426 100644
--- a/metadata/md5-cache/dev-haskell/crypto-4.2.5.1-r1
+++ b/metadata/md5-cache/dev-haskell/crypto-4.2.5.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4.0.1:2=[profile?] dev-haskell/random:=[profile?] >=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 )
+DEPEND=dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4.0.1:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Collects together existing Haskell cryptographic functions into a package
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/Crypto
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4.0.1:2=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/4.2.5.1
 SRC_URI=https://hackage.haskell.org/package/Crypto-4.2.5.1/Crypto-4.2.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5dbe3cdb1bc4feb5fc910dcde82d33e9
diff --git a/metadata/md5-cache/dev-haskell/crypto-api-0.13.3 b/metadata/md5-cache/dev-haskell/crypto-api-0.13.3
index d23e32b53f83..85f3663f4e53 100644
--- a/metadata/md5-cache/dev-haskell/crypto-api-0.13.3
+++ b/metadata/md5-cache/dev-haskell/crypto-api-0.13.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cereal-0.2:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/tagged-0.1:=[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 )
+DEPEND=>=dev-haskell/cereal-0.2:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A generic interface for cryptographic operations
 EAPI=7
 HOMEPAGE=https://github.com/TomMD/crypto-api
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/0.13.3
 SRC_URI=https://hackage.haskell.org/package/crypto-api-0.13.3/crypto-api-0.13.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=222dce1fb4da5874123833a5dba5b6a4
diff --git a/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1 b/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
index 155fa4977eaf..e6588a9ac87d 100644
--- a/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
+++ b/metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/test-framework-0.4:=[profile?] >=dev-haskell/test-framework-hunit-0.2:=[profile?] >=dev-haskell/test-framework-quickcheck2-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 )
+DEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/test-framework-0.4:=[profile?] >=dev-haskell/test-framework-hunit-0.2:=[profile?] >=dev-haskell/test-framework-quickcheck2-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A test framework and KATs for cryptographic operations
 EAPI=7
 HOMEPAGE=http://trac.haskell.org/crypto-api/wiki
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/test-framework-0.4:=[profile?] >=dev-haskell/test-framework-hunit-0.2:=[profile?] >=dev-haskell/test-framework-quickcheck2-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/crypto-api-tests-0.3/crypto-api-tests-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=29e8d101ac639374458bb93cf085867c
diff --git a/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1 b/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
index 1f84d712259c..b03f8d70a314 100644
--- a/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
+++ b/metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] <dev-haskell/securemem-0.2:=[profile?] dev-haskell/test-framework:=[profile?] dev-haskell/test-framework-hunit:=[profile?] dev-haskell/test-framework-quickcheck2:=[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 )
+DEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] <dev-haskell/securemem-0.2:=[profile?] dev-haskell/test-framework:=[profile?] dev-haskell/test-framework-hunit:=[profile?] dev-haskell/test-framework-quickcheck2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generic cryptography cipher tests
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/0.0.11
 SRC_URI=https://hackage.haskell.org/package/crypto-cipher-tests-0.0.11/crypto-cipher-tests-0.0.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6d2e2b1e5bbdf9f7e9acd90e5b195496
diff --git a/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9 b/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
index 4896e5071f8c..ebb82968794d 100644
--- a/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
+++ b/metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/securemem-0.1.1:=[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 )
+DEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generic cryptography cipher types
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/securemem-0.1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.9
 SRC_URI=https://hackage.haskell.org/package/crypto-cipher-types-0.0.9/crypto-cipher-types-0.0.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cfb20d4d08657619b69967d40e2a82ea
diff --git a/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.7 b/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.7
index 3eb528fb602a..86075e78225a 100644
--- a/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.7
+++ b/metadata/md5-cache/dev-haskell/crypto-numbers-0.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/byteable 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 )
+DEPEND=>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/byteable dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Cryptographic numbers: functions and algorithms
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-numbers
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0
 RESTRICT=!test? ( test )
 SLOT=0/0.2.7
 SRC_URI=https://hackage.haskell.org/package/crypto-numbers-0.2.7/crypto-numbers-0.2.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5b603b93fa954bb975543ff06f09940
diff --git a/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.8 b/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.8
index fc2cc4de6e49..ddb6fa76515c 100644
--- a/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.8
+++ b/metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-numbers-0.2.2:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] >=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-haskell/cryptohash-0.9.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-kat dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-numbers-0.2.2:=[profile?] >=dev-haskell/crypto-pubkey-types-0.4.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] >=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?] >=dev-haskell/cryptohash-0.9.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-kat dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Public Key cryptography
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-pubkey
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-numbers-0.2.2:=[pr
 RESTRICT=test
 SLOT=0/0.2.8
 SRC_URI=https://hackage.haskell.org/package/crypto-pubkey-0.2.8/crypto-pubkey-0.2.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cb2d2e75e2181839c858d7584c582e1e
diff --git a/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.3 b/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.3
index 192ff866701e..14d98cf52fc9 100644
--- a/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.3
+++ b/metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.1:=[profile?] <dev-haskell/asn1-types-0.4:=[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 )
+DEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generic cryptography Public keys algorithm types
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-pubkey-types
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.3
 SRC_URI=https://hackage.haskell.org/package/crypto-pubkey-types-0.4.3/crypto-pubkey-types-0.4.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=198febb5a38fe15ba457d800688055a9
diff --git a/metadata/md5-cache/dev-haskell/crypto-random-0.0.9 b/metadata/md5-cache/dev-haskell/crypto-random-0.0.9
index 51a8e068a521..b4b71e01c982 100644
--- a/metadata/md5-cache/dev-haskell/crypto-random-0.0.9
+++ b/metadata/md5-cache/dev-haskell/crypto-random-0.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/securemem:=[profile?] >=dev-haskell/vector-0.7:=[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 )
+DEPEND=dev-haskell/securemem:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple cryptographic random related types
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-random
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/securemem:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.9
 SRC_URI=https://hackage.haskell.org/package/crypto-random-0.0.9/crypto-random-0.0.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9fb4227cbc86899d4f4ef55d84a2ad09
diff --git a/metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0 b/metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0
index 2edbae38b238..723a14a76237 100644
--- a/metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0
+++ b/metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/entropy:=[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 )
+DEPEND=dev-haskell/entropy:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple random generators API for cryptography related code
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-crypto-random-api
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/entropy:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/crypto-random-api-0.2.0/crypto-random-api-0.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8bb65f9753e97cfc4608a53b0d5430ed
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-0.11.9 b/metadata/md5-cache/dev-haskell/cryptohash-0.11.9
index 976878485993..8fe172701ad4 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-0.11.9
+++ b/metadata/md5-cache/dev-haskell/cryptohash-0.11.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2 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 )
+DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=collection of crypto hashes, fast, pure and practical
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-cryptohash
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.11.9
 SRC_URI=https://hackage.haskell.org/package/cryptohash-0.11.9/cryptohash-0.11.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a6bb0a3cdaa71dbc2f5b43e607fed80d
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-conduit-0.1.1 b/metadata/md5-cache/dev-haskell/cryptohash-conduit-0.1.1
index 87482303a6bb..683b1e609f7c 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-conduit-0.1.1
+++ b/metadata/md5-cache/dev-haskell/cryptohash-conduit-0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/resourcet:=[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 )
+DEPEND=dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=cryptohash conduit
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-cryptohash-conduit
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptohash:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/cryptohash-conduit-0.1.1/cryptohash-conduit-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7b43d75511dbadc013f0077e764b0029
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.4 b/metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.4
index fd5666bbe29b..cf1b585736db 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.4
+++ b/metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/crypto-api-0.11:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/tagged-0.1:=[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 )
+DEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/crypto-api-0.11:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Crypto-api interfaces for cryptohash
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-cryptohash-cryptoapi
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/crypto-api-0.11:=[profile?] >=dev-haskell/cryptonite-0.13:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/tagged-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.4
 SRC_URI=https://hackage.haskell.org/package/cryptohash-cryptoapi-0.1.4/cryptohash-cryptoapi-0.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fd620c63a97412d65588b935db9c7095
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
index ff3ee8b4932f..d28c8c1dad8b 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
+++ b/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast, pure and practical MD5 implementation
 EAPI=6
 HOMEPAGE=https://github.com/hvr/cryptohash-md5
@@ -10,5 +10,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 6d1523932c1c..fab383a4e682 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
+++ b/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast, pure and practical SHA-1 implementation
 EAPI=6
 HOMEPAGE=https://github.com/hvr/cryptohash-sha1
@@ -10,5 +10,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 4f479a278700..1ed924534b45 100644
--- a/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
+++ b/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast, pure and practical SHA-256 implementation
 EAPI=6
 HOMEPAGE=https://github.com/hvr/cryptohash-sha256
@@ -10,5 +10,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d51d3042a188d3c36b4cb98182079ac2
diff --git a/metadata/md5-cache/dev-haskell/cryptonite-0.26-r1 b/metadata/md5-cache/dev-haskell/cryptonite-0.26-r1
index 5d9e2420b221..69fae6645605 100644
--- a/metadata/md5-cache/dev-haskell/cryptonite-0.26-r1
+++ b/metadata/md5-cache/dev-haskell/cryptonite-0.26-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/basement-0.0.6:=[profile?] >=dev-haskell/memory-0.14.18:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libc >=dev-haskell/cabal-1.18 test? ( dev-haskell/memory dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-kat dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/basement-0.0.6:=[profile?] >=dev-haskell/memory-0.14.18:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libc >=dev-haskell/cabal-1.18 test? ( dev-haskell/memory dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-kat dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Cryptography Primitives sink
 EAPI=7
 HOMEPAGE=https://github.com/haskell-crypto/cryptonite
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/basement-0.0.6:=[profile?] >=dev-haskell/memory-0.14.18:=[
 RESTRICT=!test? ( test )
 SLOT=0/0.26
 SRC_URI=https://hackage.haskell.org/package/cryptonite-0.26/cryptonite-0.26.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aaffecb4331fe378977fef264d184254
diff --git a/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2 b/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
index 22424fdf209c..c26e1e522598 100644
--- a/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
+++ b/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=cryptonite conduit
 EAPI=6
 HOMEPAGE=https://github.com/haskell-crypto/cryptonite-conduit
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] de
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a48599985a552e41d1299fe25d2354d
diff --git a/metadata/md5-cache/dev-haskell/css-text-0.1.3.0 b/metadata/md5-cache/dev-haskell/css-text-0.1.3.0
index 83f4f38e6b1e..9fde855c316d 100644
--- a/metadata/md5-cache/dev-haskell/css-text-0.1.3.0
+++ b/metadata/md5-cache/dev-haskell/css-text-0.1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.10.2.0:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/attoparsec-0.10.2.0:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=CSS parser and renderer
 EAPI=6
 HOMEPAGE=https://github.com/yesodweb/css-text.git#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10.2.0:=[profile?] >=dev-haskell/semigroups-0
 RESTRICT=test
 SLOT=0/0.1.3.0
 SRC_URI=https://hackage.haskell.org/package/css-text-0.1.3.0/css-text-0.1.3.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=946948cad7f3fad1b6276faea490b23a
diff --git a/metadata/md5-cache/dev-haskell/curl-1.3.8 b/metadata/md5-cache/dev-haskell/curl-1.3.8
index 557ab81dfd33..ec7a4c00b784 100644
--- a/metadata/md5-cache/dev-haskell/curl-1.3.8
+++ b/metadata/md5-cache/dev-haskell/curl-1.3.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= net-misc/curl >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= net-misc/curl >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell binding to libcurl
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/curl
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= net-misc/curl
 SLOT=0/1.3.8
 SRC_URI=https://hackage.haskell.org/package/curl-1.3.8/curl-1.3.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d38fe550bb00a62c0b18d7d32fb27bbe
diff --git a/metadata/md5-cache/dev-haskell/data-accessor-0.2.3 b/metadata/md5-cache/dev-haskell/data-accessor-0.2.3
index db01e1e8239a..c7e7b2641641 100644
--- a/metadata/md5-cache/dev-haskell/data-accessor-0.2.3
+++ b/metadata/md5-cache/dev-haskell/data-accessor-0.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Utilities for accessing and manipulating fields of records
 EAPI=7
 HOMEPAGE=https://www.haskell.org/haskellwiki/Record_access
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.3
 SRC_URI=https://hackage.haskell.org/package/data-accessor-0.2.3/data-accessor-0.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=547c6190940e734dd4c28c85882114eb
diff --git a/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4 b/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
index eea449b50cc5..41bed9070a09 100644
--- a/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
+++ b/metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parser/Serialiser for IEEE-754 floating-point values
 EAPI=7
 HOMEPAGE=https://john-millikin.com/software/data-binary-ieee754/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.4
 SRC_URI=https://hackage.haskell.org/package/data-binary-ieee754-0.4.4/data-binary-ieee754-0.4.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=11e45aea46fa6ca8e1524abfd05aa8a9
diff --git a/metadata/md5-cache/dev-haskell/data-default-0.7.1.1 b/metadata/md5-cache/dev-haskell/data-default-0.7.1.1
index 356582366197..a6725d785861 100644
--- a/metadata/md5-cache/dev-haskell/data-default-0.7.1.1
+++ b/metadata/md5-cache/dev-haskell/data-default-0.7.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] dev-haskell/data-default-instances-containers:=[profile?] dev-haskell/data-default-instances-dlist:=[profile?] dev-haskell/data-default-instances-old-locale:=[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 )
+DEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] dev-haskell/data-default-instances-containers:=[profile?] dev-haskell/data-default-instances-dlist:=[profile?] dev-haskell/data-default-instances-old-locale:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A class for types with a default value
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-default
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] dev-haskell/data-default-instances-containers:=[profile?] dev-haskell/data-default-instances-dlist:=[profile?] dev-haskell/data-default-instances-old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.1.1
 SRC_URI=https://hackage.haskell.org/package/data-default-0.7.1.1/data-default-0.7.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a625f41a75f2a78af01680de39143ab2
diff --git a/metadata/md5-cache/dev-haskell/data-default-class-0.1.2.0 b/metadata/md5-cache/dev-haskell/data-default-class-0.1.2.0
index dda008689a45..a7c20e3a22b2 100644
--- a/metadata/md5-cache/dev-haskell/data-default-class-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/data-default-class-0.1.2.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.6 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.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A class for types with a default value
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/data-default-class
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=51ac5968af9b1bea222f345107a866b6
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-base-0.1.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-base-0.1.0.1
index f6a7a9197bb3..fc4e0c8d2438 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-base-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-base-0.1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/data-default-class-0.1.2.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 )
+DEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Default instances for types in base
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/data-default-instances-base
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-base-0.1.0.1/data-default-instances-base-0.1.0.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6b2e217d5c3b69b9d86860342a0cfc05
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
index a6e38ba5e8f3..62171ffcb22e 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/data-default-class:=[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 )
+DEPEND=dev-haskell/data-default-class:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Default instances for types in containers
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-default-instances-containers
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-containers-0.0.1/data-default-instances-containers-0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b0d76b03dbfa587ae5c0e06240cc9141
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
index 7b9174b62469..6946aa159760 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/dlist:=[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 )
+DEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/dlist:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Default instances for types in dlist
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-default-instances-dlist
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/dlist:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-dlist-0.0.1/data-default-instances-dlist-0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=81742c85f11db84865d1e0cd2e6e9375
diff --git a/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1 b/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
index c76cf7736504..844d18e38345 100644
--- a/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
+++ b/metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/old-locale:=[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 )
+DEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Default instances for types in old-locale
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-default-instances-old-locale
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/data-default-class:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/data-default-instances-old-locale-0.0.1/data-default-instances-old-locale-0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=68a37185bd443a804492881f32f644be
diff --git a/metadata/md5-cache/dev-haskell/data-endian-0.1.1 b/metadata/md5-cache/dev-haskell/data-endian-0.1.1
index 93d9da295cb6..7ffb1914dee4 100644
--- a/metadata/md5-cache/dev-haskell/data-endian-0.1.1
+++ b/metadata/md5-cache/dev-haskell/data-endian-0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6.0 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.6.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Endian-sensitive data
 EAPI=6
 HOMEPAGE=https://github.com/mvv/data-endian
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/data-endian-0.1.1/data-endian-0.1.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5145a6ce253d2f0e99b42943c84da780
diff --git a/metadata/md5-cache/dev-haskell/data-hash-0.2.0.1 b/metadata/md5-cache/dev-haskell/data-hash-0.2.0.1
index 97a30a65b9b1..22f22048ef1e 100644
--- a/metadata/md5-cache/dev-haskell/data-hash-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/data-hash-0.2.0.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Combinators for building fast hashing functions
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-hash
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0.1
 SRC_URI=https://hackage.haskell.org/package/data-hash-0.2.0.1/data-hash-0.2.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e13bda262f3f4bc38e56e811c0a5212c
diff --git a/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0 b/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
index 89afc5ce2856..272cd1781a3d 100644
--- a/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
+++ b/metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.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.6 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.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Set and bag operations on ordered lists
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/data-ordlist
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.7.0
 SRC_URI=https://hackage.haskell.org/package/data-ordlist-0.4.7.0/data-ordlist-0.4.7.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e9f5bce11791280ddd18679e62c1ceb9
diff --git a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7 b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
index 2cc6383d7332..ce85f45f4d6f 100644
--- a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
+++ b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 test? ( dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.5:2=[profile?] dev-haskell/test-framework:=[profile?] dev-haskell/test-framework-hunit:=[profile?] dev-haskell/test-framework-quickcheck2:=[profile?] dev-haskell/test-framework-th:=[profile?] ) 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.6 test? ( dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.5:2=[profile?] dev-haskell/test-framework:=[profile?] dev-haskell/test-framework-hunit:=[profile?] dev-haskell/test-framework-quickcheck2:=[profile?] dev-haskell/test-framework-th:=[profile?] ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Data encoding library
 EAPI=7
 HOMEPAGE=https://www.haskell.org/haskellwiki/Library/Data_encoding
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.14.0.7
 SRC_URI=https://hackage.haskell.org/package/dataenc-0.14.0.7/dataenc-0.14.0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3cbe66be25b643bcee937e1eab2c2145
diff --git a/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1 b/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
index c95274b2a360..ae44beec4fbf 100644
--- a/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Date cacher
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/date-cache
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/date-cache-0.3.0/date-cache-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=266114897f337b735adbb39dc429cd4a
diff --git a/metadata/md5-cache/dev-haskell/dav-1.3.4 b/metadata/md5-cache/dev-haskell/dav-1.3.4
index 5aefcfedde8a..4f583ec1f48c 100644
--- a/metadata/md5-cache/dev-haskell/dav-1.3.4
+++ b/metadata/md5-cache/dev-haskell/dav-1.3.4
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=RFC 4918 WebDAV support
 EAPI=7
 HOMEPAGE=http://floss.scru.org/hDAV
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc7c609c0eeb480148085d0850dc0418
diff --git a/metadata/md5-cache/dev-haskell/dbus-1.2.16 b/metadata/md5-cache/dev-haskell/dbus-1.2.16
index a912f1e615c9..e7770134e752 100644
--- a/metadata/md5-cache/dev-haskell/dbus-1.2.16
+++ b/metadata/md5-cache/dev-haskell/dbus-1.2.16
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A client library for the D-Bus IPC system
 EAPI=7
 HOMEPAGE=https://github.com/rblaze/haskell-dbus#readme
@@ -10,5 +10,5 @@ RDEPEND=<dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3.0:=[profil
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee27d09451ebaf53600919e358d0644b
diff --git a/metadata/md5-cache/dev-haskell/dec-0.0.3 b/metadata/md5-cache/dev-haskell/dec-0.0.3
index 093ce3da880c..8f1604dff9f4 100644
--- a/metadata/md5-cache/dev-haskell/dec-0.0.3
+++ b/metadata/md5-cache/dev-haskell/dec-0.0.3
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Decidable propositions
 EAPI=7
 HOMEPAGE=https://github.com/phadej/vec
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c799f45cb022ca76a5b05472e77a5e98
diff --git a/metadata/md5-cache/dev-haskell/deepseq-generics-0.2.0.0 b/metadata/md5-cache/dev-haskell/deepseq-generics-0.2.0.0
index 01eb260acbab..2bffb43abf9a 100644
--- a/metadata/md5-cache/dev-haskell/deepseq-generics-0.2.0.0
+++ b/metadata/md5-cache/dev-haskell/deepseq-generics-0.2.0.0
@@ -1,5 +1,5 @@
 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/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) 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 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=GHC.Generics-based Control.DeepSeq.rnf implementation
 EAPI=7
 HOMEPAGE=https://github.com/hvr/deepseq-generics
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0.0
 SRC_URI=https://hackage.haskell.org/package/deepseq-generics-0.2.0.0/deepseq-generics-0.2.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7be90f9e73616470e898aa2ae1db8874
diff --git a/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0 b/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
index 3b8ade5ef39b..f1ee9cc7c275 100644
--- a/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/math-functions-0.1.7:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] dev-haskell/vector-th-unbox:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/math-functions-0.1.7:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] dev-haskell/vector-th-unbox:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple and incomplete pure haskell implementation of linear algebra
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/dense-linear-algebra
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/math-functions-0.1.7:=[profile?] >=dev-haskell/primitive-0
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.0
 SRC_URI=https://hackage.haskell.org/package/dense-linear-algebra-0.1.0.0/dense-linear-algebra-0.1.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b41fc5b6b7002a20aa108e6d20cf766
diff --git a/metadata/md5-cache/dev-haskell/derive-2.5.26 b/metadata/md5-cache/dev-haskell/derive-2.5.26
index 2164c7bdbde6..31961dd2b720 100644
--- a/metadata/md5-cache/dev-haskell/derive-2.5.26
+++ b/metadata/md5-cache/dev-haskell/derive-2.5.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] <dev-haskell/uniplate-1.7:=[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 )
+DEPEND=>=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] <dev-haskell/uniplate-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A program and library to derive instances for data types
 EAPI=6
 HOMEPAGE=https://github.com/ndmitchell/derive#readme
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] <dev-haskell/uniplate-1.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.5.26
 SRC_URI=https://hackage.haskell.org/package/derive-2.5.26/derive-2.5.26.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee27d1a9b8344d4d8dee6eacba649e17
diff --git a/metadata/md5-cache/dev-haskell/deriving-compat-0.5.8 b/metadata/md5-cache/dev-haskell/deriving-compat-0.5.8
index 45d161959ee7..3aa34b36c3b5 100644
--- a/metadata/md5-cache/dev-haskell/deriving-compat-0.5.8
+++ b/metadata/md5-cache/dev-haskell/deriving-compat-0.5.8
@@ -1,5 +1,5 @@
 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-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/base-compat-0.8.1 <dev-haskell/base-compat-1 >=dev-haskell/base-orphans-0.5 <dev-haskell/base-orphans-1 >=dev-haskell/hspec-1.8 >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/tagged-0.7 <dev-haskell/tagged-1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/base-compat-0.8.1 <dev-haskell/base-compat-1 >=dev-haskell/base-orphans-0.5 <dev-haskell/base-orphans-1 >=dev-haskell/hspec-1.8 >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/tagged-0.7 <dev-haskell/tagged-1 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Backports of GHC deriving extensions
 EAPI=7
 HOMEPAGE=https://github.com/haskell-compat/deriving-compat
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction
 RESTRICT=!test? ( test )
 SLOT=0/0.5.8
 SRC_URI=https://hackage.haskell.org/package/deriving-compat-0.5.8/deriving-compat-0.5.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ec1ee5d993abd5b256519cdcbbe8e006
diff --git a/metadata/md5-cache/dev-haskell/dictionary-sharing-0.1.0.0 b/metadata/md5-cache/dev-haskell/dictionary-sharing-0.1.0.0
index b0f7b8519fe7..3a6bc39e3d35 100644
--- a/metadata/md5-cache/dev-haskell/dictionary-sharing-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/dictionary-sharing-0.1.0.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Sharing/memoization of class members
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/dictionary-sharing
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.0.0
 SRC_URI=https://hackage.haskell.org/package/dictionary-sharing-0.1.0.0/dictionary-sharing-0.1.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9084f5357e04a047ea5828cf64a0d5bb
diff --git a/metadata/md5-cache/dev-haskell/diff-0.4.0 b/metadata/md5-cache/dev-haskell/diff-0.4.0
index 44b895ceb5e3..d13b1162a19b 100644
--- a/metadata/md5-cache/dev-haskell/diff-0.4.0
+++ b/metadata/md5-cache/dev-haskell/diff-0.4.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.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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=O(ND) diff algorithm in haskell
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/Diff
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2a56b1c1176383ee5a1ef2ffcc7fe803
diff --git a/metadata/md5-cache/dev-haskell/digest-0.0.1.2 b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
index 66cef7755e6c..a3e773d81c83 100644
--- a/metadata/md5-cache/dev-haskell/digest-0.0.1.2
+++ b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/digest
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib
 SLOT=0/0.0.1.2
 SRC_URI=https://hackage.haskell.org/package/digest-0.0.1.2/digest-0.0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=85bbc5f11ed1448fcd64c8de1bf59fe9
diff --git a/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1 b/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
index 90423f5fd87a..be1541d6de26 100644
--- a/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
@@ -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 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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Retrieve information about disk space usage
 EAPI=7
 HOMEPAGE=https://github.com/redneb/disk-free-space
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/disk-free-space-0.1.0.1/disk-free-space-0.1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=33f69d00969c4ae0d1aaa9a423e44bda
diff --git a/metadata/md5-cache/dev-haskell/distributive-0.6.1 b/metadata/md5-cache/dev-haskell/distributive-0.6.1
index a78a3ba1af73..40dd7f7be9a2 100644
--- a/metadata/md5-cache/dev-haskell/distributive-0.6.1
+++ b/metadata/md5-cache/dev-haskell/distributive-0.6.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Distributive functors -- Dual to Traversable
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/distributive/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1412360d6d21eb1662cd9479346216a5
diff --git a/metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3 b/metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3
index 14188e49919f..a7640e09a888 100644
--- a/metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3
+++ b/metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/djinn-lib-0.0.1.2:=[profile?] dev-haskell/mtl:=[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 )
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/djinn-lib-0.0.1.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generate Haskell code from a type. Bridge from Djinn to GHC API
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/djinn-ghc
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/djinn-lib-0.0.1.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.0.2.3
 SRC_URI=https://hackage.haskell.org/package/djinn-ghc-0.0.2.3/djinn-ghc-0.0.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6ff44c14b83fbb2e232a13afb6dead6e
diff --git a/metadata/md5-cache/dev-haskell/djinn-lib-0.0.1.3 b/metadata/md5-cache/dev-haskell/djinn-lib-0.0.1.3
index 37752c9d1ec6..aed7f67c4bf1 100644
--- a/metadata/md5-cache/dev-haskell/djinn-lib-0.0.1.3
+++ b/metadata/md5-cache/dev-haskell/djinn-lib-0.0.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/mtl:=[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 )
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generate Haskell code from a type. Library extracted from djinn package
 EAPI=6
 HOMEPAGE=http://www.augustsson.net/Darcs/Djinn/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.1.3
 SRC_URI=https://hackage.haskell.org/package/djinn-lib-0.0.1.3/djinn-lib-0.0.1.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c60d3e56d901c47c2004b03303e0bc25
diff --git a/metadata/md5-cache/dev-haskell/dlist-0.8.0.7 b/metadata/md5-cache/dev-haskell/dlist-0.8.0.7
index b3d3ee4524e8..696cf087b628 100644
--- a/metadata/md5-cache/dev-haskell/dlist-0.8.0.7
+++ b/metadata/md5-cache/dev-haskell/dlist-0.8.0.7
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( >=dev-haskell/quickcheck-2.10 <dev-haskell/quickcheck-2.14 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Difference lists
 EAPI=7
 HOMEPAGE=https://github.com/spl/dlist
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=573248f798970b57412b047f1c27f8d4
diff --git a/metadata/md5-cache/dev-haskell/dlist-instances-0.1.1.1 b/metadata/md5-cache/dev-haskell/dlist-instances-0.1.1.1
index a58617cbb62b..9887d5cbecf7 100644
--- a/metadata/md5-cache/dev-haskell/dlist-instances-0.1.1.1
+++ b/metadata/md5-cache/dev-haskell/dlist-instances-0.1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/dlist:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/dlist:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Difference lists instances
 EAPI=6
 HOMEPAGE=https://github.com/gregwebs/dlist-instances
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/dlist:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.1
 SRC_URI=https://hackage.haskell.org/package/dlist-instances-0.1.1.1/dlist-instances-0.1.1.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b2e1da7fdaed55517f7a20e7ab63f406
diff --git a/metadata/md5-cache/dev-haskell/dns-4.0.1 b/metadata/md5-cache/dev-haskell/dns-4.0.1
index 76025f67428c..d205f27a7c39 100644
--- a/metadata/md5-cache/dev-haskell/dns-4.0.1
+++ b/metadata/md5-cache/dev-haskell/dns-4.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/async:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/auto-update:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/hourglass:=[profile?] >=dev-haskell/iproute-1.3.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/psqueues:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-2.0 test? ( dev-haskell/doctest dev-haskell/hspec >=dev-haskell/quickcheck-2.9 dev-haskell/word8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/async:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/auto-update:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/hourglass:=[profile?] >=dev-haskell/iproute-1.3.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/psqueues:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-2.0 test? ( dev-haskell/doctest dev-haskell/hspec >=dev-haskell/quickcheck-2.9 dev-haskell/word8 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=DNS library in Haskell
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/dns
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] dev-haskell/attoparsec:=[profile?] dev-has
 RESTRICT=test
 SLOT=0/4.0.1
 SRC_URI=https://hackage.haskell.org/package/dns-4.0.1/dns-4.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=79c3b1343a56de748500c7dd32c524a6
diff --git a/metadata/md5-cache/dev-haskell/doclayout-0.3 b/metadata/md5-cache/dev-haskell/doclayout-0.3
index 18dd382915e0..4350d95ca378 100644
--- a/metadata/md5-cache/dev-haskell/doclayout-0.3
+++ b/metadata/md5-cache/dev-haskell/doclayout-0.3
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A prettyprinting library for laying out text documents
 EAPI=7
 HOMEPAGE=https://github.com/jgm/doclayout
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/tex
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/doclayout-0.3/doclayout-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=62269cb2d07683b5c088268228718ecb
diff --git a/metadata/md5-cache/dev-haskell/doctemplates-0.8.2 b/metadata/md5-cache/dev-haskell/doctemplates-0.8.2
index d9fb28189649..750c01dbf24d 100644
--- a/metadata/md5-cache/dev-haskell/doctemplates-0.8.2
+++ b/metadata/md5-cache/dev-haskell/doctemplates-0.8.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Pandoc-style document templates
 EAPI=7
 HOMEPAGE=https://github.com/jgm/doctemplates#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/doclayout-0.3:=[profile?] <d
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c33779426d2768321fe5ac86b0205d8d
diff --git a/metadata/md5-cache/dev-haskell/doctest-0.16.3 b/metadata/md5-cache/dev-haskell/doctest-0.16.3
index 5c1f2706862b..469376766d21 100644
--- a/metadata/md5-cache/dev-haskell/doctest-0.16.3
+++ b/metadata/md5-cache/dev-haskell/doctest-0.16.3
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Test interactive Haskell examples
 EAPI=7
 HOMEPAGE=https://github.com/sol/doctest#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-compat-0.7.0:=[profile?] >=dev-haskell/code-page-0.1:
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=08a05d3b14ca9bcd16e21dd885bffa99
diff --git a/metadata/md5-cache/dev-haskell/double-conversion-2.0.2.0 b/metadata/md5-cache/dev-haskell/double-conversion-2.0.2.0
index e09f94500e82..69a3576dc8a6 100644
--- a/metadata/md5-cache/dev-haskell/double-conversion-2.0.2.0
+++ b/metadata/md5-cache/dev-haskell/double-conversion-2.0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-0.11.0.8:=[profile?] >=dev-lang/ghc-7.4.1:= sys-devel/gcc:*[cxx] >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit 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 )
+DEPEND=>=dev-haskell/text-0.11.0.8:=[profile?] >=dev-lang/ghc-7.4.1:= sys-devel/gcc:*[cxx] >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast conversion between double precision floating point and text
 EAPI=6
 HOMEPAGE=https://github.com/bos/double-conversion
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-0.11.0.8:=[profile?] >=dev-lang/ghc-7.4.1:= sys-devel
 RESTRICT=test
 SLOT=0/2.0.2.0
 SRC_URI=https://hackage.haskell.org/package/double-conversion-2.0.2.0/double-conversion-2.0.2.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6073b40a1b9206f59a5bd6985e2c6ba6
diff --git a/metadata/md5-cache/dev-haskell/drbg-0.5.5 b/metadata/md5-cache/dev-haskell/drbg-0.5.5
index 33dd9c75cbed..44dc368be56b 100644
--- a/metadata/md5-cache/dev-haskell/drbg-0.5.5
+++ b/metadata/md5-cache/dev-haskell/drbg-0.5.5
@@ -1,5 +1,5 @@
 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/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 )
+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/crypto-api-tests dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Deterministic random bit generator (aka PRNG) based HMACs, Hashes, and Ciphers
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/DRBG
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cereal-0.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e4b8bb8ed3b10d4135fe7c315024dcfe
diff --git a/metadata/md5-cache/dev-haskell/easy-file-0.2.2 b/metadata/md5-cache/dev-haskell/easy-file-0.2.2
index 79d07fbe60ab..c99c88527a9d 100644
--- a/metadata/md5-cache/dev-haskell/easy-file-0.2.2
+++ b/metadata/md5-cache/dev-haskell/easy-file-0.2.2
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Cross-platform File handling
 EAPI=7
 HOMEPAGE=https://github.com/kazu-yamamoto/easy-file
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/easy-file-0.2.2/easy-file-0.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=78833690e706c393a373cf0f69e02a45
diff --git a/metadata/md5-cache/dev-haskell/echo-0.1.3 b/metadata/md5-cache/dev-haskell/echo-0.1.3
index 7cc0f074fcff..917cbbf36085 100644
--- a/metadata/md5-cache/dev-haskell/echo-0.1.3
+++ b/metadata/md5-cache/dev-haskell/echo-0.1.3
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A cross-platform, cross-console way to handle echoing terminal input
 EAPI=6
 HOMEPAGE=https://github.com/RyanGlScott/echo
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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 c9caa0596cac..472c374e30e6 100644
--- a/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
+++ b/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Ed25519 cryptographic signatures
 EAPI=6
 HOMEPAGE=http://thoughtpolice.github.com/hs-ed25519
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=36a459e7b03958a3c8dba22349d44b89
diff --git a/metadata/md5-cache/dev-haskell/edisonapi-1.3.1-r1 b/metadata/md5-cache/dev-haskell/edisonapi-1.3.1-r1
index 61b17fef88b5..17333b7cafca 100644
--- a/metadata/md5-cache/dev-haskell/edisonapi-1.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/edisonapi-1.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/mtl-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 )
+DEPEND=>=dev-haskell/mtl-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library of efficient, purely-functional data structures (API)
 EAPI=7
 HOMEPAGE=http://rwd.rdockins.name/edison/home/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/mtl-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.3.1
 SRC_URI=https://hackage.haskell.org/package/EdisonAPI-1.3.1/EdisonAPI-1.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8707667d6a85d6bfa4d00060d510ee24
diff --git a/metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1 b/metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1
index b0e659325037..9e3dc7dc0a36 100644
--- a/metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[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 )
+DEPEND=>=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library of efficent, purely-functional data structures (Core Implementations)
 EAPI=7
 HOMEPAGE=http://rwd.rdockins.name/edison/home/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.3.2.1
 SRC_URI=https://hackage.haskell.org/package/EdisonCore-1.3.2.1/EdisonCore-1.3.2.1.tar.gz https://dev.gentoo.org/~slyfox/distfiles/edisoncore-1.3.2.1-ghc-8.8.patch
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=73b5f632c1a1cc6d435d52b203754afa
diff --git a/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1 b/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
index 64730f668d3f..15b068c122b3 100644
--- a/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.1.1 dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.1.1 dev-haskell/test-framework-quickcheck2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Levenshtein and restricted Damerau-Levenshtein edit distances
 EAPI=7
 HOMEPAGE=https://github.com/phadej/edit-distance
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.2.1
 SRC_URI=https://hackage.haskell.org/package/edit-distance-0.2.2.1/edit-distance-0.2.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=baf4f6c21d67126314d4382869e0ac18
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
index c8e13ab77400..1feabeec72c1 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Calculate edit distances and edit scripts between vectors
 EAPI=7
 HOMEPAGE=https://github.com/thsutton/edit-distance-vector
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eb1b9ef4cbf9bd4ddc20065fb4e1d318
diff --git a/metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1 b/metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1
index b2bc14cb2324..2564f0ec5524 100644
--- a/metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1
@@ -1,6 +1,6 @@
 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-6.10.4:= dev-libs/libedit >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-6.10.4:= dev-libs/libedit >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Bindings to the editline library (libedit)
 EAPI=7
 HOMEPAGE=http://code.haskell.org/editline
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= dev-libs/libedit
 SLOT=0/0.2.1.1
 SRC_URI=https://hackage.haskell.org/package/editline-0.2.1.1/editline-0.2.1.1.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=11fdf8e13c212fd243d615bc01277393
diff --git a/metadata/md5-cache/dev-haskell/either-5.0.1.1 b/metadata/md5-cache/dev-haskell/either-5.0.1.1
index 5d03f3f367a1..e7fcc4d1941f 100644
--- a/metadata/md5-cache/dev-haskell/either-5.0.1.1
+++ b/metadata/md5-cache/dev-haskell/either-5.0.1.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=An either monad transformer
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/either/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profi
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b25d5b1633354a35e9bd551bcb49a446
diff --git a/metadata/md5-cache/dev-haskell/ekg-0.4.0.15-r7 b/metadata/md5-cache/dev-haskell/ekg-0.4.0.15-r7
index c0eba5721371..25c3af6c0a29 100644
--- a/metadata/md5-cache/dev-haskell/ekg-0.4.0.15-r7
+++ b/metadata/md5-cache/dev-haskell/ekg-0.4.0.15-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.4:=[profile?] <dev-haskell/aeson-1.6:= >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] >=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?] <dev-haskell/network-3.2:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] <dev-haskell/snap-server-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-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 )
+DEPEND=>=dev-haskell/aeson-0.4:=[profile?] <dev-haskell/aeson-1.6:= >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] >=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?] <dev-haskell/network-3.2:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] <dev-haskell/snap-server-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Remote monitoring of processes
 EAPI=7
 HOMEPAGE=https://github.com/tibbe/ekg
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.4:=[profile?] <dev-haskell/aeson-1.6:= >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] >=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?] <dev-haskell/network-3.2:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] <dev-haskell/snap-server-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.4.0.15
 SRC_URI=https://hackage.haskell.org/package/ekg-0.4.0.15/ekg-0.4.0.15.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b88b14edb81d8807080211726392da18
diff --git a/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.6 b/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.6
index 3b49f75aba23..15ceee5df1a1 100644
--- a/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.6
+++ b/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=<dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.18 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=<dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.18 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Tracking of system metrics
 EAPI=7
 HOMEPAGE=https://github.com/tibbe/ekg-core
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=<dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.6.1:=
 SLOT=0/0.1.1.6
 SRC_URI=https://hackage.haskell.org/package/ekg-core-0.1.1.6/ekg-core-0.1.1.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=86e3d051c9bd536b058ea71259ac249e
diff --git a/metadata/md5-cache/dev-haskell/ekg-json-0.1.0.6-r1 b/metadata/md5-cache/dev-haskell/ekg-json-0.1.0.6-r1
index 00d29b7c0355..c55d8d7b1bc7 100644
--- a/metadata/md5-cache/dev-haskell/ekg-json-0.1.0.6-r1
+++ b/metadata/md5-cache/dev-haskell/ekg-json-0.1.0.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.4:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.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 )
+DEPEND=>=dev-haskell/aeson-0.4:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=JSON encoding of ekg metrics
 EAPI=6
 HOMEPAGE=https://github.com/tibbe/ekg-json
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.4:=[profile?] >=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.6
 SRC_URI=https://hackage.haskell.org/package/ekg-json-0.1.0.6/ekg-json-0.1.0.6.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6fdfb17de7fc3d34f67c5fb626b9d5ae
diff --git a/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13 b/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13
index 66d9e3d87211..4c3ae4e4ac9e 100644
--- a/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13
+++ b/metadata/md5-cache/dev-haskell/email-validate-2.3.2.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/doctest-0.8 <dev-haskell/doctest-0.17 >=dev-haskell/hspec-2.2.3 <dev-haskell/hspec-2.8 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/doctest-0.8 <dev-haskell/doctest-0.17 >=dev-haskell/hspec-2.2.3 <dev-haskell/hspec-2.8 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Email address validation
 EAPI=7
 HOMEPAGE=https://github.com/Porges/email-validate-hs
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.14
 RESTRICT=!test? ( test )
 SLOT=0/2.3.2.13
 SRC_URI=https://hackage.haskell.org/package/email-validate-2.3.2.13/email-validate-2.3.2.13.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9dfbbb3d91fad6e576650d5c689e05e1
diff --git a/metadata/md5-cache/dev-haskell/emojis-0.1 b/metadata/md5-cache/dev-haskell/emojis-0.1
index 601e85cd710d..87457d6994ee 100644
--- a/metadata/md5-cache/dev-haskell/emojis-0.1
+++ b/metadata/md5-cache/dev-haskell/emojis-0.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Conversion between emoji characters and their names.
 EAPI=7
 HOMEPAGE=https://github.com/jgm/emojis#readme
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7ba760a8c4b7c9310a36a6e655bea567
diff --git a/metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3 b/metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3
index 04c1bc25846f..5e92d54c4723 100644
--- a/metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3
+++ b/metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/async-2.0 >=dev-haskell/hspec-1.3 dev-haskell/quickcheck dev-haskell/stm ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/async-2.0 >=dev-haskell/hspec-1.3 dev-haskell/quickcheck dev-haskell/stm ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Catching all exceptions from within an enclosed computation
 EAPI=6
 HOMEPAGE=https://github.com/jcristovao/enclosed-exceptions
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/lifted-base-0.2:=[profile?] dev-haskell/monad-control:=[pr
 RESTRICT=!test? ( test )
 SLOT=0/1.0.3
 SRC_URI=https://hackage.haskell.org/package/enclosed-exceptions-1.0.3/enclosed-exceptions-1.0.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=040f2dd3e905156b20f13fd33fb9a231
diff --git a/metadata/md5-cache/dev-haskell/encoding-0.8.5 b/metadata/md5-cache/dev-haskell/encoding-0.8.5
index 0318ab0be7e6..d6beaa715418 100644
--- a/metadata/md5-cache/dev-haskell/encoding-0.8.5
+++ b/metadata/md5-cache/dev-haskell/encoding-0.8.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/regex-compat-0.71:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.0 >=dev-haskell/haxml-1.22 <dev-haskell/haxml-1.26 test? ( dev-haskell/hunit dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/regex-compat-0.71:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.0 >=dev-haskell/haxml-1.22 <dev-haskell/haxml-1.26 test? ( dev-haskell/hunit dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library for various character encodings
 EAPI=7
 HOMEPAGE=http://code.haskell.org/encoding/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensi
 RESTRICT=!test? ( test )
 SLOT=0/0.8.5
 SRC_URI=https://hackage.haskell.org/package/encoding-0.8.5/encoding-0.8.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=904a208f5063f240ad9ee844accf5368
diff --git a/metadata/md5-cache/dev-haskell/entropy-0.4.1.6 b/metadata/md5-cache/dev-haskell/entropy-0.4.1.6
index 81f5b3ac151d..20dfef49dea6 100644
--- a/metadata/md5-cache/dev-haskell/entropy-0.4.1.6
+++ b/metadata/md5-cache/dev-haskell/entropy-0.4.1.6
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 <dev-haskell/cabal-3.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A platform independent entropy source
 EAPI=7
 HOMEPAGE=https://github.com/TomMD/entropy
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a6f61a7a50a124189cf9da3a27961ff9
diff --git a/metadata/md5-cache/dev-haskell/enumerator-0.4.20 b/metadata/md5-cache/dev-haskell/enumerator-0.4.20
index c3526e0d2e26..590eb97f23a6 100644
--- a/metadata/md5-cache/dev-haskell/enumerator-0.4.20
+++ b/metadata/md5-cache/dev-haskell/enumerator-0.4.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Reliable, high-performance processing with left-fold enumerators
 EAPI=7
 HOMEPAGE=https://john-millikin.com/software/enumerator/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.20
 SRC_URI=https://hackage.haskell.org/package/enumerator-0.4.20/enumerator-0.4.20.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=150ca827b82abd23c8d445fdd28fbaeb
diff --git a/metadata/md5-cache/dev-haskell/equivalence-0.3.5 b/metadata/md5-cache/dev-haskell/equivalence-0.3.5
index c19cfdd5d1f6..783d7ed9c396 100644
--- a/metadata/md5-cache/dev-haskell/equivalence-0.3.5
+++ b/metadata/md5-cache/dev-haskell/equivalence-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] >=dev-haskell/stmonadtrans-0.4.3:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] >=dev-haskell/stmonadtrans-0.4.3:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Maintaining an equivalence relation implemented as union-find using STT
 EAPI=7
 HOMEPAGE=https://github.com/pa-ba/equivalence
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] >=dev-h
 RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://hackage.haskell.org/package/equivalence-0.3.5/equivalence-0.3.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=333da8c4aae8006a4f97d2a39d3dd3e0
diff --git a/metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1 b/metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1
index 7525e3c45ddb..2cfca735c2b6 100644
--- a/metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1
@@ -1,5 +1,5 @@
 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-7.4.1:= dev-haskell/cabal hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=The error function, erf, and related functions
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/erf
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/2.0.0.0
 SRC_URI=https://hackage.haskell.org/package/erf-2.0.0.0/erf-2.0.0.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d3f104214d7b9059cf0983b40efa2cfb
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
index 44ca12e54c2f..1314e63444ce 100644
--- a/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
+++ b/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=An orphan Eq instance for ErrorCall
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/errorcall-eq-instance
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=73a56340d455fb2e2478bc9e6a25eb0b
diff --git a/metadata/md5-cache/dev-haskell/errors-2.3.0 b/metadata/md5-cache/dev-haskell/errors-2.3.0
index 664b6ae19184..c1f31e49a61d 100644
--- a/metadata/md5-cache/dev-haskell/errors-2.3.0
+++ b/metadata/md5-cache/dev-haskell/errors-2.3.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simplified error-handling
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/errors
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=48bccaa461a2ee56d540c0bab817ee46
diff --git a/metadata/md5-cache/dev-haskell/esqueleto-3.3.4.0 b/metadata/md5-cache/dev-haskell/esqueleto-3.3.4.0
index 452d3a4c848e..a7110924b405 100644
--- a/metadata/md5-cache/dev-haskell/esqueleto-3.3.4.0
+++ b/metadata/md5-cache/dev-haskell/esqueleto-3.3.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/attoparsec-0.13:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] dev-haskell/blaze-html:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/monad-logger:=[profile?] >=dev-haskell/persistent-2.10.0:=[profile?] <dev-haskell/persistent-2.11:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] dev-haskell/unliftio:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/exceptions dev-haskell/hspec dev-haskell/mtl dev-haskell/mysql dev-haskell/mysql-simple dev-haskell/persistent-mysql >=dev-haskell/persistent-postgresql-2.10.0 <dev-haskell/persistent-postgresql-2.11 dev-haskell/persistent-sqlite dev-haskell/persistent-template dev-haskell/postgresql-libpq dev-haskell/postgresql-simple dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/attoparsec-0.13:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] dev-haskell/blaze-html:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/monad-logger:=[profile?] >=dev-haskell/persistent-2.10.0:=[profile?] <dev-haskell/persistent-2.11:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] dev-haskell/unliftio:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/exceptions dev-haskell/hspec dev-haskell/mtl dev-haskell/mysql dev-haskell/mysql-simple dev-haskell/persistent-mysql >=dev-haskell/persistent-postgresql-2.10.0 <dev-haskell/persistent-postgresql-2.11 dev-haskell/persistent-sqlite dev-haskell/persistent-template dev-haskell/postgresql-libpq dev-haskell/postgresql-simple dev-haskell/vector ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Type-safe EDSL for SQL queries on persistent backends
 EAPI=7
 HOMEPAGE=https://github.com/bitemyapp/esqueleto
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/attoparsec-0.13:=[prof
 RESTRICT=test
 SLOT=0/3.3.4.0
 SRC_URI=https://hackage.haskell.org/package/esqueleto-3.3.4.0/esqueleto-3.3.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fed1bb4436dc081855eb744a8ce841b3
diff --git a/metadata/md5-cache/dev-haskell/exact-pi-0.5.0.1 b/metadata/md5-cache/dev-haskell/exact-pi-0.5.0.1
index 3b5a57bf6076..52199989f17d 100644
--- a/metadata/md5-cache/dev-haskell/exact-pi-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/exact-pi-0.5.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/numtype-dk-0.5:=[profile?] >=dev-haskell/semigroups-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.10 >=dev-haskell/semigroups-0.9 <dev-haskell/semigroups-1.0 >=dev-haskell/tasty-0.10 >=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 )
+DEPEND=>=dev-haskell/numtype-dk-0.5:=[profile?] >=dev-haskell/semigroups-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.10 >=dev-haskell/semigroups-0.9 <dev-haskell/semigroups-1.0 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Exact rational multiples of pi (and integer powers of pi)
 EAPI=7
 HOMEPAGE=https://github.com/dmcclean/exact-pi/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/numtype-dk-0.5:=[profile?] >=dev-haskell/semigroups-0.8:=[
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0.1
 SRC_URI=https://hackage.haskell.org/package/exact-pi-0.5.0.1/exact-pi-0.5.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=551aa0a228794111bb78847b62539011
diff --git a/metadata/md5-cache/dev-haskell/exceptions-0.10.4 b/metadata/md5-cache/dev-haskell/exceptions-0.10.4
index 93ef2ab37a3e..6f6ffc222b8d 100644
--- a/metadata/md5-cache/dev-haskell/exceptions-0.10.4
+++ b/metadata/md5-cache/dev-haskell/exceptions-0.10.4
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Extensible optionally-pure exceptions
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/exceptions/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4540333eea25a5a1a8dd1ff4c83c9452
diff --git a/metadata/md5-cache/dev-haskell/executable-path-0.0.3.1 b/metadata/md5-cache/dev-haskell/executable-path-0.0.3.1
index 105f7a58f477..d71a7793a353 100644
--- a/metadata/md5-cache/dev-haskell/executable-path-0.0.3.1
+++ b/metadata/md5-cache/dev-haskell/executable-path-0.0.3.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Finding out the full path of the executable
 EAPI=6
 HOMEPAGE=http://code.haskell.org/~bkomuves/
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.3.1
 SRC_URI=https://hackage.haskell.org/package/executable-path-0.0.3.1/executable-path-0.0.3.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f304be7d554c6d125a51091222a6264
diff --git a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4 b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
index 43c6acac603b..27bea49e4966 100644
--- a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
+++ b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Extensible exceptions
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/extensible-exceptions
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.4
 SRC_URI=https://hackage.haskell.org/package/extensible-exceptions-0.1.1.4/extensible-exceptions-0.1.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5ab3085c4edd50bc1bb6f233c504648c
diff --git a/metadata/md5-cache/dev-haskell/extra-1.7.8 b/metadata/md5-cache/dev-haskell/extra-1.7.8
index 33a389335221..e758b5dbf6dd 100644
--- a/metadata/md5-cache/dev-haskell/extra-1.7.8
+++ b/metadata/md5-cache/dev-haskell/extra-1.7.8
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Extra functions I use
 EAPI=7
 HOMEPAGE=https://github.com/ndmitchell/extra#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/clock-0.7:=[profile?] >=dev-lang/ghc-8.0.1:=
 RESTRICT=!test? ( test )
 SLOT=2/1.7.8
 SRC_URI=https://hackage.haskell.org/package/extra-1.7.8/extra-1.7.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bed9a0c08f6063825d4eaeeed490a4e1
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 28c03ee701a1..0fc60b91df03 100644
--- a/metadata/md5-cache/dev-haskell/fail-4.9.0.0
+++ b/metadata/md5-cache/dev-haskell/fail-4.9.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d49a31e67cbcd50c71055f18e529d0a2
diff --git a/metadata/md5-cache/dev-haskell/failure-0.2.0.3 b/metadata/md5-cache/dev-haskell/failure-0.2.0.3
index 6c7f3f6ec49f..93baed9109d4 100644
--- a/metadata/md5-cache/dev-haskell/failure-0.2.0.3
+++ b/metadata/md5-cache/dev-haskell/failure-0.2.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A simple type class for success/failure computations. (deprecated)
 EAPI=7
 HOMEPAGE=https://www.haskell.org/haskellwiki/Failure
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.0.3
 SRC_URI=https://hackage.haskell.org/package/failure-0.2.0.3/failure-0.2.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8a076caba97d1bbff79cd9e3affeccb8
diff --git a/metadata/md5-cache/dev-haskell/fast-logger-3.0.1 b/metadata/md5-cache/dev-haskell/fast-logger-3.0.1
index 1bc3d54418af..1dba8afc341f 100644
--- a/metadata/md5-cache/dev-haskell/fast-logger-3.0.1
+++ b/metadata/md5-cache/dev-haskell/fast-logger-3.0.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A fast logging system
 EAPI=7
 HOMEPAGE=https://github.com/kazu-yamamoto/logger
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/auto-update-0.1.2:=[profile?] >=dev-haskell/easy-file-0.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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f461703e03a4e62fb9268fbe49c634e
diff --git a/metadata/md5-cache/dev-haskell/fclabels-2.0.3.3 b/metadata/md5-cache/dev-haskell/fclabels-2.0.3.3
index 0505590fddb9..d4d2b7c1048f 100644
--- a/metadata/md5-cache/dev-haskell/fclabels-2.0.3.3
+++ b/metadata/md5-cache/dev-haskell/fclabels-2.0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=First class accessor labels implemented as lenses
 EAPI=6
 HOMEPAGE=https://github.com/sebastiaanvisser/fclabels
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev
 RESTRICT=!test? ( test )
 SLOT=0/2.0.3.3
 SRC_URI=https://hackage.haskell.org/package/fclabels-2.0.3.3/fclabels-2.0.3.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c1372ba3544954451df36b4748f2611d
diff --git a/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1 b/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
index 9f3da5fb3721..f236fdf0ef31 100644
--- a/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
+++ b/metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/dbus-0.10.7:=[profile?] >=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 )
+DEPEND=>=dev-haskell/dbus-0.10.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Desktop Notifications client
 EAPI=7
 HOMEPAGE=http://bitbucket.org/taejo/fdo-notify/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/dbus-0.10.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/fdo-notify-0.3.1/fdo-notify-0.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aa211ae0736954ba604ef8f56643f0b1
diff --git a/metadata/md5-cache/dev-haskell/feed-1.3.0.1 b/metadata/md5-cache/dev-haskell/feed-1.3.0.1
index c8c799e32600..a5a8790ae2fd 100644
--- a/metadata/md5-cache/dev-haskell/feed-1.3.0.1
+++ b/metadata/md5-cache/dev-haskell/feed-1.3.0.1
@@ -1,5 +1,5 @@
 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 )
+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 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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.12:
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index a5e963267f7c..00d7f257aa1b 100644
--- a/metadata/md5-cache/dev-haskell/fgl-5.7.0.2
+++ b/metadata/md5-cache/dev-haskell/fgl-5.7.0.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Martin Erwig's Functional Graph Library
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/fgl
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5b47a57593ac412e5e07f1fbd4b74c47
diff --git a/metadata/md5-cache/dev-haskell/fgl-arbitrary-0.2.0.3-r1 b/metadata/md5-cache/dev-haskell/fgl-arbitrary-0.2.0.3-r1
index 9346bd762a87..a50c28754e87 100644
--- a/metadata/md5-cache/dev-haskell/fgl-arbitrary-0.2.0.3-r1
+++ b/metadata/md5-cache/dev-haskell/fgl-arbitrary-0.2.0.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?] >=dev-haskell/quickcheck-2.3:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2.1 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=QuickCheck support for fgl
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/fgl-arbitrary
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?] >=d
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0.3
 SRC_URI=https://hackage.haskell.org/package/fgl-arbitrary-0.2.0.3/fgl-arbitrary-0.2.0.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ff9e3386c6e49542c1002382e7d3f038
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
index 16d91620adce..7ab2ffd6cb30 100644
--- a/metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
+++ b/metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-8.0.2:= >=dev-haskell/cabal-1.24.2.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Use Template Haskell to embed file contents directly
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/file-embed
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ff7a961ef777c1709c8f16744a254cce
diff --git a/metadata/md5-cache/dev-haskell/file-location-0.4.9.1 b/metadata/md5-cache/dev-haskell/file-location-0.4.9.1
index 7159cc243b2d..3fb9d1bb6ff2 100644
--- a/metadata/md5-cache/dev-haskell/file-location-0.4.9.1
+++ b/metadata/md5-cache/dev-haskell/file-location-0.4.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/hunit:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/th-orphans-0.9:=[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 )
+DEPEND=dev-haskell/hunit:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/th-orphans-0.9:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=common functions that show file location information
 EAPI=6
 HOMEPAGE=https://github.com/gregwebs/FileLocation.hs
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/hunit:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-
 RESTRICT=test
 SLOT=0/0.4.9.1
 SRC_URI=https://hackage.haskell.org/package/file-location-0.4.9.1/file-location-0.4.9.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3fab254dcc3d5ff0fcc844fad26190d4
diff --git a/metadata/md5-cache/dev-haskell/filelock-0.1.1.5 b/metadata/md5-cache/dev-haskell/filelock-0.1.1.5
index 19bfeda3e930..7b86e7033022 100644
--- a/metadata/md5-cache/dev-haskell/filelock-0.1.1.5
+++ b/metadata/md5-cache/dev-haskell/filelock-0.1.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/async ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/async ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Portable interface to file locking (flock / LockFileEx)
 EAPI=7
 HOMEPAGE=https://github.com/takano-akio/filelock
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.0.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.5
 SRC_URI=https://hackage.haskell.org/package/filelock-0.1.1.5/filelock-0.1.1.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b2c09acced6911c701b3b43e5e7d811d
diff --git a/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3 b/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
index 4e7d2989f0b2..829f9631192c 100644
--- a/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
+++ b/metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/unix-compat:=[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 )
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Expressive file and directory manipulation for Haskell
 EAPI=7
 HOMEPAGE=https://github.com/bos/filemanip
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.6.3
 SRC_URI=https://hackage.haskell.org/package/filemanip-0.3.6.3/filemanip-0.3.6.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4657f029d3e18fda9ad12d40fb15ad84
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
index 4a053daaadea..db5bf7367bd9 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Library for manipulating RawFilePaths in a cross platform way
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/filepath-bytestring
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9709e4cbb08f917bc7fbc6da00d9c180
diff --git a/metadata/md5-cache/dev-haskell/filestore-0.6.5 b/metadata/md5-cache/dev-haskell/filestore-0.6.5
index 2d9f610220b6..7ce1cef337cb 100644
--- a/metadata/md5-cache/dev-haskell/filestore-0.6.5
+++ b/metadata/md5-cache/dev-haskell/filestore-0.6.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/diff-0.4:=[profile?] <dev-haskell/diff-0.5:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[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/mtl ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/diff-0.4:=[profile?] <dev-haskell/diff-0.5:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[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/mtl ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Interface for versioning file stores
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/filestore
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/diff-0.4:=[profile?] <dev-haskell/diff-0.5:=[profile?] >=d
 RESTRICT=test
 SLOT=0/0.6.5
 SRC_URI=https://hackage.haskell.org/package/filestore-0.6.5/filestore-0.6.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1f9681843c1f508746bf407f672a0177
diff --git a/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1 b/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
index 61258d01174d..6a0aa0b7576a 100644
--- a/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.0 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.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Locate directory of original program
 EAPI=7
 HOMEPAGE=https://github.com/audreyt/findbin
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.5
 SRC_URI=https://hackage.haskell.org/package/FindBin-0.0.5/FindBin-0.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=344950c7b45db7605bd85c75bb7cc4ee
diff --git a/metadata/md5-cache/dev-haskell/fingertree-0.1.4.2 b/metadata/md5-cache/dev-haskell/fingertree-0.1.4.2
index 26a080d61643..a42ce09da277 100644
--- a/metadata/md5-cache/dev-haskell/fingertree-0.1.4.2
+++ b/metadata/md5-cache/dev-haskell/fingertree-0.1.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( dev-haskell/hunit dev-haskell/quickcheck 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generic finger-tree structure, with example instances
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/fingertree
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.4.2
 SRC_URI=https://hackage.haskell.org/package/fingertree-0.1.4.2/fingertree-0.1.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a6b30e14beb7be7f98e91bffa477259b
diff --git a/metadata/md5-cache/dev-haskell/fixed-0.3 b/metadata/md5-cache/dev-haskell/fixed-0.3
index c2433a799328..2a6130915306 100644
--- a/metadata/md5-cache/dev-haskell/fixed-0.3
+++ b/metadata/md5-cache/dev-haskell/fixed-0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Signed 15.16 precision fixed point arithmetic
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/fixed
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/fixed-0.3/fixed-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dfbdfdb3aab9c9a4b91b48f126db3d0c
diff --git a/metadata/md5-cache/dev-haskell/fmlist-0.9.3 b/metadata/md5-cache/dev-haskell/fmlist-0.9.3
index 5add7e009e57..2b174a64d992 100644
--- a/metadata/md5-cache/dev-haskell/fmlist-0.9.3
+++ b/metadata/md5-cache/dev-haskell/fmlist-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/fail:=[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 )
+DEPEND=dev-haskell/fail:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=FoldMap lists
 EAPI=7
 HOMEPAGE=https://github.com/sjoerdvisscher/fmlist
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/fail:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.9.3
 SRC_URI=https://hackage.haskell.org/package/fmlist-0.9.3/fmlist-0.9.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a5a01cb11d584da4637a86ce0c4b6f6d
diff --git a/metadata/md5-cache/dev-haskell/foldl-1.4.7 b/metadata/md5-cache/dev-haskell/foldl-1.4.7
index 0c29725c44f5..273371b12a98 100644
--- a/metadata/md5-cache/dev-haskell/foldl-1.4.7
+++ b/metadata/md5-cache/dev-haskell/foldl-1.4.7
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Composable, streaming, and efficient left folds
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/foldl
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=970b3371361b142bde28f9be235af11b
diff --git a/metadata/md5-cache/dev-haskell/foundation-0.0.25 b/metadata/md5-cache/dev-haskell/foundation-0.0.25
index 115b24509bc9..624c197475ee 100644
--- a/metadata/md5-cache/dev-haskell/foundation-0.0.25
+++ b/metadata/md5-cache/dev-haskell/foundation-0.0.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=~dev-haskell/basement-0.0.11:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/basement >=dev-haskell/doctest-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=~dev-haskell/basement-0.0.11:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/basement >=dev-haskell/doctest-0.9 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Alternative prelude with batteries and no dependencies
 EAPI=7
 HOMEPAGE=https://github.com/haskell-foundation/foundation
@@ -10,5 +10,5 @@ RDEPEND=~dev-haskell/basement-0.0.11:=[profile?] >=dev-lang/ghc-8.0.1:=
 RESTRICT=test
 SLOT=0/0.0.25
 SRC_URI=https://hackage.haskell.org/package/foundation-0.0.25/foundation-0.0.25.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=100d501590a91a75017937d915737641
diff --git a/metadata/md5-cache/dev-haskell/free-5.1.3 b/metadata/md5-cache/dev-haskell/free-5.1.3
index 1c8b03accc98..3df9ff8d0f8b 100644
--- a/metadata/md5-cache/dev-haskell/free-5.1.3
+++ b/metadata/md5-cache/dev-haskell/free-5.1.3
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Monads for free
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/free/
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 1b8e95c36430..ace3271218e5 100644
--- a/metadata/md5-cache/dev-haskell/fsnotify-0.3.0.1
+++ b/metadata/md5-cache/dev-haskell/fsnotify-0.3.0.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Cross platform library for file change notification
 EAPI=7
 HOMEPAGE=https://github.com/haskell-fswatch/hfsnotify
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/async-2.0.1:=[profile?] >=dev-haskell/hinotify-0.3.0:=[pro
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 471eed199bfd..c4af9dbf4e3e 100644
--- a/metadata/md5-cache/dev-haskell/generic-deriving-1.13.1
+++ b/metadata/md5-cache/dev-haskell/generic-deriving-1.13.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generic programming library for generalised deriving
 EAPI=7
 HOMEPAGE=https://github.com/dreixel/generic-deriving
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 992283c89fea..659335e87667 100644
--- a/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
+++ b/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generic Programming using True Sums of Products
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/generics-sop
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/sop-core-0.5.0:=[profile?] <dev-haskell/sop-core-0.5.1:=[p
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e2d58767f0cd5ccf8fd2c654bcd753fe
diff --git a/metadata/md5-cache/dev-haskell/geniplate-0.6.0.5 b/metadata/md5-cache/dev-haskell/geniplate-0.6.0.5
index cacae5b6070d..fe336d2ec4dd 100644
--- a/metadata/md5-cache/dev-haskell/geniplate-0.6.0.5
+++ b/metadata/md5-cache/dev-haskell/geniplate-0.6.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/mtl:=[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 )
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Use Template Haskell to generate Uniplate-like functions
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/geniplate
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.0.5
 SRC_URI=https://hackage.haskell.org/package/geniplate-0.6.0.5/geniplate-0.6.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5bdf0c07e71731418d1570e6ce39ce5d
diff --git a/metadata/md5-cache/dev-haskell/geniplate-mirror-0.7.7 b/metadata/md5-cache/dev-haskell/geniplate-mirror-0.7.7
index 9d2167e51eac..a5d6697e13c6 100644
--- a/metadata/md5-cache/dev-haskell/geniplate-mirror-0.7.7
+++ b/metadata/md5-cache/dev-haskell/geniplate-mirror-0.7.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/mtl:=[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 )
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Use Template Haskell to generate Uniplate-like functions
 EAPI=7
 HOMEPAGE=https://github.com/danr/geniplate
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.7
 SRC_URI=https://hackage.haskell.org/package/geniplate-mirror-0.7.7/geniplate-mirror-0.7.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c16bc25864b430bbfe20f591f6548273
diff --git a/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2 b/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
index 5b45f855f708..6dc50b0ec580 100644
--- a/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
+++ b/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Testing utilities for the validity library
 EAPI=7
 HOMEPAGE=https://github.com/NorfairKing/validity#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/quickcheck-2.7:2=[profile?] dev-haskell/random:=[profile?]
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 5674bc78b087..3eb2226af2d0 100644
--- a/metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4
+++ b/metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Standard spec's for GenValidity instances
 EAPI=7
 HOMEPAGE=https://github.com/NorfairKing/validity#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/genvalidity-0.8:=[profile?] >=dev-haskell/genvalidity-prop
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 06f6e1217b89..56e24bfb134b 100644
--- a/metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Standard properties for functions on 'Validity' types
 EAPI=7
 HOMEPAGE=https://github.com/NorfairKing/validity#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/genvalidity-0.7:=[profile?] >=dev-haskell/hspec-2.1:=[prof
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=97d5bd48c7fe2abf420109c7a7e5ca8a
diff --git a/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4 b/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4
index 406f8a57e650..2589adb35361 100644
--- a/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4
+++ b/metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/base-compat-0.8:=[profile?] dev-haskell/base-orphans:=[profile?] >=dev-haskell/generics-sop-0.2.3:=[profile?] <dev-haskell/generics-sop-0.6:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/hspec-2.1.8 dev-haskell/quickcheck dev-haskell/safe dev-haskell/silently ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/base-compat-0.8:=[profile?] dev-haskell/base-orphans:=[profile?] >=dev-haskell/generics-sop-0.2.3:=[profile?] <dev-haskell/generics-sop-0.6:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/hspec-2.1.8 dev-haskell/quickcheck dev-haskell/safe dev-haskell/silently ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Create command line interfaces with ease
 EAPI=7
 HOMEPAGE=https://github.com/soenkehahn/getopt-generics#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-compat-0.8:=[profile?] dev-haskell/base-orphans:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/0.13.0.4
 SRC_URI=https://hackage.haskell.org/package/getopt-generics-0.13.0.4/getopt-generics-0.13.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58da864d98ba4cf89d2ed3675e8d1880
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
index 0880f9fe74b7..7332c5c41214 100644
--- 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
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c90ab037922e62e7f6558e98a46797fb
diff --git a/metadata/md5-cache/dev-haskell/gio-0.13.8.1 b/metadata/md5-cache/dev-haskell/gio-0.13.8.1
index 89f25d7e111a..dd4dfbbfa26d 100644
--- a/metadata/md5-cache/dev-haskell/gio-0.13.8.1
+++ b/metadata/md5-cache/dev-haskell/gio-0.13.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Binding to GIO
 EAPI=7
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2
 SLOT=0/0.13.8.1
 SRC_URI=https://hackage.haskell.org/package/gio-0.13.8.1/gio-0.13.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=64c617092400394f6aae43b90c87e995
diff --git a/metadata/md5-cache/dev-haskell/git-0.3.0 b/metadata/md5-cache/dev-haskell/git-0.3.0
index dfa8d8e7ef81..c361e661f091 100644
--- a/metadata/md5-cache/dev-haskell/git-0.3.0
+++ b/metadata/md5-cache/dev-haskell/git-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/basement:=[profile?] >=dev-haskell/cryptonite-0.22:=[profile?] >=dev-haskell/hourglass-0.2:=[profile?] >=dev-haskell/memory-0.13:=[profile?] dev-haskell/random:=[profile?] dev-haskell/system-fileio:=[profile?] dev-haskell/system-filepath:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/zlib:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/bytedump-1.0 dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/basement:=[profile?] >=dev-haskell/cryptonite-0.22:=[profile?] >=dev-haskell/hourglass-0.2:=[profile?] >=dev-haskell/memory-0.13:=[profile?] dev-haskell/random:=[profile?] dev-haskell/system-fileio:=[profile?] dev-haskell/system-filepath:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/zlib:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/bytedump-1.0 dev-haskell/tasty dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Git operations in haskell
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-git
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/basement:=[profile?] >=dev-haskell/cryptonite-0.22:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/git-0.3.0/git-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b6166fb6f22f76c16c53760678a58ca2
diff --git a/metadata/md5-cache/dev-haskell/git-lfs-1.1.0 b/metadata/md5-cache/dev-haskell/git-lfs-1.1.0
index cd4bcb74f5e4..8268385d45c8 100644
--- a/metadata/md5-cache/dev-haskell/git-lfs-1.1.0
+++ b/metadata/md5-cache/dev-haskell/git-lfs-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-1.3:=[profile?] <=dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <=dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] <=dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <=dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <=dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/text-1.2:=[profile?] <=dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.6.3:= >=dev-haskell/cabal-2.4.0.1 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-1.3:=[profile?] <=dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <=dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] <=dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <=dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <=dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/text-1.2:=[profile?] <=dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.6.3:= >=dev-haskell/cabal-2.4.0.1 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=git-lfs protocol
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/git-lfs
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=>=dev-haskell/aeson-1.3:=[profile?] <=dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <=dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] <=dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <=dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <=dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/text-1.2:=[profile?] <=dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.6.3:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/git-lfs-1.1.0/git-lfs-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7420ec3a16b69f1e6e9618a9152f812b
diff --git a/metadata/md5-cache/dev-haskell/githash-0.1.3.3 b/metadata/md5-cache/dev-haskell/githash-0.1.3.3
index 9fc53544871d..f928bb8cfa21 100644
--- a/metadata/md5-cache/dev-haskell/githash-0.1.3.3
+++ b/metadata/md5-cache/dev-haskell/githash-0.1.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-8.0.2:= dev-vcs/git >=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 )
+DEPEND=>=dev-lang/ghc-8.0.2:= dev-vcs/git >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec dev-haskell/temporary dev-haskell/unliftio ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Compile git revision info into Haskell projects
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/githash#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.0.2:= dev-vcs/git
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=237ad6a6dc3c40f19ccc880839eee2a8
diff --git a/metadata/md5-cache/dev-haskell/gitrev-1.3.1 b/metadata/md5-cache/dev-haskell/gitrev-1.3.1
index a7439025238f..8b5b18f18b50 100644
--- a/metadata/md5-cache/dev-haskell/gitrev-1.3.1
+++ b/metadata/md5-cache/dev-haskell/gitrev-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/base-compat-0.6.0:=[profile?] >=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 )
+DEPEND=>=dev-haskell/base-compat-0.6.0:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Compile git revision info into Haskell projects
 EAPI=6
 HOMEPAGE=https://github.com/acfoltzer/gitrev
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-compat-0.6.0:=[profile?] >=dev-lang/ghc-7.6.1:=
 SLOT=0/1.3.1
 SRC_URI=https://hackage.haskell.org/package/gitrev-1.3.1/gitrev-1.3.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=abe2c7666c10a3dbce3ff4a328c94c25
diff --git a/metadata/md5-cache/dev-haskell/glib-0.13.8.1 b/metadata/md5-cache/dev-haskell/glib-0.13.8.1
index 861a27069633..492fefc581a4 100644
--- a/metadata/md5-cache/dev-haskell/glib-0.13.8.1
+++ b/metadata/md5-cache/dev-haskell/glib-0.13.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Binding to the GLIB library for Gtk2Hs
 EAPI=7
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2
 SLOT=0/0.13.8.1
 SRC_URI=https://hackage.haskell.org/package/glib-0.13.8.1/glib-0.13.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=63d91bbd73a366644c119c5c3959a2f4
diff --git a/metadata/md5-cache/dev-haskell/glob-0.9.3 b/metadata/md5-cache/dev-haskell/glob-0.9.3
index 16136c740bc1..24e3adcda22d 100644
--- a/metadata/md5-cache/dev-haskell/glob-0.9.3
+++ b/metadata/md5-cache/dev-haskell/glob-0.9.3
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Globbing library
 EAPI=6
 HOMEPAGE=http://iki.fi/matti.niemenmaa/glob/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7508a47831fabc25f1217aca8dc6cfd3
diff --git a/metadata/md5-cache/dev-haskell/gluraw-2.0.0.4 b/metadata/md5-cache/dev-haskell/gluraw-2.0.0.4
index 589b5f986f0f..2db523f56bad 100644
--- a/metadata/md5-cache/dev-haskell/gluraw-2.0.0.4
+++ b/metadata/md5-cache/dev-haskell/gluraw-2.0.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/glu >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/glu >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A raw binding for the OpenGL graphics system
 EAPI=6
 HOMEPAGE=https://www.haskell.org/haskellwiki/Opengl
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/glu
 SLOT=0/2.0.0.4
 SRC_URI=https://hackage.haskell.org/package/GLURaw-2.0.0.4/GLURaw-2.0.0.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98b6a76b80d6695e83aecd1d15884b30
diff --git a/metadata/md5-cache/dev-haskell/glut-2.7.0.15 b/metadata/md5-cache/dev-haskell/glut-2.7.0.15
index 192cd901847e..606c97f4f6a1 100644
--- a/metadata/md5-cache/dev-haskell/glut-2.7.0.15
+++ b/metadata/md5-cache/dev-haskell/glut-2.7.0.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/openglraw-1.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/openglraw-1.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A binding for the OpenGL Utility Toolkit
 EAPI=7
 HOMEPAGE=https://www.haskell.org/haskellwiki/Opengl
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/openglraw-1.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] )
 SLOT=0/2.7.0.15
 SRC_URI=https://hackage.haskell.org/package/GLUT-2.7.0.15/GLUT-2.7.0.15.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=839bce0e3ac90dd0440c6a334df55f90
diff --git a/metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1 b/metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1
index e2fa923c5889..6b09cfe763bb 100644
--- a/metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1
+++ b/metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= net-dns/libidn:0= dev-haskell/c2hs >=dev-haskell/cabal-1.8 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= net-dns/libidn:0= dev-haskell/c2hs >=dev-haskell/cabal-1.8 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Bindings for GNU IDN
 EAPI=7
 HOMEPAGE=https://john-millikin.com/software/haskell-gnuidn/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= net-dns/libidn:0=
 RESTRICT=test
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/gnuidn-0.2.2/gnuidn-0.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=074412b2be6595d28d4407e0ecfff680
diff --git a/metadata/md5-cache/dev-haskell/gnutls-0.2 b/metadata/md5-cache/dev-haskell/gnutls-0.2
index 55f05e5fb780..5d3c5b058b9b 100644
--- a/metadata/md5-cache/dev-haskell/gnutls-0.2
+++ b/metadata/md5-cache/dev-haskell/gnutls-0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= net-libs/gnutls:= >=dev-haskell/cabal-1.18.1.3 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= net-libs/gnutls:= >=dev-haskell/cabal-1.18.1.3 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Bindings for GNU libgnutls
 EAPI=7
 HOMEPAGE=https://john-millikin.com/software/haskell-gnutls/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= net-libs/gnutls:=
 SLOT=0/0.2
 SRC_URI=https://hackage.haskell.org/package/gnutls-0.2/gnutls-0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65f43148d65a05b395e9a6a07913fa32
diff --git a/metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4 b/metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4
index 6172c03f235e..4aadd038a674 100644
--- a/metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4
+++ b/metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Bindings to Graphviz for graph visualisation
 EAPI=7
 HOMEPAGE=http://projects.haskell.org/graphviz/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?]
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=41352b6c2bed674a43877778b420c6fa
diff --git a/metadata/md5-cache/dev-haskell/groupoids-4.0 b/metadata/md5-cache/dev-haskell/groupoids-4.0
index 6ee7b2f4bde6..34d8300ba85e 100644
--- a/metadata/md5-cache/dev-haskell/groupoids-4.0
+++ b/metadata/md5-cache/dev-haskell/groupoids-4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/semigroupoids-4.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 )
+DEPEND=>=dev-haskell/semigroupoids-4.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=This package has been absorbed into semigroupoids 4.0
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/groupoids/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroupoids-4.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/4.0
 SRC_URI=https://hackage.haskell.org/package/groupoids-4.0/groupoids-4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e1c73041101e9d8fbec8ad2b32d1a89f
diff --git a/metadata/md5-cache/dev-haskell/gsasl-0.3.7 b/metadata/md5-cache/dev-haskell/gsasl-0.3.7
index c176444ae4a6..821dbc4e52bb 100644
--- a/metadata/md5-cache/dev-haskell/gsasl-0.3.7
+++ b/metadata/md5-cache/dev-haskell/gsasl-0.3.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/monad-loops-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/gsasl >=dev-haskell/cabal-1.18.1.3 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/monad-loops-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/gsasl >=dev-haskell/cabal-1.18.1.3 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Bindings for GNU libgsasl
 EAPI=7
 HOMEPAGE=https://git.sr.ht/~singpolyma/gsasl-haskell
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-haskell/monad-loops-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/gsasl
 SLOT=0/0.3.7
 SRC_URI=https://hackage.haskell.org/package/gsasl-0.3.7/gsasl-0.3.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fd03b00844a438e8bc49d71e98d3a1de
diff --git a/metadata/md5-cache/dev-haskell/gtk-0.14.10-r3 b/metadata/md5-cache/dev-haskell/gtk-0.14.10-r3
index 3ee5395557a3..6a9a654e9eb8 100644
--- a/metadata/md5-cache/dev-haskell/gtk-0.14.10-r3
+++ b/metadata/md5-cache/dev-haskell/gtk-0.14.10-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] ) >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] ) >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Binding to the Gtk+ graphical user interface library
 EAPI=7
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
 SLOT=2/0.14.10
 SRC_URI=https://hackage.haskell.org/package/gtk-0.14.10/gtk-0.14.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2a9e529c24623b8a5d8978f2ddeca400
diff --git a/metadata/md5-cache/dev-haskell/gtk-0.15.5-r1 b/metadata/md5-cache/dev-haskell/gtk-0.15.5-r1
index 27397fd8f67b..d9d7bb0afd2b 100644
--- a/metadata/md5-cache/dev-haskell/gtk-0.15.5-r1
+++ b/metadata/md5-cache/dev-haskell/gtk-0.15.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] ) >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] ) >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Binding to the Gtk+ graphical user interface library
 EAPI=7
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:2 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
 SLOT=2/0.15.5
 SRC_URI=https://hackage.haskell.org/package/gtk-0.15.5/gtk-0.15.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d4b63d9f701faf43ecba2b641166bd6
diff --git a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0 b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0
index 7197bb1c9209..8b994426879e 100644
--- a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0
+++ b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cabal-1.24.0.0:=[profile?] dev-haskell/fail:=[profile?] dev-haskell/hashtables:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.8.2:= dev-haskell/alex >=dev-haskell/cabal-1.18.1.3 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/cabal-1.24.0.0:=[profile?] dev-haskell/fail:=[profile?] dev-haskell/hashtables:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.8.2:= dev-haskell/alex >=dev-haskell/cabal-1.18.1.3 dev-haskell/happy hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Tools to build the Gtk2Hs suite of User Interface libraries
 EAPI=7
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/cabal-1.24.0.0:=[profile?] dev-haskell/fail:=[profile?] dev-haskell/hashtables:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.13.8.0
 SRC_URI=https://hackage.haskell.org/package/gtk2hs-buildtools-0.13.8.0/gtk2hs-buildtools-0.13.8.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50a2068ad7675d8b3165b2f7b048754c
diff --git a/metadata/md5-cache/dev-haskell/gtk3-0.15.5 b/metadata/md5-cache/dev-haskell/gtk3-0.15.5
index b42fa0148cd3..f1dff0b07617 100644
--- a/metadata/md5-cache/dev-haskell/gtk3-0.15.5
+++ b/metadata/md5-cache/dev-haskell/gtk3-0.15.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:3 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] ) >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:3 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] ) >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Binding to the Gtk+ 3 graphical user interface library
 EAPI=7
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/glib:2 x11-libs/gtk+:3 gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
 SLOT=0/0.15.5
 SRC_URI=https://hackage.haskell.org/package/gtk3-0.15.5/gtk3-0.15.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d3ba794095c511355086c94af636f4cf
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
index fe12d506c7e4..dd1cb0e7c16c 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Hackage security library
 EAPI=7
 HOMEPAGE=https://github.com/haskell/hackage-security
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-by
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f6724408e06e1d29fdfe08d0eef2e50e
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3 b/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3
index 254c2b314b7e..bcafc9ad4cb2 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3
+++ b/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/ghc-paths:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?]
 RESTRICT=test
 SLOT=0/2.14.3.0.7.8.3
 SRC_URI=http://code.haskell.org/~slyfox/snapshots/haddock-2.14.3.0.7.8.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d08d02e248d65c0494e2e100239ee020
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.16.1 b/metadata/md5-cache/dev-haskell/haddock-2.16.1
index e5d4aea0c185..e19f5359acd1 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.16.1
+++ b/metadata/md5-cache/dev-haskell/haddock-2.16.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haddock-2.16.1/haddock-2.16.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=db1122903934bf548791203507170021
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.17.2 b/metadata/md5-cache/dev-haskell/haddock-2.17.2
index 0515bc5b25ec..3269adefa875 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.17.2
+++ b/metadata/md5-cache/dev-haskell/haddock-2.17.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/haddock-api-2.17:= <dev-haskell/haddock-api-2.18:= >=dev-l
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haddock-2.17.2/haddock-2.17.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=349c69459c2283a7a0da614fc1881fa1
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.23.1 b/metadata/md5-cache/dev-haskell/haddock-2.23.1
index b39b75204039..491df674f2dd 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.23.1
+++ b/metadata/md5-cache/dev-haskell/haddock-2.23.1
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f9d5e11f871660dade42fa6993ade91
diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.16.1 b/metadata/md5-cache/dev-haskell/haddock-api-2.16.1
index 91149ed4c93d..034936cc6054 100644
--- a/metadata/md5-cache/dev-haskell/haddock-api-2.16.1
+++ b/metadata/md5-cache/dev-haskell/haddock-api-2.16.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >=dev-haskell/haddock-library-1.2:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-7.10:= <dev-lang/ghc-7.12:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >=dev-haskell/haddock-library-1.2:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-7.10:= <dev-lang/ghc-7.12:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A documentation-generation tool for Haskell libraries
 EAPI=7
 HOMEPAGE=https://www.haskell.org/haddock/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >=dev-haskell/haddock-library-1.2:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-7.10:= <dev-lang/ghc-7.12:=
 SLOT=0/2.16.1
 SRC_URI=https://hackage.haskell.org/package/haddock-api-2.16.1/haddock-api-2.16.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9a32af6123ee21332ae56ccfeb684c47
diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.17.3 b/metadata/md5-cache/dev-haskell/haddock-api-2.17.3
index d956bb21a3aa..e4d598eb061d 100644
--- a/metadata/md5-cache/dev-haskell/haddock-api-2.17.3
+++ b/metadata/md5-cache/dev-haskell/haddock-api-2.17.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >=dev-haskell/haddock-library-1.4:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.0:= <dev-lang/ghc-8.2:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >=dev-haskell/haddock-library-1.4:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?] dev-haskell/transformers:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.0:= <dev-lang/ghc-8.2:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A documentation-generation tool for Haskell libraries
 EAPI=6
 HOMEPAGE=https://www.haskell.org/haddock/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/ghc-paths:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/2.17.3
 SRC_URI=https://hackage.haskell.org/package/haddock-api-2.17.3/haddock-api-2.17.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe336645bb8f6907c0e518acc62515a6
diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.23.1 b/metadata/md5-cache/dev-haskell/haddock-api-2.23.1
index 2d85a7942d8f..66ef0e6d0081 100644
--- a/metadata/md5-cache/dev-haskell/haddock-api-2.23.1
+++ b/metadata/md5-cache/dev-haskell/haddock-api-2.23.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A documentation-generation tool for Haskell libraries
 EAPI=7
 HOMEPAGE=https://www.haskell.org/haddock/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1f02aedd14ad49c4eedc3b146f5d532b
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.1.1 b/metadata/md5-cache/dev-haskell/haddock-library-1.1.1
index 813743c1ffc7..bf506a7f5a64 100644
--- a/metadata/md5-cache/dev-haskell/haddock-library-1.1.1
+++ b/metadata/md5-cache/dev-haskell/haddock-library-1.1.1
@@ -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 test? ( dev-haskell/base-compat dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) 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 test? ( dev-haskell/base-compat dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Library exposing some functionality of Haddock
 EAPI=7
 HOMEPAGE=https://www.haskell.org/haddock/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.1.1
 SRC_URI=https://hackage.haskell.org/package/haddock-library-1.1.1/haddock-library-1.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e30b5664ef21ad5d7a0fb6207676be45
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.2.1 b/metadata/md5-cache/dev-haskell/haddock-library-1.2.1
index 813af1f23ec3..02274b117d92 100644
--- a/metadata/md5-cache/dev-haskell/haddock-library-1.2.1
+++ b/metadata/md5-cache/dev-haskell/haddock-library-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/base-compat dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/base-compat dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Library exposing some functionality of Haddock
 EAPI=7
 HOMEPAGE=https://www.haskell.org/haddock/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/1.2.1
 SRC_URI=https://hackage.haskell.org/package/haddock-library-1.2.1/haddock-library-1.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=60f83dc73f546fce79d27cac9ad76512
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.4.2 b/metadata/md5-cache/dev-haskell/haddock-library-1.4.2
index 00385aba8839..2683de7380b1 100644
--- a/metadata/md5-cache/dev-haskell/haddock-library-1.4.2
+++ b/metadata/md5-cache/dev-haskell/haddock-library-1.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/base-compat dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/base-compat dev-haskell/hspec >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Library exposing some functionality of Haddock
 EAPI=6
 HOMEPAGE=https://www.haskell.org/haddock/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.4.2
 SRC_URI=https://hackage.haskell.org/package/haddock-library-1.4.2/haddock-library-1.4.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ec69c35203600fb115866797d5b8341b
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.8.0 b/metadata/md5-cache/dev-haskell/haddock-library-1.8.0
index 05ce5289f2b9..10e64c34677a 100644
--- a/metadata/md5-cache/dev-haskell/haddock-library-1.8.0
+++ b/metadata/md5-cache/dev-haskell/haddock-library-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[prof
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ad00e362d34ea83030d67a68bd9450c2
diff --git a/metadata/md5-cache/dev-haskell/hakyll-4.13.4.0 b/metadata/md5-cache/dev-haskell/hakyll-4.13.4.0
index 565791ecf218..3ca4d6af9c15 100644
--- a/metadata/md5-cache/dev-haskell/hakyll-4.13.4.0
+++ b/metadata/md5-cache/dev-haskell/hakyll-4.13.4.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A static website compiler library
 EAPI=7
 HOMEPAGE=https://jaspervdj.be/hakyll/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2f375b983bdf745a4307f6db475771ba
diff --git a/metadata/md5-cache/dev-haskell/half-0.3-r1 b/metadata/md5-cache/dev-haskell/half-0.3-r1
index 03903e68db42..697c64b5c3e6 100644
--- a/metadata/md5-cache/dev-haskell/half-0.3-r1
+++ b/metadata/md5-cache/dev-haskell/half-0.3-r1
@@ -1,5 +1,5 @@
 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-2.9 >=dev-haskell/hspec-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.8 test? ( >=dev-haskell/quickcheck-2.9 >=dev-haskell/hspec-2.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Half-precision floating-point
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/half
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://hackage.haskell.org/package/half-0.3/half-0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4c1af8edbda9cd023440f68cc8620d3e
diff --git a/metadata/md5-cache/dev-haskell/hamlet-1.2.0 b/metadata/md5-cache/dev-haskell/hamlet-1.2.0
index 2c2b812e0c08..928f05afd75e 100644
--- a/metadata/md5-cache/dev-haskell/hamlet-1.2.0
+++ b/metadata/md5-cache/dev-haskell/hamlet-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/shakespeare-2.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 )
+DEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haml-like template files that are compile-time checked (deprecated)
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.0
 SRC_URI=https://hackage.haskell.org/package/hamlet-1.2.0/hamlet-1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e38d8d16575d4b4def7ed0f6a3a3775
diff --git a/metadata/md5-cache/dev-haskell/happstack-server-7.6.0 b/metadata/md5-cache/dev-haskell/happstack-server-7.6.0
index 018d4247b0e2..031ef6c31fdf 100644
--- a/metadata/md5-cache/dev-haskell/happstack-server-7.6.0
+++ b/metadata/md5-cache/dev-haskell/happstack-server-7.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/hslogger-1.0.2:=[profile?] dev-haskell/html:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] >=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/system-filepath-0.3.1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/threads-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] dev-haskell/xhtml:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/network-3:=[profile?] <dev-haskell/network-3.2:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/hslogger-1.0.2:=[profile?] dev-haskell/html:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] >=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/system-filepath-0.3.1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/threads-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] dev-haskell/xhtml:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/network-3:=[profile?] <dev-haskell/network-3.2:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Web related tools and services
 EAPI=7
 HOMEPAGE=https://happstack.com
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-byte
 RESTRICT=!test? ( test )
 SLOT=0/7.6.0
 SRC_URI=https://hackage.haskell.org/package/happstack-server-7.6.0/happstack-server-7.6.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b9ad97d5f6cffeb6d2c7637e7adb68d8
diff --git a/metadata/md5-cache/dev-haskell/happy-1.19.12 b/metadata/md5-cache/dev-haskell/happy-1.19.12
index ab7d5ace9cd1..d4c87060101e 100644
--- a/metadata/md5-cache/dev-haskell/happy-1.19.12
+++ b/metadata/md5-cache/dev-haskell/happy-1.19.12
@@ -11,5 +11,5 @@ RDEPEND=>=dev-haskell/mtl-2.2.1:= >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/happy-1.19.12/happy-1.19.12.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=07a9a80a91f1b1f62afb02c342269de9
diff --git a/metadata/md5-cache/dev-haskell/harp-0.4.3.2 b/metadata/md5-cache/dev-haskell/harp-0.4.3.2
index 8d05b6d6b98f..1ba019601a86 100644
--- a/metadata/md5-cache/dev-haskell/harp-0.4.3.2
+++ b/metadata/md5-cache/dev-haskell/harp-0.4.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=HaRP allows pattern-matching with regular expressions
 EAPI=7
 HOMEPAGE=https://github.com/seereason/harp
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.3.2
 SRC_URI=https://hackage.haskell.org/package/harp-0.4.3.2/harp-0.4.3.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eb90ee5de6d4553f03a3a849cc339f9b
diff --git a/metadata/md5-cache/dev-haskell/hashable-1.2.7.0 b/metadata/md5-cache/dev-haskell/hashable-1.2.7.0
index 2a7cebefea63..0dd1fdfbdbc4 100644
--- a/metadata/md5-cache/dev-haskell/hashable-1.2.7.0
+++ b/metadata/md5-cache/dev-haskell/hashable-1.2.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-7.4.1:= doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-7.4.1:= hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A class for types that can be converted to a hash value
 EAPI=6
 HOMEPAGE=https://github.com/tibbe/hashable
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-0.11.0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/1.2.7.0
 SRC_URI=https://hackage.haskell.org/package/hashable-1.2.7.0/hashable-1.2.7.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=05e2a5e6be50805ad1d6e4a64047b006
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
index 1a61ad7d1324..a47b3a03cba8 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Hashable instances for Data.Time
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/hashable-time
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6d8e4c2d3912748364b14ac2c56c4173
diff --git a/metadata/md5-cache/dev-haskell/hashtables-1.2.4.1 b/metadata/md5-cache/dev-haskell/hashtables-1.2.4.1
index f162372bf69f..fd0b4b171094 100644
--- a/metadata/md5-cache/dev-haskell/hashtables-1.2.4.1
+++ b/metadata/md5-cache/dev-haskell/hashtables-1.2.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/mwc-random-0.8 <dev-haskell/mwc-random-0.16 >=dev-haskell/quickcheck-2.3.0.2 >=dev-haskell/test-framework-0.3.1 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.6 <dev-haskell/test-framework-hunit-3 >=dev-haskell/test-framework-quickcheck2-0.2.6 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/mwc-random-0.8 <dev-haskell/mwc-random-0.16 >=dev-haskell/quickcheck-2.3.0.2 >=dev-haskell/test-framework-0.3.1 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.6 <dev-haskell/test-framework-hunit-3 >=dev-haskell/test-framework-quickcheck2-0.2.6 <dev-haskell/test-framework-quickcheck2-0.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Mutable hash tables in the ST monad
 EAPI=7
 HOMEPAGE=https://github.com/gregorycollins/hashtables
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <
 RESTRICT=!test? ( test )
 SLOT=0/1.2.4.1
 SRC_URI=https://hackage.haskell.org/package/hashtables-1.2.4.1/hashtables-1.2.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=025fd7d4d94b2a6629ea53fbb2d4a233
diff --git a/metadata/md5-cache/dev-haskell/haskeline-0.7.5.0 b/metadata/md5-cache/dev-haskell/haskeline-0.7.5.0
index 074138fab345..88c98defc4d4 100644
--- a/metadata/md5-cache/dev-haskell/haskeline-0.7.5.0
+++ b/metadata/md5-cache/dev-haskell/haskeline-0.7.5.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A command-line interface for user input, written in Haskell
 EAPI=7
 HOMEPAGE=https://github.com/judah/haskeline
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a570cd0d37f985b48815fb4c1477ab49
diff --git a/metadata/md5-cache/dev-haskell/haskell-lexer-1.0.2 b/metadata/md5-cache/dev-haskell/haskell-lexer-1.0.2
index 5e27943c769b..dc00df288624 100644
--- a/metadata/md5-cache/dev-haskell/haskell-lexer-1.0.2
+++ b/metadata/md5-cache/dev-haskell/haskell-lexer-1.0.2
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A fully compliant Haskell 98 lexer
 EAPI=7
 HOMEPAGE=https://github.com/yav/haskell-lexer
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/haskell-lexer-1.0.2/haskell-lexer-1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=458044df77004e832576ffd8bab64725
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-1.0.3.0 b/metadata/md5-cache/dev-haskell/haskell-src-1.0.3.0
index 6a0fcc9820cf..ac6f259f814a 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-1.0.3.0
+++ b/metadata/md5-cache/dev-haskell/haskell-src-1.0.3.0
@@ -1,5 +1,5 @@
 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:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[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-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 dev-haskell/happy hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Support for manipulating Haskell source code
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/haskell-src
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[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-lang/ghc-7.4.1:=
 SLOT=0/1.0.3.0
 SRC_URI=https://hackage.haskell.org/package/haskell-src-1.0.3.0/haskell-src-1.0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f41d31abd1837f1d4774a067e34d6c2
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1 b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1
index 4bdc75dd40f3..5cc97bd5ae9e 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1
+++ b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( dev-haskell/mtl dev-haskell/pretty-show >=dev-haskell/smallcheck-1.0 dev-haskell/syb >=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 )
+DEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( dev-haskell/mtl dev-haskell/pretty-show >=dev-haskell/smallcheck-1.0 dev-haskell/syb >=dev-haskell/tasty-0.3 >=dev-haskell/tasty-golden-2.2.2 dev-haskell/tasty-smallcheck ) 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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cpphs-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/1.17.1
 SRC_URI=https://hackage.haskell.org/package/haskell-src-exts-1.17.1/haskell-src-exts-1.17.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aed5d7ab3378bf34a6ece8ec080dd0e5
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
index 34157db85552..48d9e4e71c45 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1
+++ b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1
@@ -1,5 +1,5 @@
 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 )
+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 ) 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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 87765808bfc5..846e90e41b18 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 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
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 09e3b9bf7c50..14d6aa45acd3 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parse source to template-haskell abstract syntax
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/haskell-src-meta
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/haskell-src-exts-1.18:=[profile?] <dev-haskell/haskell-src
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=434d503b2ad7464a2778ff9b5ca4357d
diff --git a/metadata/md5-cache/dev-haskell/haxml-1.25.5-r1 b/metadata/md5-cache/dev-haskell/haxml-1.25.5-r1
index 7daaf79f5009..5d73bbd023b4 100644
--- a/metadata/md5-cache/dev-haskell/haxml-1.25.5-r1
+++ b/metadata/md5-cache/dev-haskell/haxml-1.25.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/polyparse-1.12.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.19:=[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 )
+DEPEND=>=dev-haskell/polyparse-1.12.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Utilities for manipulating XML documents
 EAPI=7
 HOMEPAGE=http://projects.haskell.org/HaXml/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/polyparse-1.12.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.25.5
 SRC_URI=https://hackage.haskell.org/package/HaXml-1.25.5/HaXml-1.25.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2201f5f072d76a14ab017985a4c9d0a4
diff --git a/metadata/md5-cache/dev-haskell/hcg-minus-0.15 b/metadata/md5-cache/dev-haskell/hcg-minus-0.15
index 1a277493b100..3802a63d95df 100644
--- a/metadata/md5-cache/dev-haskell/hcg-minus-0.15
+++ b/metadata/md5-cache/dev-haskell/hcg-minus-0.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/colour:=[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 )
+DEPEND=dev-haskell/colour:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=haskell cg (minus)
 EAPI=6
 HOMEPAGE=http://rd.slavepianos.org/t/hcg-minus
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/colour:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.15
 SRC_URI=https://hackage.haskell.org/package/hcg-minus-0.15/hcg-minus-0.15.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f8d040408ef9c260087902db15222dc
diff --git a/metadata/md5-cache/dev-haskell/hcodecs-0.5.2 b/metadata/md5-cache/dev-haskell/hcodecs-0.5.2
index f36a25cef25f..ad9d4370d7bc 100644
--- a/metadata/md5-cache/dev-haskell/hcodecs-0.5.2
+++ b/metadata/md5-cache/dev-haskell/hcodecs-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/quickcheck-2.0:2=[profile?] dev-haskell/random:=[profile?] dev-haskell/semigroups:=[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 )
+DEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/quickcheck-2.0:2=[profile?] dev-haskell/random:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files
 EAPI=7
 HOMEPAGE=http://www-db.informatik.uni-tuebingen.de/team/giorgidze
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/quickcheck-2.0:2=[profile?] d
 RESTRICT=!test? ( test )
 SLOT=0/0.5.2
 SRC_URI=https://hackage.haskell.org/package/HCodecs-0.5.2/HCodecs-0.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ad5131c1089525436b07505469d02521
diff --git a/metadata/md5-cache/dev-haskell/hdbc-2.4.0.3 b/metadata/md5-cache/dev-haskell/hdbc-2.4.0.3
index 546d8d49620f..52aaf5393bcc 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-2.4.0.3
+++ b/metadata/md5-cache/dev-haskell/hdbc-2.4.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/convertible-1.1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[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 )
+DEPEND=>=dev-haskell/convertible-1.1.0.0:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell Database Connectivity
 EAPI=7
 HOMEPAGE=https://github.com/hdbc/hdbc
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/convertible-1.1.0.0:=[profile?] dev-haskell/mtl:=[profile?
 RESTRICT=test
 SLOT=2/2.4.0.3
 SRC_URI=https://hackage.haskell.org/package/HDBC-2.4.0.3/HDBC-2.4.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=43f92d3108a0dfb58bfd480c7bd03035
diff --git a/metadata/md5-cache/dev-haskell/hdbc-mysql-0.7.1.0-r1 b/metadata/md5-cache/dev-haskell/hdbc-mysql-0.7.1.0-r1
index 71cd411e297b..ee47b76bb1c0 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-mysql-0.7.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/hdbc-mysql-0.7.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/hdbc-2.1.0:2=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:= dev-libs/openssl:0= sys-libs/zlib dev-db/mysql-connector-c:0= >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/hdbc-2.1.0:2=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:= dev-libs/openssl:0= sys-libs/zlib dev-db/mysql-connector-c:0= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=MySQL driver for HDBC
 EAPI=6
 HOMEPAGE=https://github.com/ryantm/hdbc-mysql
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/hdbc-2.1.0:2=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:= dev-libs/openssl:0= sys-libs/zlib dev-db/mysql-connector-c:0=
 SLOT=0/0.7.1.0
 SRC_URI=https://hackage.haskell.org/package/HDBC-mysql-0.7.1.0/HDBC-mysql-0.7.1.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ddc31d4f8b2be401c7d6366a5fc598ac
diff --git a/metadata/md5-cache/dev-haskell/hdbc-odbc-2.6.0.0 b/metadata/md5-cache/dev-haskell/hdbc-odbc-2.6.0.0
index 0d57b6f3cb76..1bf68a17e00e 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-odbc-2.6.0.0
+++ b/metadata/md5-cache/dev-haskell/hdbc-odbc-2.6.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-db/unixODBC >=dev-haskell/concurrent-extra-0.7.0.8:=[profile?] >=dev-haskell/hdbc-2.1.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libc >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-db/unixODBC >=dev-haskell/concurrent-extra-0.7.0.8:=[profile?] >=dev-haskell/hdbc-2.1.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libc >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=ODBC driver for HDBC
 EAPI=7
 HOMEPAGE=https://github.com/hdbc/hdbc-odbc
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-db/unixODBC >=dev-haskell/concurrent-extra-0.7.0.8:=[profile?] >=dev-haskell/hdbc-2.1.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libc
 SLOT=2/2.6.0.0
 SRC_URI=https://hackage.haskell.org/package/HDBC-odbc-2.6.0.0/HDBC-odbc-2.6.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d5ad6f5c4f6939900fcc2f11229edb57
diff --git a/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.7 b/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.7
index 63b89532cbe6..93d7454c5f09 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.7
+++ b/metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-db/postgresql-7:* dev-haskell/convertible:=[profile?] >=dev-haskell/hdbc-2.2.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 <dev-haskell/cabal-3.1 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-db/postgresql-7:* dev-haskell/convertible:=[profile?] >=dev-haskell/hdbc-2.2.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 <dev-haskell/cabal-3.1 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=PostgreSQL driver for HDBC
 EAPI=7
 HOMEPAGE=https://github.com/hdbc/hdbc-postgresql
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-db/postgresql-7:* dev-haskell/convertible:=[profile?] >=dev-haskell/hdbc-2.2.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=2/2.3.2.7
 SRC_URI=https://hackage.haskell.org/package/HDBC-postgresql-2.3.2.7/HDBC-postgresql-2.3.2.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8fae6295bb52ad140b24ff623156aebb
diff --git a/metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1 b/metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
index 157fff3e6f7e..5d87f64fec3c 100644
--- a/metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hdbc-2.3.0.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=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 )
+DEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hdbc-2.3.0.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Sqlite v3 driver for HDBC
 EAPI=7
 HOMEPAGE=https://github.com/hdbc/hdbc-sqlite3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hdbc-2.3.0.0:2=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.3.3.1
 SRC_URI=https://hackage.haskell.org/package/HDBC-sqlite3-2.3.3.1/HDBC-sqlite3-2.3.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a5c9fe53c9a36d46f41f673fc83583da
diff --git a/metadata/md5-cache/dev-haskell/heaps-0.3.6.1 b/metadata/md5-cache/dev-haskell/heaps-0.3.6.1
index f11f24ddff02..3e237f220742 100644
--- a/metadata/md5-cache/dev-haskell/heaps-0.3.6.1
+++ b/metadata/md5-cache/dev-haskell/heaps-0.3.6.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Asymptotically optimal Brodal/Okasaki heaps
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/heaps/
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=84da6a2ebbba5330407246913fdc30b3
diff --git a/metadata/md5-cache/dev-haskell/hedgehog-1.0.4 b/metadata/md5-cache/dev-haskell/hedgehog-1.0.4
index f408d7db8a81..ef82518255d6 100644
--- a/metadata/md5-cache/dev-haskell/hedgehog-1.0.4
+++ b/metadata/md5-cache/dev-haskell/hedgehog-1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.12:=[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/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/pretty-show-1.11:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[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 )
+DEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.12:=[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/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/pretty-show-1.11:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Release with confidence
 EAPI=7
 HOMEPAGE=https://hedgehog.qa
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0
 RESTRICT=!test? ( test )
 SLOT=0/1.0.4
 SRC_URI=https://hackage.haskell.org/package/hedgehog-1.0.4/hedgehog-1.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b42615b0bd172835b0643584311dcba
diff --git a/metadata/md5-cache/dev-haskell/hex-0.1.2 b/metadata/md5-cache/dev-haskell/hex-0.1.2
index f95040c927fb..dca7f4cff1cc 100644
--- a/metadata/md5-cache/dev-haskell/hex-0.1.2
+++ b/metadata/md5-cache/dev-haskell/hex-0.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-8.8.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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Convert strings into hexadecimal and back
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/hex
@@ -9,5 +9,5 @@ LICENSE=BSD
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c5723cd033e8747e681641ded79772d4
diff --git a/metadata/md5-cache/dev-haskell/hexpat-0.20.13 b/metadata/md5-cache/dev-haskell/hexpat-0.20.13
index e58bf4f3510d..559872d255ac 100644
--- a/metadata/md5-cache/dev-haskell/hexpat-0.20.13
+++ b/metadata/md5-cache/dev-haskell/hexpat-0.20.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= !bundled-expat? ( dev-libs/expat ) >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= !bundled-expat? ( dev-libs/expat ) >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=XML parser/formatter based on expat
 EAPI=6
 HOMEPAGE=http://haskell.org/haskellwiki/Hexpat/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?] >=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= !bundled-expat? ( dev-libs/expat )
 SLOT=0/0.20.13
 SRC_URI=https://hackage.haskell.org/package/hexpat-0.20.13/hexpat-0.20.13.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=71d351063480c098ae92befbce5dae6c
diff --git a/metadata/md5-cache/dev-haskell/hgettext-0.1.30 b/metadata/md5-cache/dev-haskell/hgettext-0.1.30
index e32a1bb2cc97..df64eabf64b4 100644
--- a/metadata/md5-cache/dev-haskell/hgettext-0.1.30
+++ b/metadata/md5-cache/dev-haskell/hgettext-0.1.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/setlocale:=[profile?] dev-haskell/uniplate:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/setlocale:=[profile?] dev-haskell/uniplate:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Bindings to libintl.h (gettext, bindtextdomain)
 EAPI=7
 HOMEPAGE=https://github.com/vasylp/hgettext
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cabal-1.10:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/setlocale:=[profile?] dev-haskell/uniplate:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.30
 SRC_URI=https://hackage.haskell.org/package/hgettext-0.1.30/hgettext-0.1.30.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3339c556067cdeca2d82cd64dfeddf45
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
index fd75728ed7a3..c5d194f1dc38 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parser for GHC's hi files
 EAPI=7
 HOMEPAGE=https://github.com/commercialhaskell/stack#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/rio-0.1.9.2:=[profile?] >=dev-haskell/vector-0.12.0.1:=[pr
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f367d01ccdfe2e69314ba3fb095226bc
diff --git a/metadata/md5-cache/dev-haskell/highlighting-kate-0.6.4 b/metadata/md5-cache/dev-haskell/highlighting-kate-0.6.4
index d4e5f2239ac6..bc0bb047242f 100644
--- a/metadata/md5-cache/dev-haskell/highlighting-kate-0.6.4
+++ b/metadata/md5-cache/dev-haskell/highlighting-kate-0.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] ) !pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/diff ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] ) !pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/diff ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Syntax highlighting
 EAPI=6
 HOMEPAGE=https://github.com/jgm/highlighting-kate
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.10:
 RESTRICT=!test? ( test )
 SLOT=0/0.6.4
 SRC_URI=https://hackage.haskell.org/package/highlighting-kate-0.6.4/highlighting-kate-0.6.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f6a1d723412447081cd5c62f60da5e19
diff --git a/metadata/md5-cache/dev-haskell/hinotify-0.3.10 b/metadata/md5-cache/dev-haskell/hinotify-0.3.10
index 76864a54ce24..d7599bc4e5b1 100644
--- a/metadata/md5-cache/dev-haskell/hinotify-0.3.10
+++ b/metadata/md5-cache/dev-haskell/hinotify-0.3.10
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell binding to inotify
 EAPI=6
 HOMEPAGE=https://github.com/kolmodin/hinotify.git
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6c624eeb0393e42d828bbb86872e5987
diff --git a/metadata/md5-cache/dev-haskell/hit-0.7.0 b/metadata/md5-cache/dev-haskell/hit-0.7.0
index 840cfeea66d7..f7f5ec31433d 100644
--- a/metadata/md5-cache/dev-haskell/hit-0.7.0
+++ b/metadata/md5-cache/dev-haskell/hit-0.7.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/git-0.3.0:= >=dev-haskell/hashable-1.2:= dev-haskell/hashtables:= dev-haskell/hourglass:= >=dev-lang/ghc-7.4.1:=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hit-0.7.0/hit-0.7.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b31ad478e1870580233f40b1acaf26be
diff --git a/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4 b/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
index afcff08fc439..554e28e85ce9 100644
--- a/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
+++ b/metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-javascript-0.8:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/extra ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-javascript-0.8:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/extra ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell implementation of a javascript minifier
 EAPI=7
 HOMEPAGE=https://github.com/erikd/hjsmin
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-
 RESTRICT=test
 SLOT=0/0.2.0.4
 SRC_URI=https://hackage.haskell.org/package/hjsmin-0.2.0.4/hjsmin-0.2.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e248adb12b4a25bbea519c6a08e6d112
diff --git a/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1 b/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
index a5e978832e3c..bb6de4770966 100644
--- a/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
+++ b/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Source code suggestions
 EAPI=7
 HOMEPAGE=https://github.com/ndmitchell/hlint#readme
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	b9df8d576b8e3d10e3da1c292b027912	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	b9df8d576b8e3d10e3da1c292b027912	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2098cdc98fc0e87a82bc4154ba4b8931
diff --git a/metadata/md5-cache/dev-haskell/hoauth2-1.11.0 b/metadata/md5-cache/dev-haskell/hoauth2-1.11.0
index 465671618aaf..0774cf561242 100644
--- a/metadata/md5-cache/dev-haskell/hoauth2-1.11.0
+++ b/metadata/md5-cache/dev-haskell/hoauth2-1.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-1.3.0.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/exceptions-0.8.3:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.11:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] >=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?] >=dev-haskell/uri-bytestring-aeson-0.1:=[profile?] <dev-haskell/uri-bytestring-aeson-0.2:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-2.4 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-1.3.0.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/exceptions-0.8.3:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.11:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] >=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?] >=dev-haskell/uri-bytestring-aeson-0.1:=[profile?] <dev-haskell/uri-bytestring-aeson-0.2:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-2.4 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell OAuth2 authentication client
 EAPI=7
 HOMEPAGE=https://github.com/freizl/hoauth2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-1.3.0.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/exceptions-0.8.3:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.11:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] >=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?] >=dev-haskell/uri-bytestring-aeson-0.1:=[profile?] <dev-haskell/uri-bytestring-aeson-0.2:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/1.11.0
 SRC_URI=https://hackage.haskell.org/package/hoauth2-1.11.0/hoauth2-1.11.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5c9a0ab98d188a01f3d9ab649d1d696
diff --git a/metadata/md5-cache/dev-haskell/hostname-1.0-r1 b/metadata/md5-cache/dev-haskell/hostname-1.0-r1
index 5079e0bb4aa7..878fce4ab623 100644
--- a/metadata/md5-cache/dev-haskell/hostname-1.0-r1
+++ b/metadata/md5-cache/dev-haskell/hostname-1.0-r1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A a cross-platform means of determining the hostname
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/hostname
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0
 SRC_URI=https://hackage.haskell.org/package/hostname-1.0/hostname-1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a4c7da7a22c107fa32b06fcb12f7612f
diff --git a/metadata/md5-cache/dev-haskell/hourglass-0.2.12 b/metadata/md5-cache/dev-haskell/hourglass-0.2.12
index 8e3abf08287a..8d2722cd8134 100644
--- a/metadata/md5-cache/dev-haskell/hourglass-0.2.12
+++ b/metadata/md5-cache/dev-haskell/hourglass-0.2.12
@@ -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 test? ( dev-haskell/mtl dev-haskell/old-locale 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/mtl dev-haskell/old-locale dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=simple performant time related library
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-hourglass
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.12
 SRC_URI=https://hackage.haskell.org/package/hourglass-0.2.12/hourglass-0.2.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fd3a0887df2c0b0daed11693a5300a6b
diff --git a/metadata/md5-cache/dev-haskell/hpack-0.33.0 b/metadata/md5-cache/dev-haskell/hpack-0.33.0
index a1bcb698a2f7..5165675d9164 100644
--- a/metadata/md5-cache/dev-haskell/hpack-0.33.0
+++ b/metadata/md5-cache/dev-haskell/hpack-0.33.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=An alternative format for Haskell packages
 EAPI=7
 HOMEPAGE=https://github.com/sol/hpack#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.4.3.0:=[profile?] dev-haskell/bifunctors:=[profile
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=518fd1e9bf53af59b23823854ffbddd6
diff --git a/metadata/md5-cache/dev-haskell/hps-0.15 b/metadata/md5-cache/dev-haskell/hps-0.15
index 5a61daff0b7a..2451ea925bcf 100644
--- a/metadata/md5-cache/dev-haskell/hps-0.15
+++ b/metadata/md5-cache/dev-haskell/hps-0.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/hcg-minus-0.15:=[profile?] <dev-haskell/hcg-minus-0.16:=[profile?] >=dev-lang/ghc-7.4.1:= build-exec? ( dev-haskell/random:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/hcg-minus-0.15:=[profile?] <dev-haskell/hcg-minus-0.16:=[profile?] >=dev-lang/ghc-7.4.1:= build-exec? ( dev-haskell/random:=[profile?] ) >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell Postscript
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/hps
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/hcg-minus-0.15:=[profile?] <dev-haskell/hcg-minus-0.16:=[profile?] >=dev-lang/ghc-7.4.1:= build-exec? ( dev-haskell/random:=[profile?] )
 SLOT=0/0.15
 SRC_URI=https://hackage.haskell.org/package/hps-0.15/hps-0.15.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b7282921d232ca2de89b56dd498ba6f
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
index d0b9fb23518e..daf5e1c54f85 100644
--- a/metadata/md5-cache/dev-haskell/hs-bibutils-6.8.0.0
+++ b/metadata/md5-cache/dev-haskell/hs-bibutils-6.8.0.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.16 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell bindings to bibutils, the bibliography conversion utilities
 EAPI=7
 HOMEPAGE=https://github.com/wilx/hs-bibutils
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=70bb1242a9673ec4c7e8304ee91ac4dd
diff --git a/metadata/md5-cache/dev-haskell/hs3-0.5.9 b/metadata/md5-cache/dev-haskell/hs3-0.5.9
index babe4e3af4ff..8c22d6b48501 100644
--- a/metadata/md5-cache/dev-haskell/hs3-0.5.9
+++ b/metadata/md5-cache/dev-haskell/hs3-0.5.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/crypto-4.1.0:=[profile?] dev-haskell/dataenc:=[profile?] >=dev-haskell/http-4000.0.0:=[profile?] >=dev-haskell/hxt-9.0.0:=[profile?] <dev-haskell/hxt-10:=[profile?] >=dev-haskell/missingh-0.18.6:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-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 )
+DEPEND=>=dev-haskell/crypto-4.1.0:=[profile?] dev-haskell/dataenc:=[profile?] >=dev-haskell/http-4000.0.0:=[profile?] >=dev-haskell/hxt-9.0.0:=[profile?] <dev-haskell/hxt-10:=[profile?] >=dev-haskell/missingh-0.18.6:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] ) >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Interface to Amazon's Simple Storage Service (S3)
 EAPI=7
 HOMEPAGE=http://gregheartsfield.com/hS3/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/crypto-4.1.0:=[profile?] dev-haskell/dataenc:=[profile?] >=dev-haskell/http-4000.0.0:=[profile?] >=dev-haskell/hxt-9.0.0:=[profile?] <dev-haskell/hxt-10:=[profile?] >=dev-haskell/missingh-0.18.6:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] )
 SLOT=0/0.5.9
 SRC_URI=https://hackage.haskell.org/package/hS3-0.5.9/hS3-0.5.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=82c3a6493c9794a44fca1abc530206db
diff --git a/metadata/md5-cache/dev-haskell/hsb2hs-0.3.1 b/metadata/md5-cache/dev-haskell/hsb2hs-0.3.1
index 8563385cb256..764b19de1ea7 100644
--- a/metadata/md5-cache/dev-haskell/hsb2hs-0.3.1
+++ b/metadata/md5-cache/dev-haskell/hsb2hs-0.3.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>dev-haskell/preprocessor-tools-1.0:= >=dev-lang/ghc-7.4.1:=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hsb2hs-0.3.1/hsb2hs-0.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=171409fe86e768859047cd8aec2103d2
diff --git a/metadata/md5-cache/dev-haskell/hscolour-1.24.4 b/metadata/md5-cache/dev-haskell/hscolour-1.24.4
index 55b537841032..cef33895a11e 100644
--- a/metadata/md5-cache/dev-haskell/hscolour-1.24.4
+++ b/metadata/md5-cache/dev-haskell/hscolour-1.24.4
@@ -1,5 +1,5 @@
 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 ) )
+DEPEND=>=dev-lang/ghc-7.4.1:=
 DESCRIPTION=Colourise Haskell code
 EAPI=6
 HOMEPAGE=http://code.haskell.org/~malcolm/hscolour/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.24.4
 SRC_URI=https://hackage.haskell.org/package/hscolour-1.24.4/hscolour-1.24.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b507c9fa28f95a195f93be9f068a7037
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
index 306569ff2b20..82cce485769c 100644
--- a/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1
@@ -1,5 +1,5 @@
 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 )
+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 ) ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Versatile logging framework
 EAPI=7
 HOMEPAGE=https://github.com/hvr/hslogger/wiki
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[p
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 25b499791cb9..573ecf0305da 100644
--- a/metadata/md5-cache/dev-haskell/hslua-1.0.3.1
+++ b/metadata/md5-cache/dev-haskell/hslua-1.0.3.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Lua language interpreter embedding in Haskell
 EAPI=6
 HOMEPAGE=https://hslua.github.io/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 081818854d2d..952239ba0ccd 100644
--- a/metadata/md5-cache/dev-haskell/hslua-module-system-0.2.1
+++ b/metadata/md5-cache/dev-haskell/hslua-module-system-0.2.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Lua module wrapper around Haskell's System module
 EAPI=7
 HOMEPAGE=https://github.com/hslua/hslua-module-system
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index aa46b77b9bfb..6dec0c2e8f56 100644
--- a/metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1
+++ b/metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Lua module for text
 EAPI=7
 HOMEPAGE=https://github.com/hslua/hslua-module-text
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?]
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0c7de546a9a151c3badfa79bfb5952e5
diff --git a/metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17 b/metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17
index 946bc865c7e1..138a703a60ef 100644
--- a/metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17
+++ b/metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/openssl >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/openssl >=dev-haskell/cabal-1.12 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Partial OpenSSL binding for Haskell
 EAPI=7
 HOMEPAGE=https://github.com/vshabanov/HsOpenSSL
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3.2:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.11.4.17
 SRC_URI=https://hackage.haskell.org/package/HsOpenSSL-0.11.4.17/HsOpenSSL-0.11.4.17.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8e0fd40325e69c3687fb752d23f42f30
diff --git a/metadata/md5-cache/dev-haskell/hspec-2.7.1 b/metadata/md5-cache/dev-haskell/hspec-2.7.1
index 2c7209b8cd04..9e231a8a3bd1 100644
--- a/metadata/md5-cache/dev-haskell/hspec-2.7.1
+++ b/metadata/md5-cache/dev-haskell/hspec-2.7.1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Testing Framework for Haskell
 EAPI=7
 HOMEPAGE=http://hspec.github.io/
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 85e60b837b9a..54ee344e7fc8 100644
--- a/metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1
+++ b/metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-haskell/hspec-core-2.5.0:=[profile?] dev-haskell/hunit:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Contributed functionality for Hspec
 EAPI=7
 HOMEPAGE=http://hspec.github.io/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hspec-core-2.5.0:=[profile?] dev-haskell/hunit:=[profile?]
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index ce2df7e96e0c..119d38601483 100644
--- a/metadata/md5-cache/dev-haskell/hspec-core-2.7.1
+++ b/metadata/md5-cache/dev-haskell/hspec-core-2.7.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Testing Framework for Haskell
 EAPI=7
 HOMEPAGE=http://hspec.github.io/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/call-stack:=[pro
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index d5adc8ff90f5..b2a6a7ea8f6d 100644
--- a/metadata/md5-cache/dev-haskell/hspec-discover-2.7.1
+++ b/metadata/md5-cache/dev-haskell/hspec-discover-2.7.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Automatically discover and run Hspec tests
 EAPI=7
 HOMEPAGE=http://hspec.github.io/
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 58696b6a37df..5a2330a4a2f6 100644
--- a/metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2
+++ b/metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Catchy combinators for HUnit
 EAPI=6
 HOMEPAGE=https://github.com/hspec/hspec-expectations#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/call-stack:=[profile?] dev-haskell/hunit:=[profile?] >=dev-l
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 9486f107f806..f701b794c5d6 100644
--- a/metadata/md5-cache/dev-haskell/hspec-meta-2.6.0
+++ b/metadata/md5-cache/dev-haskell/hspec-meta-2.6.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A version of Hspec which is used to test Hspec itself
 EAPI=7
 HOMEPAGE=http://hspec.github.io/
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e3e2128b16828618e94962a6a80d8196
diff --git a/metadata/md5-cache/dev-haskell/hspec-smallcheck-0.5.2 b/metadata/md5-cache/dev-haskell/hspec-smallcheck-0.5.2
index aae07c0d1766..db5281c80b6b 100644
--- a/metadata/md5-cache/dev-haskell/hspec-smallcheck-0.5.2
+++ b/metadata/md5-cache/dev-haskell/hspec-smallcheck-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/call-stack:=[profile?] >=dev-haskell/hspec-core-2.5.0:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/smallcheck-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/base-orphans dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/call-stack:=[profile?] >=dev-haskell/hspec-core-2.5.0:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/smallcheck-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/base-orphans dev-haskell/hspec dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=SmallCheck support for the Hspec testing framework
 EAPI=6
 HOMEPAGE=http://hspec.github.io/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/call-stack:=[profile?] >=dev-haskell/hspec-core-2.5.0:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/0.5.2
 SRC_URI=https://hackage.haskell.org/package/hspec-smallcheck-0.5.2/hspec-smallcheck-0.5.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1702d5cd4717e2e673ca9af9df0def1
diff --git a/metadata/md5-cache/dev-haskell/hsql-1.8.2-r1 b/metadata/md5-cache/dev-haskell/hsql-1.8.2-r1
index b2ecf91ae56e..8b8d1d267097 100644
--- a/metadata/md5-cache/dev-haskell/hsql-1.8.2-r1
+++ b/metadata/md5-cache/dev-haskell/hsql-1.8.2-r1
@@ -1,5 +1,5 @@
 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.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Database access from Haskell
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/hsql
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.8.2
 SRC_URI=https://hackage.haskell.org/package/hsql-1.8.2/hsql-1.8.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b030c6db100e88dbd462287b7c3e3246
diff --git a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2-r1 b/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2-r1
index db982deff831..a0d74208625b 100644
--- a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2-r1
+++ b/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 dev-db/mysql-connector-c:0= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 dev-db/mysql-connector-c:0= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=MySQL driver for HSQL
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/hsql-mysql
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 dev-db/mysql-connector-c:0=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hsql-mysql-1.8.2/hsql-mysql-1.8.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=992ad53d7ac9be3bec196b366f3b4b33
diff --git a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.3 b/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.3
index 70db47b5e553..aaea0663d189 100644
--- a/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.3
+++ b/metadata/md5-cache/dev-haskell/hsql-mysql-1.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 dev-db/mysql-connector-c:0= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 dev-db/mysql-connector-c:0= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=MySQL driver for HSQL
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/hsql-mysql
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/cabal[profile?] >=dev-haskell/hsql-1.8.2[profile?] >=dev-lang/ghc-6.10.1 dev-db/mysql-connector-c:0=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hsql-mysql-1.8.3/hsql-mysql-1.8.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=75bcbd3526c1736cdeef0648a5211785
diff --git a/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2 b/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
index 8c563cf30bd1..eb9f5112306d 100644
--- a/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
+++ b/metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.1:= >=dev-db/unixODBC-2.2 dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.1:= >=dev-db/unixODBC-2.2 dev-haskell/cabal hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Haskell Interface to ODBC
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/hsql-odbc
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.1:= >=dev-db/unixODBC-2.2
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hsql-odbc-1.8.2/hsql-odbc-1.8.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=09a301af05c8e5cc4f3fca0f95b53f21
diff --git a/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1 b/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
index 54daffe8c560..97a2e970b490 100644
--- a/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
+++ b/metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=SQLite3 driver for HSQL
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/hsql-sqlite3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-db/sqlite-3.0 >=dev-haskell/hsql-1.8.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.8.2
 SRC_URI=https://hackage.haskell.org/package/hsql-sqlite3-1.8.2/hsql-sqlite3-1.8.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=82f12bcad5dce4956fefaa649cab4371
diff --git a/metadata/md5-cache/dev-haskell/hstringtemplate-0.8.7 b/metadata/md5-cache/dev-haskell/hstringtemplate-0.8.7
index b2e0c8e3864b..3c2cc021de03 100644
--- a/metadata/md5-cache/dev-haskell/hstringtemplate-0.8.7
+++ b/metadata/md5-cache/dev-haskell/hstringtemplate-0.8.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[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 )
+DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=StringTemplate implementation in Haskell
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/HStringTemplate
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.8.7
 SRC_URI=https://hackage.haskell.org/package/HStringTemplate-0.8.7/HStringTemplate-0.8.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=670e6ecaed7fe8089f306a974fe78676
diff --git a/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0 b/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
index e1450db4d6f2..1a612f7590a6 100644
--- a/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
+++ b/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
@@ -1,5 +1,5 @@
 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 )
+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:= ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Pure Haskell YAML 1.2 parser
 EAPI=7
 HOMEPAGE=https://github.com/hvr/HsYAML
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 943230f2b9a7..cfbf8afe796a 100644
--- a/metadata/md5-cache/dev-haskell/hsyaml-aeson-0.2.0.0
+++ b/metadata/md5-cache/dev-haskell/hsyaml-aeson-0.2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-1.4.0.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/hsyaml-0.2.0:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.12.0.2:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-2.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-1.4.0.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/hsyaml-0.2.0:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.12.0.2:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-2.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=JSON to YAML Adapter
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/HsYAML-aeson
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-haskell/aeson-1.4.0.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/hsyaml-0.2.0:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.12.0.2:=[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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6c4c8b169d544c38e889817f0bf22c8e
diff --git a/metadata/md5-cache/dev-haskell/htf-0.14.0.3 b/metadata/md5-cache/dev-haskell/htf-0.14.0.3
index 8a4294c67ec0..58b82e734b8c 100644
--- a/metadata/md5-cache/dev-haskell/htf-0.14.0.3
+++ b/metadata/md5-cache/dev-haskell/htf-0.14.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.11:= dev-haskell/base64-bytestring:= >=dev-haskell/cpphs-1.19:= >=dev-haskell/diff-0.3:= dev-haskell/haskell-src:= >=dev-haskell/hunit-1.2.5:= >=dev-haskell/lifted-base-0.1:= >=dev-haskell/monad-control-0.3:= >=dev-haskell/mtl-1.1:= >=dev-haskell/old-time-1.0:= >=dev-haskell/quickcheck-2.3:2= >=dev-haskell/random-1.0:= >=dev-haskell/regex-compat-0.92:= >=dev-haskell/text-0.11:= dev-haskell/vector:= >=dev-haskell/xmlgen-0.6:= >=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-2.0 >=dev-haskell/cpphs-1.19 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-0.11:= dev-haskell/base64-bytestring:= >=dev-haskell/cpphs-1.19:= >=dev-haskell/diff-0.3:= dev-haskell/haskell-src:= >=dev-haskell/hunit-1.2.5:= >=dev-haskell/lifted-base-0.1:= >=dev-haskell/monad-control-0.3:= >=dev-haskell/mtl-1.1:= >=dev-haskell/old-time-1.0:= >=dev-haskell/quickcheck-2.3:2= >=dev-haskell/random-1.0:= >=dev-haskell/regex-compat-0.92:= >=dev-haskell/text-0.11:= dev-haskell/vector:= >=dev-haskell/xmlgen-0.6:= >=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-2.0 >=dev-haskell/cpphs-1.19 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=The Haskell Test Framework
 EAPI=7
 HOMEPAGE=https://github.com/skogsbaer/HTF/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.11:= dev-haskell/base64-bytestring:= >=dev-haskell
 RESTRICT=test
 SLOT=0/0.14.0.3
 SRC_URI=https://hackage.haskell.org/package/HTF-0.14.0.3/HTF-0.14.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1a26272f7e36318ab802fa01cdc8011
diff --git a/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1 b/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
index f22252e7533f..062449d7c9f3 100644
--- a/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
+++ b/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.0 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.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=HTML combinator library
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/html
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.1.2
 SRC_URI=https://hackage.haskell.org/package/html-1.0.1.2/html-1.0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=66be16c214a8a3f02cf5c38dd1038020
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
index 3808b64d1296..054c44bffe18 100644
--- a/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
+++ b/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parse HTML documents using xml-conduit datatypes
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/xml
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/attoparsec:=[profile?] >=dev-haskell/conduit-1.3:=[profile?]
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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 6c5934709d9c..a4d8b73fa03a 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.3.14
+++ b/metadata/md5-cache/dev-haskell/http-4000.3.14
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library for client-side HTTP
 EAPI=7
 HOMEPAGE=https://github.com/haskell/HTTP
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 328ea54c88d7..620e4b4e0db2 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 ) 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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=16e66c4e7acad8dab7309ecc0ab87ff1
diff --git a/metadata/md5-cache/dev-haskell/http-attoparsec-0.1.1-r3 b/metadata/md5-cache/dev-haskell/http-attoparsec-0.1.1-r3
index d745dece2351..c7c5730e5b70 100644
--- a/metadata/md5-cache/dev-haskell/http-attoparsec-0.1.1-r3
+++ b/metadata/md5-cache/dev-haskell/http-attoparsec-0.1.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/http-types-0.8.0:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/http-types-0.8.0:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Attoparsec parsers for http-types
 EAPI=7
 HOMEPAGE=https://github.com/tlaitinen/http-attoparsec
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10.4.0:=[profile?] >=dev-haskell/http-types-0.8.0:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/http-attoparsec-0.1.1/http-attoparsec-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c2b3485e96b2e982f52db1c3d8ddacfc
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
index a867f3c33c1d..4cac14d890b2 100644
--- a/metadata/md5-cache/dev-haskell/http-client-0.6.4.1
+++ b/metadata/md5-cache/dev-haskell/http-client-0.6.4.1
@@ -1,5 +1,5 @@
 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 )
+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 ) ) 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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensiti
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a1b4a342b4ace90f7c85669359d9ef9
diff --git a/metadata/md5-cache/dev-haskell/http-client-conduit-0.3.0 b/metadata/md5-cache/dev-haskell/http-client-conduit-0.3.0
index 3eaf5eaad80c..b27fcf779d05 100644
--- a/metadata/md5-cache/dev-haskell/http-client-conduit-0.3.0
+++ b/metadata/md5-cache/dev-haskell/http-client-conduit-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/http-client-0.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 )
+DEPEND=>=dev-haskell/http-client-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Frontend support for using http-client with conduit (deprecated)
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/http-client
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/http-client-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/http-client-conduit-0.3.0/http-client-conduit-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8cb0441b1a92050394ab2304218a389e
diff --git a/metadata/md5-cache/dev-haskell/http-client-multipart-0.3.0.0 b/metadata/md5-cache/dev-haskell/http-client-multipart-0.3.0.0
index 072852f69f64..a149989df556 100644
--- a/metadata/md5-cache/dev-haskell/http-client-multipart-0.3.0.0
+++ b/metadata/md5-cache/dev-haskell/http-client-multipart-0.3.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/http-client-0.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 )
+DEPEND=>=dev-haskell/http-client-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generate multipart uploads for http-client. (deprecated)
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/http-client
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/http-client-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.0
 SRC_URI=https://hackage.haskell.org/package/http-client-multipart-0.3.0.0/http-client-multipart-0.3.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=91f900f5295d53054ad13f959b50a76a
diff --git a/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3 b/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3
index 71fdd1d4cc72..3cdf6531443f 100644
--- a/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3
+++ b/metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.6:=[profile?] <dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-client-tls-0.3.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/network-3.0.0.0:=[profile?] dev-haskell/network-bsd:=[profile?] dev-haskell/utf8-string:=[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 )
+DEPEND=>=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.6:=[profile?] <dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-client-tls-0.3.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/network-3.0.0.0:=[profile?] dev-haskell/network-bsd:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=restricting the servers that http-client will use
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/http-client-restricted
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.6:=[profile?] <dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-client-tls-0.3.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/network-3.0.0.0:=[profile?] dev-haskell/network-bsd:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/0.0.3
 SRC_URI=https://hackage.haskell.org/package/http-client-restricted-0.0.3/http-client-restricted-0.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4fa8eb38be64aef405f44eac68a4277b
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
index 02bfd700cca8..a834643333c7 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=http-client backend using the connection package and tls library
 EAPI=6
 HOMEPAGE=https://github.com/snoyberg/http-client
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/case-insensitive:=[profile?] >=dev-haskell/connection-0.2.5:
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aad30ac0507b68b79e1992bfdc7c9727
diff --git a/metadata/md5-cache/dev-haskell/http-common-0.8.2.1 b/metadata/md5-cache/dev-haskell/http-common-0.8.2.1
index c96a7910703f..3cc29db9a66e 100644
--- a/metadata/md5-cache/dev-haskell/http-common-0.8.2.1
+++ b/metadata/md5-cache/dev-haskell/http-common-0.8.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.24 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.24 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Common types for HTTP clients and servers
 EAPI=7
 HOMEPAGE=https://github.com/istathar/http-common
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.8.2.1
 SRC_URI=https://hackage.haskell.org/package/http-common-0.8.2.1/http-common-0.8.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=18ca5791be9e2215a32965f220ed7fcf
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
index f5f869d36c39..387c300fbbf3 100644
--- a/metadata/md5-cache/dev-haskell/http-conduit-2.3.7.3
+++ b/metadata/md5-cache/dev-haskell/http-conduit-2.3.7.3
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=HTTP client package with conduit interface and HTTPS support
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/http-conduit
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] >
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d711f1b13ae83b1538b0d5e941ec09c
diff --git a/metadata/md5-cache/dev-haskell/http-date-0.0.8 b/metadata/md5-cache/dev-haskell/http-date-0.0.8
index 2995de79f5e7..f3cf1b6e91ab 100644
--- a/metadata/md5-cache/dev-haskell/http-date-0.0.8
+++ b/metadata/md5-cache/dev-haskell/http-date-0.0.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/attoparsec:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.8 dev-haskell/hspec dev-haskell/old-locale ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/attoparsec:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.8 dev-haskell/hspec dev-haskell/old-locale ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=HTTP Date parser/formatter
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/http-date
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/attoparsec:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.0.8
 SRC_URI=https://hackage.haskell.org/package/http-date-0.0.8/http-date-0.0.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=db7a744ea5b5ba0ceb69c2da96f18f04
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
index 2a119da5dea5..3654b0e18d4b 100644
--- a/metadata/md5-cache/dev-haskell/http-download-0.2.0.0
+++ b/metadata/md5-cache/dev-haskell/http-download-0.2.0.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Verified downloads with retries
 EAPI=7
 HOMEPAGE=https://github.com/commercialhaskell/http-download#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/conduit:=[profile?
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5fa04488ebbfb9d4dea6456b53e9adca
diff --git a/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.4.3.2 b/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.4.3.2
index bdbb5915180d..bb1e147a4832 100644
--- a/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.4.3.2
+++ b/metadata/md5-cache/dev-haskell/http-reverse-proxy-0.4.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/http-client-0.3:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/network:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/word8-0.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/http-conduit >=dev-haskell/warp-2.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/http-client-0.3:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] dev-haskell/network:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/word8-0.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/http-conduit >=dev-haskell/warp-2.1 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Reverse proxy HTTP requests, either over raw sockets or with WAI
 EAPI=6
 HOMEPAGE=https://github.com/fpco/http-reverse-proxy
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/0.4.3.2
 SRC_URI=https://hackage.haskell.org/package/http-reverse-proxy-0.4.3.2/http-reverse-proxy-0.4.3.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2a30883e78bc99c3dbcce1ac687255a1
diff --git a/metadata/md5-cache/dev-haskell/http-streams-0.8.7.1 b/metadata/md5-cache/dev-haskell/http-streams-0.8.7.1
index c0a5de035bd6..c12b6dc833a6 100644
--- a/metadata/md5-cache/dev-haskell/http-streams-0.8.7.1
+++ b/metadata/md5-cache/dev-haskell/http-streams-0.8.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/hsopenssl-0.11.2:=[profile?] >=dev-haskell/http-common-0.8.2:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] ) >=dev-haskell/cabal-1.24 test? ( dev-haskell/aeson-pretty dev-haskell/hspec dev-haskell/hspec-expectations dev-haskell/hunit dev-haskell/lifted-base >=dev-haskell/snap-core-1.0 <dev-haskell/snap-core-1.2 >=dev-haskell/snap-server-1.1 <dev-haskell/snap-server-1.2 >=dev-haskell/system-fileio-0.3.10 <dev-haskell/system-fileio-0.4 >=dev-haskell/system-filepath-0.4.1 <dev-haskell/system-filepath-0.5 !network-uri? ( >=dev-haskell/network-2.6 >=dev-haskell/network-uri-2.6 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/hsopenssl-0.11.2:=[profile?] >=dev-haskell/http-common-0.8.2:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] ) >=dev-haskell/cabal-1.24 test? ( dev-haskell/aeson-pretty dev-haskell/hspec dev-haskell/hspec-expectations dev-haskell/hunit dev-haskell/lifted-base >=dev-haskell/snap-core-1.0 <dev-haskell/snap-core-1.2 >=dev-haskell/snap-server-1.1 <dev-haskell/snap-server-1.2 >=dev-haskell/system-fileio-0.3.10 <dev-haskell/system-fileio-0.4 >=dev-haskell/system-filepath-0.4.1 <dev-haskell/system-filepath-0.5 !network-uri? ( >=dev-haskell/network-2.6 >=dev-haskell/network-uri-2.6 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=An HTTP client using io-streams
 EAPI=7
 HOMEPAGE=https://github.com/afcowie/http-streams/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-has
 RESTRICT=test
 SLOT=0/0.8.7.1
 SRC_URI=https://hackage.haskell.org/package/http-streams-0.8.7.1/http-streams-0.8.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0f90e31042f608d18064a85869a935dc
diff --git a/metadata/md5-cache/dev-haskell/http-types-0.12.3 b/metadata/md5-cache/dev-haskell/http-types-0.12.3
index c1d615381eb4..257dc65bdfab 100644
--- a/metadata/md5-cache/dev-haskell/http-types-0.12.3
+++ b/metadata/md5-cache/dev-haskell/http-types-0.12.3
@@ -1,5 +1,5 @@
 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 )
+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 ) 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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensi
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=900591806c9d69401dfb3397873c599b
diff --git a/metadata/md5-cache/dev-haskell/http2-2.0.3 b/metadata/md5-cache/dev-haskell/http2-2.0.3
index 25b4ea1d17a6..be0331530b68 100644
--- a/metadata/md5-cache/dev-haskell/http2-2.0.3
+++ b/metadata/md5-cache/dev-haskell/http2-2.0.3
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=HTTP/2.0 library including frames and HPACK
 EAPI=7
 HOMEPAGE=https://github.com/kazu-yamamoto/http2
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/case-insensitive:=[profile?] dev-haskell/http-types:=[profil
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 415a43a402bd..406bbda22924 100644
--- a/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
+++ b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A simple web-server with an interact style API
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/httpd-shed
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=391e6750c4ff4c2e7251d4b618e62b04
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1 b/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
index 118d1174e9ba..8bf377d7455c 100644
--- a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
+++ b/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A unit testing framework for Haskell
 EAPI=7
 HOMEPAGE=http://hunit.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.5.2
 SRC_URI=https://hackage.haskell.org/package/HUnit-1.2.5.2/HUnit-1.2.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fde16febc9768316c716ba4d0856ced0
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.6.0.0 b/metadata/md5-cache/dev-haskell/hunit-1.6.0.0
index 2ae091ee56ac..b67730d52ea2 100644
--- a/metadata/md5-cache/dev-haskell/hunit-1.6.0.0
+++ b/metadata/md5-cache/dev-haskell/hunit-1.6.0.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=dev-haskell/call-stack:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A unit testing framework for Haskell
 EAPI=6
 HOMEPAGE=https://github.com/hspec/HUnit#readme
@@ -10,5 +10,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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 3283635d9ed9..1ae2e8fb0c73 100644
--- a/metadata/md5-cache/dev-haskell/hxt-9.3.1.18
+++ b/metadata/md5-cache/dev-haskell/hxt-9.3.1.18
@@ -1,5 +1,5 @@
 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:= >=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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A collection of tools for processing XML with Haskell
 EAPI=7
 HOMEPAGE=https://github.com/UweSchmidt/hxt
@@ -9,5 +9,5 @@ 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:= >=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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=118a6df1a915e1a42b23adc36891a6e4
diff --git a/metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.0.0 b/metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.0.0
index 4bbe660787fe..8a11697e3eb3 100644
--- a/metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.0.0
+++ b/metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.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.6 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.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Character properties and classes for XML and Unicode
 EAPI=7
 HOMEPAGE=https://github.com/UweSchmidt/hxt
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/9.4.0.0
 SRC_URI=https://hackage.haskell.org/package/hxt-charproperties-9.4.0.0/hxt-charproperties-9.4.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=79635efdb23b0621e03874efd023ace6
diff --git a/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.2.0.3 b/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.2.0.3
index 359e1d56432d..3e97e45b07b0 100644
--- a/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.2.0.3
+++ b/metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.2.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A regular expression library for W3C XML Schema regular expressions
 EAPI=6
 HOMEPAGE=https://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charprop
 RESTRICT=!test? ( test )
 SLOT=0/9.2.0.3
 SRC_URI=https://hackage.haskell.org/package/hxt-regex-xmlschema-9.2.0.3/hxt-regex-xmlschema-9.2.0.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7eb53e69258450e6714229b45a87241
diff --git a/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4 b/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4
index 047f93c641df..90985f16e587 100644
--- a/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4
+++ b/metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[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 )
+DEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Unicode en-/decoding functions for utf8, iso-latin-* and other encodings
 EAPI=7
 HOMEPAGE=https://github.com/UweSchmidt/hxt
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/9.0.2.4
 SRC_URI=https://hackage.haskell.org/package/hxt-unicode-9.0.2.4/hxt-unicode-9.0.2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=079eaf572b20b7ae007692c61346c698
diff --git a/metadata/md5-cache/dev-haskell/icalendar-0.4.0.5-r1 b/metadata/md5-cache/dev-haskell/icalendar-0.4.0.5-r1
index fcb496f639ab..5eeda7cd3bfa 100644
--- a/metadata/md5-cache/dev-haskell/icalendar-0.4.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/icalendar-0.4.0.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/data-default-0.3:=[profile?] >=dev-haskell/mime-0.4.0.2:=[profile?] >=dev-haskell/mtl-2.1.0:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.10.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/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/data-default-0.3:=[profile?] >=dev-haskell/mime-0.4.0.2:=[profile?] >=dev-haskell/mtl-2.1.0:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.10.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/cabal-1.22.2.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=iCalendar data types, parser, and printer
 EAPI=7
 HOMEPAGE=https://github.com/chrra/iCalendar
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/case-insensitive-0.4:=[profile?] >=dev-haskell/data-default-0.3:=[profile?] >=dev-haskell/mime-0.4.0.2:=[profile?] >=dev-haskell/mtl-2.1.0:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1.0:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.10.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] )
 SLOT=0/0.4.0.5
 SRC_URI=https://hackage.haskell.org/package/iCalendar-0.4.0.5/iCalendar-0.4.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e601e0fb36fe30beb92c8156d5b036b7
diff --git a/metadata/md5-cache/dev-haskell/iconv-0.4.1.3 b/metadata/md5-cache/dev-haskell/iconv-0.4.1.3
index aa077bbe7e78..7ef0012beea0 100644
--- a/metadata/md5-cache/dev-haskell/iconv-0.4.1.3
+++ b/metadata/md5-cache/dev-haskell/iconv-0.4.1.3
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=String encoding conversion
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/iconv
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.1.3
 SRC_URI=https://hackage.haskell.org/package/iconv-0.4.1.3/iconv-0.4.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c6c176edf62b191e99e9d82ee717d711
diff --git a/metadata/md5-cache/dev-haskell/idiii-0.1.3.3 b/metadata/md5-cache/dev-haskell/idiii-0.1.3.3
index 073f06427044..5fabc19efa0e 100644
--- a/metadata/md5-cache/dev-haskell/idiii-0.1.3.3
+++ b/metadata/md5-cache/dev-haskell/idiii-0.1.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/data-accessor:=[profile?] dev-haskell/missingh:=[profile?] dev-haskell/polyparse:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[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 )
+DEPEND=dev-haskell/data-accessor:=[profile?] dev-haskell/missingh:=[profile?] dev-haskell/polyparse:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=ID3v2 (tagging standard for MP3 files) library
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/idiii
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/data-accessor:=[profile?] dev-haskell/missingh:=[profile?] d
 RESTRICT=test
 SLOT=0/0.1.3.3
 SRC_URI=https://hackage.haskell.org/package/idiii-0.1.3.3/idiii-0.1.3.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fbf603c72635faba798935250358e155
diff --git a/metadata/md5-cache/dev-haskell/idna-0.3.0 b/metadata/md5-cache/dev-haskell/idna-0.3.0
index 91824aa9bd5c..ba107bc699d5 100644
--- a/metadata/md5-cache/dev-haskell/idna-0.3.0
+++ b/metadata/md5-cache/dev-haskell/idna-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/punycode-2.0:=[profile?] >=dev-haskell/stringprep-1:=[profile?] <dev-haskell/stringprep-2:=[profile?] >=dev-haskell/text-0.1:=[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 )
+DEPEND=>=dev-haskell/punycode-2.0:=[profile?] >=dev-haskell/stringprep-1:=[profile?] <dev-haskell/stringprep-2:=[profile?] >=dev-haskell/text-0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Implements IDNA (RFC 3490)
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/idna
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/punycode-2.0:=[profile?] >=dev-haskell/stringprep-1:=[profile?] <dev-haskell/stringprep-2:=[profile?] >=dev-haskell/text-0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/idna-0.3.0/idna-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c90c09cbab9561fd035257d85d446e11
diff --git a/metadata/md5-cache/dev-haskell/ieee754-0.7.8 b/metadata/md5-cache/dev-haskell/ieee754-0.7.8
index de41fd782b6e..a7be43955e30 100644
--- a/metadata/md5-cache/dev-haskell/ieee754-0.7.8
+++ b/metadata/md5-cache/dev-haskell/ieee754-0.7.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.0 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.2.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Utilities for dealing with IEEE floating point numbers
 EAPI=7
 HOMEPAGE=https://github.com/patperry/hs-ieee754
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.8
 SRC_URI=https://hackage.haskell.org/package/ieee754-0.7.8/ieee754-0.7.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35bc49bf1db739218b93eeb5b6a6b781
diff --git a/metadata/md5-cache/dev-haskell/ifelse-0.85-r1 b/metadata/md5-cache/dev-haskell/ifelse-0.85-r1
index 4032a7d18275..aa15e8cbcc31 100644
--- a/metadata/md5-cache/dev-haskell/ifelse-0.85-r1
+++ b/metadata/md5-cache/dev-haskell/ifelse-0.85-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/mtl:=[profile?] >=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 )
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Anaphoric and miscellaneous useful control-flow
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/IfElse
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.85
 SRC_URI=https://hackage.haskell.org/package/IfElse-0.85/IfElse-0.85.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=693b724c6457b03479c7a79cc3875094
diff --git a/metadata/md5-cache/dev-haskell/indexed-traversable-0.1 b/metadata/md5-cache/dev-haskell/indexed-traversable-0.1
index 6a598cc1ebb2..808a659fca25 100644
--- a/metadata/md5-cache/dev-haskell/indexed-traversable-0.1
+++ b/metadata/md5-cache/dev-haskell/indexed-traversable-0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[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 )
+DEPEND=>=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=FunctorWithIndex, FoldableWithIndex, TraversableWithIndex
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/indexed-traversable
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.6.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/indexed-traversable-0.1/indexed-traversable-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ea4c0734db7ea67b28ee9068ada0d8a6
diff --git a/metadata/md5-cache/dev-haskell/infer-license-0.2.0 b/metadata/md5-cache/dev-haskell/infer-license-0.2.0
index e6d30313eba4..653688d98865 100644
--- a/metadata/md5-cache/dev-haskell/infer-license-0.2.0
+++ b/metadata/md5-cache/dev-haskell/infer-license-0.2.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Infer software license from a given license file
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/infer-license
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/text:=[profile?] >=dev-haskell/text-metrics-0.3.0:=[profile?
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ae0e78bd6b45c43f27b115d07cf81b7b
diff --git a/metadata/md5-cache/dev-haskell/inspection-testing-0.4.2.4 b/metadata/md5-cache/dev-haskell/inspection-testing-0.4.2.4
index ba868830de66..981b124f2667 100644
--- a/metadata/md5-cache/dev-haskell/inspection-testing-0.4.2.4
+++ b/metadata/md5-cache/dev-haskell/inspection-testing-0.4.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/mtl:=[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 )
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=GHC plugin to do inspection testing
 EAPI=7
 HOMEPAGE=https://github.com/nomeata/inspection-testing
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-8.0.1:=
 RESTRICT=test
 SLOT=0/0.4.2.4
 SRC_URI=https://hackage.haskell.org/package/inspection-testing-0.4.2.4/inspection-testing-0.4.2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ed6877032db8aafa8151f642a282b3fd
diff --git a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3 b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3
index af9a445ce39e..d60ab5e031de 100644
--- a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3
+++ b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Integer logarithms
 EAPI=7
 HOMEPAGE=https://github.com/Bodigrim/integer-logarithms
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1a5df11a393b417de735b2ffb1fa1f69
diff --git a/metadata/md5-cache/dev-haskell/integer-roots-1.0 b/metadata/md5-cache/dev-haskell/integer-roots-1.0
index fb6e4120d32d..776719ece8e4 100644
--- a/metadata/md5-cache/dev-haskell/integer-roots-1.0
+++ b/metadata/md5-cache/dev-haskell/integer-roots-1.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Integer roots and perfect powers
 EAPI=7
 HOMEPAGE=https://github.com/Bodigrim/integer-roots
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.0.1:=
 RESTRICT=test
 SLOT=0/1.0
 SRC_URI=https://hackage.haskell.org/package/integer-roots-1.0/integer-roots-1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f3bf88fe020947d1d5b0a22f24e5a46
diff --git a/metadata/md5-cache/dev-haskell/interpolate-0.2.0 b/metadata/md5-cache/dev-haskell/interpolate-0.2.0
index 23869993f64b..b12ce5ee4b3b 100644
--- a/metadata/md5-cache/dev-haskell/interpolate-0.2.0
+++ b/metadata/md5-cache/dev-haskell/interpolate-0.2.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=String interpolation done right
 EAPI=6
 HOMEPAGE=https://github.com/sol/interpolate#readme
@@ -10,5 +10,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7a99beee89c3ec063704920311506a57
diff --git a/metadata/md5-cache/dev-haskell/invariant-0.5.3 b/metadata/md5-cache/dev-haskell/invariant-0.5.3
index a919c48fb6f8..42fee253f1d6 100644
--- a/metadata/md5-cache/dev-haskell/invariant-0.5.3
+++ b/metadata/md5-cache/dev-haskell/invariant-0.5.3
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell 98 invariant functors
 EAPI=7
 HOMEPAGE=https://github.com/nfrisby/invariant-functors
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[pro
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dc00358ab4d7c06b8d1d2bd16673f1fd
diff --git a/metadata/md5-cache/dev-haskell/io-streams-1.5.2.0 b/metadata/md5-cache/dev-haskell/io-streams-1.5.2.0
index 137aafe0a775..0bdb8ef2e3f5 100644
--- a/metadata/md5-cache/dev-haskell/io-streams-1.5.2.0
+++ b/metadata/md5-cache/dev-haskell/io-streams-1.5.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= network? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] ) zlib? ( >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/mtl-2 <dev-haskell/mtl-3 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 zlib? ( >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= network? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] ) zlib? ( >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/mtl-2 <dev-haskell/mtl-3 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 zlib? ( >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple, composable, and easy-to-use stream I/O
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/io-streams
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=
 RESTRICT=test
 SLOT=0/1.5.2.0
 SRC_URI=https://hackage.haskell.org/package/io-streams-1.5.2.0/io-streams-1.5.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=46b4d410dfbee10b4113e744300cfadd
diff --git a/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1 b/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1
index 6fcffee1959d..d731b49adec2 100644
--- a/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=HAProxy protocol 1.5 support for io-streams
 EAPI=7
 HOMEPAGE=http://snapframework.com/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[
 RESTRICT=test
 SLOT=0/1.0.1.0
 SRC_URI=https://hackage.haskell.org/package/io-streams-haproxy-1.0.1.0/io-streams-haproxy-1.0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe917edb129e2153e4a1739067bcd81e
diff --git a/metadata/md5-cache/dev-haskell/iproute-1.7.8 b/metadata/md5-cache/dev-haskell/iproute-1.7.8
index 1bc5b8f14542..a225e7d35202 100644
--- a/metadata/md5-cache/dev-haskell/iproute-1.7.8
+++ b/metadata/md5-cache/dev-haskell/iproute-1.7.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/doctest-0.9.3 dev-haskell/hspec dev-haskell/quickcheck dev-haskell/safe ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/doctest-0.9.3 dev-haskell/hspec dev-haskell/quickcheck dev-haskell/safe ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=IP Routing Table
 EAPI=7
 HOMEPAGE=http://www.mew.org/~kazu/proj/iproute/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/appar:=[profile?] dev-haskell/byteorder:=[profile?] dev-hask
 RESTRICT=test
 SLOT=0/1.7.8
 SRC_URI=https://hackage.haskell.org/package/iproute-1.7.8/iproute-1.7.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fedbaa69660e5b16fd3ad5c7a427f76e
diff --git a/metadata/md5-cache/dev-haskell/ipynb-0.1 b/metadata/md5-cache/dev-haskell/ipynb-0.1
index 36d864cc840b..03a81d2de076 100644
--- a/metadata/md5-cache/dev-haskell/ipynb-0.1
+++ b/metadata/md5-cache/dev-haskell/ipynb-0.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Data structure for working with Jupyter notebooks (ipynb)
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/ipynb
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/base64-bytestring:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/ipynb-0.1/ipynb-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9ae4e4d7643aefb1c9ca7c993cc7e206
diff --git a/metadata/md5-cache/dev-haskell/iwlib-0.1.0 b/metadata/md5-cache/dev-haskell/iwlib-0.1.0
index 13faf0604d95..9f09814cf26e 100644
--- a/metadata/md5-cache/dev-haskell/iwlib-0.1.0
+++ b/metadata/md5-cache/dev-haskell/iwlib-0.1.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= net-wireless/wireless-tools >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Bindings for the iw C library
 EAPI=6
 HOMEPAGE=https://github.com/jaor/iwlib
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index f839643dd214..5b8e2068d35c 100644
--- a/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4
+++ b/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parse jira wiki text into an abstract syntax tree
 EAPI=7
 HOMEPAGE=https://github.com/tarleb/jira-wiki-markup
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a2f8e5103c3a8b9d2496733efc0292e9
diff --git a/metadata/md5-cache/dev-haskell/js-flot-0.8.3 b/metadata/md5-cache/dev-haskell/js-flot-0.8.3
index fd0719d6195a..25bd4a33bb6e 100644
--- a/metadata/md5-cache/dev-haskell/js-flot-0.8.3
+++ b/metadata/md5-cache/dev-haskell/js-flot-0.8.3
@@ -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 test? ( dev-haskell/http ) 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 test? ( dev-haskell/http ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Obtain minified flot code
 EAPI=7
 HOMEPAGE=https://github.com/ndmitchell/js-flot#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.3
 SRC_URI=https://hackage.haskell.org/package/js-flot-0.8.3/js-flot-0.8.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9bc1a03f2eb4883e2c7bd4563d00824a
diff --git a/metadata/md5-cache/dev-haskell/js-jquery-3.3.1 b/metadata/md5-cache/dev-haskell/js-jquery-3.3.1
index 685ab976942e..88f89a41d4ed 100644
--- a/metadata/md5-cache/dev-haskell/js-jquery-3.3.1
+++ b/metadata/md5-cache/dev-haskell/js-jquery-3.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( dev-haskell/http ) 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.18 test? ( dev-haskell/http ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Obtain minified jQuery code
 EAPI=7
 HOMEPAGE=https://github.com/ndmitchell/js-jquery#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/3.3.1
 SRC_URI=https://hackage.haskell.org/package/js-jquery-3.3.1/js-jquery-3.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc53819de019b444ff69bbfe375e9e7b
diff --git a/metadata/md5-cache/dev-haskell/json-0.10 b/metadata/md5-cache/dev-haskell/json-0.10
index 7b7c576cbed5..0562be3da5af 100644
--- a/metadata/md5-cache/dev-haskell/json-0.10
+++ b/metadata/md5-cache/dev-haskell/json-0.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/syb-0.3.3:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.0.1:= parsec? ( dev-haskell/parsec:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/syb-0.3.3:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.0.1:= parsec? ( dev-haskell/parsec:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Support for serialising Haskell to and from JSON
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/json
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/syb-0.3.3:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.0.1:= parsec? ( dev-haskell/parsec:=[profile?] )
 SLOT=0/0.10
 SRC_URI=https://hackage.haskell.org/package/json-0.10/json-0.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4b43799897716a3b0eebb2e79ef8019c
diff --git a/metadata/md5-cache/dev-haskell/juicypixels-3.3.5 b/metadata/md5-cache/dev-haskell/juicypixels-3.3.5
index 9afffbc8439c..3fc7d97e3e5b 100644
--- a/metadata/md5-cache/dev-haskell/juicypixels-3.3.5
+++ b/metadata/md5-cache/dev-haskell/juicypixels-3.3.5
@@ -1,5 +1,5 @@
 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 )
+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 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
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2c179df30cbf3806be85c3d2c529b7a9
diff --git a/metadata/md5-cache/dev-haskell/kan-extensions-5.2 b/metadata/md5-cache/dev-haskell/kan-extensions-5.2
index bf0a6517ae0e..42321a247374 100644
--- a/metadata/md5-cache/dev-haskell/kan-extensions-5.2
+++ b/metadata/md5-cache/dev-haskell/kan-extensions-5.2
@@ -1,5 +1,5 @@
 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 )
+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 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/
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=063f13ef6f49ef77392997e89ef19fa3
diff --git a/metadata/md5-cache/dev-haskell/keys-3.12.3 b/metadata/md5-cache/dev-haskell/keys-3.12.3
index 04beaacf46b0..bfd920677be8 100644
--- a/metadata/md5-cache/dev-haskell/keys-3.12.3
+++ b/metadata/md5-cache/dev-haskell/keys-3.12.3
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Keyed functors and containers
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/keys/
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b21845a4eb1f8146565d2c14f0b5581
diff --git a/metadata/md5-cache/dev-haskell/language-bash-0.9.0 b/metadata/md5-cache/dev-haskell/language-bash-0.9.0
index 9ae4cb0a1ef5..fd2b18b5eadf 100644
--- a/metadata/md5-cache/dev-haskell/language-bash-0.9.0
+++ b/metadata/md5-cache/dev-haskell/language-bash-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-4.0:=[profile?] >=dev-haskell/prettyprinter-1.2:=[profile?] <dev-haskell/prettyprinter-2.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-expected-failure 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 )
+DEPEND=>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-4.0:=[profile?] >=dev-haskell/prettyprinter-1.2:=[profile?] <dev-haskell/prettyprinter-2.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-expected-failure dev-haskell/tasty-golden dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parsing and pretty-printing Bash shell scripts
 EAPI=7
 HOMEPAGE=https://github.com/knrafto/language-bash/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-4.0:=[profile?]
 RESTRICT=test
 SLOT=0/0.9.0
 SRC_URI=https://hackage.haskell.org/package/language-bash-0.9.0/language-bash-0.9.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=90ae55e8f760ee5d52fbb35202379efe
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.4.7 b/metadata/md5-cache/dev-haskell/language-c-0.4.7
index 4aa107bce414..d2000e502559 100644
--- a/metadata/md5-cache/dev-haskell/language-c-0.4.7
+++ b/metadata/md5-cache/dev-haskell/language-c-0.4.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.6 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.6 dev-haskell/happy hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Analysis and generation of C code
 EAPI=7
 HOMEPAGE=https://visq.github.io/language-c/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.7
 SRC_URI=https://hackage.haskell.org/package/language-c-0.4.7/language-c-0.4.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7328d5699e32aae0b55c85aa4b6f18d5
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.7.1 b/metadata/md5-cache/dev-haskell/language-c-0.7.1
index 211846ee2bb4..8c63db0a61cd 100644
--- a/metadata/md5-cache/dev-haskell/language-c-0.7.1
+++ b/metadata/md5-cache/dev-haskell/language-c-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.8 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.8 dev-haskell/happy hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Analysis and generation of C code
 EAPI=6
 HOMEPAGE=https://visq.github.io/language-c/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.7.1
 SRC_URI=https://hackage.haskell.org/package/language-c-0.7.1/language-c-0.7.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee779cf358f2a3c659fc6420a9122c27
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.8.3 b/metadata/md5-cache/dev-haskell/language-c-0.8.3
index eaf5332aeb6f..b96a7ea91b37 100644
--- a/metadata/md5-cache/dev-haskell/language-c-0.8.3
+++ b/metadata/md5-cache/dev-haskell/language-c-0.8.3
@@ -1,5 +1,5 @@
 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 )
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.10.1:= dev-haskell/alex >=dev-haskell/cabal-1.22.2.0 dev-haskell/happy hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Analysis and generation of C code
 EAPI=7
 HOMEPAGE=http://visq.github.io/language-c/
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b1794b851dfea4c53f7ed77894344b15
diff --git a/metadata/md5-cache/dev-haskell/language-css-0.0.3 b/metadata/md5-cache/dev-haskell/language-css-0.0.3
index 60c8ac41cf75..173899ad6a08 100644
--- a/metadata/md5-cache/dev-haskell/language-css-0.0.3
+++ b/metadata/md5-cache/dev-haskell/language-css-0.0.3
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=CSS 2.1 syntax
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/language-css
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.3
 SRC_URI=https://hackage.haskell.org/package/language-css-0.0.3/language-css-0.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30ba5e8f44374314fb6f44c12fbd85fc
diff --git a/metadata/md5-cache/dev-haskell/language-dot-0.1.1 b/metadata/md5-cache/dev-haskell/language-dot-0.1.1
index ac818ff0c8e5..9be3176768ff 100644
--- a/metadata/md5-cache/dev-haskell/language-dot-0.1.1
+++ b/metadata/md5-cache/dev-haskell/language-dot-0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library for the analysis and creation of Graphviz DOT files
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/language-dot
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=d
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/language-dot-0.1.1/language-dot-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=542dc636fae2fd1d22678a63c95c0992
diff --git a/metadata/md5-cache/dev-haskell/language-ecmascript-0.19.1.0 b/metadata/md5-cache/dev-haskell/language-ecmascript-0.19.1.0
index e7b54f79ee1f..48666203f020 100644
--- a/metadata/md5-cache/dev-haskell/language-ecmascript-0.19.1.0
+++ b/metadata/md5-cache/dev-haskell/language-ecmascript-0.19.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-1:=[profile?] >=dev-haskell/charset-0.3:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-haskell/diff-0.4:=[profile?] <dev-haskell/diff-0.5:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2.0:=[profile?] >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-haskell/uniplate-1.6:=[profile?] <dev-haskell/uniplate-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/testing-feat-0.4.0.2 <dev-haskell/testing-feat-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-1:=[profile?] >=dev-haskell/charset-0.3:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-haskell/diff-0.4:=[profile?] <dev-haskell/diff-0.5:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2.0:=[profile?] >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] >=dev-haskell/uniplate-1.6:=[profile?] <dev-haskell/uniplate-1.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/testing-feat-0.4.0.2 <dev-haskell/testing-feat-1.2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=JavaScript parser and pretty-printer library
 EAPI=7
 HOMEPAGE=https://github.com/jswebtools/language-ecmascript
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint
 RESTRICT=!test? ( test )
 SLOT=0/0.19.1.0
 SRC_URI=https://hackage.haskell.org/package/language-ecmascript-0.19.1.0/language-ecmascript-0.19.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d0883279ebb9b6a3386c30d894ef659d
diff --git a/metadata/md5-cache/dev-haskell/language-glsl-0.3.0 b/metadata/md5-cache/dev-haskell/language-glsl-0.3.0
index 2994a76aecf0..a9c1cc3dcd5d 100644
--- a/metadata/md5-cache/dev-haskell/language-glsl-0.3.0
+++ b/metadata/md5-cache/dev-haskell/language-glsl-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/parsec:=[profile?] dev-haskell/prettyclass:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 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 )
+DEPEND=dev-haskell/parsec:=[profile?] dev-haskell/prettyclass:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=GLSL abstract syntax tree, parser, and pretty-printer
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/language-glsl
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/parsec:=[profile?] dev-haskell/prettyclass:=[profile?] >=dev
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/language-glsl-0.3.0/language-glsl-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=20057eb1752002052f7a6ebbe8ed69c5
diff --git a/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1 b/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
index f0685fda7c5a..a6e6d8545c33 100644
--- a/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
+++ b/metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/regex-posix:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/regex-posix:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Module to automatically extract functions from the local code
 EAPI=7
 HOMEPAGE=https://github.com/finnsson/template-helper
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/regex-posix:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/language-haskell-extract-0.2.4/language-haskell-extract-0.2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ce28954ad5c96d5c56205894a27de2d7
diff --git a/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14 b/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
index 563b1207eadb..45ac7d4d26aa 100644
--- a/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
+++ b/metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.9.2 >=dev-haskell/happy-1.19.12 test? ( dev-haskell/hspec >=dev-haskell/quickcheck-2 >=dev-haskell/utf8-light-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.9.2 >=dev-haskell/happy-1.19.12 test? ( dev-haskell/hspec >=dev-haskell/quickcheck-2 >=dev-haskell/utf8-light-0.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parser for JavaScript
 EAPI=7
 HOMEPAGE=https://github.com/erikd/language-javascript
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] >=dev-haskell/mtl-1.1:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/0.6.0.14
 SRC_URI=https://hackage.haskell.org/package/language-javascript-0.6.0.14/language-javascript-0.6.0.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=11c731656d07741714c4218ce2e90062
diff --git a/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1 b/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1
index d3011391f06c..1ec21637b094 100644
--- a/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1
+++ b/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/alex-tools-0.4:=[profile?] <dev-haskell/alex-tools-0.5:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.6.1:= dev-haskell/alex >=dev-haskell/cabal-1.16.0 dev-haskell/happy test? ( dev-haskell/quickcheck 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 )
+DEPEND=>=dev-haskell/alex-tools-0.4:=[profile?] <dev-haskell/alex-tools-0.5:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.6.1:= dev-haskell/alex >=dev-haskell/cabal-1.16.0 dev-haskell/happy test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Lua parser and pretty-printer
 EAPI=7
 HOMEPAGE=https://github.com/glguy/language-lua
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/alex-tools-0.4:=[profile?] <dev-haskell/alex-tools-0.5:=[p
 RESTRICT=!test? ( test )
 SLOT=0/0.11.0.1
 SRC_URI=https://hackage.haskell.org/package/language-lua-0.11.0.1/language-lua-0.11.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=73911692f34b7b47fd36d393e6bb0dc6
diff --git a/metadata/md5-cache/dev-haskell/language-python-0.5.8 b/metadata/md5-cache/dev-haskell/language-python-0.5.8
index 6c25caced853..fec0b6205df7 100644
--- a/metadata/md5-cache/dev-haskell/language-python-0.5.8
+++ b/metadata/md5-cache/dev-haskell/language-python-0.5.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.8.2:= dev-haskell/alex >=dev-haskell/cabal-1.18.1.3 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.8.2:= dev-haskell/alex >=dev-haskell/cabal-1.18.1.3 dev-haskell/happy hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parsing and pretty printing of Python code
 EAPI=7
 HOMEPAGE=https://github.com/bjpop/language-python
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.5.8
 SRC_URI=https://hackage.haskell.org/package/language-python-0.5.8/language-python-0.5.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=82c86effa853d3b032d5caa4f91523f0
diff --git a/metadata/md5-cache/dev-haskell/lazysmallcheck-0.6-r1 b/metadata/md5-cache/dev-haskell/lazysmallcheck-0.6-r1
index 3370b34b6f89..0a5c12c3e672 100644
--- a/metadata/md5-cache/dev-haskell/lazysmallcheck-0.6-r1
+++ b/metadata/md5-cache/dev-haskell/lazysmallcheck-0.6-r1
@@ -1,5 +1,5 @@
 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-7.4.1:= dev-haskell/cabal hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library for demand-driven testing of Haskell programs
 EAPI=7
 HOMEPAGE=http://www.cs.york.ac.uk/~mfn/lazysmallcheck/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6
 SRC_URI=https://hackage.haskell.org/package/lazysmallcheck-0.6/lazysmallcheck-0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7f1b9624c3bdd03e4e73f16eca58804
diff --git a/metadata/md5-cache/dev-haskell/lcs-0.2-r1 b/metadata/md5-cache/dev-haskell/lcs-0.2-r1
index 06459d0e011d..ee4f74e541b3 100644
--- a/metadata/md5-cache/dev-haskell/lcs-0.2-r1
+++ b/metadata/md5-cache/dev-haskell/lcs-0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.0 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.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Find longest common sublist of two lists
 EAPI=7
 HOMEPAGE=http://urchin.earth.li/~ian/cabal/lcs/
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD GPL-2 )
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2
 SRC_URI=https://hackage.haskell.org/package/lcs-0.2/lcs-0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=54ee621d8aaa02e110b4f4dceffb16bf
diff --git a/metadata/md5-cache/dev-haskell/leancheck-0.9.3 b/metadata/md5-cache/dev-haskell/leancheck-0.9.3
index 625009c5f569..5788c9352996 100644
--- a/metadata/md5-cache/dev-haskell/leancheck-0.9.3
+++ b/metadata/md5-cache/dev-haskell/leancheck-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Enumerative property-based testing
 EAPI=7
 HOMEPAGE=https://github.com/rudymatela/leancheck#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.3
 SRC_URI=https://hackage.haskell.org/package/leancheck-0.9.3/leancheck-0.9.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a62df54835a3b725d2af2f9915aa7b7
diff --git a/metadata/md5-cache/dev-haskell/lens-4.19.1 b/metadata/md5-cache/dev-haskell/lens-4.19.1
index 5ffe27a082ff..276cfe3549ed 100644
--- a/metadata/md5-cache/dev-haskell/lens-4.19.1
+++ b/metadata/md5-cache/dev-haskell/lens-4.19.1
@@ -1,5 +1,5 @@
 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.13 <dev-haskell/doctest-0.17 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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.13 <dev-haskell/doctest-0.17 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Lenses, Folds and Traversals
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/lens/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cddc630da05966f9726404e156768361
diff --git a/metadata/md5-cache/dev-haskell/lens-aeson-1.1 b/metadata/md5-cache/dev-haskell/lens-aeson-1.1
index fc165b7c9215..066e9eb30fa2 100644
--- a/metadata/md5-cache/dev-haskell/lens-aeson-1.1
+++ b/metadata/md5-cache/dev-haskell/lens-aeson-1.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Law-abiding lenses for aeson
 EAPI=7
 HOMEPAGE=https://github.com/lens/lens-aeson/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.5:=[profile
 RESTRICT=test
 SLOT=0/1.1
 SRC_URI=https://hackage.haskell.org/package/lens-aeson-1.1/lens-aeson-1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e54cb722d59c9e80a3d0d4ad3a1953b4
diff --git a/metadata/md5-cache/dev-haskell/lens-family-1.2.3 b/metadata/md5-cache/dev-haskell/lens-family-1.2.3
index a52bf52aa34d..837c6763c120 100644
--- a/metadata/md5-cache/dev-haskell/lens-family-1.2.3
+++ b/metadata/md5-cache/dev-haskell/lens-family-1.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/lens-family-core-1.2.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[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 )
+DEPEND=>=dev-haskell/lens-family-core-1.2.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Lens Families
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/lens-family
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/lens-family-core-1.2.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-8.2.1:=
 SLOT=0/1.2.3
 SRC_URI=https://hackage.haskell.org/package/lens-family-1.2.3/lens-family-1.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6de328dde311f48ee6bcc0060afd6c91
diff --git a/metadata/md5-cache/dev-haskell/lens-family-core-1.2.3 b/metadata/md5-cache/dev-haskell/lens-family-core-1.2.3
index 3d69992e5b7c..86de5654cc36 100644
--- a/metadata/md5-cache/dev-haskell/lens-family-core-1.2.3
+++ b/metadata/md5-cache/dev-haskell/lens-family-core-1.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=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 )
+DEPEND=>=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell 98 Lens Families
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/lens-family-core
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.2.1:=
 SLOT=0/1.2.3
 SRC_URI=https://hackage.haskell.org/package/lens-family-core-1.2.3/lens-family-core-1.2.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1371c247a191c34aaae2baa904fda4ff
diff --git a/metadata/md5-cache/dev-haskell/lens-family-th-0.5.1.0 b/metadata/md5-cache/dev-haskell/lens-family-th-0.5.1.0
index dad3cde56b22..fa57529bbd5a 100644
--- a/metadata/md5-cache/dev-haskell/lens-family-th-0.5.1.0
+++ b/metadata/md5-cache/dev-haskell/lens-family-th-0.5.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=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 )
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generate lens-family style lenses
 EAPI=7
 HOMEPAGE=https://github.com/DanBurton/lens-family-th#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.0.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1.0
 SRC_URI=https://hackage.haskell.org/package/lens-family-th-0.5.1.0/lens-family-th-0.5.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=412a225fc80633acf2bca9182d027105
diff --git a/metadata/md5-cache/dev-haskell/lens-simple-0.1.0.9 b/metadata/md5-cache/dev-haskell/lens-simple-0.1.0.9
index ef7430e193f0..576554025b5f 100644
--- a/metadata/md5-cache/dev-haskell/lens-simple-0.1.0.9
+++ b/metadata/md5-cache/dev-haskell/lens-simple-0.1.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/lens-family-1.2:=[profile?] <dev-haskell/lens-family-1.3:=[profile?] >=dev-haskell/lens-family-core-1.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?] <dev-haskell/lens-family-th-0.6:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-6:=[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 )
+DEPEND=>=dev-haskell/lens-family-1.2:=[profile?] <dev-haskell/lens-family-1.3:=[profile?] >=dev-haskell/lens-family-core-1.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?] <dev-haskell/lens-family-th-0.6:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=simplified import of elementary lens-family combinators
 EAPI=6
 HOMEPAGE=https://github.com/michaelt/lens-simple
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/lens-family-1.2:=[profile?] <dev-haskell/lens-family-1.3:=[profile?] >=dev-haskell/lens-family-core-1.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?] <dev-haskell/lens-family-th-0.6:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-6:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.9
 SRC_URI=https://hackage.haskell.org/package/lens-simple-0.1.0.9/lens-simple-0.1.0.9.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=77a272512d25f80b348977c904a9b1b9
diff --git a/metadata/md5-cache/dev-haskell/lhs2tex-1.24 b/metadata/md5-cache/dev-haskell/lhs2tex-1.24
index 87b09185ab86..96759d0dfef6 100644
--- a/metadata/md5-cache/dev-haskell/lhs2tex-1.24
+++ b/metadata/md5-cache/dev-haskell/lhs2tex-1.24
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-haskell/mtl-2.2.1:= dev-haskell/regex-compat:= >=dev-lang/ghc-7.4.1:= dev-texlive/texlive-mathscience:= dev-texlive/texlive-latexextra:=
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/lhs2tex-1.24/lhs2tex-1.24.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=16efbebe55edf5d1eb07072921d21c10
diff --git a/metadata/md5-cache/dev-haskell/libmpd-0.9.1.0 b/metadata/md5-cache/dev-haskell/libmpd-0.9.1.0
index 8067e5f5b4ed..3033c34c150c 100644
--- a/metadata/md5-cache/dev-haskell/libmpd-0.9.1.0
+++ b/metadata/md5-cache/dev-haskell/libmpd-0.9.1.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=An MPD client library
 EAPI=7
 HOMEPAGE=https://github.com/vimus/libmpd-haskell#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4c9159f27d614a8fe7a1fe76322ca43f
diff --git a/metadata/md5-cache/dev-haskell/libxml-0.1.1 b/metadata/md5-cache/dev-haskell/libxml-0.1.1
index ca23ce310e4b..9d69d7607bc0 100644
--- a/metadata/md5-cache/dev-haskell/libxml-0.1.1
+++ b/metadata/md5-cache/dev-haskell/libxml-0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libxml2 >=dev-haskell/cabal-1.6.0.3 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libxml2 >=dev-haskell/cabal-1.6.0.3 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Binding to libxml2
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/libxml
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libxml2
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/libxml-0.1.1/libxml-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e76be88a4c64fb49e0293180ce1b8239
diff --git a/metadata/md5-cache/dev-haskell/libxml-sax-0.7.5 b/metadata/md5-cache/dev-haskell/libxml-sax-0.7.5
index fb847440c008..18a0fd732dab 100644
--- a/metadata/md5-cache/dev-haskell/libxml-sax-0.7.5
+++ b/metadata/md5-cache/dev-haskell/libxml-sax-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/libxml2 >=dev-haskell/cabal-1.6 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/libxml2 >=dev-haskell/cabal-1.6 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Bindings for the libXML2 SAX interface
 EAPI=7
 HOMEPAGE=https://john-millikin.com/software/haskell-libxml/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/libxml2
 SLOT=0/0.7.5
 SRC_URI=https://hackage.haskell.org/package/libxml-sax-0.7.5/libxml-sax-0.7.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5e8fce8989e64f4d42fd75db2f0d3ae7
diff --git a/metadata/md5-cache/dev-haskell/libyaml-0.1.2 b/metadata/md5-cache/dev-haskell/libyaml-0.1.2
index 64ea80ba35af..0df3791547ac 100644
--- a/metadata/md5-cache/dev-haskell/libyaml-0.1.2
+++ b/metadata/md5-cache/dev-haskell/libyaml-0.1.2
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Low-level, streaming YAML interface
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/yaml#readme
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index c7e9ec1f5f77..f169a966367d 100644
--- a/metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6
+++ b/metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Run lifted IO operations asynchronously and wait for their results
 EAPI=7
 HOMEPAGE=https://github.com/maoe/lifted-async
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=684614bf1d40dabc9ec927a3600f820f
diff --git a/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12 b/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12
index bd147c1499ae..5b68203e7264 100644
--- a/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12
+++ b/metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2.2 >=dev-haskell/monad-control-1.0.0.3 >=dev-haskell/test-framework-0.2.4 >=dev-haskell/test-framework-hunit-0.2.4 >=dev-haskell/transformers-0.3 >=dev-haskell/transformers-base-0.4.4 >=dev-haskell/transformers-compat-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2.2 >=dev-haskell/monad-control-1.0.0.3 >=dev-haskell/test-framework-0.2.4 >=dev-haskell/test-framework-hunit-0.2.4 >=dev-haskell/transformers-0.3 >=dev-haskell/transformers-base-0.4.4 >=dev-haskell/transformers-compat-0.3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=lifted IO operations from the base library
 EAPI=6
 HOMEPAGE=https://github.com/basvandijk/lifted-base
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/transformers-b
 RESTRICT=!test? ( test )
 SLOT=0/0.2.3.12
 SRC_URI=https://hackage.haskell.org/package/lifted-base-0.2.3.12/lifted-base-0.2.3.12.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c1ed6b3451e20464286c98262b318516
diff --git a/metadata/md5-cache/dev-haskell/linear-1.20.9 b/metadata/md5-cache/dev-haskell/linear-1.20.9
index 03d2b385d01a..ee4dcbab168a 100644
--- a/metadata/md5-cache/dev-haskell/linear-1.20.9
+++ b/metadata/md5-cache/dev-haskell/linear-1.20.9
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Linear Algebra
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/linear/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[pro
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=90984d8dd2a3eda242c0a72760e81ee9
diff --git a/metadata/md5-cache/dev-haskell/list-0.6.2 b/metadata/md5-cache/dev-haskell/list-0.6.2
index e25bed938111..24799e345174 100644
--- a/metadata/md5-cache/dev-haskell/list-0.6.2
+++ b/metadata/md5-cache/dev-haskell/list-0.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=List monad transformer and class
 EAPI=6
 HOMEPAGE=https://github.com/yairchu/generator
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.6.2
 SRC_URI=https://hackage.haskell.org/package/List-0.6.2/List-0.6.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5275af9e92a00615bce3b9567d05ec3e
diff --git a/metadata/md5-cache/dev-haskell/listlike-4.6.3 b/metadata/md5-cache/dev-haskell/listlike-4.6.3
index 9d9c9c151958..3d0cf164cffe 100644
--- a/metadata/md5-cache/dev-haskell/listlike-4.6.3
+++ b/metadata/md5-cache/dev-haskell/listlike-4.6.3
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generic support for list-like structures
 EAPI=7
 HOMEPAGE=https://github.com/ddssff/listlike
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d2164fd091e4b8e2f9003a45fe115f82
diff --git a/metadata/md5-cache/dev-haskell/logging-facade-0.3.0 b/metadata/md5-cache/dev-haskell/logging-facade-0.3.0
index c5934f20d67a..331f5e0dc73f 100644
--- a/metadata/md5-cache/dev-haskell/logging-facade-0.3.0
+++ b/metadata/md5-cache/dev-haskell/logging-facade-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/call-stack:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/call-stack:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple logging abstraction that allows multiple back-ends
 EAPI=7
 HOMEPAGE=https://github.com/sol/logging-facade#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/call-stack:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://hackage.haskell.org/package/logging-facade-0.3.0/logging-facade-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8ff3b4596fe506ebc4592a2f6e03996b
diff --git a/metadata/md5-cache/dev-haskell/logict-0.7.0.3 b/metadata/md5-cache/dev-haskell/logict-0.7.0.3
index 51eaa2cbd22e..5b2d0935c3ef 100644
--- a/metadata/md5-cache/dev-haskell/logict-0.7.0.3
+++ b/metadata/md5-cache/dev-haskell/logict-0.7.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[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 )
+DEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/tasty dev-haskell/tasty-hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A backtracking logic-programming monad
 EAPI=7
 HOMEPAGE=https://github.com/Bodigrim/logict#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/fail:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskel
 RESTRICT=!test? ( test )
 SLOT=0/0.7.0.3
 SRC_URI=https://hackage.haskell.org/package/logict-0.7.0.3/logict-0.7.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9d5ae9b1f66988f3de487a4910755cb1
diff --git a/metadata/md5-cache/dev-haskell/logict-state-0.1.0.5 b/metadata/md5-cache/dev-haskell/logict-state-0.1.0.5
index 9d90006de115..e216a87ce50d 100644
--- a/metadata/md5-cache/dev-haskell/logict-state-0.1.0.5
+++ b/metadata/md5-cache/dev-haskell/logict-state-0.1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/logict-0.6.0.2:=[profile?] >=dev-haskell/mtl-2.1:=[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 )
+DEPEND=>=dev-haskell/logict-0.6.0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Library for logic programming based on haskell package logict
 EAPI=7
 HOMEPAGE=https://github.com/atzedijkstra/logict-state
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/logict-0.6.0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.1.0.5
 SRC_URI=https://hackage.haskell.org/package/logict-state-0.1.0.5/logict-state-0.1.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=96d0c0387e26b99a382c3884ef8db762
diff --git a/metadata/md5-cache/dev-haskell/lrucache-1.2.0.1 b/metadata/md5-cache/dev-haskell/lrucache-1.2.0.1
index 56abbc5606db..fb7a406499fd 100644
--- a/metadata/md5-cache/dev-haskell/lrucache-1.2.0.1
+++ b/metadata/md5-cache/dev-haskell/lrucache-1.2.0.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=a simple, pure LRU cache
 EAPI=7
 HOMEPAGE=https://github.com/chowells79/lrucache
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 3b4eb16d3300..04ab669c8042 100644
--- a/metadata/md5-cache/dev-haskell/lukko-0.1.1.2
+++ b/metadata/md5-cache/dev-haskell/lukko-0.1.1.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=File locking
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/lukko
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dcfa161554584fa3bfcf5915316334fd
diff --git a/metadata/md5-cache/dev-haskell/maccatcher-2.1.5-r1 b/metadata/md5-cache/dev-haskell/maccatcher-2.1.5-r1
index 83dea53e836c..354f96296af0 100644
--- a/metadata/md5-cache/dev-haskell/maccatcher-2.1.5-r1
+++ b/metadata/md5-cache/dev-haskell/maccatcher-2.1.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/binary:=[profile?] dev-haskell/parsec:=[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 )
+DEPEND=dev-haskell/binary:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Obtain the host MAC address on *NIX and Windows
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/maccatcher
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.1.5
 SRC_URI=https://hackage.haskell.org/package/maccatcher-2.1.5/maccatcher-2.1.5.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cc8b7934749d49e782bde4768192fc66
diff --git a/metadata/md5-cache/dev-haskell/magic-1.1 b/metadata/md5-cache/dev-haskell/magic-1.1
index a5dfae0f2179..4f94579d8686 100644
--- a/metadata/md5-cache/dev-haskell/magic-1.1
+++ b/metadata/md5-cache/dev-haskell/magic-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= sys-apps/file >=dev-haskell/cabal-1.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= sys-apps/file >=dev-haskell/cabal-1.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Interface to C file/magic library
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/magic
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= sys-apps/file
 SLOT=0/1.1
 SRC_URI=https://hackage.haskell.org/package/magic-1.1/magic-1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=51b385f30a6964e089defc1f0d3139d2
diff --git a/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0 b/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
index c101fe3d64ad..f3e1c8a1a505 100644
--- a/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
+++ b/metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/base-compat:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/quickcheck dev-haskell/silently dev-haskell/stringbuilder dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/base-compat:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/quickcheck dev-haskell/silently dev-haskell/stringbuilder dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Literate Haskell support for Markdown
 EAPI=7
 HOMEPAGE=https://github.com/sol/markdown-unlit#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/base-compat:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://hackage.haskell.org/package/markdown-unlit-0.5.0/markdown-unlit-0.5.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=62392b8eb8b0246512b74c96e5b39e08
diff --git a/metadata/md5-cache/dev-haskell/math-functions-0.3.3.0 b/metadata/md5-cache/dev-haskell/math-functions-0.3.3.0
index fbaea77fb422..a392a83a88c7 100644
--- a/metadata/md5-cache/dev-haskell/math-functions-0.3.3.0
+++ b/metadata/md5-cache/dev-haskell/math-functions-0.3.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-haskell/vector-th-unbox-0.2.1.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/erf >=dev-haskell/quickcheck-2.7 >=dev-haskell/tasty-1.2 >=dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.10 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-haskell/vector-th-unbox-0.2.1.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/erf >=dev-haskell/quickcheck-2.7 >=dev-haskell/tasty-1.2 >=dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.10 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Special functions and Chebyshev polynomials
 EAPI=7
 HOMEPAGE=https://github.com/bos/math-functions
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/data-default-class-0.1.2.0:=[profile?] dev-haskell/primiti
 RESTRICT=!test? ( test )
 SLOT=0/0.3.3.0
 SRC_URI=https://hackage.haskell.org/package/math-functions-0.3.3.0/math-functions-0.3.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ac81a9aa9848ddc14a78a93cc9360642
diff --git a/metadata/md5-cache/dev-haskell/megaparsec-8.0.0 b/metadata/md5-cache/dev-haskell/megaparsec-8.0.0
index 2d159147837c..d312901c5ee7 100644
--- a/metadata/md5-cache/dev-haskell/megaparsec-8.0.0
+++ b/metadata/md5-cache/dev-haskell/megaparsec-8.0.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Monadic parser combinators
 EAPI=7
 HOMEPAGE=https://github.com/mrkkrp/megaparsec
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dd9eb855a749683561b3eae3f8430692
diff --git a/metadata/md5-cache/dev-haskell/memory-0.15.0 b/metadata/md5-cache/dev-haskell/memory-0.15.0
index 6658d43d934f..f4e77d5e7069 100644
--- a/metadata/md5-cache/dev-haskell/memory-0.15.0
+++ b/metadata/md5-cache/dev-haskell/memory-0.15.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/basement-0.0.7:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/foundation ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/basement-0.0.7:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/foundation ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=memory and related abstraction stuff
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-memory
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/basement-0.0.7:=[profile?] >=dev-lang/ghc-8.0.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.15.0
 SRC_URI=https://hackage.haskell.org/package/memory-0.15.0/memory-0.15.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=77a9e58de8acf67f9eba7ce28249fc93
diff --git a/metadata/md5-cache/dev-haskell/memotrie-0.6.10 b/metadata/md5-cache/dev-haskell/memotrie-0.6.10
index 886d33ee5c2a..3683faee1888 100644
--- a/metadata/md5-cache/dev-haskell/memotrie-0.6.10
+++ b/metadata/md5-cache/dev-haskell/memotrie-0.6.10
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-haskell/newtype-generics-0.5.3:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Trie-based memo functions
 EAPI=7
 HOMEPAGE=https://github.com/conal/MemoTrie
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a364043e3c6eff1b1a6c9fc800dea9b
diff --git a/metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.2.0 b/metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.2.0
index 6c863934ac96..c8b4c769886c 100644
--- a/metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.2.0
+++ b/metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generate high quality pseudorandom numbers purely using a Mersenne Twister
 EAPI=6
 HOMEPAGE=http://code.haskell.org/~dons/code/mersenne-random-pure64/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.2.0
 SRC_URI=https://hackage.haskell.org/package/mersenne-random-pure64-0.2.2.0/mersenne-random-pure64-0.2.2.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b1cb2c33323e55c94abf6d16156adb3
diff --git a/metadata/md5-cache/dev-haskell/microlens-0.4.11.2 b/metadata/md5-cache/dev-haskell/microlens-0.4.11.2
index f0942d388913..c36d6758b256 100644
--- a/metadata/md5-cache/dev-haskell/microlens-0.4.11.2
+++ b/metadata/md5-cache/dev-haskell/microlens-0.4.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A tiny lens library with no dependencies
 EAPI=7
 HOMEPAGE=https://github.com/monadfix/microlens
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.4.11.2
 SRC_URI=https://hackage.haskell.org/package/microlens-0.4.11.2/microlens-0.4.11.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=016e56fe0a9b94eed1073427204c85b3
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
index a8bdf2617f47..94a7fbcd4c76 100644
--- a/metadata/md5-cache/dev-haskell/microlens-aeson-2.3.0.4
+++ b/metadata/md5-cache/dev-haskell/microlens-aeson-2.3.0.4
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Law-abiding lenses for Aeson, using microlens
 EAPI=7
 HOMEPAGE=https://github.com/fosskers/microlens-aeson/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[prof
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index eddcac8872f6..424bc5a6047a 100644
--- a/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=microlens support for Reader/Writer/State from mtl
 EAPI=7
 HOMEPAGE=https://github.com/monadfix/microlens
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index bbb47c23b2c9..99001c5ac5b4 100644
--- a/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4
+++ b/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Automatic generation of record lenses for microlens
 EAPI=7
 HOMEPAGE=https://github.com/monadfix/microlens
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[p
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5c8e9bc49470d696a9ef38cc9d218110
diff --git a/metadata/md5-cache/dev-haskell/microstache-1.0.1.1 b/metadata/md5-cache/dev-haskell/microstache-1.0.1.1
index ae369b9c09f2..6af16293ae10 100644
--- a/metadata/md5-cache/dev-haskell/microstache-1.0.1.1
+++ b/metadata/md5-cache/dev-haskell/microstache-1.0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/parsec-3.1.11:=[profile?] <dev-haskell/parsec-6.0:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 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 )
+DEPEND=>=dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/parsec-3.1.11:=[profile?] <dev-haskell/parsec-6.0:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Mustache templates for Haskell
 EAPI=6
 HOMEPAGE=https://github.com/phadej/microstache
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/parsec-3.1.11:=[profi
 RESTRICT=!test? ( test )
 SLOT=0/1.0.1.1
 SRC_URI=https://hackage.haskell.org/package/microstache-1.0.1.1/microstache-1.0.1.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1c58fce205bc38e292404ddf078e0084
diff --git a/metadata/md5-cache/dev-haskell/mime-0.4.0.2 b/metadata/md5-cache/dev-haskell/mime-0.4.0.2
index 8f54aa5459d1..e6a577f8cebb 100644
--- a/metadata/md5-cache/dev-haskell/mime-0.4.0.2
+++ b/metadata/md5-cache/dev-haskell/mime-0.4.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-0.9:=[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 )
+DEPEND=>=dev-haskell/text-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Working with MIME types
 EAPI=7
 HOMEPAGE=https://github.com/GaloisInc/mime
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.0.2
 SRC_URI=https://hackage.haskell.org/package/mime-0.4.0.2/mime-0.4.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b4845f6ade8641c4d4088e635b4f29d
diff --git a/metadata/md5-cache/dev-haskell/mime-mail-0.5.0 b/metadata/md5-cache/dev-haskell/mime-mail-0.5.0
index 4c8ac951aed5..214945e5cb41 100644
--- a/metadata/md5-cache/dev-haskell/mime-mail-0.5.0
+++ b/metadata/md5-cache/dev-haskell/mime-mail-0.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/hspec-1.3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Compose MIME email messages
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/mime-mail
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-buil
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://hackage.haskell.org/package/mime-mail-0.5.0/mime-mail-0.5.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b346170a83ba17fbc0e322c551b9f49
diff --git a/metadata/md5-cache/dev-haskell/mime-types-0.1.0.9 b/metadata/md5-cache/dev-haskell/mime-types-0.1.0.9
index 7a896669060b..b0647ed9b689 100644
--- a/metadata/md5-cache/dev-haskell/mime-types-0.1.0.9
+++ b/metadata/md5-cache/dev-haskell/mime-types-0.1.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/text:=[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 )
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Basic mime-type handling types and functions
 EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.9
 SRC_URI=https://hackage.haskell.org/package/mime-types-0.1.0.9/mime-types-0.1.0.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9dd8bfaf084e5ef59dbc7c0ac4a6f4f2
diff --git a/metadata/md5-cache/dev-haskell/minisat-0.1.2 b/metadata/md5-cache/dev-haskell/minisat-0.1.2
index 50a0f0cfc6f2..4dc57e9b12c7 100644
--- a/metadata/md5-cache/dev-haskell/minisat-0.1.2
+++ b/metadata/md5-cache/dev-haskell/minisat-0.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/async:=[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 )
+DEPEND=dev-haskell/async:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Haskell bundle of the Minisat SAT solver
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/minisat
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/async:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.2
 SRC_URI=https://hackage.haskell.org/package/minisat-0.1.2/minisat-0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=599a51700719351995576e7e24254e15
diff --git a/metadata/md5-cache/dev-haskell/mintty-0.1.2 b/metadata/md5-cache/dev-haskell/mintty-0.1.2
index 1cd568f58a42..6127c3c90519 100644
--- a/metadata/md5-cache/dev-haskell/mintty-0.1.2
+++ b/metadata/md5-cache/dev-haskell/mintty-0.1.2
@@ -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 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 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
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index d0de7b061a24..327332e1fa19 100644
--- a/metadata/md5-cache/dev-haskell/missingh-1.4.3.0
+++ b/metadata/md5-cache/dev-haskell/missingh-1.4.3.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Large utility library
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/MissingH
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[p
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=01104d6fc11fb05ffedc05f34afe1fc8
diff --git a/metadata/md5-cache/dev-haskell/mmap-0.5.9 b/metadata/md5-cache/dev-haskell/mmap-0.5.9
index da360e8e075b..eb28cc22cbed 100644
--- a/metadata/md5-cache/dev-haskell/mmap-0.5.9
+++ b/metadata/md5-cache/dev-haskell/mmap-0.5.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Memory mapped files for POSIX and Windows
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/mmap
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.5.9
 SRC_URI=https://hackage.haskell.org/package/mmap-0.5.9/mmap-0.5.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fd526ffbd6c4bd983669072b60f97d91
diff --git a/metadata/md5-cache/dev-haskell/mmorph-1.1.3 b/metadata/md5-cache/dev-haskell/mmorph-1.1.3
index d1cae5d0099a..fb10415e4acc 100644
--- a/metadata/md5-cache/dev-haskell/mmorph-1.1.3
+++ b/metadata/md5-cache/dev-haskell/mmorph-1.1.3
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Monad morphisms
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/mmorph
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ad3e1e1d3f43217a0cdee0c0a8fc8ff5
diff --git a/metadata/md5-cache/dev-haskell/mockery-0.3.5 b/metadata/md5-cache/dev-haskell/mockery-0.3.5
index 11ecd00de7c0..f0bea65fabf7 100644
--- a/metadata/md5-cache/dev-haskell/mockery-0.3.5
+++ b/metadata/md5-cache/dev-haskell/mockery-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/base-compat:=[profile?] dev-haskell/logging-facade:=[profile?] dev-haskell/temporary:=[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 )
+DEPEND=dev-haskell/base-compat:=[profile?] dev-haskell/logging-facade:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Support functions for automated testing
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/mockery
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/base-compat:=[profile?] dev-haskell/logging-facade:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://hackage.haskell.org/package/mockery-0.3.5/mockery-0.3.5.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=03dc531c44f86d599e779c3ac1fada5c
diff --git a/metadata/md5-cache/dev-haskell/mod-0.1.1.0 b/metadata/md5-cache/dev-haskell/mod-0.1.1.0
index 801e390f069d..dece9d566c89 100644
--- a/metadata/md5-cache/dev-haskell/mod-0.1.1.0
+++ b/metadata/md5-cache/dev-haskell/mod-0.1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-8.2.1:= semirings? ( >=dev-haskell/semirings-0.5:=[profile?] ) >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/quickcheck-classes-base >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 semirings? ( >=dev-haskell/quickcheck-classes-0.6.3 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-8.2.1:= semirings? ( >=dev-haskell/semirings-0.5:=[profile?] ) >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/quickcheck-classes-base >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 semirings? ( >=dev-haskell/quickcheck-classes-0.6.3 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast type-safe modular arithmetic
 EAPI=7
 HOMEPAGE=https://github.com/Bodigrim/mod
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-8.2.1:= semirings? ( >=dev-haskell/semirings-0.5:=[profil
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.0
 SRC_URI=https://hackage.haskell.org/package/mod-0.1.1.0/mod-0.1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=756d6a288ad71fbd3add1872f3e3033b
diff --git a/metadata/md5-cache/dev-haskell/monad-control-1.0.2.3 b/metadata/md5-cache/dev-haskell/monad-control-1.0.2.3
index 1294a22a8568..59a212789067 100644
--- a/metadata/md5-cache/dev-haskell/monad-control-1.0.2.3
+++ b/metadata/md5-cache/dev-haskell/monad-control-1.0.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[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 )
+DEPEND=>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Lift control operations, like exception catching, through monad transformers
 EAPI=6
 HOMEPAGE=https://github.com/basvandijk/monad-control
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.0.2.3
 SRC_URI=https://hackage.haskell.org/package/monad-control-1.0.2.3/monad-control-1.0.2.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=59c90f409c493b6f3c0884ff108e02f8
diff --git a/metadata/md5-cache/dev-haskell/monad-journal-0.8.1 b/metadata/md5-cache/dev-haskell/monad-journal-0.8.1
index 483d4d003851..c3162cd6a262 100644
--- a/metadata/md5-cache/dev-haskell/monad-journal-0.8.1
+++ b/metadata/md5-cache/dev-haskell/monad-journal-0.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[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 )
+DEPEND=>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Pure logger typeclass and monad transformer
 EAPI=6
 HOMEPAGE=https://github.com/phaazon/monad-journal
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.8.1
 SRC_URI=https://hackage.haskell.org/package/monad-journal-0.8.1/monad-journal-0.8.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eb9ff190747a92e483d705af4e58dc72
diff --git a/metadata/md5-cache/dev-haskell/monad-logger-0.3.32 b/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
index 167128ee3906..e0fd9e601130 100644
--- a/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
+++ b/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A class of monads which can log messages
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/monad-logger#readme
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=21db67ceb75c1bca17f019aabe40f4a5
diff --git a/metadata/md5-cache/dev-haskell/monad-loops-0.4.3 b/metadata/md5-cache/dev-haskell/monad-loops-0.4.3
index f5756fe0bd01..a596be6ced82 100644
--- a/metadata/md5-cache/dev-haskell/monad-loops-0.4.3
+++ b/metadata/md5-cache/dev-haskell/monad-loops-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/tasty dev-haskell/tasty-hunit ) 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.8 test? ( dev-haskell/tasty dev-haskell/tasty-hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Monadic loops
 EAPI=7
 HOMEPAGE=https://github.com/mokus0/monad-loops
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.3
 SRC_URI=https://hackage.haskell.org/package/monad-loops-0.4.3/monad-loops-0.4.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5014e4c863411dee5e1b43e7ad564cf3
diff --git a/metadata/md5-cache/dev-haskell/monad-par-0.3.5 b/metadata/md5-cache/dev-haskell/monad-par-0.3.5
index 12991f1f2135..4f8f40d95741 100644
--- a/metadata/md5-cache/dev-haskell/monad-par-0.3.5
+++ b/metadata/md5-cache/dev-haskell/monad-par-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/abstract-deque-0.1.4:=[profile?] dev-haskell/abstract-par:=[profile?] >=dev-haskell/monad-par-extras-0.3:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] >=dev-haskell/mwc-random-0.11:=[profile?] >=dev-haskell/parallel-3.1:=[profile?] >=dev-lang/ghc-8.0.1:= chaselev? ( dev-haskell/chaselev-deque:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.3 dev-haskell/test-framework-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/abstract-deque-0.1.4:=[profile?] dev-haskell/abstract-par:=[profile?] >=dev-haskell/monad-par-extras-0.3:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] >=dev-haskell/mwc-random-0.11:=[profile?] >=dev-haskell/parallel-3.1:=[profile?] >=dev-lang/ghc-8.0.1:= chaselev? ( dev-haskell/chaselev-deque:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit >=dev-haskell/test-framework-quickcheck2-0.3 dev-haskell/test-framework-th ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library for parallel programming based on a monad
 EAPI=7
 HOMEPAGE=https://github.com/simonmar/monad-par
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/abstract-deque-0.1.4:=[profile?] dev-haskell/abstract-par:
 RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://hackage.haskell.org/package/monad-par-0.3.5/monad-par-0.3.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f0fee2bd76b286fa9ec3ec33cd096042
diff --git a/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1 b/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
index 24ba763bd27b..236d655619e8 100644
--- a/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
+++ b/metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/abstract-par-0.3:=[profile?] <dev-haskell/abstract-par-0.4:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/random-1.0:=[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 )
+DEPEND=>=dev-haskell/abstract-par-0.3:=[profile?] <dev-haskell/abstract-par-0.4:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Combinators and extra features for Par monads
 EAPI=7
 HOMEPAGE=https://github.com/simonmar/monad-par
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/abstract-par-0.3:=[profile?] <dev-haskell/abstract-par-0.4:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/monad-par-extras-0.3.3/monad-par-extras-0.3.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=42a30d8b317c763e6942e1d98ce077bf
diff --git a/metadata/md5-cache/dev-haskell/monad-unlift-0.2.0 b/metadata/md5-cache/dev-haskell/monad-unlift-0.2.0
index 494da51b1f8a..779ea2cb7b8b 100644
--- a/metadata/md5-cache/dev-haskell/monad-unlift-0.2.0
+++ b/metadata/md5-cache/dev-haskell/monad-unlift-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/constraints:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=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 )
+DEPEND=dev-haskell/constraints:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Typeclasses for representing monad transformer unlifting
 EAPI=6
 HOMEPAGE=https://github.com/fpco/monad-unlift
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/constraints:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.6.1:=
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/monad-unlift-0.2.0/monad-unlift-0.2.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=73e53dafe1b920f57250ebff6ec82d98
diff --git a/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.1.0-r2 b/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.1.0-r2
index 38b75f51e261..91670a96f5af 100644
--- a/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.1.0-r2
+++ b/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.1.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3.1.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3.1.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Monad-transformer version of the Control.Exception module
 EAPI=7
 HOMEPAGE=http://darcsden.com/jcpetruzza/MonadCatchIO-mtl
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/monadcatchio-transformers-0.3.1.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.1.0
 SRC_URI=https://hackage.haskell.org/package/MonadCatchIO-mtl-0.3.1.0/MonadCatchIO-mtl-0.3.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f6d70b5ed394f53e807f4e248835bb58
diff --git a/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.3-r1 b/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.3-r1
index 4d40a68ebe68..f6dc2af38d02 100644
--- a/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.3-r1
+++ b/metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-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 )
+DEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Monad-transformer compatible version of the Control.Exception module
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/MonadCatchIO-transformers
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.3.1.3
 SRC_URI=https://hackage.haskell.org/package/MonadCatchIO-transformers-0.3.1.3/MonadCatchIO-transformers-0.3.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4b5adf91ded70b815254be4b71651164
diff --git a/metadata/md5-cache/dev-haskell/monadlib-3.10 b/metadata/md5-cache/dev-haskell/monadlib-3.10
index 7e3b51374d8e..caa972c59c67 100644
--- a/metadata/md5-cache/dev-haskell/monadlib-3.10
+++ b/metadata/md5-cache/dev-haskell/monadlib-3.10
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A collection of monad transformers
 EAPI=7
 HOMEPAGE=https://wiki.github.com/yav/monadlib
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5820253652179f3d789b8b074e489794
diff --git a/metadata/md5-cache/dev-haskell/monadplus-1.4.2-r1 b/metadata/md5-cache/dev-haskell/monadplus-1.4.2-r1
index 021e9545cdde..aa6d1a092b4d 100644
--- a/metadata/md5-cache/dev-haskell/monadplus-1.4.2-r1
+++ b/metadata/md5-cache/dev-haskell/monadplus-1.4.2-r1
@@ -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 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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell98 partial maps and filters over MonadPlus
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/monadplus
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.4.2
 SRC_URI=https://hackage.haskell.org/package/monadplus-1.4.2/monadplus-1.4.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30bc302a310607c467f6d0e13f1a7b78
diff --git a/metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2 b/metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2
index 068939ed8579..45d8b904d97a 100644
--- a/metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2
+++ b/metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/fail-4.9:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[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 )
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Random-number generation monad
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/MonadRandom
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.5.1.2
 SRC_URI=https://hackage.haskell.org/package/MonadRandom-0.5.1.2/MonadRandom-0.5.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d0f0837c197200c52dcfaba1a9162fe3
diff --git a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3 b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
index 6ce2b44d6d8b..99098235ba40 100644
--- a/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
+++ b/metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Monad classes, using type families
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/monads-tf
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.3
 SRC_URI=https://hackage.haskell.org/package/monads-tf-0.1.0.3/monads-tf-0.1.0.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c128ac91e2a52ec8fcdff114029b729
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
index 80bb918c3455..16e9c4f50235 100644
--- a/metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1
+++ b/metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Type classes for mapping, folding, and traversing monomorphic containers
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/mono-traversable#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/split-0.2:=[profile?] >=d
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aa092693967821b75bd47ed78f37d25c
diff --git a/metadata/md5-cache/dev-haskell/mono-traversable-instances-0.1.0.0 b/metadata/md5-cache/dev-haskell/mono-traversable-instances-0.1.0.0
index 9d4a225bdfd2..d0069a2963a6 100644
--- a/metadata/md5-cache/dev-haskell/mono-traversable-instances-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/mono-traversable-instances-0.1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] >=dev-haskell/mono-traversable-1.0:=[profile?] <dev-haskell/mono-traversable-1.1:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/vector-instances:=[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 )
+DEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] >=dev-haskell/mono-traversable-1.0:=[profile?] <dev-haskell/mono-traversable-1.1:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Extra typeclass instances for mono-traversable
 EAPI=6
 HOMEPAGE=https://github.com/snoyberg/mono-traversable#readme
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/comonad-3.0.3:=[profile?] >=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?] >=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?] >=dev-haskell/mono-traversable-1.0:=[profile?] <dev-haskell/mono-traversable-1.1:=[profile?] >=dev-haskell/semigroupoids-3.0:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/vector-instances:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.0.0
 SRC_URI=https://hackage.haskell.org/package/mono-traversable-instances-0.1.0.0/mono-traversable-instances-0.1.0.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=986633ea165bbec5a323e781d8be7ddf
diff --git a/metadata/md5-cache/dev-haskell/mountpoints-1.0.2 b/metadata/md5-cache/dev-haskell/mountpoints-1.0.2
index eab942f22aae..56c648410fab 100644
--- a/metadata/md5-cache/dev-haskell/mountpoints-1.0.2
+++ b/metadata/md5-cache/dev-haskell/mountpoints-1.0.2
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=list mount points
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/mountpoints
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.2
 SRC_URI=https://hackage.haskell.org/package/mountpoints-1.0.2/mountpoints-1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fcc35c2318b86f75dfd403d37073b84c
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.2.2 b/metadata/md5-cache/dev-haskell/mtl-2.2.2
index 6186189d3e4a..25b696d69be3 100644
--- a/metadata/md5-cache/dev-haskell/mtl-2.2.2
+++ b/metadata/md5-cache/dev-haskell/mtl-2.2.2
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.10.1:= hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Monad classes, using functional dependencies
 EAPI=7
 HOMEPAGE=https://github.com/haskell/mtl
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e47341ecb7605464e701eec5bfc6ddec
diff --git a/metadata/md5-cache/dev-haskell/mtl-compat-0.2.2 b/metadata/md5-cache/dev-haskell/mtl-compat-0.2.2
index b1be9e73b1f1..091e36f7a88a 100644
--- a/metadata/md5-cache/dev-haskell/mtl-compat-0.2.2
+++ b/metadata/md5-cache/dev-haskell/mtl-compat-0.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/transformers-compat:= >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/mtl-compat-0.2.2/mtl-compat-0.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=93da1f8df0dead07848719a4b75e6820
diff --git a/metadata/md5-cache/dev-haskell/multipart-0.2.0 b/metadata/md5-cache/dev-haskell/multipart-0.2.0
index 8a7f012bf837..0600dfa1d415 100644
--- a/metadata/md5-cache/dev-haskell/multipart-0.2.0
+++ b/metadata/md5-cache/dev-haskell/multipart-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/parsec-2.0:=[profile?] dev-haskell/stringsearch:=[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 )
+DEPEND=>=dev-haskell/parsec-2.0:=[profile?] dev-haskell/stringsearch:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=HTTP multipart split out of the cgi package
 EAPI=7
 HOMEPAGE=http://www.github.com/silkapp/multipart
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-2.0:=[profile?] dev-haskell/stringsearch:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/multipart-0.2.0/multipart-0.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30a361c1010f8f308bbc2cf5a94f17e6
diff --git a/metadata/md5-cache/dev-haskell/murmur-hash-0.1.0.9 b/metadata/md5-cache/dev-haskell/murmur-hash-0.1.0.9
index a6f66ac935ee..e0bc7fa4f487 100644
--- a/metadata/md5-cache/dev-haskell/murmur-hash-0.1.0.9
+++ b/metadata/md5-cache/dev-haskell/murmur-hash-0.1.0.9
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=MurmurHash2 implementation for Haskell
 EAPI=6
 HOMEPAGE=https://github.com/nominolo/murmur-hash
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.9
 SRC_URI=https://hackage.haskell.org/package/murmur-hash-0.1.0.9/murmur-hash-0.1.0.9.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d22d03ce12e945007fb96b23ad24b59
diff --git a/metadata/md5-cache/dev-haskell/mustache-2.3.1 b/metadata/md5-cache/dev-haskell/mustache-2.3.1
index 07f2b9674241..7fa7a10c8949 100644
--- a/metadata/md5-cache/dev-haskell/mustache-2.3.1
+++ b/metadata/md5-cache/dev-haskell/mustache-2.3.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A mustache template parser library
 EAPI=7
 HOMEPAGE=https://github.com/JustusAdam/mustache
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/cmdargs:=[profile?] dev-haskel
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=37761571eaef0ea21cd4e6c2da8f7e91
diff --git a/metadata/md5-cache/dev-haskell/mutable-containers-0.3.4 b/metadata/md5-cache/dev-haskell/mutable-containers-0.3.4
index 302e51f8716f..37530b1bd27d 100644
--- a/metadata/md5-cache/dev-haskell/mutable-containers-0.3.4
+++ b/metadata/md5-cache/dev-haskell/mutable-containers-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/mono-traversable:=[profile?] >=dev-haskell/primitive-0.5.2.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/mono-traversable:=[profile?] >=dev-haskell/primitive-0.5.2.1:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/hspec dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Abstactions and concrete implementations of mutable containers
 EAPI=6
 HOMEPAGE=https://github.com/snoyberg/mono-traversable#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mono-traversable:=[profile?] >=dev-haskell/primitive-0.5.2.1
 RESTRICT=!test? ( test )
 SLOT=0/0.3.4
 SRC_URI=https://hackage.haskell.org/package/mutable-containers-0.3.4/mutable-containers-0.3.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50e4c2e0e918e50ac018afea0c666bd1
diff --git a/metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0 b/metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0
index 803af61fd236..b3d3d863fbf9 100644
--- a/metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0
+++ b/metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/math-functions-0.2.1.0:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8.0.4 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/math-functions-0.2.1.0:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8.0.4 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast, high quality pseudo random number generation
 EAPI=7
 HOMEPAGE=https://github.com/bos/mwc-random
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/math-functions-0.2.1.0:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.14.0.0
 SRC_URI=https://hackage.haskell.org/package/mwc-random-0.14.0.0/mwc-random-0.14.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=af959e8cff0e91cada75967295b6b23b
diff --git a/metadata/md5-cache/dev-haskell/mysql-0.1.7 b/metadata/md5-cache/dev-haskell/mysql-0.1.7
index d0b89ac67139..eacad01c5180 100644
--- a/metadata/md5-cache/dev-haskell/mysql-0.1.7
+++ b/metadata/md5-cache/dev-haskell/mysql-0.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:= dev-db/mysql-connector-c:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:= dev-db/mysql-connector-c:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A low-level MySQL client library
 EAPI=7
 HOMEPAGE=https://github.com/paul-rouse/mysql
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=
 RESTRICT=test
 SLOT=0/0.1.7
 SRC_URI=https://hackage.haskell.org/package/mysql-0.1.7/mysql-0.1.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=738dc77aa3638fdcfeaac8c379e6d5ca
diff --git a/metadata/md5-cache/dev-haskell/mysql-simple-0.4.5 b/metadata/md5-cache/dev-haskell/mysql-simple-0.4.5
index 33d9cee0c74b..32d150f0b0be 100644
--- a/metadata/md5-cache/dev-haskell/mysql-simple-0.4.5
+++ b/metadata/md5-cache/dev-haskell/mysql-simple-0.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.10.0.0:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/blaze-textual:=[profile?] >=dev-haskell/mysql-0.1.1.1:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/pcre-light:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/attoparsec-0.10.0.0:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/blaze-textual:=[profile?] >=dev-haskell/mysql-0.1.1.1:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/pcre-light:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A mid-level MySQL client library
 EAPI=7
 HOMEPAGE=https://github.com/paul-rouse/mysql-simple
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10.0.0:=[profile?] dev-haskell/base16-bytestr
 RESTRICT=test
 SLOT=0/0.4.5
 SRC_URI=https://hackage.haskell.org/package/mysql-simple-0.4.5/mysql-simple-0.4.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f665e935240b1dd8958ece364c813a27
diff --git a/metadata/md5-cache/dev-haskell/nanospec-0.2.2 b/metadata/md5-cache/dev-haskell/nanospec-0.2.2
index 774671e0fbb8..735a7901ddf7 100644
--- a/metadata/md5-cache/dev-haskell/nanospec-0.2.2
+++ b/metadata/md5-cache/dev-haskell/nanospec-0.2.2
@@ -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 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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A lightweight implementation of a subset of Hspec's API
 EAPI=6
 HOMEPAGE=https://github.com/hspec/nanospec#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.2.2
 SRC_URI=https://hackage.haskell.org/package/nanospec-0.2.2/nanospec-0.2.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a21311c2357a3c9f4ca77a20677a0db
diff --git a/metadata/md5-cache/dev-haskell/nats-1.1.2 b/metadata/md5-cache/dev-haskell/nats-1.1.2
index 4f05fceb32cd..eca377f9fa2a 100644
--- a/metadata/md5-cache/dev-haskell/nats-1.1.2
+++ b/metadata/md5-cache/dev-haskell/nats-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:= binary? ( >=dev-haskell/binary-0.2:=[profile?] <d
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=60789e6958f7ac6851dfa1cc8aacd320
diff --git a/metadata/md5-cache/dev-haskell/neat-interpolation-0.5.1.2 b/metadata/md5-cache/dev-haskell/neat-interpolation-0.5.1.2
index a29bbd984fc6..86f5e0594b7a 100644
--- a/metadata/md5-cache/dev-haskell/neat-interpolation-0.5.1.2
+++ b/metadata/md5-cache/dev-haskell/neat-interpolation-0.5.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/megaparsec-7:=[profile?] <dev-haskell/megaparsec-10:=[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 )
+DEPEND=>=dev-haskell/megaparsec-7:=[profile?] <dev-haskell/megaparsec-10:=[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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A quasiquoter for neat and simple multiline text interpolation
 EAPI=7
 HOMEPAGE=https://github.com/nikita-volkov/neat-interpolation
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/megaparsec-7:=[profile?] <dev-haskell/megaparsec-10:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1.2
 SRC_URI=https://hackage.haskell.org/package/neat-interpolation-0.5.1.2/neat-interpolation-0.5.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d3e5c168a06261a73e94310d5c094ce4
diff --git a/metadata/md5-cache/dev-haskell/netlink-1.1.1.0 b/metadata/md5-cache/dev-haskell/netlink-1.1.1.0
index 426ed0af00dd..7c60a109f8fe 100644
--- a/metadata/md5-cache/dev-haskell/netlink-1.1.1.0
+++ b/metadata/md5-cache/dev-haskell/netlink-1.1.1.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Netlink communication for Haskell
 EAPI=6
 HOMEPAGE=https://github.com/Ongy/netlink-hs
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=920be4018c6d652dcb60d4e99f3bfee9
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.1.2 b/metadata/md5-cache/dev-haskell/network-2.4.1.2
index 6c0692929598..87d303b65ab3 100644
--- a/metadata/md5-cache/dev-haskell/network-2.4.1.2
+++ b/metadata/md5-cache/dev-haskell/network-2.4.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit 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 )
+DEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Low-level networking interface
 EAPI=7
 HOMEPAGE=https://github.com/haskell/network
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 RESTRICT=!test? ( test )
 SLOT=0/2.4.1.2
 SRC_URI=https://hackage.haskell.org/package/network-2.4.1.2/network-2.4.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e41e7d8ebeba9d85503d558c8966eb43
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.2.2 b/metadata/md5-cache/dev-haskell/network-2.4.2.2
index a5b58a6f20a2..13ba9ba2c93b 100644
--- a/metadata/md5-cache/dev-haskell/network-2.4.2.2
+++ b/metadata/md5-cache/dev-haskell/network-2.4.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit 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 )
+DEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Low-level networking interface
 EAPI=7
 HOMEPAGE=https://github.com/haskell/network
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 RESTRICT=!test? ( test )
 SLOT=0/2.4.2.2
 SRC_URI=https://hackage.haskell.org/package/network-2.4.2.2/network-2.4.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d488510f845f7aee78b725864db6c9e4
diff --git a/metadata/md5-cache/dev-haskell/network-2.5.0.0 b/metadata/md5-cache/dev-haskell/network-2.5.0.0
index 845b23e5a665..3ba191589bbf 100644
--- a/metadata/md5-cache/dev-haskell/network-2.5.0.0
+++ b/metadata/md5-cache/dev-haskell/network-2.5.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit 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 )
+DEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Low-level networking interface
 EAPI=7
 HOMEPAGE=https://github.com/haskell/network
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.5.0.0
 SRC_URI=https://hackage.haskell.org/package/network-2.5.0.0/network-2.5.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=64dbada134e214878e46c8e9dbac337c
diff --git a/metadata/md5-cache/dev-haskell/network-2.6.2.1 b/metadata/md5-cache/dev-haskell/network-2.6.2.1
index 57d1a7d67ee9..83cbffad3ebf 100644
--- a/metadata/md5-cache/dev-haskell/network-2.6.2.1
+++ b/metadata/md5-cache/dev-haskell/network-2.6.2.1
@@ -1,5 +1,5 @@
 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/test-framework dev-haskell/test-framework-hunit ) 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.8 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Low-level networking interface
 EAPI=7
 HOMEPAGE=https://github.com/haskell/network
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/2.6.2.1
 SRC_URI=https://hackage.haskell.org/package/network-2.6.2.1/network-2.6.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=64d620b2b115b5b458abf5b01cce6915
diff --git a/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1 b/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1
index 7fe8b6c9743e..4d0826639a53 100644
--- a/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.10.1 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/doctest-0.10.1 dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Low-level networking interface
 EAPI=7
 HOMEPAGE=https://github.com/haskell/network
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/2.6.3.1
 SRC_URI=https://hackage.haskell.org/package/network-2.6.3.1/network-2.6.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0bed46a53ec00fc21039279dad6adbd8
diff --git a/metadata/md5-cache/dev-haskell/network-3.0.1.1 b/metadata/md5-cache/dev-haskell/network-3.0.1.1
index b8d056450220..d0294d30dc9d 100644
--- a/metadata/md5-cache/dev-haskell/network-3.0.1.1
+++ b/metadata/md5-cache/dev-haskell/network-3.0.1.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.6 dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Low-level networking interface
 EAPI=7
 HOMEPAGE=https://github.com/haskell/network
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=test
 SLOT=0/3.0.1.1
 SRC_URI=https://hackage.haskell.org/package/network-3.0.1.1/network-3.0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a9bb956209213caa4aede27f7ddd3f8
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
index 467887465b4b..6cb68d4f5bec 100644
--- a/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0
+++ b/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Network.BSD
 EAPI=7
 HOMEPAGE=https://github.com/haskell/network-bsd
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index d4e963a9a44b..e3f1f6f7c716 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/doctest ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Network byte order utilities
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/network-byte-order
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d5b5823019bd67e9639115103d311bf8
diff --git a/metadata/md5-cache/dev-haskell/network-conduit-1.1.0 b/metadata/md5-cache/dev-haskell/network-conduit-1.1.0
index edd067ca672f..2cf0c37d66c7 100644
--- a/metadata/md5-cache/dev-haskell/network-conduit-1.1.0
+++ b/metadata/md5-cache/dev-haskell/network-conduit-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/conduit-1.1:=[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 )
+DEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Stream socket data using conduits. (deprecated)
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/conduit
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/network-conduit-1.1.0/network-conduit-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0445124d9138ca463a04775b97608094
diff --git a/metadata/md5-cache/dev-haskell/network-data-0.5.3 b/metadata/md5-cache/dev-haskell/network-data-0.5.3
index 8ede41c08087..8ae956021bcc 100644
--- a/metadata/md5-cache/dev-haskell/network-data-0.5.3
+++ b/metadata/md5-cache/dev-haskell/network-data-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/prettyclass-1.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/prettyclass-1.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.22.2.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Library for network data structures and their serialization
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/network-data
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/prettyclass-1.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.3
 SRC_URI=https://hackage.haskell.org/package/network-data-0.5.3/network-data-0.5.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f182dc37d4d83c8d04616e76221af82
diff --git a/metadata/md5-cache/dev-haskell/network-info-0.2.0.10 b/metadata/md5-cache/dev-haskell/network-info-0.2.0.10
index 49398c132efe..53b57fe280a9 100644
--- a/metadata/md5-cache/dev-haskell/network-info-0.2.0.10
+++ b/metadata/md5-cache/dev-haskell/network-info-0.2.0.10
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Access the local computer's basic network configuration
 EAPI=6
 HOMEPAGE=https://github.com/jystic/network-info
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0.10
 SRC_URI=https://hackage.haskell.org/package/network-info-0.2.0.10/network-info-0.2.0.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=43f9e78d7b79637e87588311cf698b12
diff --git a/metadata/md5-cache/dev-haskell/network-multicast-0.3.2 b/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
index 1c81a813a673..822c41a34f5c 100644
--- a/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
+++ b/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
@@ -1,5 +1,5 @@
 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 )
+DEPEND=dev-haskell/network:=[profile?] dev-haskell/network-bsd:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple multicast library
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/network-multicast
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd4af9e13d89a196f97ef5013fc58221
diff --git a/metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.9 b/metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.9
index 098d689951b9..1316a26d529c 100644
--- a/metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.9
+++ b/metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/gnuidn-0.2:=[profile?] <dev-haskell/gnuidn-0.3:=[profile?] >=dev-haskell/gnutls-0.1.4:=[profile?] <dev-haskell/gnutls-0.3:=[profile?] >=dev-haskell/gsasl-0.3:=[profile?] <dev-haskell/gsasl-0.4:=[profile?] >=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/network-2.2:=[profile?] <dev-haskell/network-3.0.0.0:=[profile?] >=dev-haskell/text-0.10:=[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 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/gnuidn-0.2:=[profile?] <dev-haskell/gnuidn-0.3:=[profile?] >=dev-haskell/gnutls-0.1.4:=[profile?] <dev-haskell/gnutls-0.3:=[profile?] >=dev-haskell/gsasl-0.3:=[profile?] <dev-haskell/gsasl-0.4:=[profile?] >=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/network-2.2:=[profile?] <dev-haskell/network-3.0.0.0:=[profile?] >=dev-haskell/text-0.10:=[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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Client library for the XMPP protocol
 EAPI=7
 HOMEPAGE=https://git.sr.ht/~singpolyma/network-protocol-xmpp
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-haskell/gnuidn-0.2:=[profile?] <dev-haskell/gnuidn-0.3:=[profile?] >=dev-haskell/gnutls-0.1.4:=[profile?] <dev-haskell/gnutls-0.3:=[profile?] >=dev-haskell/gsasl-0.3:=[profile?] <dev-haskell/gsasl-0.4:=[profile?] >=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?] >=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?] >=dev-haskell/network-2.2:=[profile?] <dev-haskell/network-3.0.0.0:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.4.9
 SRC_URI=https://hackage.haskell.org/package/network-protocol-xmpp-0.4.9/network-protocol-xmpp-0.4.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d2b6d93b8cf7282fad56a57f013a7602
diff --git a/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0 b/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0
index ffe323455bf5..56f2104c4fb1 100644
--- a/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0
+++ b/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/2.5.0.0
 SRC_URI=https://hackage.haskell.org/package/network-uri-2.5.0.0/network-uri-2.5.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eefdb9d4dc467c6494c206c7122cd6f7
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
index 1b1c4fcb56d2..eb1f6e0266cc 100644
--- a/metadata/md5-cache/dev-haskell/network-uri-2.6.3.0
+++ b/metadata/md5-cache/dev-haskell/network-uri-2.6.3.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=URI manipulation
 EAPI=7
 HOMEPAGE=https://github.com/haskell/network-uri
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-3.1.12.0:=[profile?] <dev-haskell/parsec-3.2:=[prof
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50469135c34afac1cd1dfd6a41935a04
diff --git a/metadata/md5-cache/dev-haskell/newtype-0.2.2.0 b/metadata/md5-cache/dev-haskell/newtype-0.2.2.0
index 047e7db88aab..3ac2fc010312 100644
--- a/metadata/md5-cache/dev-haskell/newtype-0.2.2.0
+++ b/metadata/md5-cache/dev-haskell/newtype-0.2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A typeclass and set of functions for working with newtypes
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/newtype
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.2.0
 SRC_URI=https://hackage.haskell.org/package/newtype-0.2.2.0/newtype-0.2.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fbd7b253873237f29d66d6ba1f7078f8
diff --git a/metadata/md5-cache/dev-haskell/newtype-generics-0.5.4 b/metadata/md5-cache/dev-haskell/newtype-generics-0.5.4
index 707fa27053f7..4ba88c2906ad 100644
--- a/metadata/md5-cache/dev-haskell/newtype-generics-0.5.4
+++ b/metadata/md5-cache/dev-haskell/newtype-generics-0.5.4
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.1 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A typeclass for working with newtypes, with generics support
 EAPI=7
 HOMEPAGE=https://github.com/sjakobi/newtype-generics
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a19ed884217083ada7ba077531c32156
diff --git a/metadata/md5-cache/dev-haskell/nonce-1.0.7 b/metadata/md5-cache/dev-haskell/nonce-1.0.7
index 472e4c28ec71..ac1ebbf42e2f 100644
--- a/metadata/md5-cache/dev-haskell/nonce-1.0.7
+++ b/metadata/md5-cache/dev-haskell/nonce-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/entropy-0.3.7:=[profile?] >=dev-haskell/text-0.9:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[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 )
+DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/entropy-0.3.7:=[profile?] >=dev-haskell/text-0.9:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generate cryptographic nonces
 EAPI=6
 HOMEPAGE=https://github.com/prowdsponsor/nonce
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/entropy-0.3.7:=[profile?] >=dev-haskell/text-0.9:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.0.7
 SRC_URI=https://hackage.haskell.org/package/nonce-1.0.7/nonce-1.0.7.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35db5ab7b691e4dabdb7ffbdc214aca3
diff --git a/metadata/md5-cache/dev-haskell/numinstances-1.4 b/metadata/md5-cache/dev-haskell/numinstances-1.4
index 52095025a0f3..c1f5c16764c3 100644
--- a/metadata/md5-cache/dev-haskell/numinstances-1.4
+++ b/metadata/md5-cache/dev-haskell/numinstances-1.4
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Instances of numeric classes for functions and tuples
 EAPI=7
 HOMEPAGE=https://github.com/conal/NumInstances
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.4
 SRC_URI=https://hackage.haskell.org/package/NumInstances-1.4/NumInstances-1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fd61fdcc7278fe6ce598b4b86884cb94
diff --git a/metadata/md5-cache/dev-haskell/numtype-dk-0.5.0.2 b/metadata/md5-cache/dev-haskell/numtype-dk-0.5.0.2
index ce7674e4c42f..bdc152a82277 100644
--- a/metadata/md5-cache/dev-haskell/numtype-dk-0.5.0.2
+++ b/metadata/md5-cache/dev-haskell/numtype-dk-0.5.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Type-level integers, using TypeNats, Data Kinds, and Closed Type Families
 EAPI=6
 HOMEPAGE=https://github.com/bjornbm/numtype-dk
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.5.0.2
 SRC_URI=https://hackage.haskell.org/package/numtype-dk-0.5.0.2/numtype-dk-0.5.0.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=83b8ae2f3f7a0f3ade42de01c08afd19
diff --git a/metadata/md5-cache/dev-haskell/objectname-1.1.0.1 b/metadata/md5-cache/dev-haskell/objectname-1.1.0.1
index ca7a078f2c60..ae3dce9fbc00 100644
--- a/metadata/md5-cache/dev-haskell/objectname-1.1.0.1
+++ b/metadata/md5-cache/dev-haskell/objectname-1.1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Explicitly handled object names
 EAPI=7
 HOMEPAGE=https://github.com/svenpanne/ObjectName
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/1.1.0.1
 SRC_URI=https://hackage.haskell.org/package/ObjectName-1.1.0.1/ObjectName-1.1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=222b9d1ef7587871103f739ec1ce7330
diff --git a/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7 b/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
index cb3ba6e8a9f8..ae6418653b3d 100644
--- a/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
+++ b/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=locale library
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/old-locale
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.0.7
 SRC_URI=https://hackage.haskell.org/package/old-locale-1.0.0.7/old-locale-1.0.0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=391cd5d64cd8bad9935aaf5b2bd2cee3
diff --git a/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1 b/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
index 0740d03f7dd0..7fce15cddc2b 100644
--- a/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
+++ b/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
@@ -1,5 +1,5 @@
 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:= >=dev-haskell/cabal-1.18.1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18.1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Time library
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/old-time
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.3
 SRC_URI=https://hackage.haskell.org/package/old-time-1.1.0.3/old-time-1.1.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f61af5886e883772e879bc9d11a553d6
diff --git a/metadata/md5-cache/dev-haskell/only-0.1 b/metadata/md5-cache/dev-haskell/only-0.1
index a511d3cb492a..a33d0e7a599a 100644
--- a/metadata/md5-cache/dev-haskell/only-0.1
+++ b/metadata/md5-cache/dev-haskell/only-0.1
@@ -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 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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=The 1-tuple type or single-value "collection"
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/Only
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/Only-0.1/Only-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7815da8c093351298cd580275b3c167f
diff --git a/metadata/md5-cache/dev-haskell/open-browser-0.2.1.0-r1 b/metadata/md5-cache/dev-haskell/open-browser-0.2.1.0-r1
index 9820536cc8e9..791ff7dd7f03 100644
--- a/metadata/md5-cache/dev-haskell/open-browser-0.2.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/open-browser-0.2.1.0-r1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Open a web browser from Haskell
 EAPI=6
 HOMEPAGE=https://github.com/rightfold/open-browser
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.1.0
 SRC_URI=https://hackage.haskell.org/package/open-browser-0.2.1.0/open-browser-0.2.1.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e3b2ec40c9443f28041fe5c2dc2efe9a
diff --git a/metadata/md5-cache/dev-haskell/openal-1.7.0.5 b/metadata/md5-cache/dev-haskell/openal-1.7.0.5
index efd8116a3f45..4bd59711aeca 100644
--- a/metadata/md5-cache/dev-haskell/openal-1.7.0.5
+++ b/metadata/md5-cache/dev-haskell/openal-1.7.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= media-libs/openal >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= media-libs/openal >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A binding to the OpenAL cross-platform 3D audio API
 EAPI=7
 HOMEPAGE=https://github.com/haskell-openal/ALUT
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= media-libs/openal
 SLOT=0/1.7.0.5
 SRC_URI=https://hackage.haskell.org/package/OpenAL-1.7.0.5/OpenAL-1.7.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=db1ea3a2df89437e4214455eaa13f946
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
index 1948afa284dd..2b7262507432 100644
--- a/metadata/md5-cache/dev-haskell/opengl-3.0.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/opengl-3.0.3.0-r1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A binding for the OpenGL graphics system
 EAPI=7
 HOMEPAGE=https://wiki.haskell.org/OpenGL
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index d5975bbff5e1..15e00ec17c23 100644
--- a/metadata/md5-cache/dev-haskell/openglraw-3.3.4.0
+++ b/metadata/md5-cache/dev-haskell/openglraw-3.3.4.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A raw binding for the OpenGL graphics system
 EAPI=7
 HOMEPAGE=https://www.haskell.org/haskellwiki/Opengl
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c2c3ed03b29d7ade677442dacc6ce8a
diff --git a/metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0 b/metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0
index 9ea854865167..a6b5c9d77449 100644
--- a/metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0
+++ b/metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] >=dev-haskell/io-streams-1.0:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] >=dev-haskell/io-streams-1.0:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=OpenSSL network support for io-streams
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/openssl-streams
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=
 RESTRICT=test
 SLOT=0/1.2.3.0
 SRC_URI=https://hackage.haskell.org/package/openssl-streams-1.2.3.0/openssl-streams-1.2.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f66f6ff09042282490acbd9fdaa3976b
diff --git a/metadata/md5-cache/dev-haskell/options-1.2.1.1 b/metadata/md5-cache/dev-haskell/options-1.2.1.1
index e33365986645..4514a23d783b 100644
--- a/metadata/md5-cache/dev-haskell/options-1.2.1.1
+++ b/metadata/md5-cache/dev-haskell/options-1.2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] >=dev-haskell/transformers-0.2:=[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 )
+DEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A powerful and easy-to-use command-line option parser
 EAPI=7
 HOMEPAGE=https://john-millikin.com/software/haskell-options/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/monads-tf-0.1:=[profile?] >=dev-haskell/transformers-0.2:=
 RESTRICT=test
 SLOT=0/1.2.1.1
 SRC_URI=https://hackage.haskell.org/package/options-1.2.1.1/options-1.2.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4fa162e608c9646737ab463057226db6
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
index f7bdd4beb6e3..fbb49a2cf636 100644
--- a/metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0
+++ b/metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Utilities and combinators for parsing command line options
 EAPI=7
 HOMEPAGE=https://github.com/pcapriotti/optparse-applicative
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-wl-pprint-0.6.8:=[profile?] <dev-haskell/ansi-wl-ppri
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a8fcea588cdcfa3b2b62d7aa5f912be0
diff --git a/metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.3 b/metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.3
index a913a9238618..5a04511d9f68 100644
--- a/metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.3
+++ b/metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.3
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple interface to optparse-applicative
 EAPI=7
 HOMEPAGE=https://github.com/fpco/optparse-simple#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/githash-0.1.3.0:=[profile?] dev-haskell/optparse-applicati
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.3
 SRC_URI=https://hackage.haskell.org/package/optparse-simple-0.1.1.3/optparse-simple-0.1.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=471811eb305cc9b6c1eeae9367de28de
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
index 308b05affe34..0f94c9b572b9 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.17.0.1
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.17.0.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=7
 HOMEPAGE=https://github.com/jgm/pandoc-citeproc
@@ -10,5 +10,5 @@ RDEPEND=>=app-text/pandoc-2.8:=[profile?] <app-text/pandoc-2.11:=[profile?] >=de
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b1f555b8835992f19da460379cf1ed50
diff --git a/metadata/md5-cache/dev-haskell/pandoc-types-1.20 b/metadata/md5-cache/dev-haskell/pandoc-types-1.20
index cf02f5e9ce25..5a4664ea7190 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-types-1.20
+++ b/metadata/md5-cache/dev-haskell/pandoc-types-1.20
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Types for representing a structured document
 EAPI=7
 HOMEPAGE=https://pandoc.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=96d62af53106755adfcc493b615673ad
diff --git a/metadata/md5-cache/dev-haskell/pango-0.13.8.1 b/metadata/md5-cache/dev-haskell/pango-0.13.8.1
index 502a3daa031f..198748e3fee0 100644
--- a/metadata/md5-cache/dev-haskell/pango-0.13.8.1
+++ b/metadata/md5-cache/dev-haskell/pango-0.13.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/cairo x11-libs/pango >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/cairo x11-libs/pango >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3 >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Binding to the Pango text rendering engine
 EAPI=7
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/cairo x11-libs/pango
 SLOT=0/0.13.8.1
 SRC_URI=https://hackage.haskell.org/package/pango-0.13.8.1/pango-0.13.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d6a605213ced28f546406a4e96c0eaf8
diff --git a/metadata/md5-cache/dev-haskell/pantry-0.4.0.2 b/metadata/md5-cache/dev-haskell/pantry-0.4.0.2
index 557e9ef3417d..cf179c7862b9 100644
--- a/metadata/md5-cache/dev-haskell/pantry-0.4.0.2
+++ b/metadata/md5-cache/dev-haskell/pantry-0.4.0.2
@@ -1,5 +1,5 @@
 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.3:=[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 )
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] >=dev-haskell/cabal-3:=[profile?] <dev-haskell/cabal-3.3:=[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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Content addressable Haskell package management
 EAPI=7
 HOMEPAGE=https://github.com/commercialhaskell/pantry#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] >=de
 RESTRICT=test
 SLOT=0/0.4.0.2
 SRC_URI=https://hackage.haskell.org/package/pantry-0.4.0.2/pantry-0.4.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=035556bc9eee4074b335e7c8c5fb4abc
diff --git a/metadata/md5-cache/dev-haskell/parallel-3.2.2.0 b/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
index 430627393a1b..4d05975bae05 100644
--- a/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
+++ b/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parallel programming library
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/parallel
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f77fccabb463156d82b15a279bc83242
diff --git a/metadata/md5-cache/dev-haskell/parallel-io-0.3.3-r3 b/metadata/md5-cache/dev-haskell/parallel-io-0.3.3-r3
index cda88e18fe64..ba92606c2497 100644
--- a/metadata/md5-cache/dev-haskell/parallel-io-0.3.3-r3
+++ b/metadata/md5-cache/dev-haskell/parallel-io-0.3.3-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>dev-haskell/extensible-exceptions-0.1.0.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=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 )
+DEPEND=>dev-haskell/extensible-exceptions-0.1.0.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Combinators for executing IO actions in parallel on a thread pool
 EAPI=6
 HOMEPAGE=http://batterseapower.github.com/parallel-io
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>dev-haskell/extensible-exceptions-0.1.0.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/parallel-io-0.3.3/parallel-io-0.3.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9599911e263b05de2962fbe774d50b1d
diff --git a/metadata/md5-cache/dev-haskell/parsec-3.1.13.0-r1 b/metadata/md5-cache/dev-haskell/parsec-3.1.13.0-r1
index f3cc974c1af8..51e440602443 100644
--- a/metadata/md5-cache/dev-haskell/parsec-3.1.13.0-r1
+++ b/metadata/md5-cache/dev-haskell/parsec-3.1.13.0-r1
@@ -1,13 +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-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= 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 ) ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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.19:=[profile?] >=dev-haskell/text-0.11.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Monadic parser combinators
 EAPI=7
 HOMEPAGE=https://github.com/hvr/parsec
-IUSE=doc hscolour profile test
+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-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/3.1.13.0
 SRC_URI=https://hackage.haskell.org/package/parsec-3.1.13.0/parsec-3.1.13.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=acadd3555441b6403e169662e3440ee2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=15707c6155b49ffe9bc41ce6992388e1
diff --git a/metadata/md5-cache/dev-haskell/parsec-3.1.14.0 b/metadata/md5-cache/dev-haskell/parsec-3.1.14.0
index a8bd2704c503..5733caf87b96 100644
--- a/metadata/md5-cache/dev-haskell/parsec-3.1.14.0
+++ b/metadata/md5-cache/dev-haskell/parsec-3.1.14.0
@@ -1,5 +1,5 @@
 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 )
+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?] hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Monadic parser combinators
 EAPI=7
 HOMEPAGE=https://github.com/haskell/parsec
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2748c9ce019c69b72d88f9d4e214858f
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=83d90198917e46f76da119878eee18c1
diff --git a/metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0 b/metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0
index c36aaff9dab9..1d337bd9896e 100644
--- a/metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0
+++ b/metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= parsec1? ( dev-haskell/parsec1:=[profile?] ) !parsec1? ( dev-haskell/parsec:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= parsec1? ( dev-haskell/parsec1:=[profile?] ) !parsec1? ( dev-haskell/parsec:=[profile?] ) >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Utilities for parsing numbers from strings
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/parsec-numbers
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= parsec1? ( dev-haskell/parsec1:=[profile?] ) !parsec1? ( dev-haskell/parsec:=[profile?] )
 SLOT=0/0.1.0
 SRC_URI=https://hackage.haskell.org/package/parsec-numbers-0.1.0/parsec-numbers-0.1.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f2919b241f32e518460c826a5fbbb0a
diff --git a/metadata/md5-cache/dev-haskell/parsec1-1.0.0.7 b/metadata/md5-cache/dev-haskell/parsec1-1.0.0.7
index 5c1c39589374..6af836add2bf 100644
--- a/metadata/md5-cache/dev-haskell/parsec1-1.0.0.7
+++ b/metadata/md5-cache/dev-haskell/parsec1-1.0.0.7
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Portable monadic parser combinators
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/parsec1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-8.0.1:=
 SLOT=0/1.0.0.7
 SRC_URI=https://hackage.haskell.org/package/parsec1-1.0.0.7/parsec1-1.0.0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d1ca68b0f1e46d93acd26bb92da12c31
diff --git a/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0 b/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0
index 1b46e3403129..261e0cd1b814 100644
--- a/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0
+++ b/metadata/md5-cache/dev-haskell/parser-combinators-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[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 )
+DEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Lightweight package providing commonly useful parser combinators
 EAPI=6
 HOMEPAGE=https://github.com/mrkkrp/parser-combinators
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/1.0.0
 SRC_URI=https://hackage.haskell.org/package/parser-combinators-1.0.0/parser-combinators-1.0.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb534863bdaad3b53a6563b56f174cc6
diff --git a/metadata/md5-cache/dev-haskell/parsers-0.12.10 b/metadata/md5-cache/dev-haskell/parsers-0.12.10
index b7da36d00922..27872ccb6719 100644
--- a/metadata/md5-cache/dev-haskell/parsers-0.12.10
+++ b/metadata/md5-cache/dev-haskell/parsers-0.12.10
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parsing combinators
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/parsers/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7325cd397b9fea9285eda2aa7fb05a13
diff --git a/metadata/md5-cache/dev-haskell/path-0.7.0 b/metadata/md5-cache/dev-haskell/path-0.7.0
index 24d162fd4c43..d19850fd5f5f 100644
--- a/metadata/md5-cache/dev-haskell/path-0.7.0
+++ b/metadata/md5-cache/dev-haskell/path-0.7.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Support for well-typed paths
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/path
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=354970f70e5aa8c5a35b60ed99721367
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
index 0886dc3367cd..89b8f85b8b50 100644
--- a/metadata/md5-cache/dev-haskell/path-io-1.6.0-r1
+++ b/metadata/md5-cache/dev-haskell/path-io-1.6.0-r1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Interface to 'directory' package for users of 'path'
 EAPI=7
 HOMEPAGE=https://github.com/mrkkrp/path-io
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=88cb3413d7f49d0ec6c551e276068d62
diff --git a/metadata/md5-cache/dev-haskell/path-pieces-0.2.1 b/metadata/md5-cache/dev-haskell/path-pieces-0.2.1
index 8ca1be1d871a..f31a01c0a62d 100644
--- a/metadata/md5-cache/dev-haskell/path-pieces-0.2.1
+++ b/metadata/md5-cache/dev-haskell/path-pieces-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-0.5:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/text-0.5:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Components of paths
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/path-pieces
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-0.5:=[profile?] >=dev-lang/ghc-7.6.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1
 SRC_URI=https://hackage.haskell.org/package/path-pieces-0.2.1/path-pieces-0.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cf1dec02c461cf3704d83a313070991e
diff --git a/metadata/md5-cache/dev-haskell/patience-0.1.1-r1 b/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
index 456d46f4bdb4..1a3b2d70564a 100644
--- a/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Patience diff and longest increasing subsequence
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/patience
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cdc3b78334ca531edc23f09f2751bf5e
diff --git a/metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1 b/metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1
index 7f03edf5a5bc..76de5a864fbd 100644
--- a/metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1
+++ b/metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.12.1:= net-libs/libpcap >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.12.1:= net-libs/libpcap >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A system-independent interface for user-level packet capture
 EAPI=7
 HOMEPAGE=https://github.com/bos/pcap
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.12.1:= net-libs/libpcap
 SLOT=0/0.4.5.2
 SRC_URI=https://hackage.haskell.org/package/pcap-0.4.5.2/pcap-0.4.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f492e47481f7a588b38a664ab78a7e2
diff --git a/metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0 b/metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0
index ae527295dc2a..4937e58d355a 100644
--- a/metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0
+++ b/metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= dev-libs/libpcre >=dev-haskell/cabal-1.8.0 virtual/pkgconfig test? ( >=dev-haskell/hunit-1.2.5.2 >=dev-haskell/mtl-2.1.3.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= dev-libs/libpcre >=dev-haskell/cabal-1.8.0 virtual/pkgconfig test? ( >=dev-haskell/hunit-1.2.5.2 >=dev-haskell/mtl-2.1.3.2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Portable regex library for Perl 5 compatible regular expressions
 EAPI=7
 HOMEPAGE=https://github.com/Daniel-Diaz/pcre-light
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:= dev-libs/libpcre
 RESTRICT=!test? ( test )
 SLOT=0/0.4.1.0
 SRC_URI=https://hackage.haskell.org/package/pcre-light-0.4.1.0/pcre-light-0.4.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=62fc80da6ef7420e5f8c0b01391f34aa
diff --git a/metadata/md5-cache/dev-haskell/pem-0.2.4 b/metadata/md5-cache/dev-haskell/pem-0.2.4
index 922e8a0e4315..2b0689598ea8 100644
--- a/metadata/md5-cache/dev-haskell/pem-0.2.4
+++ b/metadata/md5-cache/dev-haskell/pem-0.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/basement:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/basement:=[profile?] dev-haskell/memory:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit >=dev-haskell/quickcheck-2.4.0.1 >=dev-haskell/test-framework-0.3.3 dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Privacy Enhanced Mail (PEM) format reader and writer
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-pem
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/basement:=[profile?] dev-haskell/memory:=[profile?] >=dev-la
 RESTRICT=!test? ( test )
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/pem-0.2.4/pem-0.2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f29718818e07c9e4f15bd495f84a9177
diff --git a/metadata/md5-cache/dev-haskell/persistent-2.10.5.2 b/metadata/md5-cache/dev-haskell/persistent-2.10.5.2
index 2ab016a6bf62..ade5258bf892 100644
--- a/metadata/md5-cache/dev-haskell/persistent-2.10.5.2
+++ b/metadata/md5-cache/dev-haskell/persistent-2.10.5.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Type-safe, multi-backend data serialization
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/persistent
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/attoparsec:=[profile?] d
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7797fbf08791a54ab355b43be4bd8948
diff --git a/metadata/md5-cache/dev-haskell/persistent-mysql-2.10.2.3 b/metadata/md5-cache/dev-haskell/persistent-mysql-2.10.2.3
index eff5b48c889b..ab4fdcfe5cfc 100644
--- a/metadata/md5-cache/dev-haskell/persistent-mysql-2.10.2.3
+++ b/metadata/md5-cache/dev-haskell/persistent-mysql-2.10.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] dev-haskell/monad-logger:=[profile?] >=dev-haskell/mysql-0.1.4:=[profile?] <dev-haskell/mysql-0.2:=[profile?] >=dev-haskell/mysql-simple-0.4.4:=[profile?] <dev-haskell/mysql-simple-0.5:=[profile?] >=dev-haskell/persistent-2.10.0:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/fast-logger >=dev-haskell/hspec-2.4 dev-haskell/hunit dev-haskell/persistent-qq dev-haskell/persistent-template dev-haskell/persistent-test dev-haskell/quickcheck dev-haskell/quickcheck-instances ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] dev-haskell/monad-logger:=[profile?] >=dev-haskell/mysql-0.1.4:=[profile?] <dev-haskell/mysql-0.2:=[profile?] >=dev-haskell/mysql-simple-0.4.4:=[profile?] <dev-haskell/mysql-simple-0.5:=[profile?] >=dev-haskell/persistent-2.10.0:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/fast-logger >=dev-haskell/hspec-2.4 dev-haskell/hunit dev-haskell/persistent-qq dev-haskell/persistent-template dev-haskell/persistent-test dev-haskell/quickcheck dev-haskell/quickcheck-instances ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Backend for the persistent library using MySQL database server
 EAPI=7
 HOMEPAGE=http://www.yesodweb.com/book/persistent
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/blaze-builder:=[profile?
 RESTRICT=test
 SLOT=0/2.10.2.3
 SRC_URI=https://hackage.haskell.org/package/persistent-mysql-2.10.2.3/persistent-mysql-2.10.2.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=88b2ef4216ecee13d660203e0eb0caf3
diff --git a/metadata/md5-cache/dev-haskell/persistent-postgresql-2.10.1.2 b/metadata/md5-cache/dev-haskell/persistent-postgresql-2.10.1.2
index 34076766eccc..aaa3463788aa 100644
--- a/metadata/md5-cache/dev-haskell/persistent-postgresql-2.10.1.2
+++ b/metadata/md5-cache/dev-haskell/persistent-postgresql-2.10.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?] >=dev-haskell/postgresql-libpq-0.9.4.2:=[profile?] <dev-haskell/postgresql-libpq-0.10:=[profile?] >=dev-haskell/postgresql-simple-0.6.1:=[profile?] <dev-haskell/postgresql-simple-0.7:=[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-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/fast-logger >=dev-haskell/hspec-2.4 dev-haskell/hspec-expectations dev-haskell/hunit dev-haskell/persistent-qq dev-haskell/persistent-template dev-haskell/persistent-test dev-haskell/quickcheck dev-haskell/quickcheck-instances dev-haskell/unordered-containers dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?] >=dev-haskell/postgresql-libpq-0.9.4.2:=[profile?] <dev-haskell/postgresql-libpq-0.10:=[profile?] >=dev-haskell/postgresql-simple-0.6.1:=[profile?] <dev-haskell/postgresql-simple-0.7:=[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-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/fast-logger >=dev-haskell/hspec-2.4 dev-haskell/hspec-expectations dev-haskell/hunit dev-haskell/persistent-qq dev-haskell/persistent-template dev-haskell/persistent-test dev-haskell/quickcheck dev-haskell/quickcheck-instances dev-haskell/unordered-containers dev-haskell/vector ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Backend for the persistent library using postgresql
 EAPI=7
 HOMEPAGE=http://www.yesodweb.com/book/persistent
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/blaze-builder:=[profile?
 RESTRICT=test
 SLOT=0/2.10.1.2
 SRC_URI=https://hackage.haskell.org/package/persistent-postgresql-2.10.1.2/persistent-postgresql-2.10.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4cda1e1bd66deb8132bcee35e78032ae
diff --git a/metadata/md5-cache/dev-haskell/persistent-qq-2.9.2 b/metadata/md5-cache/dev-haskell/persistent-qq-2.9.2
index 81686f9ec922..f83d9f34079f 100644
--- a/metadata/md5-cache/dev-haskell/persistent-qq-2.9.2
+++ b/metadata/md5-cache/dev-haskell/persistent-qq-2.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/haskell-src-meta:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/persistent-2.10:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/aeson dev-haskell/fast-logger dev-haskell/hspec dev-haskell/hunit dev-haskell/monad-logger dev-haskell/persistent-sqlite dev-haskell/persistent-template dev-haskell/resourcet dev-haskell/unliftio ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/haskell-src-meta:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/persistent-2.10:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/aeson dev-haskell/fast-logger dev-haskell/hspec dev-haskell/hunit dev-haskell/monad-logger dev-haskell/persistent-sqlite dev-haskell/persistent-template dev-haskell/resourcet dev-haskell/unliftio ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Provides a quasi-quoter for raw SQL for persistent
 EAPI=7
 HOMEPAGE=https://github.com/yesodweb/persistent#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/haskell-src-meta:=[profile?] dev-haskell/mtl:=[profile?] >=d
 RESTRICT=test
 SLOT=0/2.9.2
 SRC_URI=https://hackage.haskell.org/package/persistent-qq-2.9.2/persistent-qq-2.9.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e1281a35838e9a7b0518858ea31c00bc
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
index 35c2e9807843..4237f1219c6a 100644
--- a/metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2
+++ b/metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Backend for the persistent library using sqlite3
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/persistent
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/conduit-1.2.12:=[profi
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d4ce2d5dc9ed7ff598fe4189b943807
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
index 8527c5d12d59..cf620dee2f22 100644
--- a/metadata/md5-cache/dev-haskell/persistent-template-2.8.2.3
+++ b/metadata/md5-cache/dev-haskell/persistent-template-2.8.2.3
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Type-safe, non-relational, multi-backend persistence
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/persistent
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2498cb36050b3cefbca0671617807e4d
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
index 35c709d59099..93460a93388b 100644
--- a/metadata/md5-cache/dev-haskell/persistent-test-2.0.3.0
+++ b/metadata/md5-cache/dev-haskell/persistent-test-2.0.3.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Tests for Persistent
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/persistent
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=19943ee71cb2e5c0acab3a7c2347cb1d
diff --git a/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3 b/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3
index 8295086738ae..8899b191adb8 100644
--- a/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3
+++ b/metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-haskell/vector-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/doctest-0.10 dev-haskell/hunit >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-haskell/vector-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/doctest-0.10 dev-haskell/hunit >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Translate between binary data and a human-readable collection of words
 EAPI=7
 HOMEPAGE=https://github.com/quchen/pgp-wordlist
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-haskell/vector-0.5:=[profile?]
 RESTRICT=test
 SLOT=0/0.1.0.3
 SRC_URI=https://hackage.haskell.org/package/pgp-wordlist-0.1.0.3/pgp-wordlist-0.1.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c5fa231810c22735aa6cade8bd04adc6
diff --git a/metadata/md5-cache/dev-haskell/pid1-0.1.2.0 b/metadata/md5-cache/dev-haskell/pid1-0.1.2.0
index 322a87d09c7f..b4e641a72486 100644
--- a/metadata/md5-cache/dev-haskell/pid1-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/pid1-0.1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Do signal handling and orphan reaping for Unix PID1 init processes
 EAPI=6
 HOMEPAGE=https://github.com/fpco/pid1#readme
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/pid1-0.1.2.0/pid1-0.1.2.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=278fdd47301ce270ac262a241e20ee6b
diff --git a/metadata/md5-cache/dev-haskell/pipes-4.3.14 b/metadata/md5-cache/dev-haskell/pipes-4.3.14
index 75a2e4e3e893..5f086f90b1f3 100644
--- a/metadata/md5-cache/dev-haskell/pipes-4.3.14
+++ b/metadata/md5-cache/dev-haskell/pipes-4.3.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mmorph-1.0.4:=[profile?] <dev-haskell/mmorph-1.2:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-1 >=dev-haskell/test-framework-quickcheck2-0.2.0 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mmorph-1.0.4:=[profile?] <dev-haskell/mmorph-1.2:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-1 >=dev-haskell/test-framework-quickcheck2-0.2.0 <dev-haskell/test-framework-quickcheck2-0.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Compositional pipelines
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/pipes
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[
 RESTRICT=!test? ( test )
 SLOT=0/4.3.14
 SRC_URI=https://hackage.haskell.org/package/pipes-4.3.14/pipes-4.3.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c249236618da15d0872e84a514d593eb
diff --git a/metadata/md5-cache/dev-haskell/pointed-5.0.1-r1 b/metadata/md5-cache/dev-haskell/pointed-5.0.1-r1
index aa2f9199d1b8..e50ddef5ef14 100644
--- a/metadata/md5-cache/dev-haskell/pointed-5.0.1-r1
+++ b/metadata/md5-cache/dev-haskell/pointed-5.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] ) kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] ) semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] ) semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) transformers? ( >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] ) kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] ) semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] ) semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) transformers? ( >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Pointed and copointed data
 EAPI=6
 HOMEPAGE=https://github.com/ekmett/pointed/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] ) kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] ) semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] ) semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) transformers? ( >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
 SLOT=0/5.0.1
 SRC_URI=https://hackage.haskell.org/package/pointed-5.0.1/pointed-5.0.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27564fd4c9d6bcddde16778dbfd2539f
diff --git a/metadata/md5-cache/dev-haskell/polyparse-1.13 b/metadata/md5-cache/dev-haskell/polyparse-1.13
index f46b9f821eb4..3da48cba6a5b 100644
--- a/metadata/md5-cache/dev-haskell/polyparse-1.13
+++ b/metadata/md5-cache/dev-haskell/polyparse-1.13
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A variety of alternative parser combinator libraries
 EAPI=7
 HOMEPAGE=http://code.haskell.org/~malcolm/polyparse/
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0ff24bceb35f5647c9dba9f40c7e1981
diff --git a/metadata/md5-cache/dev-haskell/postgresql-libpq-0.9.4.2-r2 b/metadata/md5-cache/dev-haskell/postgresql-libpq-0.9.4.2-r2
index db844d2b7909..5793a36d89b4 100644
--- a/metadata/md5-cache/dev-haskell/postgresql-libpq-0.9.4.2-r2
+++ b/metadata/md5-cache/dev-haskell/postgresql-libpq-0.9.4.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-db/postgresql-7:* >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 <dev-haskell/cabal-3.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-db/postgresql-7:* >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 <dev-haskell/cabal-3.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=low-level binding to libpq
 EAPI=7
 HOMEPAGE=https://github.com/phadej/postgresql-libpq
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/postgresql-7:* >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.4.2
 SRC_URI=https://hackage.haskell.org/package/postgresql-libpq-0.9.4.2/postgresql-libpq-0.9.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e51612177b92fcd66fd1d6a87c40efe7
diff --git a/metadata/md5-cache/dev-haskell/postgresql-simple-0.6.2 b/metadata/md5-cache/dev-haskell/postgresql-simple-0.6.2
index 5ac5815372bd..569d9757677e 100644
--- a/metadata/md5-cache/dev-haskell/postgresql-simple-0.6.2
+++ b/metadata/md5-cache/dev-haskell/postgresql-simple-0.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10.8.1.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.2.0.11:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?] >=dev-haskell/postgresql-libpq-0.9.4.2:=[profile?] <dev-haskell/postgresql-libpq-0.10:=[profile?] >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.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-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/base16-bytestring >=dev-haskell/cryptohash-md5-0.11.100.1 <dev-haskell/cryptohash-md5-0.12 dev-haskell/hunit >=dev-haskell/inspection-testing-0.4.1.1 <dev-haskell/inspection-testing-0.5 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 )
+DEPEND=>=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10.8.1.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.2.0.11:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] >=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?] >=dev-haskell/postgresql-libpq-0.9.4.2:=[profile?] <dev-haskell/postgresql-libpq-0.10:=[profile?] >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.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-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/base16-bytestring >=dev-haskell/cryptohash-md5-0.11.100.1 <dev-haskell/cryptohash-md5-0.12 dev-haskell/hunit >=dev-haskell/inspection-testing-0.4.1.1 <dev-haskell/inspection-testing-0.5 dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Mid-Level PostgreSQL client library
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/postgresql-simple
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile
 RESTRICT=test
 SLOT=0/0.6.2
 SRC_URI=https://hackage.haskell.org/package/postgresql-simple-0.6.2/postgresql-simple-0.6.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ab46b561627a914370a8984551d4c592
diff --git a/metadata/md5-cache/dev-haskell/pqueue-1.4.1.3 b/metadata/md5-cache/dev-haskell/pqueue-1.4.1.3
index e3e027d386f6..832616b7cdab 100644
--- a/metadata/md5-cache/dev-haskell/pqueue-1.4.1.3
+++ b/metadata/md5-cache/dev-haskell/pqueue-1.4.1.3
@@ -1,5 +1,5 @@
 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/quickcheck-2.5 <dev-haskell/quickcheck-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Reliable, persistent, fast priority queues
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/pqueue
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.10.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.4.1.3
 SRC_URI=https://hackage.haskell.org/package/pqueue-1.4.1.3/pqueue-1.4.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3e2d28211a9f19d030b2ca63f8429ca6
diff --git a/metadata/md5-cache/dev-haskell/prelude-extras-0.4.0.3 b/metadata/md5-cache/dev-haskell/prelude-extras-0.4.0.3
index a01178de9f69..c92881d59825 100644
--- a/metadata/md5-cache/dev-haskell/prelude-extras-0.4.0.3
+++ b/metadata/md5-cache/dev-haskell/prelude-extras-0.4.0.3
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Higher order versions of Prelude classes
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/prelude-extras
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.0.3
 SRC_URI=https://hackage.haskell.org/package/prelude-extras-0.4.0.3/prelude-extras-0.4.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1c6f0c0565b623fa036b076744e718c6
diff --git a/metadata/md5-cache/dev-haskell/preprocessor-tools-2.0.2 b/metadata/md5-cache/dev-haskell/preprocessor-tools-2.0.2
index ee36bae03a97..5119780404d2 100644
--- a/metadata/md5-cache/dev-haskell/preprocessor-tools-2.0.2
+++ b/metadata/md5-cache/dev-haskell/preprocessor-tools-2.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[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 )
+DEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A framework for extending Haskell's syntax via quick-and-dirty preprocessors
 EAPI=7
 HOMEPAGE=https://github.com/tov/preprocessor-tools-hs
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[profile?] >=dev-lang/ghc-8.4.3:=
 SLOT=0/2.0.2
 SRC_URI=https://hackage.haskell.org/package/preprocessor-tools-2.0.2/preprocessor-tools-2.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ef4b9369b6b4def8e4240efd927090b0
diff --git a/metadata/md5-cache/dev-haskell/pretty-hex-1.0 b/metadata/md5-cache/dev-haskell/pretty-hex-1.0
index 81de3f28a61b..2689fece1d6d 100644
--- a/metadata/md5-cache/dev-haskell/pretty-hex-1.0
+++ b/metadata/md5-cache/dev-haskell/pretty-hex-1.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.6 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.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library for hex dumps of ByteStrings
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/pretty-hex
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0
 SRC_URI=https://hackage.haskell.org/package/pretty-hex-1.0/pretty-hex-1.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b48230b41d70d63bf88d0843d11a9b4
diff --git a/metadata/md5-cache/dev-haskell/pretty-show-1.9.5 b/metadata/md5-cache/dev-haskell/pretty-show-1.9.5
index c98b331e7dee..2f59f439c1f9 100644
--- a/metadata/md5-cache/dev-haskell/pretty-show-1.9.5
+++ b/metadata/md5-cache/dev-haskell/pretty-show-1.9.5
@@ -1,5 +1,5 @@
 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 )
+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 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
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6d054d740d1eb68eabdca5e6eb598cd2
diff --git a/metadata/md5-cache/dev-haskell/prettyclass-1.0.0.0 b/metadata/md5-cache/dev-haskell/prettyclass-1.0.0.0
index 4b0e72590443..43ed8b5388aa 100644
--- a/metadata/md5-cache/dev-haskell/prettyclass-1.0.0.0
+++ b/metadata/md5-cache/dev-haskell/prettyclass-1.0.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.0 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.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Pretty printing class similar to Show
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/prettyclass
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.0.0
 SRC_URI=https://hackage.haskell.org/package/prettyclass-1.0.0.0/prettyclass-1.0.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b395d414bfe6ac94f6791a68a88d3247
diff --git a/metadata/md5-cache/dev-haskell/prettyprinter-1.6.1 b/metadata/md5-cache/dev-haskell/prettyprinter-1.6.1
index a07279aeb49c..d1170bbd0da9 100644
--- a/metadata/md5-cache/dev-haskell/prettyprinter-1.6.1
+++ b/metadata/md5-cache/dev-haskell/prettyprinter-1.6.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A modern, easy to use, well-documented, extensible pretty-printer
 EAPI=7
 HOMEPAGE=https://github.com/quchen/prettyprinter
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index ace5a2dc2db0..f712c7087a8a 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=ANSI terminal backend for the "prettyprinter" package
 EAPI=6
 HOMEPAGE=https://github.com/quchen/prettyprinter
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/prettyprinte
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 56bdc2db7612..473ee418de61 100644
--- a/metadata/md5-cache/dev-haskell/primitive-0.7.1.0
+++ b/metadata/md5-cache/dev-haskell/primitive-0.7.1.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Primitive memory-related operations
 EAPI=7
 HOMEPAGE=https://github.com/haskell/primitive
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc642888864976841f04595007591981
diff --git a/metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2 b/metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2
index 2632207474d8..378758d7c43f 100644
--- a/metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2
+++ b/metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-lang/ghc-7.4.2:= >=dev-haskell/cabal-2.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-lang/ghc-7.4.2:= >=dev-haskell/cabal-2.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Addresses to unmanaged memory
 EAPI=7
 HOMEPAGE=https://github.com/andrewthad/primitive-addr
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-lang/ghc-7.4.2:=
 SLOT=0/0.1.0.2
 SRC_URI=https://hackage.haskell.org/package/primitive-addr-0.1.0.2/primitive-addr-0.1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7a1ef1163e35dd1e69617ee85d8fda3
diff --git a/metadata/md5-cache/dev-haskell/process-extras-0.7.4 b/metadata/md5-cache/dev-haskell/process-extras-0.7.4
index e08974966447..ddb66df788f2 100644
--- a/metadata/md5-cache/dev-haskell/process-extras-0.7.4
+++ b/metadata/md5-cache/dev-haskell/process-extras-0.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/data-default:=[profile?] >=dev-haskell/generic-deriving-1.10:=[profile?] >=dev-haskell/listlike-4.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/data-default:=[profile?] >=dev-haskell/generic-deriving-1.10:=[profile?] >=dev-haskell/listlike-4.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Process extras
 EAPI=6
 HOMEPAGE=https://github.com/seereason/process-extras
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/data-default:=[profile?] >=dev-haskell/generic-deriving-1.10
 RESTRICT=!test? ( test )
 SLOT=0/0.7.4
 SRC_URI=https://hackage.haskell.org/package/process-extras-0.7.4/process-extras-0.7.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0f347b2654a977e706c1ccabc9d79edc
diff --git a/metadata/md5-cache/dev-haskell/profunctor-extras-4.0 b/metadata/md5-cache/dev-haskell/profunctor-extras-4.0
index 18fe1e0447e1..18b4e4df6cf9 100644
--- a/metadata/md5-cache/dev-haskell/profunctor-extras-4.0
+++ b/metadata/md5-cache/dev-haskell/profunctor-extras-4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/profunctors-4:=[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 )
+DEPEND=>=dev-haskell/profunctors-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=This package has been absorbed into profunctors 4.0
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/profunctor-extras/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/profunctors-4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/4.0
 SRC_URI=https://hackage.haskell.org/package/profunctor-extras-4.0/profunctor-extras-4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee4adc76c09f40d5b6ce83bc67ae2b41
diff --git a/metadata/md5-cache/dev-haskell/profunctors-5.5.1 b/metadata/md5-cache/dev-haskell/profunctors-5.5.1
index 12eaa7031e85..b377397a9d42 100644
--- a/metadata/md5-cache/dev-haskell/profunctors-5.5.1
+++ b/metadata/md5-cache/dev-haskell/profunctors-5.5.1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell98 profunctors package
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/profunctors/
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index aba375afd31a..d864f03c3d64 100644
--- a/metadata/md5-cache/dev-haskell/project-template-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/project-template-0.2.0.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Specify Haskell project templates and generate files
 EAPI=6
 HOMEPAGE=https://github.com/fpco/haskell-ide
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/conduit-1.2.8:=[
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=00d934e6a814595b7e5e5ef0846fade6
diff --git a/metadata/md5-cache/dev-haskell/psqueue-1.1.0.1 b/metadata/md5-cache/dev-haskell/psqueue-1.1.0.1
index 7f251df6d931..c1a04121b33f 100644
--- a/metadata/md5-cache/dev-haskell/psqueue-1.1.0.1
+++ b/metadata/md5-cache/dev-haskell/psqueue-1.1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-2.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Priority Search Queue
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/PSQueue
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.1
 SRC_URI=https://hackage.haskell.org/package/PSQueue-1.1.0.1/PSQueue-1.1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=89c339921429eaeea3f8db526e55b8b5
diff --git a/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2 b/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
index 0d05ffc8b0af..58cf10d6549b 100644
--- a/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
+++ b/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Pure priority search queues
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/psqueues
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[p
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=24cca263868c4c7e48226f832b796846
diff --git a/metadata/md5-cache/dev-haskell/publicsuffixlist-0.1 b/metadata/md5-cache/dev-haskell/publicsuffixlist-0.1
index 2b4d71a7c110..5d8f42dc8deb 100644
--- a/metadata/md5-cache/dev-haskell/publicsuffixlist-0.1
+++ b/metadata/md5-cache/dev-haskell/publicsuffixlist-0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/cereal:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= create? ( >=dev-haskell/conduit-1.0.0:=[profile?] <dev-haskell/conduit-2.0.0:=[profile?] >=dev-haskell/idna-0.1.2:=[profile?] <dev-haskell/idna-1.0:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit !create? ( >=dev-haskell/idna-0.1.1 <dev-haskell/idna-1.0 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/cereal:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= create? ( >=dev-haskell/conduit-1.0.0:=[profile?] <dev-haskell/conduit-2.0.0:=[profile?] >=dev-haskell/idna-0.1.2:=[profile?] <dev-haskell/idna-1.0:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit !create? ( >=dev-haskell/idna-0.1.1 <dev-haskell/idna-1.0 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Is a given string a domain suffix?
 EAPI=7
 HOMEPAGE=https://github.com/litherum/publicsuffixlist
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/data-default:=[profile?] >=de
 RESTRICT=!test? ( test )
 SLOT=0/0.1
 SRC_URI=https://hackage.haskell.org/package/publicsuffixlist-0.1/publicsuffixlist-0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=184029ef4bd6257770f36f6e12def938
diff --git a/metadata/md5-cache/dev-haskell/punycode-2.0 b/metadata/md5-cache/dev-haskell/punycode-2.0
index 941a0484743f..3a449b717f53 100644
--- a/metadata/md5-cache/dev-haskell/punycode-2.0
+++ b/metadata/md5-cache/dev-haskell/punycode-2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/encoding dev-haskell/hunit dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/encoding dev-haskell/hunit dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Encode unicode strings to ascii forms according to RFC 3492
 EAPI=7
 HOMEPAGE=https://github.com/litherum/punycode
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/t
 RESTRICT=test
 SLOT=0/2.0
 SRC_URI=https://hackage.haskell.org/package/punycode-2.0/punycode-2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c9f6ed120b49920248cfee91bcf19513
diff --git a/metadata/md5-cache/dev-haskell/puremd5-2.1.3 b/metadata/md5-cache/dev-haskell/puremd5-2.1.3
index 39ddda8e0be4..07ab962b6423 100644
--- a/metadata/md5-cache/dev-haskell/puremd5-2.1.3
+++ b/metadata/md5-cache/dev-haskell/puremd5-2.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/binary-0.4.0:=[profile?] >=dev-haskell/cereal-0.2:=[profile?] dev-haskell/crypto-api:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/crypto-api-tests dev-haskell/pretty-hex dev-haskell/quickcheck >=dev-haskell/test-framework-0.8 dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/binary-0.4.0:=[profile?] >=dev-haskell/cereal-0.2:=[profile?] dev-haskell/crypto-api:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/crypto-api-tests dev-haskell/pretty-hex dev-haskell/quickcheck >=dev-haskell/test-framework-0.8 dev-haskell/test-framework-quickcheck2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Haskell-only implementation of the MD5 digest (hash) algorithm
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/pureMD5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/binary-0.4.0:=[profile?] >=dev-haskell/cereal-0.2:=[profil
 RESTRICT=!test? ( test )
 SLOT=0/2.1.3
 SRC_URI=https://hackage.haskell.org/package/pureMD5-2.1.3/pureMD5-2.1.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f394147e09086d42e029db6ae5e62c2f
diff --git a/metadata/md5-cache/dev-haskell/pwstore-fast-2.4.4 b/metadata/md5-cache/dev-haskell/pwstore-fast-2.4.4
index 79a0bde362a6..4dd1431b817d 100644
--- a/metadata/md5-cache/dev-haskell/pwstore-fast-2.4.4
+++ b/metadata/md5-cache/dev-haskell/pwstore-fast-2.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] >=dev-haskell/random-1:=[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 )
+DEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Secure password storage
 EAPI=7
 HOMEPAGE=https://github.com/PeterScott/pwstore
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.4.4
 SRC_URI=https://hackage.haskell.org/package/pwstore-fast-2.4.4/pwstore-fast-2.4.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8e04ab2069d6c494104bf41c7c6f86f1
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.13.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.13.2
index f96cffb2a589..b0f903eb97a7 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.13.2
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.13.2
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Automatic testing of Haskell programs
 EAPI=7
 HOMEPAGE=https://github.com/nick8325/quickcheck
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/random-1.0.1.0:=[profile?] <dev-haskell/random-1.2:=[profi
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d55758f6bd509697ce0bfe6a7f19c50
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.6 b/metadata/md5-cache/dev-haskell/quickcheck-2.6
index caf0d45892ad..1d36d8327e0d 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.6
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Automatic testing of Haskell programs
 EAPI=7
 HOMEPAGE=https://github.com/nick8325/quickcheck
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=2/2.6
 SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.6/QuickCheck-2.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=19018f35818b7af2a26e12d116611222
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.7.6 b/metadata/md5-cache/dev-haskell/quickcheck-2.7.6
index 887a08e012ff..e3cd64e56802 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.7.6
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.7.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Automatic testing of Haskell programs
 EAPI=7
 HOMEPAGE=https://github.com/nick8325/quickcheck
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=2/2.7.6
 SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.7.6/QuickCheck-2.7.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aad3071c4502049ae113026b1713aaa0
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.8.1 b/metadata/md5-cache/dev-haskell/quickcheck-2.8.1
index d743842df7dc..321b58111bf5 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.8.1
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Automatic testing of Haskell programs
 EAPI=7
 HOMEPAGE=https://github.com/nick8325/quickcheck
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=2/2.8.1
 SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.8.1/QuickCheck-2.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=56390ee6196d3b087a8df5682ff6cd5d
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.8.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.8.2
index 6a060f821b40..3c644d431c41 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.8.2
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Automatic testing of Haskell programs
 EAPI=7
 HOMEPAGE=https://github.com/nick8325/quickcheck
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >
 RESTRICT=test
 SLOT=2/2.8.2
 SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.8.2/QuickCheck-2.8.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ecdb6baa11b362747cc95c5187f6d448
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.9.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.9.2
index 8368225350e1..8224aac059da 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.9.2
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/nats-1:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( template-haskell? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/nats-1:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( template-haskell? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Automatic testing of Haskell programs
 EAPI=6
 HOMEPAGE=https://github.com/nick8325/quickcheck
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/nats-1:=[profile?] dev-haskell/random:=[profile?] >=dev-ha
 RESTRICT=test
 SLOT=2/2.9.2
 SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.9.2/QuickCheck-2.9.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bedcaa2ea1374297ec2e2fb412c9c325
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0 b/metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0
index 609cc9077551..d51bf3a4532c 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/base-orphans-0.1:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/contravariant:=[profile?] dev-haskell/fail:=[profile?] >=dev-haskell/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/primitive-addr-0.1.0.2:=[profile?] <dev-haskell/primitive-addr-0.2:=[profile?] >=dev-haskell/quickcheck-classes-base-0.6:=[profile?] <dev-haskell/quickcheck-classes-base-0.7:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-8.0.1:= aeson? ( >=dev-haskell/aeson-0.9:=[profile?] ) binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) semigroupoids? ( dev-haskell/semigroupoids:=[profile?] ) semirings? ( >=dev-haskell/semirings-0.4.2:=[profile?] ) unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) ) vector? ( >=dev-haskell/vector-0.12:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/base-orphans-0.5 dev-haskell/tasty dev-haskell/tasty-quickcheck !vector? ( dev-haskell/vector ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/base-orphans-0.1:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/contravariant:=[profile?] dev-haskell/fail:=[profile?] >=dev-haskell/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/primitive-addr-0.1.0.2:=[profile?] <dev-haskell/primitive-addr-0.2:=[profile?] >=dev-haskell/quickcheck-classes-base-0.6:=[profile?] <dev-haskell/quickcheck-classes-base-0.7:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-8.0.1:= aeson? ( >=dev-haskell/aeson-0.9:=[profile?] ) binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) semigroupoids? ( dev-haskell/semigroupoids:=[profile?] ) semirings? ( >=dev-haskell/semirings-0.4.2:=[profile?] ) unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) ) vector? ( >=dev-haskell/vector-0.12:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/base-orphans-0.5 dev-haskell/tasty dev-haskell/tasty-quickcheck !vector? ( dev-haskell/vector ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=QuickCheck common typeclasses
 EAPI=7
 HOMEPAGE=https://github.com/andrewthad/quickcheck-classes#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.1:=[profile?] dev-haskell/bifunctors:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/0.6.4.0
 SRC_URI=https://hackage.haskell.org/package/quickcheck-classes-0.6.4.0/quickcheck-classes-0.6.4.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c2487f891c3f967d9c6c7ccdf0d5d388
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.0.0 b/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.0.0
index d7661191a9e5..dbe8c057cb09 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.0.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/base-orphans-0.1:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/contravariant:=[profile?] dev-haskell/fail:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-8.0.1:= binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) ) >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/base-orphans-0.1:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/contravariant:=[profile?] dev-haskell/fail:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-8.0.1:= binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) ) >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=QuickCheck common typeclasses from 'base'
 EAPI=7
 HOMEPAGE=https://github.com/andrewthad/quickcheck-classes#readme
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/base-orphans-0.1:=[profile?] dev-haskell/bifunctors:=[profile?] dev-haskell/contravariant:=[profile?] dev-haskell/fail:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-8.0.1:= binary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) unary-laws? ( >=dev-haskell/quickcheck-2.10.0:2=[profile?] ) !unary-laws? ( !binary-laws? ( >=dev-haskell/quickcheck-2.7:2=[profile?] ) )
 SLOT=0/0.6.0.0
 SRC_URI=https://hackage.haskell.org/package/quickcheck-classes-base-0.6.0.0/quickcheck-classes-base-0.6.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=257a35eb8df34a3e382b949343d841f2
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22 b/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22
index e0b0808c5b27..aca4d40fca93 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22
+++ b/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Common quickcheck instances
 EAPI=7
 HOMEPAGE=https://github.com/phadej/qc-instances
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-compat-0.9.3:=[profile?] >=dev-haskell/case-insensiti
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 8f55fff44f48..513743d1a158 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Use HUnit assertions as QuickCheck properties
 EAPI=6
 HOMEPAGE=https://github.com/hspec/quickcheck-io#readme
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fa064b825f519219e8f2c782b585cb77
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-unicode-1.0.1.0 b/metadata/md5-cache/dev-haskell/quickcheck-unicode-1.0.1.0
index d97ccea90061..cfc8f94fdd3b 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-unicode-1.0.1.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-unicode-1.0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/quickcheck-2.7:2=[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 )
+DEPEND=>=dev-haskell/quickcheck-2.7:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generator and shrink functions for testing Unicode-related software
 EAPI=6
 HOMEPAGE=https://github.com/bos/quickcheck-unicode
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-haskell/quickcheck-2.7:2=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.1.0
 SRC_URI=https://hackage.haskell.org/package/quickcheck-unicode-1.0.1.0/quickcheck-unicode-1.0.1.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=adcab9810c2e08ea65c711070f554cb4
diff --git a/metadata/md5-cache/dev-haskell/random-1.1 b/metadata/md5-cache/dev-haskell/random-1.1
index a378ad1f2064..da4262e92679 100644
--- a/metadata/md5-cache/dev-haskell/random-1.1
+++ b/metadata/md5-cache/dev-haskell/random-1.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=random number library
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/random
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=https://hackage.haskell.org/package/random-1.1/random-1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=965e6934abcf5b040d2e654b47b21896
diff --git a/metadata/md5-cache/dev-haskell/ranges-0.2.4-r1 b/metadata/md5-cache/dev-haskell/ranges-0.2.4-r1
index ac9886ad1303..fa73752a8975 100644
--- a/metadata/md5-cache/dev-haskell/ranges-0.2.4-r1
+++ b/metadata/md5-cache/dev-haskell/ranges-0.2.4-r1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Ranges and various functions on them
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/ranges
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/ranges-0.2.4/ranges-0.2.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65d0749d2bd8007a39399d25dba1fad8
diff --git a/metadata/md5-cache/dev-haskell/raw-strings-qq-1.1 b/metadata/md5-cache/dev-haskell/raw-strings-qq-1.1
index 3c96abf9fbee..4909b38df984 100644
--- a/metadata/md5-cache/dev-haskell/raw-strings-qq-1.1
+++ b/metadata/md5-cache/dev-haskell/raw-strings-qq-1.1
@@ -1,5 +1,5 @@
 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 ) 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.8 test? ( dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Raw string literals for Haskell
 EAPI=7
 HOMEPAGE=https://github.com/23Skidoo/raw-strings-qq
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=https://hackage.haskell.org/package/raw-strings-qq-1.1/raw-strings-qq-1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30f811d91026b284283fa006e72367a8
diff --git a/metadata/md5-cache/dev-haskell/readable-0.3.1 b/metadata/md5-cache/dev-haskell/readable-0.3.1
index 412f186e0e1a..cd9d98728a1b 100644
--- a/metadata/md5-cache/dev-haskell/readable-0.3.1
+++ b/metadata/md5-cache/dev-haskell/readable-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.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 )
+DEPEND=>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Reading from Text and ByteString
 EAPI=6
 HOMEPAGE=https://github.com/mightybyte/readable
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/readable-0.3.1/readable-0.3.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6f3d1da5321e98bbc8048a22005a83ed
diff --git a/metadata/md5-cache/dev-haskell/readargs-1.2.3 b/metadata/md5-cache/dev-haskell/readargs-1.2.3
index 2f6364123b2c..2f238df57bb0 100644
--- a/metadata/md5-cache/dev-haskell/readargs-1.2.3
+++ b/metadata/md5-cache/dev-haskell/readargs-1.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.11.1.13:=[profile?] <dev-haskell/text-12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 <dev-haskell/hspec-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.11.1.13:=[profile?] <dev-haskell/text-12:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 <dev-haskell/hspec-3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple command line argument parsing
 EAPI=6
 HOMEPAGE=https://github.com/rampion/ReadArgs
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-file
 RESTRICT=!test? ( test )
 SLOT=0/1.2.3
 SRC_URI=https://hackage.haskell.org/package/ReadArgs-1.2.3/ReadArgs-1.2.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9138483b2a9722409a84949b1cd6e0f3
diff --git a/metadata/md5-cache/dev-haskell/readline-1.0.3.0-r1 b/metadata/md5-cache/dev-haskell/readline-1.0.3.0-r1
index 68cc5d4341fa..d04085f87b0b 100644
--- a/metadata/md5-cache/dev-haskell/readline-1.0.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/readline-1.0.3.0-r1
@@ -1,6 +1,6 @@
 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-6.10.4:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=An interface to the GNU readline library
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/readline
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.3.0
 SRC_URI=https://hackage.haskell.org/package/readline-1.0.3.0/readline-1.0.3.0.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=32997a03cb1639c2c0dbec19e63dce6c
diff --git a/metadata/md5-cache/dev-haskell/rebase-1.4.1 b/metadata/md5-cache/dev-haskell/rebase-1.4.1
index da9b1fbecbab..af53611168ee 100644
--- a/metadata/md5-cache/dev-haskell/rebase-1.4.1
+++ b/metadata/md5-cache/dev-haskell/rebase-1.4.1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A more progressive alternative to the 'base' package
 EAPI=7
 HOMEPAGE=https://github.com/nikita-volkov/rebase
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=02e4a427a90bbc027d8b7ff82cb5a15b
diff --git a/metadata/md5-cache/dev-haskell/recaptcha-0.1.0.4 b/metadata/md5-cache/dev-haskell/recaptcha-0.1.0.4
index 70e936e806b3..b9d692ad6253 100644
--- a/metadata/md5-cache/dev-haskell/recaptcha-0.1.0.4
+++ b/metadata/md5-cache/dev-haskell/recaptcha-0.1.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/http-3001.1.4:=[profile?] >=dev-haskell/xhtml-3000.0:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[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/http-3001.1.4:=[profile?] >=dev-haskell/xhtml-3000.0:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Functions for using the reCAPTCHA service in web applications
 EAPI=6
 HOMEPAGE=https://github.com/jgm/recaptcha/tree/master
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/http-3001.1.4:=[profile?] >=dev-haskell/xhtml-3000.0:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
 SLOT=0/0.1.0.4
 SRC_URI=https://hackage.haskell.org/package/recaptcha-0.1.0.4/recaptcha-0.1.0.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=99a59ecf5026f4aa430411c7b6df78fa
diff --git a/metadata/md5-cache/dev-haskell/reducers-3.12.3 b/metadata/md5-cache/dev-haskell/reducers-3.12.3
index 8cad030199a9..8433915f5092 100644
--- a/metadata/md5-cache/dev-haskell/reducers-3.12.3
+++ b/metadata/md5-cache/dev-haskell/reducers-3.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.11.1.5:=[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:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.11.1.5:=[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:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Semigroups, specialized containers and a general map/reduce framework
 EAPI=6
 HOMEPAGE=https://github.com/ekmett/reducers/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.11.1.5:=[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:=
 SLOT=0/3.12.3
 SRC_URI=https://hackage.haskell.org/package/reducers-3.12.3/reducers-3.12.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8875a86fb1cc9a122ae1e9d1350b235b
diff --git a/metadata/md5-cache/dev-haskell/refact-0.3.0.2 b/metadata/md5-cache/dev-haskell/refact-0.3.0.2
index 408e746a2732..3f41f152dced 100644
--- a/metadata/md5-cache/dev-haskell/refact-0.3.0.2
+++ b/metadata/md5-cache/dev-haskell/refact-0.3.0.2
@@ -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 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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Specify refactorings to perform with apply-refact
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/refact
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.2
 SRC_URI=https://hackage.haskell.org/package/refact-0.3.0.2/refact-0.3.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ade7e305250e6407b835a89a1dce0ddd
diff --git a/metadata/md5-cache/dev-haskell/reflection-2.1.4 b/metadata/md5-cache/dev-haskell/reflection-2.1.4
index 6761c2b7f595..ebaa5b6f04ca 100644
--- a/metadata/md5-cache/dev-haskell/reflection-2.1.4
+++ b/metadata/md5-cache/dev-haskell/reflection-2.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-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 )
+DEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Reifies arbitrary terms into types that can be reflected back into terms
 EAPI=6
 HOMEPAGE=https://github.com/ekmett/reflection
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.1.4
 SRC_URI=https://hackage.haskell.org/package/reflection-2.1.4/reflection-2.1.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7ac913d21aff365ab25bf98d6397f3a
diff --git a/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1 b/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1
index 72ed55450639..e3713ec7ac35 100644
--- a/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1
+++ b/metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1
@@ -1,5 +1,5 @@
 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/smallcheck-1.0 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-smallcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/smallcheck-1.0 dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-smallcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Regex-based parsing with applicative interface
 EAPI=7
 HOMEPAGE=https://github.com/feuerbach/regex-applicative
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.3.1
 SRC_URI=https://hackage.haskell.org/package/regex-applicative-0.3.3.1/regex-applicative-0.3.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a678d9c4232516cac2744ed45edc8a9
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 eb10cb47abfd..7fbbcfc8ca4c 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,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=regex-applicative on text
 EAPI=6
 HOMEPAGE=https://github.com/phadej/regex-applicative-text#readme
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-applicative-0.3:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 913502462cd6..2ca35c0dc1a2 100644
--- a/metadata/md5-cache/dev-haskell/regex-base-0.94.0.0
+++ b/metadata/md5-cache/dev-haskell/regex-base-0.94.0.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Replaces/Enhances Text.Regex
 EAPI=7
 HOMEPAGE=https://wiki.haskell.org/Regular_expressions
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 81a3d87b87cb..9845db38708f 100644
--- a/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
+++ b/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Replaces/Enhances Text.Regex
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/regex-compat
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=224d24034c88fb49dab960931a8aa4e1
diff --git a/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4 b/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
index 942bb8844441..5084b62e8d54 100644
--- a/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
+++ b/metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-haskell/regex-tdfa-1.1.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 )
+DEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-haskell/regex-tdfa-1.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Unicode Support version of Text.Regex, using regex-tdfa
 EAPI=7
 HOMEPAGE=http://hub.darcs.net/shelarcy/regex-compat-tdfa
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-haskell/regex-tdfa-1.1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.95.1.4
 SRC_URI=https://hackage.haskell.org/package/regex-compat-tdfa-0.95.1.4/regex-compat-tdfa-0.95.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4cff680c7405ee23df7cce3a7df769be
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
index 6e9a70f074de..3418b48e3e2f 100644
--- a/metadata/md5-cache/dev-haskell/regex-pcre-0.95.0.0
+++ b/metadata/md5-cache/dev-haskell/regex-pcre-0.95.0.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Replaces/Enhances Text.Regex
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/regex-pcre
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c1fb6c761f7fb6943c7c7b2542f6af8b
diff --git a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.95.1.3.8.43 b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.95.1.3.8.43
index b32bf24276ae..2828c1d2cceb 100644
--- a/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.95.1.3.8.43
+++ b/metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.95.1.3.8.43
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm 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-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.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 )
+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-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=PCRE Backend for "Text.Regex" (regex-base)
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/regex-pcre-builtin
@@ -9,5 +9,5 @@ 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-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.95.1.3.8.43
 SRC_URI=https://hackage.haskell.org/package/regex-pcre-builtin-0.95.1.3.8.43/regex-pcre-builtin-0.95.1.3.8.43.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a7f533bebbcfcdb31138fe10df68d9b
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
index 11e91f1fdf8e..c6a41dada953 100644
--- a/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
+++ b/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Replaces/Enhances Text.Regex
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/regex-posix
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8a0b54843a4853d8e4e8cc77480d63dc
diff --git a/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2 b/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2
index ccf501470e10..061072ca7921 100644
--- a/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2
+++ b/metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[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 )
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Replaces/Enhances Text.Regex
 EAPI=6
 HOMEPAGE=https://github.com/ChrisKuklewicz/regex-tdfa
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/regex-base-0.93.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.2
 SRC_URI=https://hackage.haskell.org/package/regex-tdfa-1.2.2/regex-tdfa-1.2.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=53802cc21d15a47b619c227d8ad5ddab
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
index 13e03fec83d8..063fdbe688c1 100644
--- a/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0
+++ b/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Replaces/Enhances Text.Regex
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/regex-tdfa
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c248c4889282ded7907804ef482cbf6c
diff --git a/metadata/md5-cache/dev-haskell/rerebase-1.4.1 b/metadata/md5-cache/dev-haskell/rerebase-1.4.1
index 2dd0463da160..76e570317a6c 100644
--- a/metadata/md5-cache/dev-haskell/rerebase-1.4.1
+++ b/metadata/md5-cache/dev-haskell/rerebase-1.4.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=~dev-haskell/rebase-1.4.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Reexports from 'base' with a bunch of other standard libraries
 EAPI=7
 HOMEPAGE=https://github.com/nikita-volkov/rerebase
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 288acd8da8f4..c8bdbd2c5ce1 100644
--- a/metadata/md5-cache/dev-haskell/resolv-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/resolv-0.1.2.0
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Domain Name Service (DNS) lookup via the libresolv standard library routines
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/resolv
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-byte
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b521b04c076c6f703d67a1f19b7c75c
diff --git a/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2 b/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
index 423bb646d3c8..e60c9e9097d3 100644
--- a/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
+++ b/metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/monad-control-0.2.0.1:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-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 )
+DEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/monad-control-0.2.0.1:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A high-performance striped resource pooling implementation
 EAPI=7
 HOMEPAGE=https://github.com/bos/pool
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/monad-control-0.2.0.1:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] >=dev-haskell/vector-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.3.2
 SRC_URI=https://hackage.haskell.org/package/resource-pool-0.2.3.2/resource-pool-0.2.3.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=63b7d26895cc350b7c8ea6d5f5c0d976
diff --git a/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2 b/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
index 23f30fbd3350..8ad9d913c95b 100644
--- a/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
+++ b/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Deterministic allocation and freeing of scarce resources
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/conduit
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-h
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index c8bb4413f16e..5a547807ddde 100644
--- a/metadata/md5-cache/dev-haskell/retry-0.8.1.1
+++ b/metadata/md5-cache/dev-haskell/retry-0.8.1.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Retry combinators for monadic actions that may fail
 EAPI=7
 HOMEPAGE=https://github.com/Soostone/retry
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/random-1:=[profil
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dd88c79585591c0cbad9dbf773de404c
diff --git a/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.4 b/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.4
index 4ad8d17ca6aa..ab2ae52e62e5 100644
--- a/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.4
+++ b/metadata/md5-cache/dev-haskell/rfc5051-0.1.0.4
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple unicode collation as per RFC5051
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/rfc5051
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.4
 SRC_URI=https://hackage.haskell.org/package/rfc5051-0.1.0.4/rfc5051-0.1.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3c92607e0a097293be55e64d9919552a
diff --git a/metadata/md5-cache/dev-haskell/riff-0.3.0.1 b/metadata/md5-cache/dev-haskell/riff-0.3.0.1
index d1bb53b19bc3..d4b05d236893 100644
--- a/metadata/md5-cache/dev-haskell/riff-0.3.0.1
+++ b/metadata/md5-cache/dev-haskell/riff-0.3.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/either-4.3:=[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 )
+DEPEND=>=dev-haskell/either-4.3:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=RIFF parser for Haskell
 EAPI=6
 HOMEPAGE=https://bitbucket.org/robertmassaioli/riff/overview
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/either-4.3:=[profile?] >=dev-lang/ghc-7.10.1:=
 SLOT=0/0.3.0.1
 SRC_URI=https://hackage.haskell.org/package/riff-0.3.0.1/riff-0.3.0.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=51f8c15ed6a2b3d31097353d15a75f60
diff --git a/metadata/md5-cache/dev-haskell/rio-0.1.18.0 b/metadata/md5-cache/dev-haskell/rio-0.1.18.0
index bf5fd2d1ee3d..9f7b4a701026 100644
--- a/metadata/md5-cache/dev-haskell/rio-0.1.18.0
+++ b/metadata/md5-cache/dev-haskell/rio-0.1.18.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A standard library for Haskell
 EAPI=7
 HOMEPAGE=https://github.com/commercialhaskell/rio#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/hashable:=[profile?] dev-
 RESTRICT=!test? ( test )
 SLOT=0/0.1.18.0
 SRC_URI=https://hackage.haskell.org/package/rio-0.1.18.0/rio-0.1.18.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=89a2261c545120e256040b2accc47dd1
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
index 47b428114ab1..34ca5d34766e 100644
--- a/metadata/md5-cache/dev-haskell/rio-orphans-0.1.1.0
+++ b/metadata/md5-cache/dev-haskell/rio-orphans-0.1.1.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Orphan instances for the RIO type in the rio package
 EAPI=7
 HOMEPAGE=https://github.com/commercialhaskell/rio#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/fast-logger:=[profile?] d
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35addf4110708179984393ee5df525d3
diff --git a/metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.1.0 b/metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.1.0
index b4dfe6909924..d4db8bbf75ec 100644
--- a/metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.1.0
+++ b/metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/annotated-wl-pprint:=[profile?] >=dev-haskell/ansi-terminal-0.9:=[profile?] dev-haskell/cabal:=[profile?] dev-haskell/colour:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/path:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/text:=[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 )
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/annotated-wl-pprint:=[profile?] >=dev-haskell/ansi-terminal-0.9:=[profile?] dev-haskell/cabal:=[profile?] dev-haskell/colour:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/path:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Pretty-printing for RIO
 EAPI=7
 HOMEPAGE=https://github.com/commercialhaskell/rio-prettyprint#readme
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/annotated-wl-pprint:=[profile?] >=dev-haskell/ansi-terminal-0.9:=[profile?] dev-haskell/cabal:=[profile?] dev-haskell/colour:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/path:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.2.1:=
 SLOT=0/0.1.1.0
 SRC_URI=https://hackage.haskell.org/package/rio-prettyprint-0.1.1.0/rio-prettyprint-0.1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cfd6c04af53d9ac29201b85ccedfcc5f
diff --git a/metadata/md5-cache/dev-haskell/rsa-2.3.1 b/metadata/md5-cache/dev-haskell/rsa-2.3.1
index 38e6ba76c4bf..96c162a3d3b7 100644
--- a/metadata/md5-cache/dev-haskell/rsa-2.3.1
+++ b/metadata/md5-cache/dev-haskell/rsa-2.3.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Implementation of RSA, using the padding schemes of PKCS#1 v2.1
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/RSA
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/crypto-api-0.10:=[profile?] <dev-haskell/crypto-api-0.14:=
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7172540117e9ba54a5f70fef4ef7e8f2
diff --git a/metadata/md5-cache/dev-haskell/safe-0.3.17 b/metadata/md5-cache/dev-haskell/safe-0.3.17
index af6cf9592f73..937f673c6f9d 100644
--- a/metadata/md5-cache/dev-haskell/safe-0.3.17
+++ b/metadata/md5-cache/dev-haskell/safe-0.3.17
@@ -1,5 +1,5 @@
 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 ) 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.18 test? ( dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Library of safe (exception free) functions
 EAPI=7
 HOMEPAGE=https://github.com/ndmitchell/safe#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.3.17
 SRC_URI=https://hackage.haskell.org/package/safe-0.3.17/safe-0.3.17.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=00ea5ece8f533874ee625606b861fc72
diff --git a/metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0 b/metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0
index 629d0fdd67b9..d20a67a6c4c2 100644
--- a/metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0
+++ b/metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/exceptions-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/void ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/exceptions-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/void ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Safe, consistent, and easy exception handling
 EAPI=6
 HOMEPAGE=https://github.com/fpco/safe-exceptions#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.7.0
 SRC_URI=https://hackage.haskell.org/package/safe-exceptions-0.1.7.0/safe-exceptions-0.1.7.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7a20bd03c8a33aefa965f01e15cd81e7
diff --git a/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1 b/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
index 7e5b16d50866..3ef44b024a2d 100644
--- a/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
+++ b/metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/stm:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/stm:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Much safer replacement for QSemN, QSem, and SampleVar
 EAPI=7
 HOMEPAGE=https://github.com/ChrisKuklewicz/SafeSemaphore
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/stm:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.10.1
 SRC_URI=https://hackage.haskell.org/package/SafeSemaphore-0.10.1/SafeSemaphore-0.10.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=204788e08ba8fb1419d4b005c93ec6c0
diff --git a/metadata/md5-cache/dev-haskell/sandi-0.5 b/metadata/md5-cache/dev-haskell/sandi-0.5
index 8f4d0cf1e1de..2d73d688cdd8 100644
--- a/metadata/md5-cache/dev-haskell/sandi-0.5
+++ b/metadata/md5-cache/dev-haskell/sandi-0.5
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Data encoding library
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/sandi
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:= conduit? ( >=dev-haskell/conduit-1.3:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/0.5
 SRC_URI=https://hackage.haskell.org/package/sandi-0.5/sandi-0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=06574ea4e076e29606eaaed4f64d38a8
diff --git a/metadata/md5-cache/dev-haskell/say-0.1.0.0 b/metadata/md5-cache/dev-haskell/say-0.1.0.0
index e91f1067d8b0..a84e0b847fc1 100644
--- a/metadata/md5-cache/dev-haskell/say-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/say-0.1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Initial project template from stack
 EAPI=6
 HOMEPAGE=https://github.com/fpco/say#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.0
 SRC_URI=https://hackage.haskell.org/package/say-0.1.0.0/say-0.1.0.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2251264bdff675431925d1c337308af8
diff --git a/metadata/md5-cache/dev-haskell/scientific-0.3.6.2 b/metadata/md5-cache/dev-haskell/scientific-0.3.6.2
index 79450ea912d9..4cb4b72f97e0 100644
--- a/metadata/md5-cache/dev-haskell/scientific-0.3.6.2
+++ b/metadata/md5-cache/dev-haskell/scientific-0.3.6.2
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Numbers represented using scientific notation
 EAPI=7
 HOMEPAGE=https://github.com/basvandijk/scientific
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestr
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0bb216be144ca46ba56a3dc9a5893e81
diff --git a/metadata/md5-cache/dev-haskell/securemem-0.1.10 b/metadata/md5-cache/dev-haskell/securemem-0.1.10
index 7ea4d307ec17..fcefc2b8756f 100644
--- a/metadata/md5-cache/dev-haskell/securemem-0.1.10
+++ b/metadata/md5-cache/dev-haskell/securemem-0.1.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/memory-0.7:=[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 )
+DEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=abstraction to an auto scrubbing and const time eq, memory chunk
 EAPI=6
 HOMEPAGE=https://github.com/vincenthz/hs-securemem
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/byteable-0.1.1:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.10
 SRC_URI=https://hackage.haskell.org/package/securemem-0.1.10/securemem-0.1.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d2b07b7d1b439c67ec030dd869a27ef
diff --git a/metadata/md5-cache/dev-haskell/selective-0.3 b/metadata/md5-cache/dev-haskell/selective-0.3
index 62f0768a59ba..0b5a3e4f5d18 100644
--- a/metadata/md5-cache/dev-haskell/selective-0.3
+++ b/metadata/md5-cache/dev-haskell/selective-0.3
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Selective applicative functors
 EAPI=7
 HOMEPAGE=https://github.com/snowleopard/selective
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=970af3d67ad33c267c7633479114b4f0
diff --git a/metadata/md5-cache/dev-haskell/semigroupoid-extras-5 b/metadata/md5-cache/dev-haskell/semigroupoid-extras-5
index 57623fb81faf..2e1dc465acf6 100644
--- a/metadata/md5-cache/dev-haskell/semigroupoid-extras-5
+++ b/metadata/md5-cache/dev-haskell/semigroupoid-extras-5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-lang/ghc-7.6.2:= profunctors? ( >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] ) >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-lang/ghc-7.6.2:= profunctors? ( >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] ) >=dev-haskell/cabal-1.16.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Semigroupoids that depend on PolyKinds
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/semigroupoid-extras
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-lang/ghc-7.6.2:= profunctors? ( >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] )
 SLOT=0/5
 SRC_URI=https://hackage.haskell.org/package/semigroupoid-extras-5/semigroupoid-extras-5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=657d4f4c39e5f75cbe591c7406b83b3c
diff --git a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4 b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
index 0ad7a51d7c63..7d73c484ed47 100644
--- a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
+++ b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Semigroupoids: Category sans id
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/semigroupoids
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0fa89d432a58783a22283f7ab0390ee7
diff --git a/metadata/md5-cache/dev-haskell/semigroups-0.18.5 b/metadata/md5-cache/dev-haskell/semigroups-0.18.5
index 9b7dd393a6de..d9a90d30fccc 100644
--- a/metadata/md5-cache/dev-haskell/semigroups-0.18.5
+++ b/metadata/md5-cache/dev-haskell/semigroups-0.18.5
@@ -1,5 +1,5 @@
 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 )
+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?] ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Anything that associates
 EAPI=6
 HOMEPAGE=https://github.com/ekmett/semigroups/
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=336024fdceebbe1f1aee9c8740f58b3f
diff --git a/metadata/md5-cache/dev-haskell/semirings-0.5.3 b/metadata/md5-cache/dev-haskell/semirings-0.5.3
index fb64a5f66c28..72f9d473dd3b 100644
--- a/metadata/md5-cache/dev-haskell/semirings-0.5.3
+++ b/metadata/md5-cache/dev-haskell/semirings-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] >=dev-lang/ghc-7.8.2:= hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) ) >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] >=dev-lang/ghc-7.8.2:= hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) ) >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=two monoids as one, in holy haskimony
 EAPI=7
 HOMEPAGE=https://github.com/chessai/semirings
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] >=dev-lang/ghc-7.8.2:= hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) )
 SLOT=0/0.5.3
 SRC_URI=https://hackage.haskell.org/package/semirings-0.5.3/semirings-0.5.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8277277374832a76423aee7e07165f85
diff --git a/metadata/md5-cache/dev-haskell/sendfile-0.7.11.1 b/metadata/md5-cache/dev-haskell/sendfile-0.7.11.1
index b7b9066e6927..192184ea4498 100644
--- a/metadata/md5-cache/dev-haskell/sendfile-0.7.11.1
+++ b/metadata/md5-cache/dev-haskell/sendfile-0.7.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/network-2:=[profile?] <dev-haskell/network-3.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 )
+DEPEND=>=dev-haskell/network-2:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A portable sendfile library
 EAPI=7
 HOMEPAGE=https://hub.darcs.net/stepcut/sendfile
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/network-2:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.11.1
 SRC_URI=https://hackage.haskell.org/package/sendfile-0.7.11.1/sendfile-0.7.11.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d3169d3c683d79d5f25329330a294fc3
diff --git a/metadata/md5-cache/dev-haskell/setenv-0.1.1.3 b/metadata/md5-cache/dev-haskell/setenv-0.1.1.3
index a41e5c0d9f69..73ddb76ca66a 100644
--- a/metadata/md5-cache/dev-haskell/setenv-0.1.1.3
+++ b/metadata/md5-cache/dev-haskell/setenv-0.1.1.3
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A cross-platform library for setting environment variables
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/setenv
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.3
 SRC_URI=https://hackage.haskell.org/package/setenv-0.1.1.3/setenv-0.1.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=06af0e4c273493fc209690d58ffa5958
diff --git a/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9 b/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
index 68c018d7b2b6..88104def52ca 100644
--- a/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
+++ b/metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell bindings to setlocale
 EAPI=7
 HOMEPAGE=https://gitlab.com/Kritzefitz/haskell-setlocale
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.6.1:=
 SLOT=0/1.0.0.9
 SRC_URI=https://hackage.haskell.org/package/setlocale-1.0.0.9/setlocale-1.0.0.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7752c7da449f65b4915f8fda991436bb
diff --git a/metadata/md5-cache/dev-haskell/sha-1.6.4.4 b/metadata/md5-cache/dev-haskell/sha-1.6.4.4
index 9dfac1be74fe..ef70a1bc63c5 100644
--- a/metadata/md5-cache/dev-haskell/sha-1.6.4.4
+++ b/metadata/md5-cache/dev-haskell/sha-1.6.4.4
@@ -1,5 +1,5 @@
 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/quickcheck-2.5 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-10000 >=dev-haskell/test-framework-quickcheck2-0.3.0.2 <dev-haskell/test-framework-quickcheck2-10000 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-10000 >=dev-haskell/test-framework-quickcheck2-0.3.0.2 <dev-haskell/test-framework-quickcheck2-10000 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Implementations of the SHA suite of message digest functions
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/SHA
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1.6.4.4
 SRC_URI=https://hackage.haskell.org/package/SHA-1.6.4.4/SHA-1.6.4.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e87ea8cafc3fc954dc1fb803500cf0b
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-2.0.21 b/metadata/md5-cache/dev-haskell/shakespeare-2.0.21
index db82c2a58ea9..eb8a39f6a70f 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-2.0.21
+++ b/metadata/md5-cache/dev-haskell/shakespeare-2.0.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/scientific-0.3.0.0:=[profile?] >=dev-haskell/text-0.7:=[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 <dev-haskell/hspec-3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-haskell/blaze-markup:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/scientific-0.3.0.0:=[profile?] >=dev-haskell/text-0.7:=[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 <dev-haskell/hspec-3 dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A toolkit for making compile-time interpolated templates
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/blaze-html:=[profile?] dev-has
 RESTRICT=!test? ( test )
 SLOT=0/2.0.21
 SRC_URI=https://hackage.haskell.org/package/shakespeare-2.0.21/shakespeare-2.0.21.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=20e8db0b0a5170754f8f560b25ae4dbe
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-css-1.1.0 b/metadata/md5-cache/dev-haskell/shakespeare-css-1.1.0
index 1427a3cea55c..672c0ec0300d 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-css-1.1.0
+++ b/metadata/md5-cache/dev-haskell/shakespeare-css-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/shakespeare-2.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 )
+DEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Stick your haskell variables into css at compile time. (deprecated)
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/shakespeare-css-1.1.0/shakespeare-css-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=14e28642f1d4c362417276ee0b850ac1
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.1.0 b/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.1.0
index 283094a12ab9..885055b5a980 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.1.0
+++ b/metadata/md5-cache/dev-haskell/shakespeare-i18n-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/shakespeare-2.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 )
+DEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A type-based approach to internationalization. (deprecated)
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/shakespeare-i18n-1.1.0/shakespeare-i18n-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8375518e8bf355b6aca55e839fb0acb2
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-js-1.3.0 b/metadata/md5-cache/dev-haskell/shakespeare-js-1.3.0
index 5140ac057f5c..e877bca0f619 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-js-1.3.0
+++ b/metadata/md5-cache/dev-haskell/shakespeare-js-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/shakespeare-2.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 )
+DEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Stick your haskell variables into javascript/coffeescript at compile time
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.3.0
 SRC_URI=https://hackage.haskell.org/package/shakespeare-js-1.3.0/shakespeare-js-1.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a3cd40afbcaf77a37ad85f7b64f23873
diff --git a/metadata/md5-cache/dev-haskell/shakespeare-text-1.1.0 b/metadata/md5-cache/dev-haskell/shakespeare-text-1.1.0
index 648b45e12ce5..5c062efe09c6 100644
--- a/metadata/md5-cache/dev-haskell/shakespeare-text-1.1.0
+++ b/metadata/md5-cache/dev-haskell/shakespeare-text-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/shakespeare-2.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 )
+DEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Interpolation with quasi-quotation: put variables strings (deprecated)
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/shakespeare-text-1.1.0/shakespeare-text-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b95de94df92772cb3aee30e09de84ce0
diff --git a/metadata/md5-cache/dev-haskell/shell-escape-0.2.0 b/metadata/md5-cache/dev-haskell/shell-escape-0.2.0
index 8bb03b02449e..e708c4359f44 100644
--- a/metadata/md5-cache/dev-haskell/shell-escape-0.2.0
+++ b/metadata/md5-cache/dev-haskell/shell-escape-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/vector-0.6.0.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 )
+DEPEND=>=dev-haskell/vector-0.6.0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Shell escaping library
 EAPI=6
 HOMEPAGE=https://github.com/solidsnack/shell-escape
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/vector-0.6.0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.0
 SRC_URI=https://hackage.haskell.org/package/shell-escape-0.2.0/shell-escape-0.2.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a784eed580cbdd3ef9cffb385d968b10
diff --git a/metadata/md5-cache/dev-haskell/shelly-1.9.0 b/metadata/md5-cache/dev-haskell/shelly-1.9.0
index 5cf11ecd3b70..4fc30013f254 100644
--- a/metadata/md5-cache/dev-haskell/shelly-1.9.0
+++ b/metadata/md5-cache/dev-haskell/shelly-1.9.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=shell-like (systems) programming in Haskell
 EAPI=7
 HOMEPAGE=https://github.com/yesodweb/Shelly.hs
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a9af7570a43492288a32485e5d5e63f2
diff --git a/metadata/md5-cache/dev-haskell/silently-1.2.5.1 b/metadata/md5-cache/dev-haskell/silently-1.2.5.1
index 360ea60c791f..743cf82003bd 100644
--- a/metadata/md5-cache/dev-haskell/silently-1.2.5.1
+++ b/metadata/md5-cache/dev-haskell/silently-1.2.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/nanospec dev-haskell/temporary ) 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.8 test? ( dev-haskell/nanospec dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Prevent or capture writing to stdout and other handles
 EAPI=7
 HOMEPAGE=https://github.com/hspec/silently
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/1.2.5.1
 SRC_URI=https://hackage.haskell.org/package/silently-1.2.5.1/silently-1.2.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c2135f8fa193998086424c341c35691e
diff --git a/metadata/md5-cache/dev-haskell/simple-reflect-0.3.3 b/metadata/md5-cache/dev-haskell/simple-reflect-0.3.3
index 221d706bbdc9..5e3414283cd2 100644
--- a/metadata/md5-cache/dev-haskell/simple-reflect-0.3.3
+++ b/metadata/md5-cache/dev-haskell/simple-reflect-0.3.3
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Simple reflection of expressions containing variables
 EAPI=6
 HOMEPAGE=https://twanvl.nl/blog/haskell/simple-reflection-of-expressions
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.3
 SRC_URI=https://hackage.haskell.org/package/simple-reflect-0.3.3/simple-reflect-0.3.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2902783b529e840a018686bd41857924
diff --git a/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28 b/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28
index a2c18424f3e9..373415e6aeed 100644
--- a/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28
+++ b/metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/conduit dev-haskell/conduit-extra >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/resourcet ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/conduit dev-haskell/conduit-extra >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/resourcet ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Cross platform library for the sendfile system call
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/simple-sendfile
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.28
 SRC_URI=https://hackage.haskell.org/package/simple-sendfile-0.2.28/simple-sendfile-0.2.28.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=79f53b06638febbfc9b58c692bc29fb9
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
index ed03cb4f2d86..e365928a2651 100644
--- a/metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1
+++ b/metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Type level booleans
 EAPI=7
 HOMEPAGE=https://github.com/phadej/singleton-bool#readme
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=15bb456a320ae2e1f93282236aa7fac1
diff --git a/metadata/md5-cache/dev-haskell/size-based-0.1.2.0 b/metadata/md5-cache/dev-haskell/size-based-0.1.2.0
index 825d3e8b3702..ecb9876028f5 100644
--- a/metadata/md5-cache/dev-haskell/size-based-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/size-based-0.1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/dictionary-sharing-0.1:=[profile?] <dev-haskell/dictionary-sharing-1.0:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/testing-type-modifiers-0.1:=[profile?] <dev-haskell/testing-type-modifiers-1.0:=[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 )
+DEPEND=>=dev-haskell/dictionary-sharing-0.1:=[profile?] <dev-haskell/dictionary-sharing-1.0:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/testing-type-modifiers-0.1:=[profile?] <dev-haskell/testing-type-modifiers-1.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Sized functors, for size-based enumerations
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/size-based
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/dictionary-sharing-0.1:=[profile?] <dev-haskell/dictionary-sharing-1.0:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/testing-type-modifiers-0.1:=[profile?] <dev-haskell/testing-type-modifiers-1.0:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.2.0
 SRC_URI=https://hackage.haskell.org/package/size-based-0.1.2.0/size-based-0.1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2e21b7c90e2573cb499e2f9494bf8d84
diff --git a/metadata/md5-cache/dev-haskell/skein-1.0.9.4 b/metadata/md5-cache/dev-haskell/skein-1.0.9.4
index c67333b0917b..adcce4217d6b 100644
--- a/metadata/md5-cache/dev-haskell/skein-1.0.9.4
+++ b/metadata/md5-cache/dev-haskell/skein-1.0.9.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/crypto-api-0.6:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/crypto-api-0.6:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?] >=dev-haskell/tagged-0.2:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Skein, a family of cryptographic hash functions. Includes Skein-MAC as well
 EAPI=7
 HOMEPAGE=https://github.com/meteficha/skein
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/1.0.9.4
 SRC_URI=https://hackage.haskell.org/package/skein-1.0.9.4/skein-1.0.9.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bd6bf2e0acdf57b8e4379f69b49fe956
diff --git a/metadata/md5-cache/dev-haskell/skylighting-0.8.5 b/metadata/md5-cache/dev-haskell/skylighting-0.8.5
index 02455dceef7c..e15b3f9e1b83 100644
--- a/metadata/md5-cache/dev-haskell/skylighting-0.8.5
+++ b/metadata/md5-cache/dev-haskell/skylighting-0.8.5
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=syntax highlighting library
 EAPI=7
 HOMEPAGE=https://github.com/jgm/skylighting
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index b58c40b87dd7..9d909cc6b369 100644
--- a/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5
+++ b/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=syntax highlighting library
 EAPI=7
 HOMEPAGE=https://github.com/jgm/skylighting
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[pr
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2b5e7a62fc9ad4fea866b1352d8adc4f
diff --git a/metadata/md5-cache/dev-haskell/smallcheck-1.2.0 b/metadata/md5-cache/dev-haskell/smallcheck-1.2.0
index dbc9211400df..abbd040634ff 100644
--- a/metadata/md5-cache/dev-haskell/smallcheck-1.2.0
+++ b/metadata/md5-cache/dev-haskell/smallcheck-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/logict:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/nats:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/void:=[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 )
+DEPEND=dev-haskell/logict:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/nats:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A property-based testing library
 EAPI=7
 HOMEPAGE=https://github.com/Bodigrim/smallcheck
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/logict:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/nats:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.2.0
 SRC_URI=https://hackage.haskell.org/package/smallcheck-1.2.0/smallcheck-1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1abe9c39b3654fcd9ebec885970f01f8
diff --git a/metadata/md5-cache/dev-haskell/snap-core-1.0.4.2 b/metadata/md5-cache/dev-haskell/snap-core-1.0.4.2
index 6c9f56717e8f..ddf91c61686b 100644
--- a/metadata/md5-cache/dev-haskell/snap-core-1.0.4.2
+++ b/metadata/md5-cache/dev-haskell/snap-core-1.0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/hashable-1.2.0.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[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/random-1:=[profile?] <dev-haskell/random-2:=[profile?] >=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?] >=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] ) !portable? ( >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/parallel-3 <dev-haskell/parallel-4 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/hashable-1.2.0.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.0:=[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/random-1:=[profile?] <dev-haskell/random-2:=[profile?] >=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?] >=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.8.2:= portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] ) !portable? ( >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/parallel-3 <dev-haskell/parallel-4 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Snap: A Haskell Web Framework (core interfaces and types)
 EAPI=7
 HOMEPAGE=http://snapframework.com/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.4.2
 SRC_URI=https://hackage.haskell.org/package/snap-core-1.0.4.2/snap-core-1.0.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2b476f9a54c25a580b1e28a744875bb2
diff --git a/metadata/md5-cache/dev-haskell/snap-server-1.1.1.2 b/metadata/md5-cache/dev-haskell/snap-server-1.1.1.2
index a5626712cc91..1da35b9a2432 100644
--- a/metadata/md5-cache/dev-haskell/snap-server-1.1.1.2
+++ b/metadata/md5-cache/dev-haskell/snap-server-1.1.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.9:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.6.2:= openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] ) >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/base16-bytestring-0.1 <dev-haskell/base16-bytestring-0.2 >=dev-haskell/http-common-0.7 <dev-haskell/http-common-0.9 >=dev-haskell/http-streams-0.7 <dev-haskell/http-streams-0.9 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/monad-control-1.0 <dev-haskell/monad-control-1.1 >=dev-haskell/parallel-3 <dev-haskell/parallel-4 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/random-1.0 <dev-haskell/random-1.2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/threads-0.5 <dev-haskell/threads-0.6 >=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.9:=[profile?] >=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?] >=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.6.2:= openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] >=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] ) >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/base16-bytestring-0.1 <dev-haskell/base16-bytestring-0.2 >=dev-haskell/http-common-0.7 <dev-haskell/http-common-0.9 >=dev-haskell/http-streams-0.7 <dev-haskell/http-streams-0.9 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/monad-control-1.0 <dev-haskell/monad-control-1.1 >=dev-haskell/parallel-3 <dev-haskell/parallel-4 >=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3 >=dev-haskell/random-1.0 <dev-haskell/random-1.2 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/threads-0.5 <dev-haskell/threads-0.6 >=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A fast, iteratee-based, epoll-enabled web server for the Snap Framework
 EAPI=7
 HOMEPAGE=http://snapframework.com/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=
 RESTRICT=!test? ( test )
 SLOT=0/1.1.1.2
 SRC_URI=https://hackage.haskell.org/package/snap-server-1.1.1.2/snap-server-1.1.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a77da2aa3aaa5c33accb238adf3d439b
diff --git a/metadata/md5-cache/dev-haskell/socks-0.6.1 b/metadata/md5-cache/dev-haskell/socks-0.6.1
index 3941b821bc77..835c160c32ff 100644
--- a/metadata/md5-cache/dev-haskell/socks-0.6.1
+++ b/metadata/md5-cache/dev-haskell/socks-0.6.1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Socks proxy (version 5) implementation
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-socks
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 52c6511f9d8b..2c86cc484827 100644
--- a/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=True Sums of Products
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/sop-core
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=afdc0bb356980cd81f2ea8f1a253a97f
diff --git a/metadata/md5-cache/dev-haskell/split-0.2.3.4 b/metadata/md5-cache/dev-haskell/split-0.2.3.4
index a5562ba68212..f566aeb94fec 100644
--- a/metadata/md5-cache/dev-haskell/split-0.2.3.4
+++ b/metadata/md5-cache/dev-haskell/split-0.2.3.4
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Combinator library for splitting lists
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/split
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9ea97f646c73ab217cfa2606b780187d
diff --git a/metadata/md5-cache/dev-haskell/splitmix-0.0.4 b/metadata/md5-cache/dev-haskell/splitmix-0.0.4
index f919c20e01b9..ced7f3b62601 100644
--- a/metadata/md5-cache/dev-haskell/splitmix-0.0.4
+++ b/metadata/md5-cache/dev-haskell/splitmix-0.0.4
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast Splittable PRNG
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/splitmix
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:= random? ( >=dev-haskell/random-1.0:=[profile?] <d
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=933e939552dffd8030e321225d39dc76
diff --git a/metadata/md5-cache/dev-haskell/stack-2.3.3 b/metadata/md5-cache/dev-haskell/stack-2.3.3
index 374cca5543f7..c2a7d2138f35 100644
--- a/metadata/md5-cache/dev-haskell/stack-2.3.3
+++ b/metadata/md5-cache/dev-haskell/stack-2.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm 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.5:=[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:=[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 )
+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.5:=[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:=[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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=The Haskell Tool Stack
 EAPI=7
 HOMEPAGE=https://haskellstack.org
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.4.6.0:=[profile?] >=dev-haskell/annotated-wl-pprin
 RESTRICT=test
 SLOT=0/2.3.3
 SRC_URI=https://hackage.haskell.org/package/stack-2.3.3/stack-2.3.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4fa1f6420a7eaf660c10130c55cbc534
diff --git a/metadata/md5-cache/dev-haskell/statevar-1.1.1.1 b/metadata/md5-cache/dev-haskell/statevar-1.1.1.1
index 6806595864c4..5514a26d6bac 100644
--- a/metadata/md5-cache/dev-haskell/statevar-1.1.1.1
+++ b/metadata/md5-cache/dev-haskell/statevar-1.1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/stm-2.2.0.1:=[profile?] <dev-haskell/stm-2.6:=[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 )
+DEPEND=>=dev-haskell/stm-2.2.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=State variables
 EAPI=6
 HOMEPAGE=https://github.com/haskell-opengl/StateVar
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.2.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.1.1.1
 SRC_URI=https://hackage.haskell.org/package/StateVar-1.1.1.1/StateVar-1.1.1.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7c7f07f8bf8783f588378cf4c56d27f
diff --git a/metadata/md5-cache/dev-haskell/statistics-0.15.2.0 b/metadata/md5-cache/dev-haskell/statistics-0.15.2.0
index f87aeea83b55..d103930a4fa5 100644
--- a/metadata/md5-cache/dev-haskell/statistics-0.15.2.0
+++ b/metadata/md5-cache/dev-haskell/statistics-0.15.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.6.0.0:=[profile?] >=dev-haskell/async-2.2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/base-orphans-0.6:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/data-default-class-0.1.2:=[profile?] >=dev-haskell/dense-linear-algebra-0.1:=[profile?] <dev-haskell/dense-linear-algebra-0.2:=[profile?] >=dev-haskell/math-functions-0.3:=[profile?] >=dev-haskell/monad-par-0.3.4:=[profile?] >=dev-haskell/mwc-random-0.13.0.0:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] dev-haskell/vector-th-unbox:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/erf >=dev-haskell/ieee754-0.7.3 >=dev-haskell/quickcheck-2.7.5 dev-haskell/tasty dev-haskell/tasty-expected-failure dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-0.6.0.0:=[profile?] >=dev-haskell/async-2.2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/base-orphans-0.6:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/data-default-class-0.1.2:=[profile?] >=dev-haskell/dense-linear-algebra-0.1:=[profile?] <dev-haskell/dense-linear-algebra-0.2:=[profile?] >=dev-haskell/math-functions-0.3:=[profile?] >=dev-haskell/monad-par-0.3.4:=[profile?] >=dev-haskell/mwc-random-0.13.0.0:=[profile?] >=dev-haskell/primitive-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.4:=[profile?] >=dev-haskell/vector-binary-instances-0.2.1:=[profile?] dev-haskell/vector-th-unbox:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/erf >=dev-haskell/ieee754-0.7.3 >=dev-haskell/quickcheck-2.7.5 dev-haskell/tasty dev-haskell/tasty-expected-failure dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library of statistical types, data, and functions
 EAPI=7
 HOMEPAGE=https://github.com/bos/statistics
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.6.0.0:=[profile?] >=dev-haskell/async-2.2.2:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/0.15.2.0
 SRC_URI=https://hackage.haskell.org/package/statistics-0.15.2.0/statistics-0.15.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4fdb24bd02632a1304d51070a9b9cda1
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 511cda7f17da..4560e8b91bb5 100644
--- a/metadata/md5-cache/dev-haskell/stm-2.5.0.0
+++ b/metadata/md5-cache/dev-haskell/stm-2.5.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/nats-0.1.3:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/nats-0.1.3:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Software Transactional Memory
 EAPI=7
 HOMEPAGE=https://wiki.haskell.org/Software_transactional_memory
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ba307e1b617e3fb2c89f3547fbf170a3
diff --git a/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4 b/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
index f598c10244a5..ad2f24c6d604 100644
--- a/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
+++ b/metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/stm-2.4:=[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 )
+DEPEND=>=dev-haskell/stm-2.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Additional types of channels for STM
 EAPI=7
 HOMEPAGE=http://code.haskell.org/~wren/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/stm-2.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/3.0.0.4
 SRC_URI=https://hackage.haskell.org/package/stm-chans-3.0.0.4/stm-chans-3.0.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=520da41578af7a9c39796c7c43bf196c
diff --git a/metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4 b/metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4
index 94cdba150091..4a550f1de58c 100644
--- a/metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4
+++ b/metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/fail:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/tasty-0.11.0.4 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-hunit-0.9.2 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.8.4 <dev-haskell/tasty-quickcheck-0.11 >=dev-haskell/transformers-0.4 <dev-haskell/transformers-0.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/fail:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/tasty-0.11.0.4 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-hunit-0.9.2 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.8.4 <dev-haskell/tasty-quickcheck-0.11 >=dev-haskell/transformers-0.4 <dev-haskell/transformers-0.6 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A monad transformer version of the ST monad
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/STMonadTrans
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/fail:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-
 RESTRICT=!test? ( test )
 SLOT=0/0.4.4
 SRC_URI=https://hackage.haskell.org/package/STMonadTrans-0.4.4/STMonadTrans-0.4.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=21c3af352ebc0e83b96cde3dd713c950
diff --git a/metadata/md5-cache/dev-haskell/store-0.7.6 b/metadata/md5-cache/dev-haskell/store-0.7.6
index 9cef00dfa618..461a26d0b6f1 100644
--- a/metadata/md5-cache/dev-haskell/store-0.7.6
+++ b/metadata/md5-cache/dev-haskell/store-0.7.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/async-2.0.2:=[profile?] >=dev-haskell/base-orphans-0.4.3:=[profile?] >=dev-haskell/base64-bytestring-0.1.1:=[profile?] >=dev-haskell/bifunctors-4.0:=[profile?] >=dev-haskell/contravariant-1.3:=[profile?] >=dev-haskell/cryptohash-0.11.6:=[profile?] >=dev-haskell/fail-4.9:=[profile?] >=dev-haskell/free-4.11:=[profile?] >=dev-haskell/hashable-1.2.3.1:=[profile?] >=dev-haskell/hspec-2.1.2:=[profile?] >=dev-haskell/hspec-smallcheck-0.3.0:=[profile?] >=dev-haskell/lifted-base-0.2.3.3:=[profile?] >=dev-haskell/monad-control-0.3.3.0:=[profile?] >=dev-haskell/mono-traversable-0.7.0:=[profile?] >=dev-haskell/network-2.6.0.2:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/resourcet-1.1.3.3:=[profile?] >=dev-haskell/safe-0.3.8:=[profile?] >=dev-haskell/semigroups-0.8:=[profile?] >=dev-haskell/smallcheck-1.1.1:=[profile?] >=dev-haskell/store-core-0.4:=[profile?] <dev-haskell/store-core-0.5:=[profile?] >=dev-haskell/syb-0.4.4:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] >=dev-haskell/th-lift-instances-0.1.4:=[profile?] >=dev-haskell/th-orphans-0.13.2:=[profile?] >=dev-haskell/th-reify-many-0.1.6:=[profile?] >=dev-haskell/th-utilities-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] >=dev-haskell/void-0.5.11:=[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 )
+DEPEND=>=dev-haskell/async-2.0.2:=[profile?] >=dev-haskell/base-orphans-0.4.3:=[profile?] >=dev-haskell/base64-bytestring-0.1.1:=[profile?] >=dev-haskell/bifunctors-4.0:=[profile?] >=dev-haskell/contravariant-1.3:=[profile?] >=dev-haskell/cryptohash-0.11.6:=[profile?] >=dev-haskell/fail-4.9:=[profile?] >=dev-haskell/free-4.11:=[profile?] >=dev-haskell/hashable-1.2.3.1:=[profile?] >=dev-haskell/hspec-2.1.2:=[profile?] >=dev-haskell/hspec-smallcheck-0.3.0:=[profile?] >=dev-haskell/lifted-base-0.2.3.3:=[profile?] >=dev-haskell/monad-control-0.3.3.0:=[profile?] >=dev-haskell/mono-traversable-0.7.0:=[profile?] >=dev-haskell/network-2.6.0.2:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/resourcet-1.1.3.3:=[profile?] >=dev-haskell/safe-0.3.8:=[profile?] >=dev-haskell/semigroups-0.8:=[profile?] >=dev-haskell/smallcheck-1.1.1:=[profile?] >=dev-haskell/store-core-0.4:=[profile?] <dev-haskell/store-core-0.5:=[profile?] >=dev-haskell/syb-0.4.4:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] >=dev-haskell/th-lift-instances-0.1.4:=[profile?] >=dev-haskell/th-orphans-0.13.2:=[profile?] >=dev-haskell/th-reify-many-0.1.6:=[profile?] >=dev-haskell/th-utilities-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2.5.1:=[profile?] >=dev-haskell/vector-0.10.12.3:=[profile?] >=dev-haskell/void-0.5.11:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast binary serialization
 EAPI=7
 HOMEPAGE=https://github.com/fpco/store#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/async-2.0.2:=[profile?] >=dev-haskell/base-orphans-0.4.3:=
 RESTRICT=test
 SLOT=0/0.7.6
 SRC_URI=https://hackage.haskell.org/package/store-0.7.6/store-0.7.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=da3c4567a11953bf470e7b4e279efad3
diff --git a/metadata/md5-cache/dev-haskell/store-core-0.4.4.3 b/metadata/md5-cache/dev-haskell/store-core-0.4.4.3
index 04c6c5d40da8..94b57070640c 100644
--- a/metadata/md5-cache/dev-haskell/store-core-0.4.4.3
+++ b/metadata/md5-cache/dev-haskell/store-core-0.4.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/fail-4.9:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-1.0:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-2.0:=[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 )
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-1.0:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-2.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast and lightweight binary serialization
 EAPI=7
 HOMEPAGE=https://github.com/fpco/store#readme
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/fail-4.9:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-1.0:=[profile?] >=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-2.0:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.4.4.3
 SRC_URI=https://hackage.haskell.org/package/store-core-0.4.4.3/store-core-0.4.4.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=54452d8665aadd742f05be0f6f8c3c80
diff --git a/metadata/md5-cache/dev-haskell/stream-0.4.7.2 b/metadata/md5-cache/dev-haskell/stream-0.4.7.2
index 1e39b45e9e81..6cbbadcfeaca 100644
--- a/metadata/md5-cache/dev-haskell/stream-0.4.7.2
+++ b/metadata/md5-cache/dev-haskell/stream-0.4.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/lazysmallcheck-0.3:=[profile?] >=dev-haskell/quickcheck-2.0:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/lazysmallcheck-0.3:=[profile?] >=dev-haskell/quickcheck-2.0:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library for manipulating infinite lists
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/Stream
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/lazysmallcheck-0.3:=[profile?] >=dev-haskell/quickcheck-2.0:2=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.7.2
 SRC_URI=https://hackage.haskell.org/package/Stream-0.4.7.2/Stream-0.4.7.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe1ad915921cf6b1fd47b8581d8fcdb4
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
index b12085c10291..333a22d25e33 100644
--- a/metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2
+++ b/metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Common lower-level functions needed by various streaming data libraries
 EAPI=7
 HOMEPAGE=https://github.com/fpco/streaming-commons
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/network-2.4.0.0:=[profile?]
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2c9bca1c2279669b89141f2dd0815d2a
diff --git a/metadata/md5-cache/dev-haskell/strict-0.3.2-r1 b/metadata/md5-cache/dev-haskell/strict-0.3.2-r1
index ce6ebc053d1a..6a1de3262bbf 100644
--- a/metadata/md5-cache/dev-haskell/strict-0.3.2-r1
+++ b/metadata/md5-cache/dev-haskell/strict-0.3.2-r1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Strict data types and String IO
 EAPI=7
 HOMEPAGE=http://www.cse.unsw.edu.au/~rl/code/strict.html
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.2
 SRC_URI=https://hackage.haskell.org/package/strict-0.3.2/strict-0.3.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bf42f5cf65879d9dac660ced8811e500
diff --git a/metadata/md5-cache/dev-haskell/string-qq-0.0.4 b/metadata/md5-cache/dev-haskell/string-qq-0.0.4
index 8db1a4b80907..2f53644d726a 100644
--- a/metadata/md5-cache/dev-haskell/string-qq-0.0.4
+++ b/metadata/md5-cache/dev-haskell/string-qq-0.0.4
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=QuasiQuoter for non-interpolated strings, texts and bytestrings
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/string-qq
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5184c8ecb47230c67175c68c972959a2
diff --git a/metadata/md5-cache/dev-haskell/stringable-0.1.3 b/metadata/md5-cache/dev-haskell/stringable-0.1.3
index d45fecf59a8d..ffd5b8d11b06 100644
--- a/metadata/md5-cache/dev-haskell/stringable-0.1.3
+++ b/metadata/md5-cache/dev-haskell/stringable-0.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] >=dev-haskell/text-0.11.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 )
+DEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] >=dev-haskell/text-0.11.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Stringable type class, in the spirit of Foldable and Traversable
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/stringable
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] >=dev-haskell/text-0.11.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/stringable-0.1.3/stringable-0.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=07ef4d7f76c774217ff9699d410f96c4
diff --git a/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1 b/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
index d1a72ca1f680..dd1c005a29ac 100644
--- a/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
+++ b/metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) 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.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A writer monad for multi-line string literals
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/stringbuilder
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1
 SRC_URI=https://hackage.haskell.org/package/stringbuilder-0.5.1/stringbuilder-0.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1d6f746a4a3771c5a0aba6b3278d6a88
diff --git a/metadata/md5-cache/dev-haskell/stringprep-1.0.0 b/metadata/md5-cache/dev-haskell/stringprep-1.0.0
index 75d56534026e..b01ce7a1d1fe 100644
--- a/metadata/md5-cache/dev-haskell/stringprep-1.0.0
+++ b/metadata/md5-cache/dev-haskell/stringprep-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-0.9:=[profile?] >=dev-haskell/text-icu-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-quickcheck dev-haskell/tasty-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/text-0.9:=[profile?] >=dev-haskell/text-icu-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-quickcheck dev-haskell/tasty-th ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Implements the "StringPrep" algorithm
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/stringprep
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-0.9:=[profile?] >=dev-haskell/text-icu-0.6:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://hackage.haskell.org/package/stringprep-1.0.0/stringprep-1.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c35803d97051bfac7e7ff60943186270
diff --git a/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6-r1 b/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6-r1
index a1781fbc75d3..e2294e959b25 100644
--- a/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6-r1
+++ b/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast searching, splitting and replacing of ByteStrings
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/stringsearch
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.6.6
 SRC_URI=https://hackage.haskell.org/package/stringsearch-0.3.6.6/stringsearch-0.3.6.6.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8951924e87dff00ffbfdf346611aa443
diff --git a/metadata/md5-cache/dev-haskell/syb-0.7.1 b/metadata/md5-cache/dev-haskell/syb-0.7.1
index b110d70f3c76..a6ab2d2b7533 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.7.1
+++ b/metadata/md5-cache/dev-haskell/syb-0.7.1
@@ -1,5 +1,5 @@
 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/mtl ) 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.8 test? ( dev-haskell/hunit dev-haskell/mtl ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Scrap Your Boilerplate
 EAPI=7
 HOMEPAGE=http://www.cs.uu.nl/wiki/GenericProgramming/SYB
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.7.1
 SRC_URI=https://hackage.haskell.org/package/syb-0.7.1/syb-0.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4c33546dd082bf18013d4078d0612fc3
diff --git a/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.11 b/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.11
index 82a83bb2c3e4..528afac4e3cc 100644
--- a/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.11
+++ b/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.11
@@ -1,5 +1,5 @@
 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/hunit ) 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 test? ( dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Scrap Your Boilerplate With Class
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/syb-with-class
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.6.1.11
 SRC_URI=https://hackage.haskell.org/package/syb-with-class-0.6.1.11/syb-with-class-0.6.1.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=57deacccb4a8023a72de34cc87302dad
diff --git a/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4 b/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
index 765f58947b25..b769d1b49661 100644
--- a/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
+++ b/metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5 >=dev-haskell/temporary-1.1 <dev-haskell/temporary-2.0 >=dev-haskell/transformers-0.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?] >=dev-haskell/text-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5 >=dev-haskell/temporary-1.1 <dev-haskell/temporary-2.0 >=dev-haskell/transformers-0.2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Consistent filesystem interaction across GHC versions (deprecated)
 EAPI=6
 HOMEPAGE=https://github.com/fpco/haskell-filesystem
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-file
 RESTRICT=!test? ( test )
 SLOT=0/0.3.16.4
 SRC_URI=https://hackage.haskell.org/package/system-fileio-0.3.16.4/system-fileio-0.3.16.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d050e53010f00aa9d3c12cc9138d1a1a
diff --git a/metadata/md5-cache/dev-haskell/system-filepath-0.4.14 b/metadata/md5-cache/dev-haskell/system-filepath-0.4.14
index 8b27d273500a..6ad442e93f69 100644
--- a/metadata/md5-cache/dev-haskell/system-filepath-0.4.14
+++ b/metadata/md5-cache/dev-haskell/system-filepath-0.4.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11.0.6:=[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 )
+DEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.11.0.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=High-level, byte-based file and directory path manipulations (deprecated)
 EAPI=6
 HOMEPAGE=https://github.com/fpco/haskell-filesystem
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=
 RESTRICT=test
 SLOT=0/0.4.14
 SRC_URI=https://hackage.haskell.org/package/system-filepath-0.4.14/system-filepath-0.4.14.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ac540735d382dd74bd8313324c8ce3e1
diff --git a/metadata/md5-cache/dev-haskell/system-posix-redirect-1.1.0.1 b/metadata/md5-cache/dev-haskell/system-posix-redirect-1.1.0.1
index 156d2cf89614..bb29c4e61653 100644
--- a/metadata/md5-cache/dev-haskell/system-posix-redirect-1.1.0.1
+++ b/metadata/md5-cache/dev-haskell/system-posix-redirect-1.1.0.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A toy module to temporarily redirect a program's stdout
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/system-posix-redirect
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.1
 SRC_URI=https://hackage.haskell.org/package/system-posix-redirect-1.1.0.1/system-posix-redirect-1.1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=af77d647a824e7f6a1e4025924fb8e38
diff --git a/metadata/md5-cache/dev-haskell/tagged-0.8.6 b/metadata/md5-cache/dev-haskell/tagged-0.8.6
index 5d824fb20c40..89f91e6abaf1 100644
--- a/metadata/md5-cache/dev-haskell/tagged-0.8.6
+++ b/metadata/md5-cache/dev-haskell/tagged-0.8.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell 98 phantom types to avoid unsafely passing dummy arguments
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/tagged
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.8.6
 SRC_URI=https://hackage.haskell.org/package/tagged-0.8.6/tagged-0.8.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b0349b58cf856a6e4e5d75a46f9e956
diff --git a/metadata/md5-cache/dev-haskell/tagshare-0.0 b/metadata/md5-cache/dev-haskell/tagshare-0.0
index 236db77611fb..69e7a7bb7bdb 100644
--- a/metadata/md5-cache/dev-haskell/tagshare-0.0
+++ b/metadata/md5-cache/dev-haskell/tagshare-0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=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 )
+DEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=TagShare - explicit sharing with tags
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/tagshare
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0
 SRC_URI=https://hackage.haskell.org/package/tagshare-0.0/tagshare-0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=685c44f0d5dafa5a4dfbd577d0be14de
diff --git a/metadata/md5-cache/dev-haskell/tagsoup-0.14.8 b/metadata/md5-cache/dev-haskell/tagsoup-0.14.8
index 0aabe637254d..ae5c9b3d61a9 100644
--- a/metadata/md5-cache/dev-haskell/tagsoup-0.14.8
+++ b/metadata/md5-cache/dev-haskell/tagsoup-0.14.8
@@ -1,5 +1,5 @@
 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 )
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( >=dev-haskell/quickcheck-2.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Parsing and extracting information from (possibly malformed) HTML/XML documents
 EAPI=7
 HOMEPAGE=https://github.com/ndmitchell/tagsoup#readme
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3723203921bf2eceeee455ce5da375c4
diff --git a/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.6 b/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.6
index 666a618d9f54..571f5b7b6503 100644
--- a/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.6
+++ b/metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] >=dev-haskell/conduit-extra-1.1.0:=[profile?] >=dev-haskell/data-default-0.5.0:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/xml-conduit-1.2.4:=[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/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] >=dev-haskell/conduit-extra-1.1.0:=[profile?] >=dev-haskell/data-default-0.5.0:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/xml-conduit-1.2.4:=[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/quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=streamlined html tag parser
 EAPI=7
 HOMEPAGE=https://github.com/yihuang/tagstream-conduit
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[pr
 RESTRICT=!test? ( test )
 SLOT=0/0.5.6
 SRC_URI=https://hackage.haskell.org/package/tagstream-conduit-0.5.6/tagstream-conduit-0.5.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c1b96a9e061faf67685a61bd0f420f05
diff --git a/metadata/md5-cache/dev-haskell/tar-0.5.1.1 b/metadata/md5-cache/dev-haskell/tar-0.5.1.1
index 3067bba11253..73908eb00486 100644
--- a/metadata/md5-cache/dev-haskell/tar-0.5.1.1
+++ b/metadata/md5-cache/dev-haskell/tar-0.5.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( dev-haskell/bytestring-handle >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-quickcheck-0.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( dev-haskell/bytestring-handle >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-quickcheck-0.8 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Reading, writing and manipulating tar files
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/tar
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] <dev-haskell/byt
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1.1
 SRC_URI=https://hackage.haskell.org/package/tar-0.5.1.1/tar-0.5.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2e843635b8c099325f9f8e48f7c585d6
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
index 22b64a3bcf63..19c365fdf620 100644
--- a/metadata/md5-cache/dev-haskell/tar-conduit-0.3.2-r1
+++ b/metadata/md5-cache/dev-haskell/tar-conduit-0.3.2-r1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Extract and create tar files using conduit for streaming
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/tar-conduit#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/conduit-combinators-1.0.8.1 >=dev-haskell/conduit-1.3 dev-
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=239628b163a25fdd705cf548ba05adaa
diff --git a/metadata/md5-cache/dev-haskell/tasty-1.2.3 b/metadata/md5-cache/dev-haskell/tasty-1.2.3
index 4703c285fcc8..ea4128fc41db 100644
--- a/metadata/md5-cache/dev-haskell/tasty-1.2.3
+++ b/metadata/md5-cache/dev-haskell/tasty-1.2.3
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Modern and extensible testing framework
 EAPI=7
 HOMEPAGE=https://github.com/feuerbach/tasty
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7710b7d029a012ca256efeee03884819
diff --git a/metadata/md5-cache/dev-haskell/tasty-ant-xml-1.1.6 b/metadata/md5-cache/dev-haskell/tasty-ant-xml-1.1.6
index daf1f769d70d..664da821bf18 100644
--- a/metadata/md5-cache/dev-haskell/tasty-ant-xml-1.1.6
+++ b/metadata/md5-cache/dev-haskell/tasty-ant-xml-1.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/generic-deriving-1.6.2:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] >=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-1.3:=[profile?] >=dev-haskell/xml-1.3.13:=[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 )
+DEPEND=>=dev-haskell/generic-deriving-1.6.2:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] >=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-1.3:=[profile?] >=dev-haskell/xml-1.3.13:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Render tasty output to XML for Jenkins
 EAPI=7
 HOMEPAGE=https://github.com/ocharles/tasty-ant-xml
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/generic-deriving-1.6.2:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] >=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-1.3:=[profile?] >=dev-haskell/xml-1.3.13:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/1.1.6
 SRC_URI=https://hackage.haskell.org/package/tasty-ant-xml-1.1.6/tasty-ant-xml-1.1.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b46430d917ba8dac9ce2f885356151cd
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
index 5adda5c213b0..c102dd8248d2 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Mark tasty tests as failure expected
 EAPI=7
 HOMEPAGE=https://github.com/nomeata/tasty-expected-failure
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2103d23c11e7301172e0b132464a317b
diff --git a/metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1 b/metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1
index 30ca32e06e6c..185436508112 100644
--- a/metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1
+++ b/metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/async:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/tasty-hunit dev-haskell/temporary-rc ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/async:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( dev-haskell/tasty-hunit dev-haskell/temporary-rc ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Golden tests support for tasty
 EAPI=6
 HOMEPAGE=https://github.com/feuerbach/tasty-golden
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/op
 RESTRICT=!test? ( test )
 SLOT=0/2.3.1.1
 SRC_URI=https://hackage.haskell.org/package/tasty-golden-2.3.1.1/tasty-golden-2.3.1.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a727a0a11e446a05296e20fc0faa4540
diff --git a/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2-r1 b/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2-r1
index 25eb71147546..f098ab8561b8 100644
--- a/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2-r1
+++ b/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.1:=[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.13 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.1:=[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.13 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Integration for tasty and hedgehog
 EAPI=7
 HOMEPAGE=https://github.com/qfpl/tasty-hedgehog
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.1:=[pro
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4ff4e2ba27397d8537ac44dcc413e5ed
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
index 1dcfbbcaae1a..a4c4ed30dfbf 100644
--- a/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2
+++ b/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2
@@ -1,5 +1,5 @@
 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 )
+DEPEND=dev-haskell/call-stack:=[profile?] >=dev-haskell/tasty-1.2.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=HUnit support for the Tasty test framework
 EAPI=7
 HOMEPAGE=https://github.com/feuerbach/tasty
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc124c2365da8746abe76488504a9fab
diff --git a/metadata/md5-cache/dev-haskell/tasty-kat-0.0.3 b/metadata/md5-cache/dev-haskell/tasty-kat-0.0.3
index a97f2a295fc1..ba737d4e41f4 100644
--- a/metadata/md5-cache/dev-haskell/tasty-kat-0.0.3
+++ b/metadata/md5-cache/dev-haskell/tasty-kat-0.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/mtl dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/mtl dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Known Answer Tests (KAT) framework for tasty
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/tasty-kat
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.0.3
 SRC_URI=https://hackage.haskell.org/package/tasty-kat-0.0.3/tasty-kat-0.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f36d7fb2cc0b867f0903245f74561a7
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
index 0d407cad6522..4581c16ebc70 100644
--- a/metadata/md5-cache/dev-haskell/tasty-lua-0.2.0.1
+++ b/metadata/md5-cache/dev-haskell/tasty-lua-0.2.0.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Write tests in Lua, integrate into tasty
 EAPI=7
 HOMEPAGE=https://github.com/hslua/tasty-lua
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[p
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 27d0e3b2e981..f8a1915df201 100644
--- a/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1
+++ b/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=QuickCheck support for the Tasty test framework
 EAPI=7
 HOMEPAGE=https://github.com/feuerbach/tasty
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/optparse-applicative:=[profile?] >=dev-haskell/quickcheck-2.
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c743d101942a58ee2b3a151096fe895
diff --git a/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.17 b/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.17
index af51ed1564f7..0cd1a7b4079f 100644
--- a/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.17
+++ b/metadata/md5-cache/dev-haskell/tasty-rerun-1.1.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-1.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 )
+DEPEND=>=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Run tests by filtering the tests depending on the result of previous runs
 EAPI=7
 HOMEPAGE=https://github.com/ocharles/tasty-rerun
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.1.2:=[profile?] >=dev-haskell/optparse-applicative-0.6:=[profile?] >=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/stm-2.4.2:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.1.17
 SRC_URI=https://hackage.haskell.org/package/tasty-rerun-1.1.17/tasty-rerun-1.1.17.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=207eb95819dad130131da880d521cfc9
diff --git a/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1 b/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1
index cf192a6080f8..56b3a15cbeb3 100644
--- a/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1
+++ b/metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[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 )
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=SmallCheck support for the Tasty test framework
 EAPI=7
 HOMEPAGE=http://documentup.com/feuerbach/tasty
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/smallcheck-1.0:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.8.1
 SRC_URI=https://hackage.haskell.org/package/tasty-smallcheck-0.8.1/tasty-smallcheck-0.8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2902878a539585f8fad2f6216611fd86
diff --git a/metadata/md5-cache/dev-haskell/tasty-th-0.1.7 b/metadata/md5-cache/dev-haskell/tasty-th-0.1.7
index b02714e50d16..943de7aabf30 100644
--- a/metadata/md5-cache/dev-haskell/tasty-th-0.1.7
+++ b/metadata/md5-cache/dev-haskell/tasty-th-0.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/haskell-src-exts-1.18.0:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/haskell-src-exts-1.18.0:=[profile?] dev-haskell/tasty:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/tasty-hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Automatic tasty test case discovery using TH
 EAPI=6
 HOMEPAGE=https://github.com/bennofs/tasty-th
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/haskell-src-exts-1.18.0:=[profile?] dev-haskell/tasty:=[pr
 RESTRICT=!test? ( test )
 SLOT=0/0.1.7
 SRC_URI=https://hackage.haskell.org/package/tasty-th-0.1.7/tasty-th-0.1.7.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b3721784ed15f18c17318d9ce6506b0e
diff --git a/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4 b/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4
index 1e343683d98e..8fcb71f80d86 100644
--- a/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4
+++ b/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.16.0 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
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.6.2:=
 SLOT=0/0.1.4
 SRC_URI=https://hackage.haskell.org/package/template-haskell-compat-v0208-0.1.4/template-haskell-compat-v0208-0.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=125795c6db0b41154dfdc6470ec34b87
diff --git a/metadata/md5-cache/dev-haskell/temporary-1.3 b/metadata/md5-cache/dev-haskell/temporary-1.3
index bcd81ed14ff8..e0997acd00cf 100644
--- a/metadata/md5-cache/dev-haskell/temporary-1.3
+++ b/metadata/md5-cache/dev-haskell/temporary-1.3
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Portable temporary file and directory support for Windows and Unix
 EAPI=7
 HOMEPAGE=https://github.com/feuerbach/temporary
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/random-1.1:=[prof
 RESTRICT=!test? ( test )
 SLOT=0/1.3
 SRC_URI=https://hackage.haskell.org/package/temporary-1.3/temporary-1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7cee727f7c71fa1291c35f0b987b1d4c
diff --git a/metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3 b/metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3
index 8d2653235e0e..7ea333ec754f 100644
--- a/metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3
+++ b/metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/exceptions-0.6:=[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 )
+DEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Portable temporary file and directory support for Windows and Unix
 EAPI=7
 HOMEPAGE=https://github.com/feuerbach/temporary
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/1.2.0.3
 SRC_URI=https://hackage.haskell.org/package/temporary-rc-1.2.0.3/temporary-rc-1.2.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7acb88058553b7522338a38e4b3fc6e0
diff --git a/metadata/md5-cache/dev-haskell/tensor-1.1.0.1 b/metadata/md5-cache/dev-haskell/tensor-1.1.0.1
index 8e62a5276803..6387c580bbb8 100644
--- a/metadata/md5-cache/dev-haskell/tensor-1.1.0.1
+++ b/metadata/md5-cache/dev-haskell/tensor-1.1.0.1
@@ -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 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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Tensor data types
 EAPI=6
 HOMEPAGE=https://github.com/svenpanne/Tensor
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.1
 SRC_URI=https://hackage.haskell.org/package/Tensor-1.1.0.1/Tensor-1.1.0.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dbe0a77e54d92c35b08e1ff11aa114ec
diff --git a/metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1 b/metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1
index 9c8eeaa0090e..7493a7cfd725 100644
--- a/metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1
+++ b/metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1
@@ -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 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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Get terminal window height and width
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/terminal-size
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.2.1
 SRC_URI=https://hackage.haskell.org/package/terminal-size-0.3.2.1/terminal-size-0.3.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d3515b86c0dae3817d7a20422bce5a5b
diff --git a/metadata/md5-cache/dev-haskell/terminfo-0.4.1.4 b/metadata/md5-cache/dev-haskell/terminfo-0.4.1.4
index 2d684d1dcd90..4b918549c24d 100644
--- a/metadata/md5-cache/dev-haskell/terminfo-0.4.1.4
+++ b/metadata/md5-cache/dev-haskell/terminfo-0.4.1.4
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell bindings to the terminfo library
 EAPI=7
 HOMEPAGE=https://github.com/judah/terminfo
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=88ee62a1fe604e8890302e816508ae50
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r2 b/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r2
index 6bf849e258fe..2c6bd0efce7b 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r2
+++ b/metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/base-orphans-0.1:=[profile?] >=dev-haskell/hostname-1.0:=[profile?] <dev-haskell/hostname-1.1:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-posix-0.72:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] <dev-haskell/xml-1.4:=[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 )
+DEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/base-orphans-0.1:=[profile?] >=dev-haskell/hostname-1.0:=[profile?] <dev-haskell/hostname-1.1:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-posix-0.72:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Framework for running and organising tests, with HUnit and QuickCheck support
 EAPI=7
 HOMEPAGE=http://haskell.github.io/test-framework/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/ansi-wl-ppri
 RESTRICT=test
 SLOT=0/0.8.2.0
 SRC_URI=https://hackage.haskell.org/package/test-framework-0.8.2.0/test-framework-0.8.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d3c76e99d3d9f51f9708e68a2baa5418
diff --git a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1 b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1
index e3eefd606723..5248aafd948f 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1
+++ b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] >=dev-haskell/test-framework-0.2.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 )
+DEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] >=dev-haskell/test-framework-0.2.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=HUnit support for the test-framework package
 EAPI=7
 HOMEPAGE=https://batterseapower.github.io/test-framework/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] >=dev-haskell/test-framework-0.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.2
 SRC_URI=https://hackage.haskell.org/package/test-framework-hunit-0.3.0.2/test-framework-hunit-0.3.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=63f409bda0020b3d87adb9d1c1325278
diff --git a/metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1 b/metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1
index 208ebf3daee7..a1425ec5a24d 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1
+++ b/metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/leancheck:=[profile?] dev-haskell/test-framework:=[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 )
+DEPEND=dev-haskell/leancheck:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=LeanCheck support for test-framework
 EAPI=7
 HOMEPAGE=https://github.com/rudymatela/test-framework-leancheck#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/leancheck:=[profile?] dev-haskell/test-framework:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/0.0.1
 SRC_URI=https://hackage.haskell.org/package/test-framework-leancheck-0.0.1/test-framework-leancheck-0.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e846aa6606668f5f20bfdc91e830b2a9
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r1 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r1
index e88816deeca0..e632563d9eea 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r1
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/test-framework-0.8:=[profile?] <dev-haskell/test-framework-0.9:=[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 )
+DEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/test-framework-0.8:=[profile?] <dev-haskell/test-framework-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=QuickCheck2 support for the test-framework package
 EAPI=7
 HOMEPAGE=http://haskell.github.io/test-framework/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/test-framework-0.8:=[profile?] <dev-haskell/test-framework-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.5
 SRC_URI=https://hackage.haskell.org/package/test-framework-quickcheck2-0.3.0.5/test-framework-quickcheck2-0.3.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f1879fb8365bb3cdb3d4a7e31478e71
diff --git a/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4 b/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
index b75f4e5c9069..93ee6f3de620 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
+++ b/metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/haskell-src-exts:=[profile?] >=dev-haskell/language-haskell-extract-0.2:=[profile?] dev-haskell/regex-posix:=[profile?] dev-haskell/test-framework:=[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 )
+DEPEND=dev-haskell/haskell-src-exts:=[profile?] >=dev-haskell/language-haskell-extract-0.2:=[profile?] dev-haskell/regex-posix:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Automagically generate the HUnit and Quickcheck using Template Haskell
 EAPI=7
 HOMEPAGE=https://github.com/finnsson/test-generator
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/haskell-src-exts:=[profile?] >=dev-haskell/language-haskell-extract-0.2:=[profile?] dev-haskell/regex-posix:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.4
 SRC_URI=https://hackage.haskell.org/package/test-framework-th-0.2.4/test-framework-th-0.2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aa515fed92f139a4e05d28cc6c2c2081
diff --git a/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.9 b/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.9
index f44b3f27b098..d4b1eab41fc0 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.9
+++ b/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[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 )
+DEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Template Haskell for test framework
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/test-framework-th-prime
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.0.9
 SRC_URI=https://hackage.haskell.org/package/test-framework-th-prime-0.0.9/test-framework-th-prime-0.0.9.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0bc7bbcc11143df7d3354aa6c181e54a
diff --git a/metadata/md5-cache/dev-haskell/testing-feat-1.1.0.0 b/metadata/md5-cache/dev-haskell/testing-feat-1.1.0.0
index 949f9679ab80..bc463ddace22 100644
--- a/metadata/md5-cache/dev-haskell/testing-feat-1.1.0.0
+++ b/metadata/md5-cache/dev-haskell/testing-feat-1.1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] <dev-haskell/semigroups-0.19:=[profile?] <dev-haskell/size-based-0.2:=[profile?] <dev-haskell/testing-type-modifiers-0.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 )
+DEPEND=>dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] <dev-haskell/semigroups-0.19:=[profile?] <dev-haskell/size-based-0.2:=[profile?] <dev-haskell/testing-type-modifiers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Functional Enumeration of Algebraic Types
 EAPI=7
 HOMEPAGE=https://github.com/JonasDuregard/testing-feat
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] <dev-haskell/semigroups-0.19:=[profile?] <dev-haskell/size-based-0.2:=[profile?] <dev-haskell/testing-type-modifiers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.0
 SRC_URI=https://hackage.haskell.org/package/testing-feat-1.1.0.0/testing-feat-1.1.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=47ab6a98372dc2d76a1c62a948d3e865
diff --git a/metadata/md5-cache/dev-haskell/testing-type-modifiers-0.1.0.1 b/metadata/md5-cache/dev-haskell/testing-type-modifiers-0.1.0.1
index 73d9eab83e3d..e6d7bdd919bc 100644
--- a/metadata/md5-cache/dev-haskell/testing-type-modifiers-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/testing-type-modifiers-0.1.0.1
@@ -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 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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Data type modifiers for property based testing
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/testing-type-modifiers
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/testing-type-modifiers-0.1.0.1/testing-type-modifiers-0.1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2340b364166dff676fcedc28e71f2487
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.12.0.3 b/metadata/md5-cache/dev-haskell/texmath-0.12.0.3
index c1cd052f4ddf..07777444fa17 100644
--- a/metadata/md5-cache/dev-haskell/texmath-0.12.0.3
+++ b/metadata/md5-cache/dev-haskell/texmath-0.12.0.3
@@ -1,5 +1,5 @@
 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.23:=[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-7.10.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 )
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.23:=[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-7.10.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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Conversion between formats used to represent mathematics
 EAPI=7
 HOMEPAGE=https://github.com/jgm/texmath
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/0.12.0.3
 SRC_URI=https://hackage.haskell.org/package/texmath-0.12.0.3/texmath-0.12.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=55872f0c742831d49e73e190f9b33b86
diff --git a/metadata/md5-cache/dev-haskell/text-1.2.4.0 b/metadata/md5-cache/dev-haskell/text-1.2.4.0
index 18d5e0934c8e..6280237eea61 100644
--- a/metadata/md5-cache/dev-haskell/text-1.2.4.0
+++ b/metadata/md5-cache/dev-haskell/text-1.2.4.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-8.8.1:= hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=An efficient packed Unicode text type
 EAPI=7
 HOMEPAGE=https://github.com/haskell/text
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=11141117a07168419e5ca44500f7ee1b
diff --git a/metadata/md5-cache/dev-haskell/text-binary-0.2.1.1 b/metadata/md5-cache/dev-haskell/text-binary-0.2.1.1
index 16dd2e62b24f..ce5e387d9af8 100644
--- a/metadata/md5-cache/dev-haskell/text-binary-0.2.1.1
+++ b/metadata/md5-cache/dev-haskell/text-binary-0.2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/text:=[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 )
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Binary instances for text types
 EAPI=6
 HOMEPAGE=https://github.com/kawu/text-binary
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.1.1
 SRC_URI=https://hackage.haskell.org/package/text-binary-0.2.1.1/text-binary-0.2.1.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c0ad97f354a470c1a587e1eb7cc16345
diff --git a/metadata/md5-cache/dev-haskell/text-conversions-0.3.0 b/metadata/md5-cache/dev-haskell/text-conversions-0.3.0
index 1911c54417b3..a19dc98f0e74 100644
--- a/metadata/md5-cache/dev-haskell/text-conversions-0.3.0
+++ b/metadata/md5-cache/dev-haskell/text-conversions-0.3.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Safe conversions between textual types
 EAPI=7
 HOMEPAGE=https://github.com/cjdev/text-conversions#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e9184e12904ac82372984d439f9ac54
diff --git a/metadata/md5-cache/dev-haskell/text-icu-0.7.0.1 b/metadata/md5-cache/dev-haskell/text-icu-0.7.0.1
index b8615a49ee3c..9f6e9ead2c87 100644
--- a/metadata/md5-cache/dev-haskell/text-icu-0.7.0.1
+++ b/metadata/md5-cache/dev-haskell/text-icu-0.7.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-0.9.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/icu:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/text-0.9.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/icu:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Bindings to the ICU library
 EAPI=7
 HOMEPAGE=https://github.com/bos/text-icu
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-0.9.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/i
 RESTRICT=test
 SLOT=0/0.7.0.1
 SRC_URI=https://hackage.haskell.org/package/text-icu-0.7.0.1/text-icu-0.7.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8ad4ddf397ed3a12ce006b62554c6685
diff --git a/metadata/md5-cache/dev-haskell/text-metrics-0.3.0 b/metadata/md5-cache/dev-haskell/text-metrics-0.3.0
index 0c321fcc0bfc..b1c38446d175 100644
--- a/metadata/md5-cache/dev-haskell/text-metrics-0.3.0
+++ b/metadata/md5-cache/dev-haskell/text-metrics-0.3.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Calculate various string metrics efficiently
 EAPI=6
 HOMEPAGE=https://github.com/mrkkrp/text-metrics
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=d
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d70def7d451c7a22812571f928fe71b4
diff --git a/metadata/md5-cache/dev-haskell/text-short-0.1.3 b/metadata/md5-cache/dev-haskell/text-short-0.1.3
index 2d3524040a5e..15ee0a553b78 100644
--- a/metadata/md5-cache/dev-haskell/text-short-0.1.3
+++ b/metadata/md5-cache/dev-haskell/text-short-0.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/hashable-1.2.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-instances-0.3.14 <dev-haskell/quickcheck-instances-0.4 >=dev-haskell/tasty-1.0.0 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-hunit-0.10.0 <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 )
+DEPEND=>=dev-haskell/hashable-1.2.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-instances-0.3.14 <dev-haskell/quickcheck-instances-0.4 >=dev-haskell/tasty-1.0.0 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-hunit-0.10.0 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Memory-efficient representation of Unicode text strings
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/text-short
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hashable-1.2.6:=[profile?] <dev-haskell/hashable-1.4:=[pro
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/text-short-0.1.3/text-short-0.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=872f8aa09e5b72a0c22f7c806b7fff1c
diff --git a/metadata/md5-cache/dev-haskell/text-show-3.8.5 b/metadata/md5-cache/dev-haskell/text-show-3.8.5
index 127808bd1728..0b60f1648337 100644
--- a/metadata/md5-cache/dev-haskell/text-show-3.8.5
+++ b/metadata/md5-cache/dev-haskell/text-show-3.8.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?] >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?] >=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/base-orphans-0.8.2 <dev-haskell/base-orphans-0.9 >=dev-haskell/deriving-compat-0.5.6 <dev-haskell/deriving-compat-1 >=dev-haskell/hspec-2 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.12 <dev-haskell/quickcheck-2.15 >=dev-haskell/quickcheck-instances-0.3.18 <dev-haskell/quickcheck-instances-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?] >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?] dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?] >=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/base-orphans-0.8.2 <dev-haskell/base-orphans-0.9 >=dev-haskell/deriving-compat-0.5.6 <dev-haskell/deriving-compat-1 >=dev-haskell/hspec-2 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.12 <dev-haskell/quickcheck-2.15 >=dev-haskell/quickcheck-instances-0.3.18 <dev-haskell/quickcheck-instances-0.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Efficient conversion of values into Text
 EAPI=7
 HOMEPAGE=https://github.com/RyanGlScott/text-show
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-c
 RESTRICT=!test? ( test )
 SLOT=0/3.8.5
 SRC_URI=https://hackage.haskell.org/package/text-show-3.8.5/text-show-3.8.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=57074aeb6b48a5a188b7f40dbffaca77
diff --git a/metadata/md5-cache/dev-haskell/text-stream-decode-0.1.0.5 b/metadata/md5-cache/dev-haskell/text-stream-decode-0.1.0.5
index c2ab26018562..45e3fc26b48f 100644
--- a/metadata/md5-cache/dev-haskell/text-stream-decode-0.1.0.5
+++ b/metadata/md5-cache/dev-haskell/text-stream-decode-0.1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.8 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Streaming decoding functions for UTF encodings. (deprecated)
 EAPI=7
 HOMEPAGE=https://github.com/fpco/text-stream-decode
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0.5
 SRC_URI=https://hackage.haskell.org/package/text-stream-decode-0.1.0.5/text-stream-decode-0.1.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=990a76f8f9da2404ef94a5d3ab03574f
diff --git a/metadata/md5-cache/dev-haskell/tf-random-0.5 b/metadata/md5-cache/dev-haskell/tf-random-0.5
index 59939b766c09..36c6299fc5e1 100644
--- a/metadata/md5-cache/dev-haskell/tf-random-0.5
+++ b/metadata/md5-cache/dev-haskell/tf-random-0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/primitive-0.3:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5
 SRC_URI=https://hackage.haskell.org/package/tf-random-0.5/tf-random-0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5e141b65b98fa5c9f60cbab87fa9e6f
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
index 28867f974ffe..9106dcde289c 100644
--- a/metadata/md5-cache/dev-haskell/th-abstraction-0.3.2.0
+++ b/metadata/md5-cache/dev-haskell/th-abstraction-0.3.2.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 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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Nicer interface for reified information about data types
 EAPI=7
 HOMEPAGE=https://github.com/glguy/th-abstraction
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1d02ff9f3e1492a889ee0f049ebd503a
diff --git a/metadata/md5-cache/dev-haskell/th-expand-syns-0.4.5.0 b/metadata/md5-cache/dev-haskell/th-expand-syns-0.4.5.0
index 59b9e460d3fc..bcec091a67a6 100644
--- a/metadata/md5-cache/dev-haskell/th-expand-syns-0.4.5.0
+++ b/metadata/md5-cache/dev-haskell/th-expand-syns-0.4.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/syb:=[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 )
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Expands type synonyms in Template Haskell ASTs
 EAPI=7
 HOMEPAGE=https://github.com/DanielSchuessler/th-expand-syns
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.5.0
 SRC_URI=https://hackage.haskell.org/package/th-expand-syns-0.4.5.0/th-expand-syns-0.4.5.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8796b1b6d7c68d4c81ce77a137c053f9
diff --git a/metadata/md5-cache/dev-haskell/th-lift-0.8.1 b/metadata/md5-cache/dev-haskell/th-lift-0.8.1
index adfd8ec6af00..0f3b5c713881 100644
--- a/metadata/md5-cache/dev-haskell/th-lift-0.8.1
+++ b/metadata/md5-cache/dev-haskell/th-lift-0.8.1
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Derive Template Haskell's Lift class for datatypes
 EAPI=7
 HOMEPAGE=https://github.com/RyanGlScott/th-lift
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/th-abstraction-0.2.3:=[profile?] <dev-haskell/th-abstracti
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 4045c8002ef3..4fb49329372f 100644
--- a/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14
+++ b/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Lift instances for template-haskell for common data types
 EAPI=7
 HOMEPAGE=https://github.com/bennofs/th-lift-instances/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/text:=[profile?] >=dev-haskell/th-lift-0.8:=[profile?] >=dev
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8485a4e5494a745f3545d7f4196fc957
diff --git a/metadata/md5-cache/dev-haskell/th-orphans-0.13.3 b/metadata/md5-cache/dev-haskell/th-orphans-0.13.3
index d868af5a31e3..3d11850e27f1 100644
--- a/metadata/md5-cache/dev-haskell/th-orphans-0.13.3
+++ b/metadata/md5-cache/dev-haskell/th-orphans-0.13.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/generic-deriving-1.9:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] dev-haskell/th-lift-instances:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/generic-deriving-1.9:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/th-lift-0.7.1:=[profile?] dev-haskell/th-lift-instances:=[profile?] >=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Orphan instances for TH datatypes
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/th-orphans
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/generic-deriving-1.9:=[profile?] dev-haskell/mtl:=[profile
 RESTRICT=!test? ( test )
 SLOT=0/0.13.3
 SRC_URI=https://hackage.haskell.org/package/th-orphans-0.13.3/th-orphans-0.13.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d18ffa0391af60e826ce084bae1980aa
diff --git a/metadata/md5-cache/dev-haskell/th-reify-many-0.1.9 b/metadata/md5-cache/dev-haskell/th-reify-many-0.1.9
index 277943b81d6b..3d6dc779a40c 100644
--- a/metadata/md5-cache/dev-haskell/th-reify-many-0.1.9
+++ b/metadata/md5-cache/dev-haskell/th-reify-many-0.1.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/th-expand-syns:=[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 )
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/th-expand-syns:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Recurseively reify template haskell datatype info
 EAPI=7
 HOMEPAGE=https://github.com/mgsloan/th-reify-many
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/th-
 RESTRICT=!test? ( test )
 SLOT=0/0.1.9
 SRC_URI=https://hackage.haskell.org/package/th-reify-many-0.1.9/th-reify-many-0.1.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee2809c1349eebede4178e01ebee6adc
diff --git a/metadata/md5-cache/dev-haskell/th-utilities-0.2.3.0 b/metadata/md5-cache/dev-haskell/th-utilities-0.2.3.0
index 2e4dbdd08044..77f90af18c87 100644
--- a/metadata/md5-cache/dev-haskell/th-utilities-0.2.3.0
+++ b/metadata/md5-cache/dev-haskell/th-utilities-0.2.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-orphans:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-orphans:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/vector ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Collection of useful functions for use with Template Haskell
 EAPI=7
 HOMEPAGE=https://github.com/fpco/th-utilities#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] dev-haskel
 RESTRICT=!test? ( test )
 SLOT=0/0.2.3.0
 SRC_URI=https://hackage.haskell.org/package/th-utilities-0.2.3.0/th-utilities-0.2.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=672112da35c2ba0f153f823398f44d97
diff --git a/metadata/md5-cache/dev-haskell/threads-0.5.1.6 b/metadata/md5-cache/dev-haskell/threads-0.5.1.6
index 1285d0b553e9..dfafe747ea7b 100644
--- a/metadata/md5-cache/dev-haskell/threads-0.5.1.6
+++ b/metadata/md5-cache/dev-haskell/threads-0.5.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/stm-2.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/concurrent-extra-0.5.1 >=dev-haskell/hunit-1.2.2 >=dev-haskell/test-framework-0.2.4 >=dev-haskell/test-framework-hunit-0.2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/stm-2.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/concurrent-extra-0.5.1 >=dev-haskell/hunit-1.2.2 >=dev-haskell/test-framework-0.2.4 >=dev-haskell/test-framework-hunit-0.2.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fork threads and wait for their result
 EAPI=6
 HOMEPAGE=https://github.com/basvandijk/threads
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/stm-2.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1.6
 SRC_URI=https://hackage.haskell.org/package/threads-0.5.1.6/threads-0.5.1.6.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0b77a18204df740b44397573fceccb4
diff --git a/metadata/md5-cache/dev-haskell/thyme-0.3.5.5 b/metadata/md5-cache/dev-haskell/thyme-0.3.5.5
index 427de264c869..036201a764e4 100644
--- a/metadata/md5-cache/dev-haskell/thyme-0.3.5.5
+++ b/metadata/md5-cache/dev-haskell/thyme-0.3.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-haskell/vector-space-0.8:=[profile?] >=dev-haskell/vector-th-unbox-0.2.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= lens? ( >=dev-haskell/lens-3.9:=[profile?] ) !lens? ( >=dev-haskell/profunctors-3.1.2:=[profile?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-haskell/vector-space-0.8:=[profile?] >=dev-haskell/vector-th-unbox-0.2.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= lens? ( >=dev-haskell/lens-3.9:=[profile?] ) !lens? ( >=dev-haskell/profunctors-3.1.2:=[profile?] ) >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A faster time library
 EAPI=7
 HOMEPAGE=https://github.com/liyang/thyme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.10:=[prof
 RESTRICT=test
 SLOT=0/0.3.5.5
 SRC_URI=https://hackage.haskell.org/package/thyme-0.3.5.5/thyme-0.3.5.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9419dc27ac9b62a5a1e608c07ba2363a
diff --git a/metadata/md5-cache/dev-haskell/time-compat-1.9.3 b/metadata/md5-cache/dev-haskell/time-compat-1.9.3
index d9b388f9dd82..ee60202f38b6 100644
--- a/metadata/md5-cache/dev-haskell/time-compat-1.9.3
+++ b/metadata/md5-cache/dev-haskell/time-compat-1.9.3
@@ -1,5 +1,5 @@
 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 )
+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 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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/base-orphans-0.8.1:=[profile?] <dev-haskell/base-orphans-0
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=775bd61a961a037ceaf703c5acd1237c
diff --git a/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5 b/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5
index de024e0af233..9d5cf7dba5d8 100644
--- a/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5
+++ b/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/old-locale:=[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 )
+DEPEND=dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Compatibility of TimeLocale between old-locale and time-1.5
 EAPI=6
 HOMEPAGE=https://github.com/khibino/haskell-time-locale-compat
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.5
 SRC_URI=https://hackage.haskell.org/package/time-locale-compat-0.1.1.5/time-locale-compat-0.1.1.5.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a68eceffa62019a3b938ae8a31139a0b
diff --git a/metadata/md5-cache/dev-haskell/time-manager-0.0.0 b/metadata/md5-cache/dev-haskell/time-manager-0.0.0
index 84343db700e3..549528696074 100644
--- a/metadata/md5-cache/dev-haskell/time-manager-0.0.0
+++ b/metadata/md5-cache/dev-haskell/time-manager-0.0.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=dev-haskell/auto-update:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Scalable timer
 EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f882e9687b698bc613715e3f4db10816
diff --git a/metadata/md5-cache/dev-haskell/timezone-olson-0.1.9 b/metadata/md5-cache/dev-haskell/timezone-olson-0.1.9
index 3477e972a80b..44785359062f 100644
--- a/metadata/md5-cache/dev-haskell/timezone-olson-0.1.9
+++ b/metadata/md5-cache/dev-haskell/timezone-olson-0.1.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-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 )
+DEPEND=>=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A pure Haskell parser and renderer for binary Olson timezone files
 EAPI=6
 HOMEPAGE=http://projects.haskell.org/time-ng/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/timezone-series-0.1.0:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/0.1.9
 SRC_URI=https://hackage.haskell.org/package/timezone-olson-0.1.9/timezone-olson-0.1.9.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a2fe191d7833d2002d7478862b69f140
diff --git a/metadata/md5-cache/dev-haskell/timezone-series-0.1.9 b/metadata/md5-cache/dev-haskell/timezone-series-0.1.9
index d9e72683f93f..008eacc9413b 100644
--- a/metadata/md5-cache/dev-haskell/timezone-series-0.1.9
+++ b/metadata/md5-cache/dev-haskell/timezone-series-0.1.9
@@ -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 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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Enhanced timezone handling for Data.Time
 EAPI=6
 HOMEPAGE=http://projects.haskell.org/time-ng/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.9
 SRC_URI=https://hackage.haskell.org/package/timezone-series-0.1.9/timezone-series-0.1.9.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=860972c6e788f96a78b0a5162df7bd37
diff --git a/metadata/md5-cache/dev-haskell/tls-1.5.4 b/metadata/md5-cache/dev-haskell/tls-1.5.4
index e6607234f13d..5b2c3c732076 100644
--- a/metadata/md5-cache/dev-haskell/tls-1.5.4
+++ b/metadata/md5-cache/dev-haskell/tls-1.5.4
@@ -1,5 +1,5 @@
 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:= 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 )
+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:= 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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=TLS/SSL protocol native implementation (Server and Client)
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-tls
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[p
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a5b6902835b42fce658274f1c271a9ea
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
index 81375d4dbc7f..e4bbe3ee197d 100644
--- a/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
+++ b/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=In-memory TLS session manager
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/tls-session-manager
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2622ce5de60e89b9b4da7376ee68dff5
diff --git a/metadata/md5-cache/dev-haskell/top-1.7 b/metadata/md5-cache/dev-haskell/top-1.7
index 647b95bb547b..c0c7026d287e 100644
--- a/metadata/md5-cache/dev-haskell/top-1.7
+++ b/metadata/md5-cache/dev-haskell/top-1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10.1.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10.1.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Constraint solving framework employed by the Helium Compiler
 EAPI=7
 HOMEPAGE=http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.7
 SRC_URI=https://hackage.haskell.org/package/Top-1.7/Top-1.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=00e067f6b3486f519da6ead7e5196098
diff --git a/metadata/md5-cache/dev-haskell/torrent-10000.1.1 b/metadata/md5-cache/dev-haskell/torrent-10000.1.1
index 1caa5f86e9d9..ca9a8b9e73a8 100644
--- a/metadata/md5-cache/dev-haskell/torrent-10000.1.1
+++ b/metadata/md5-cache/dev-haskell/torrent-10000.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/bencode-0.2:=[profile?] dev-haskell/syb:=[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 )
+DEPEND=>=dev-haskell/bencode-0.2:=[profile?] dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=BitTorrent file parser and generater
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/torrent
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/bencode-0.2:=[profile?] dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/10000.1.1
 SRC_URI=https://hackage.haskell.org/package/torrent-10000.1.1/torrent-10000.1.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a961d2f9e63d1f8038487e642ef22bb
diff --git a/metadata/md5-cache/dev-haskell/transformers-0.5.6.2 b/metadata/md5-cache/dev-haskell/transformers-0.5.6.2
index 1f35742df36e..5939c236cfd2 100644
--- a/metadata/md5-cache/dev-haskell/transformers-0.5.6.2
+++ b/metadata/md5-cache/dev-haskell/transformers-0.5.6.2
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Concrete functor and monad transformers
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/transformers
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 12a4f6184bf7..d211f688de72 100644
--- a/metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2
+++ b/metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Lift computations from the bottom of a transformer stack
 EAPI=6
 HOMEPAGE=https://github.com/mvv/transformers-base
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2e909f253b0c74a43b052f2156ad32af
diff --git a/metadata/md5-cache/dev-haskell/transformers-compat-0.6.6 b/metadata/md5-cache/dev-haskell/transformers-compat-0.6.6
index 83a88e25161f..496806f03f2f 100644
--- a/metadata/md5-cache/dev-haskell/transformers-compat-0.6.6
+++ b/metadata/md5-cache/dev-haskell/transformers-compat-0.6.6
@@ -1,5 +1,5 @@
 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 )
+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:= hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A small compatibility shim for the transformers library
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/transformers-compat/
@@ -9,5 +9,5 @@ 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.6
 SRC_URI=https://hackage.haskell.org/package/transformers-compat-0.6.6/transformers-compat-0.6.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=efa312c0f59432cce547e5f4ab9978cd
diff --git a/metadata/md5-cache/dev-haskell/tree-diff-0.1 b/metadata/md5-cache/dev-haskell/tree-diff-0.1
index e9a979bc64f5..a24bcb31f0f6 100644
--- a/metadata/md5-cache/dev-haskell/tree-diff-0.1
+++ b/metadata/md5-cache/dev-haskell/tree-diff-0.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Diffing of (expression) trees
 EAPI=7
 HOMEPAGE=https://github.com/phadej/tree-diff
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.4.0.0:=[profile?] <dev-haskell/aeson-1.5:=[profile
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=029b4f158d7d17617b48c722845671fd
diff --git a/metadata/md5-cache/dev-haskell/trifecta-2.1 b/metadata/md5-cache/dev-haskell/trifecta-2.1
index 81ffe4ec678e..8e8d46909153 100644
--- a/metadata/md5-cache/dev-haskell/trifecta-2.1
+++ b/metadata/md5-cache/dev-haskell/trifecta-2.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A modern parser combinator library with convenient diagnostics
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/trifecta/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0
 RESTRICT=test
 SLOT=0/2.1
 SRC_URI=https://hackage.haskell.org/package/trifecta-2.1/trifecta-2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=10714e3cdffa7e5dfd1a1b9c9bc614ef
diff --git a/metadata/md5-cache/dev-haskell/type-equality-1 b/metadata/md5-cache/dev-haskell/type-equality-1
index 3cf43e12353d..d539af34ee65 100644
--- a/metadata/md5-cache/dev-haskell/type-equality-1
+++ b/metadata/md5-cache/dev-haskell/type-equality-1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Type equality, coercion/cast and other operations
 EAPI=7
 HOMEPAGE=https://github.com/hesselink/type-equality
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 7484ef938b6f..4b26545c95f3 100644
--- a/metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
+++ b/metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Run external processes, with strong typing of streams
 EAPI=7
 HOMEPAGE=https://haskell-lang.org/library/typed-process
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/un
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ca2a15401f1f498697de5d390a0a8de1
diff --git a/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.0 b/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.0
index cf9b935341bc..dc886b2d136b 100644
--- a/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.0
+++ b/metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.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.6 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.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Unbounded thread delays and timeouts
 EAPI=6
 HOMEPAGE=https://github.com/basvandijk/unbounded-delays
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.0
 SRC_URI=https://hackage.haskell.org/package/unbounded-delays-0.1.1.0/unbounded-delays-0.1.1.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3bea5dffdab10305041f9ffc8c1150eb
diff --git a/metadata/md5-cache/dev-haskell/unexceptionalio-0.5.1 b/metadata/md5-cache/dev-haskell/unexceptionalio-0.5.1
index da5431d95d57..31f1ab8affda 100644
--- a/metadata/md5-cache/dev-haskell/unexceptionalio-0.5.1
+++ b/metadata/md5-cache/dev-haskell/unexceptionalio-0.5.1
@@ -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 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=IO without any non-error, synchronous exceptions
 EAPI=7
 HOMEPAGE=https://github.com/singpolyma/unexceptionalio
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.5.1
 SRC_URI=https://hackage.haskell.org/package/unexceptionalio-0.5.1/unexceptionalio-0.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e88fd8efcaf08f9bfdec3de0f0380145
diff --git a/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7 b/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7
index 93a2bddf2b59..0ddb4ae71dad 100644
--- a/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7
+++ b/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14 >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.15 >=dev-haskell/split-0.1 <dev-haskell/split-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14 >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.15 >=dev-haskell/split-0.1 <dev-haskell/split-0.3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Unicode normalization
 EAPI=7
 HOMEPAGE=https://github.com/harendra-kumar/unicode-transforms
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >
 RESTRICT=!test? ( test )
 SLOT=0/0.3.7
 SRC_URI=https://hackage.haskell.org/package/unicode-transforms-0.3.7/unicode-transforms-0.3.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3893baaef3646a8e7c99d96c3c980a58
diff --git a/metadata/md5-cache/dev-haskell/uniplate-1.6.12 b/metadata/md5-cache/dev-haskell/uniplate-1.6.12
index 55ed81d2900e..44e58921d8c6 100644
--- a/metadata/md5-cache/dev-haskell/uniplate-1.6.12
+++ b/metadata/md5-cache/dev-haskell/uniplate-1.6.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[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 )
+DEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Help writing simple, concise and fast generic operations
 EAPI=7
 HOMEPAGE=http://community.haskell.org/~ndm/uniplate/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.6.12
 SRC_URI=https://hackage.haskell.org/package/uniplate-1.6.12/uniplate-1.6.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7b67870a7da09557be387d7bb2fb29ce
diff --git a/metadata/md5-cache/dev-haskell/uniqueid-0.1.1 b/metadata/md5-cache/dev-haskell/uniqueid-0.1.1
index a3bd59b9aeeb..d5344f911ead 100644
--- a/metadata/md5-cache/dev-haskell/uniqueid-0.1.1
+++ b/metadata/md5-cache/dev-haskell/uniqueid-0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.8.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.8.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Splittable Unique Identifier Supply
 EAPI=7
 HOMEPAGE=https://github.com/sebfisch/uniqueid/wikis
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.1:=
 SLOT=0/0.1.1
 SRC_URI=https://hackage.haskell.org/package/uniqueid-0.1.1/uniqueid-0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aa27504837595ee8b444ab4383f70dcc
diff --git a/metadata/md5-cache/dev-haskell/unix-compat-0.5.2 b/metadata/md5-cache/dev-haskell/unix-compat-0.5.2
index 523dd57289ca..90ce5ce5d632 100644
--- a/metadata/md5-cache/dev-haskell/unix-compat-0.5.2
+++ b/metadata/md5-cache/dev-haskell/unix-compat-0.5.2
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Portable POSIX-compatibility layer
 EAPI=7
 HOMEPAGE=https://github.com/jacobstanley/unix-compat
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=71db102530246e9b65269ed2022de7a5
diff --git a/metadata/md5-cache/dev-haskell/unix-time-0.4.7 b/metadata/md5-cache/dev-haskell/unix-time-0.4.7
index 157814a64020..6136960b03a6 100644
--- a/metadata/md5-cache/dev-haskell/unix-time-0.4.7
+++ b/metadata/md5-cache/dev-haskell/unix-time-0.4.7
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Unix time parser/formatter and utilities
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/unix-time
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3ee956d5c4afd12c3cc713080bb26c36
diff --git a/metadata/md5-cache/dev-haskell/unixutils-1.54.1 b/metadata/md5-cache/dev-haskell/unixutils-1.54.1
index 4195fb510021..ef21d81c07f7 100644
--- a/metadata/md5-cache/dev-haskell/unixutils-1.54.1
+++ b/metadata/md5-cache/dev-haskell/unixutils-1.54.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/process-extras-0.3:=[profile?] dev-haskell/puremd5:=[profile?] dev-haskell/regex-tdfa:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libc >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/process-extras-0.3:=[profile?] dev-haskell/puremd5:=[profile?] dev-haskell/regex-tdfa:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libc >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A crude interface between Haskell and Unix-like operating systems
 EAPI=7
 HOMEPAGE=https://github.com/seereason/haskell-unixutils.git
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/process-extras-0.3:=[profile?] dev-haskell/puremd5:=[profile?] dev-haskell/regex-tdfa:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= virtual/libc
 SLOT=0/1.54.1
 SRC_URI=https://hackage.haskell.org/package/Unixutils-1.54.1/Unixutils-1.54.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=abcdbbe44e5b83bfa6a94ff600ccf219
diff --git a/metadata/md5-cache/dev-haskell/unliftio-0.2.12.1 b/metadata/md5-cache/dev-haskell/unliftio-0.2.12.1
index be603fb12c1a..ac6cae8d72cb 100644
--- a/metadata/md5-cache/dev-haskell/unliftio-0.2.12.1
+++ b/metadata/md5-cache/dev-haskell/unliftio-0.2.12.1
@@ -1,5 +1,5 @@
 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 )
+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 ) 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
@@ -10,5 +10,5 @@ RDEPEND=>dev-haskell/async-2.1.1:=[profile?] >=dev-haskell/stm-2.4.3:=[profile?]
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 74f614cfd337..19096d292daa 100644
--- a/metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0
+++ b/metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 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
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b710c49566ac8498796be3847312a31
diff --git a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.12.0 b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.12.0
index bf470daf1196..723cac57f2d4 100644
--- a/metadata/md5-cache/dev-haskell/unordered-containers-0.2.12.0
+++ b/metadata/md5-cache/dev-haskell/unordered-containers-0.2.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-lang/ghc-7.8.2:= doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-lang/ghc-7.8.2:= hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Efficient hashing-based container types
 EAPI=7
 HOMEPAGE=https://github.com/haskell-unordered-containers/unordered-containers
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[p
 RESTRICT=test
 SLOT=0/0.2.12.0
 SRC_URI=https://hackage.haskell.org/package/unordered-containers-0.2.12.0/unordered-containers-0.2.12.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5fdd0f41583f67d8f8f88acf550d548f
diff --git a/metadata/md5-cache/dev-haskell/uri-0.1.6.4 b/metadata/md5-cache/dev-haskell/uri-0.1.6.4
index cf90b86cc364..709b13ceec9e 100644
--- a/metadata/md5-cache/dev-haskell/uri-0.1.6.4
+++ b/metadata/md5-cache/dev-haskell/uri-0.1.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/parsec-3.0:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/utf8-string:=[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 )
+DEPEND=>=dev-haskell/parsec-3.0:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Library for working with URIs
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/uri
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.6.4
 SRC_URI=https://hackage.haskell.org/package/uri-0.1.6.4/uri-0.1.6.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f40c6b906c06ea6f69b1dacdad2d3b9c
diff --git a/metadata/md5-cache/dev-haskell/uri-bytestring-0.3.3.0 b/metadata/md5-cache/dev-haskell/uri-bytestring-0.3.3.0
index 54a6532bf97f..1db52ddbdbfb 100644
--- a/metadata/md5-cache/dev-haskell/uri-bytestring-0.3.3.0
+++ b/metadata/md5-cache/dev-haskell/uri-bytestring-0.3.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/attoparsec-0.13.1.0:=[profile?] >=dev-haskell/blaze-builder-0.3.0.0:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/semigroups-0.16.2.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/th-lift-0.7.5:=[profile?] <dev-haskell/th-lift-0.9:=[profile?] >=dev-haskell/th-lift-instances-0.1.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/base-compat-0.7.0 dev-haskell/hedgehog dev-haskell/hunit dev-haskell/safe 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 )
+DEPEND=>=dev-haskell/attoparsec-0.13.1.0:=[profile?] >=dev-haskell/blaze-builder-0.3.0.0:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/semigroups-0.16.2.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/th-lift-0.7.5:=[profile?] <dev-haskell/th-lift-0.9:=[profile?] >=dev-haskell/th-lift-instances-0.1.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/base-compat-0.7.0 dev-haskell/hedgehog dev-haskell/hunit dev-haskell/safe dev-haskell/tasty dev-haskell/tasty-hedgehog dev-haskell/tasty-hunit ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell URI parsing as ByteStrings
 EAPI=7
 HOMEPAGE=https://github.com/Soostone/uri-bytestring
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.13.1.0:=[profile?] >=dev-haskell/blaze-builde
 RESTRICT=!test? ( test )
 SLOT=0/0.3.3.0
 SRC_URI=https://hackage.haskell.org/package/uri-bytestring-0.3.3.0/uri-bytestring-0.3.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a84278d733bed2519b0804635bc6b319
diff --git a/metadata/md5-cache/dev-haskell/uri-bytestring-aeson-0.1.0.7 b/metadata/md5-cache/dev-haskell/uri-bytestring-aeson-0.1.0.7
index 2b2166cd1ca6..ca92d0ea0e2e 100644
--- a/metadata/md5-cache/dev-haskell/uri-bytestring-aeson-0.1.0.7
+++ b/metadata/md5-cache/dev-haskell/uri-bytestring-aeson-0.1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] >=dev-haskell/uri-bytestring-0.2:=[profile?] <dev-haskell/uri-bytestring-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 )
+DEPEND=>=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] >=dev-haskell/uri-bytestring-0.2:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Aeson instances for URI Bytestring
 EAPI=7
 HOMEPAGE=https://github.com/reactormonk/uri-bytestring-aeson
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] >=dev-haskell/uri-bytestring-0.2:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/0.1.0.7
 SRC_URI=https://hackage.haskell.org/package/uri-bytestring-aeson-0.1.0.7/uri-bytestring-aeson-0.1.0.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ed59ff191b64b60ced32bf49a12f9fe3
diff --git a/metadata/md5-cache/dev-haskell/uri-encode-1.5.0.5 b/metadata/md5-cache/dev-haskell/uri-encode-1.5.0.5
index 3c3b2ac46ea8..d2291c5c9af7 100644
--- a/metadata/md5-cache/dev-haskell/uri-encode-1.5.0.5
+++ b/metadata/md5-cache/dev-haskell/uri-encode-1.5.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >dev-haskell/network-2.4.1.0:=[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/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >dev-haskell/network-2.4.1.0:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Unicode aware uri-encoding
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/uri-encode
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >dev-haskell/network-2.4.1.0:=[profile?] <dev-haskell/network-2.6:=[profile?] )
 SLOT=0/1.5.0.5
 SRC_URI=https://hackage.haskell.org/package/uri-encode-1.5.0.5/uri-encode-1.5.0.5.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=06aaf1f294db7f92ded4e8d293ead9c9
diff --git a/metadata/md5-cache/dev-haskell/url-2.1.3-r1 b/metadata/md5-cache/dev-haskell/url-2.1.3-r1
index ceaf8d1e05df..3b5c1ee6c205 100644
--- a/metadata/md5-cache/dev-haskell/url-2.1.3-r1
+++ b/metadata/md5-cache/dev-haskell/url-2.1.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library for working with URLs
 EAPI=7
 HOMEPAGE=https://www.haskell.org/haskellwiki/Url
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.1.3
 SRC_URI=https://hackage.haskell.org/package/url-2.1.3/url-2.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b091ac82a30182e34577a759c42f7b8
diff --git a/metadata/md5-cache/dev-haskell/utf8-light-0.4.2 b/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
index af036944eae7..d87b089b3309 100644
--- a/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
+++ b/metadata/md5-cache/dev-haskell/utf8-light-0.4.2
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Lightweight UTF8 handling
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/utf8-light
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.2
 SRC_URI=https://hackage.haskell.org/package/utf8-light-0.4.2/utf8-light-0.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=28159c50d123dedd82cf8995212aa031
diff --git a/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1 b/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
index a049e67fa761..53a9584e3de8 100644
--- a/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
+++ b/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Support for reading and writing UTF8 Strings
 EAPI=7
 HOMEPAGE=https://github.com/glguy/utf8-string/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.1.1
 SRC_URI=https://hackage.haskell.org/package/utf8-string-1.0.1.1/utf8-string-1.0.1.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=54b4b5f4962f7014361a6c666987fa94
diff --git a/metadata/md5-cache/dev-haskell/uuagc-0.9.53.1 b/metadata/md5-cache/dev-haskell/uuagc-0.9.53.1
index 7a2b08866b92..86f0449ac314 100644
--- a/metadata/md5-cache/dev-haskell/uuagc-0.9.53.1
+++ b/metadata/md5-cache/dev-haskell/uuagc-0.9.53.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/haskell-src-exts-1.11.1:=[profile?] >=dev-haskell/mtl-1.1.1.1:=[profile?] >=dev-haskell/uuagc-cabal-1.0.2.0:=[profile?] >=dev-haskell/uulib-0.9.14:=[profile?] >=dev-lang/ghc-7.4.1:= loag? ( dev-haskell/minisat:=[profile?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/haskell-src-exts-1.11.1:=[profile?] >=dev-haskell/mtl-1.1.1.1:=[profile?] >=dev-haskell/uuagc-cabal-1.0.2.0:=[profile?] >=dev-haskell/uulib-0.9.14:=[profile?] >=dev-lang/ghc-7.4.1:= loag? ( dev-haskell/minisat:=[profile?] ) >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Attribute Grammar System of Universiteit Utrecht
 EAPI=7
 HOMEPAGE=http://www.cs.uu.nl/wiki/HUT/WebHome
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/haskell-src-exts-1.11.1:=[profile?] >=dev-haskell/mtl-1.1.1.1:=[profile?] >=dev-haskell/uuagc-cabal-1.0.2.0:=[profile?] >=dev-haskell/uulib-0.9.14:=[profile?] >=dev-lang/ghc-7.4.1:= loag? ( dev-haskell/minisat:=[profile?] )
 SLOT=0/0.9.53.1
 SRC_URI=https://hackage.haskell.org/package/uuagc-0.9.53.1/uuagc-0.9.53.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=acb97380b4164571762a556adae7971a
diff --git a/metadata/md5-cache/dev-haskell/uuagc-cabal-1.2.0.0 b/metadata/md5-cache/dev-haskell/uuagc-cabal-1.2.0.0
index 324a9a843e10..bef226ee7c21 100644
--- a/metadata/md5-cache/dev-haskell/uuagc-cabal-1.2.0.0
+++ b/metadata/md5-cache/dev-haskell/uuagc-cabal-1.2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cabal-2:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/uulib-0.9.14:=[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 )
+DEPEND=>=dev-haskell/cabal-2:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/uulib-0.9.14:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Cabal plugin for UUAGC
 EAPI=7
 HOMEPAGE=https://github.com/UU-ComputerScience/uuagc
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/cabal-2:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/uulib-0.9.14:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.0.0
 SRC_URI=https://hackage.haskell.org/package/uuagc-cabal-1.2.0.0/uuagc-cabal-1.2.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=accdbdc5be75fb76ff403f447773bad2
diff --git a/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1 b/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1
index 5a46c562d0d8..55e506c73d99 100644
--- a/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1
+++ b/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=For creating, comparing, parsing and printing Universally Unique Identifiers
 EAPI=6
 HOMEPAGE=https://github.com/hvr/uuid
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cryptohash-md5-0.11.100:=[profile?] <dev-haskell/cryptohas
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 54ba3c789458..202a5d7a0dfa 100644
--- a/metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1
+++ b/metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Type definitions for Universally Unique Identifiers
 EAPI=7
 HOMEPAGE=https://github.com/aslatter/uuid
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6f85542da3b5f5a78f04097de2868332
diff --git a/metadata/md5-cache/dev-haskell/uulib-0.9.24 b/metadata/md5-cache/dev-haskell/uulib-0.9.24
index d7c5739bf9b8..854d7560f5d7 100644
--- a/metadata/md5-cache/dev-haskell/uulib-0.9.24
+++ b/metadata/md5-cache/dev-haskell/uulib-0.9.24
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell Utrecht Tools Library
 EAPI=7
 HOMEPAGE=https://github.com/UU-ComputerScience/uulib
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.9.24
 SRC_URI=https://hackage.haskell.org/package/uulib-0.9.24/uulib-0.9.24.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b72081fbb9b4e6548e14522b19723b08
diff --git a/metadata/md5-cache/dev-haskell/validity-0.9.0.3 b/metadata/md5-cache/dev-haskell/validity-0.9.0.3
index 8fcf20d04614..eb262a86e921 100644
--- a/metadata/md5-cache/dev-haskell/validity-0.9.0.3
+++ b/metadata/md5-cache/dev-haskell/validity-0.9.0.3
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Validity typeclass
 EAPI=7
 HOMEPAGE=https://github.com/NorfairKing/validity#readme
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58201b194b4eaf56be4603953323923c
diff --git a/metadata/md5-cache/dev-haskell/vault-0.3.1.3 b/metadata/md5-cache/dev-haskell/vault-0.3.1.3
index b2a3d4aa7761..90b96e02595b 100644
--- a/metadata/md5-cache/dev-haskell/vault-0.3.1.3
+++ b/metadata/md5-cache/dev-haskell/vault-0.3.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[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 ) )
+DEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6
 DESCRIPTION=a persistent store for values of arbitrary types
 EAPI=7
 HOMEPAGE=https://github.com/HeinrichApfelmus/vault
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[profile?] >=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.1.3
 SRC_URI=https://hackage.haskell.org/package/vault-0.3.1.3/vault-0.3.1.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c88885f8623412022b2fa841319bd9e4
diff --git a/metadata/md5-cache/dev-haskell/vector-0.12.1.2 b/metadata/md5-cache/dev-haskell/vector-0.12.1.2
index 39a5c8be569e..444fb05a2a8b 100644
--- a/metadata/md5-cache/dev-haskell/vector-0.12.1.2
+++ b/metadata/md5-cache/dev-haskell/vector-0.12.1.2
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Efficient Arrays
 EAPI=7
 HOMEPAGE=https://github.com/haskell/vector
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 77ce46e331c1..90eecbd4f8f5 100644
--- a/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3
+++ b/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3
@@ -1,5 +1,5 @@
 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 )
+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 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Efficient algorithms for vector arrays
 EAPI=7
 HOMEPAGE=https://github.com/erikd/vector-algorithms/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.8:=[pro
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35d279425b04965bd94c21e48ff1434d
diff --git a/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1 b/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
index 02b546d4fd65..f94afef6b7f0 100644
--- a/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
+++ b/metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/tasty dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Instances of Data.Binary and Data.Serialize for vector
 EAPI=7
 HOMEPAGE=https://github.com/bos/vector-binary-instances
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?
 RESTRICT=!test? ( test )
 SLOT=0/0.2.5.1
 SRC_URI=https://hackage.haskell.org/package/vector-binary-instances-0.2.5.1/vector-binary-instances-0.2.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ff6a327168f412854abbb77845613054
diff --git a/metadata/md5-cache/dev-haskell/vector-builder-0.3.8 b/metadata/md5-cache/dev-haskell/vector-builder-0.3.8
index 8ef5984a8c19..27fa336ff973 100644
--- a/metadata/md5-cache/dev-haskell/vector-builder-0.3.8
+++ b/metadata/md5-cache/dev-haskell/vector-builder-0.3.8
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Vector builder
 EAPI=7
 HOMEPAGE=https://github.com/nikita-volkov/vector-builder
@@ -10,5 +10,5 @@ RDEPEND=<dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/semigroups-0.16:=[
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5150f6334fab9f3e3d4a7537475dfd8d
diff --git a/metadata/md5-cache/dev-haskell/vector-instances-3.4 b/metadata/md5-cache/dev-haskell/vector-instances-3.4
index a9446f7be571..d992a83e0018 100644
--- a/metadata/md5-cache/dev-haskell/vector-instances-3.4
+++ b/metadata/md5-cache/dev-haskell/vector-instances-3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/keys-3:=[profile?] >=dev-haskell/pointed-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1.1.0:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/keys-3:=[profile?] >=dev-haskell/pointed-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1.1.0:=[profile?] ) >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Orphan Instances for 'Data.Vector'
 EAPI=6
 HOMEPAGE=https://github.com/ekmett/vector-instances
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/comonad-3:=[profile?] >=dev-haskell/keys-3:=[profile?] >=dev-haskell/pointed-3:=[profile?] >=dev-haskell/semigroupoids-3:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1.1.0:=[profile?] )
 SLOT=0/3.4
 SRC_URI=https://hackage.haskell.org/package/vector-instances-3.4/vector-instances-3.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8acec3c08690a38d5db2e4d19d48cf7b
diff --git a/metadata/md5-cache/dev-haskell/vector-space-0.16 b/metadata/md5-cache/dev-haskell/vector-space-0.16
index e4beac8bb06c..4d7bd7083cc6 100644
--- a/metadata/md5-cache/dev-haskell/vector-space-0.16
+++ b/metadata/md5-cache/dev-haskell/vector-space-0.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/boolean-0.1.0:=[profile?] >=dev-haskell/memotrie-0.5:=[profile?] >=dev-haskell/numinstances-1.0:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] >=dev-haskell/void-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 )
+DEPEND=>=dev-haskell/boolean-0.1.0:=[profile?] >=dev-haskell/memotrie-0.5:=[profile?] >=dev-haskell/numinstances-1.0:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] >=dev-haskell/void-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Vector & affine spaces, linear maps, and derivatives
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/vector-space
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/boolean-0.1.0:=[profile?] >=dev-haskell/memotrie-0.5:=[profile?] >=dev-haskell/numinstances-1.0:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] >=dev-haskell/void-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.16
 SRC_URI=https://hackage.haskell.org/package/vector-space-0.16/vector-space-0.16.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f3c1c7d63a3da0f539624171ca5ce58
diff --git a/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7 b/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
index 692f7c65dd5b..d4e243a9f983 100644
--- a/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
+++ b/metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/vector-0.7.1:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/data-default ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/vector-0.7.1:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/data-default ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Deriver for Data.Vector.Unboxed using Template Haskell
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/vector-th-unbox
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/vector-0.7.1:=[profile?] <dev-haskell/vector-0.13:=[profil
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1.7
 SRC_URI=https://hackage.haskell.org/package/vector-th-unbox-0.2.1.7/vector-th-unbox-0.2.1.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e66a371ca3391e55b5afe49cfb26d2a4
diff --git a/metadata/md5-cache/dev-haskell/void-0.7.3 b/metadata/md5-cache/dev-haskell/void-0.7.3
index f2cb37bea4a5..91c1b92652ca 100644
--- a/metadata/md5-cache/dev-haskell/void-0.7.3
+++ b/metadata/md5-cache/dev-haskell/void-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/hashable-1.1:=[profile?] >=dev-haskell/semigroups-0.8.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 )
+DEPEND=>=dev-haskell/hashable-1.1:=[profile?] >=dev-haskell/semigroups-0.8.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Haskell 98 logically uninhabited data type
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/void
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] >=dev-haskell/semigroups-0.8.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.3
 SRC_URI=https://hackage.haskell.org/package/void-0.7.3/void-0.7.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=014a2db8f559d6a749752c17f33336b6
diff --git a/metadata/md5-cache/dev-haskell/wai-3.2.2.1 b/metadata/md5-cache/dev-haskell/wai-3.2.2.1
index 547610a6a04a..e0a9ab78d584 100644
--- a/metadata/md5-cache/dev-haskell/wai-3.2.2.1
+++ b/metadata/md5-cache/dev-haskell/wai-3.2.2.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Web Application Interface
 EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=588cc0f4599d856d9448a38a050ba93e
diff --git a/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1 b/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
index 8526deef655c..961420496299 100644
--- a/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
+++ b/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare 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.2:=[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 )
+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.2:=[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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=WAI application for static serving
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/web-application-interface
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.
 RESTRICT=!test? ( test )
 SLOT=0/3.1.7.2
 SRC_URI=https://hackage.haskell.org/package/wai-app-static-3.1.7.2/wai-app-static-3.1.7.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5e2c8cd8da9def44b3a13dd85be326ec
diff --git a/metadata/md5-cache/dev-haskell/wai-conduit-3.0.0.4 b/metadata/md5-cache/dev-haskell/wai-conduit-3.0.0.4
index 1da83fcb7b3f..40bbb6a4c2db 100644
--- a/metadata/md5-cache/dev-haskell/wai-conduit-3.0.0.4
+++ b/metadata/md5-cache/dev-haskell/wai-conduit-3.0.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/conduit:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.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 )
+DEPEND=dev-haskell/conduit:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=conduit wrappers for WAI
 EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/conduit:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/3.0.0.4
 SRC_URI=https://hackage.haskell.org/package/wai-conduit-3.0.0.4/wai-conduit-3.0.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c4c6595f4460fd8812b57d32ac55afb2
diff --git a/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1 b/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1
index f8c35a9ef454..42056add382c 100644
--- a/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1
+++ b/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1
@@ -1,5 +1,5 @@
 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/call-stack:=[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/hunit:=[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-8.2.1:= examples? ( dev-haskell/warp:=[profile?] ) >=dev-haskell/cabal-2.0.0.2 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/call-stack:=[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/hunit:=[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-8.2.1:= examples? ( dev-haskell/warp:=[profile?] ) >=dev-haskell/cabal-2.0.0.2 test? ( >=dev-haskell/hspec-1.3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Provides some basic WAI handlers and middleware
 EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-
 RESTRICT=!test? ( test )
 SLOT=0/3.1.4.1
 SRC_URI=https://hackage.haskell.org/package/wai-extra-3.1.4.1/wai-extra-3.1.4.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=96dc7ffaccc4ac2551d0c0e6a981e3f1
diff --git a/metadata/md5-cache/dev-haskell/wai-logger-2.3.6 b/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
index c473d4281732..2f31762f9b98 100644
--- a/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
+++ b/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A logging system for WAI
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/wai-logger
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/byteorder:=[profile?] >=dev-haskell/fast-logger-3:=[profile?
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6c6a46e6207d09a4426ed585a6224042
diff --git a/metadata/md5-cache/dev-haskell/wai-test-3.0.0 b/metadata/md5-cache/dev-haskell/wai-test-3.0.0
index f964ea6d0f97..a8d3caae9b7f 100644
--- a/metadata/md5-cache/dev-haskell/wai-test-3.0.0
+++ b/metadata/md5-cache/dev-haskell/wai-test-3.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/wai-3.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 )
+DEPEND=>=dev-haskell/wai-3.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Unit test framework (built on HUnit) for WAI applications. (deprecated)
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/web-application-interface
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/wai-3.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/3.0.0
 SRC_URI=https://hackage.haskell.org/package/wai-test-3.0.0/wai-test-3.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1bdd0c9b60602e87c75c5cc4d5a462e3
diff --git a/metadata/md5-cache/dev-haskell/warp-3.3.13 b/metadata/md5-cache/dev-haskell/warp-3.3.13
index 7ad2cb95fdac..96eb0b344191 100644
--- a/metadata/md5-cache/dev-haskell/warp-3.3.13
+++ b/metadata/md5-cache/dev-haskell/warp-3.3.13
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A fast, light-weight web server for WAI applications
 EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/auto-update-0.1.3:=[profile?
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 9a4d39298090..ee0e55744e89 100644
--- a/metadata/md5-cache/dev-haskell/warp-tls-3.2.12
+++ b/metadata/md5-cache/dev-haskell/warp-tls-3.2.12
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=HTTP over TLS support for Warp via the TLS package
 EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c924fe86b4c7b75e15ade9a8cf3637cc
diff --git a/metadata/md5-cache/dev-haskell/wavy-0.1.0.0 b/metadata/md5-cache/dev-haskell/wavy-0.1.0.0
index b8d4c8e53fb9..ce37cc4205e4 100644
--- a/metadata/md5-cache/dev-haskell/wavy-0.1.0.0
+++ b/metadata/md5-cache/dev-haskell/wavy-0.1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/pretty-show:=[profile?] >=dev-haskell/riff-0.3:=[profile?] <dev-haskell/riff-0.4:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/vector-0.10:=[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 )
+DEPEND=dev-haskell/pretty-show:=[profile?] >=dev-haskell/riff-0.3:=[profile?] <dev-haskell/riff-0.4:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Process WAVE files in Haskell
 EAPI=6
 HOMEPAGE=https://bitbucket.org/robertmassaioli/wavy
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/pretty-show:=[profile?] >=dev-haskell/riff-0.3:=[profile?] <dev-haskell/riff-0.4:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.1.0.0
 SRC_URI=https://hackage.haskell.org/package/wavy-0.1.0.0/wavy-0.1.0.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22acdde7ee0edf395bb7c2ddeac0a4e1
diff --git a/metadata/md5-cache/dev-haskell/wcwidth-0.0.2 b/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
index 9408b5f780a9..85d751d92a23 100644
--- a/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
+++ b/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Native wcwidth
 EAPI=6
 HOMEPAGE=https://github.com/solidsnack/wcwidth/
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c099309f806ecebae60ebd9e0d507ab9
diff --git a/metadata/md5-cache/dev-haskell/weigh-0.0.16 b/metadata/md5-cache/dev-haskell/weigh-0.0.16
index f7e3d3effd62..c3a9a3a9f2eb 100644
--- a/metadata/md5-cache/dev-haskell/weigh-0.0.16
+++ b/metadata/md5-cache/dev-haskell/weigh-0.0.16
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Measure allocations of a Haskell functions/values
 EAPI=7
 HOMEPAGE=https://github.com/fpco/weigh#readme
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/split:=[profile?] dev-haskell/te
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c858d0681b0b51e7f1ce305646e2315e
diff --git a/metadata/md5-cache/dev-haskell/with-location-0.1.0 b/metadata/md5-cache/dev-haskell/with-location-0.1.0
index 51f95d970dd9..aceca9f28dc7 100644
--- a/metadata/md5-cache/dev-haskell/with-location-0.1.0
+++ b/metadata/md5-cache/dev-haskell/with-location-0.1.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 test? ( dev-haskell/hspec ) 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 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Use ImplicitParams-based source locations in a backward compatible way
 EAPI=7
 HOMEPAGE=https://github.com/sol/with-location#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0
 SRC_URI=https://hackage.haskell.org/package/with-location-0.1.0/with-location-0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=304a7f8255635c9312549b2ac24c7081
diff --git a/metadata/md5-cache/dev-haskell/wl-pprint-1.2.1 b/metadata/md5-cache/dev-haskell/wl-pprint-1.2.1
index 7e2d6e244b21..362c55075799 100644
--- a/metadata/md5-cache/dev-haskell/wl-pprint-1.2.1
+++ b/metadata/md5-cache/dev-haskell/wl-pprint-1.2.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=The Wadler/Leijen Pretty Printer
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/wl-pprint
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.2.1
 SRC_URI=https://hackage.haskell.org/package/wl-pprint-1.2.1/wl-pprint-1.2.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8a1ebbbcd53311d1c656b284a0335897
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
index e8ecf3c75980..1f14f60d7948 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 ) 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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[pro
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index a8bfb3105dc5..bf38ca828e11 100644
--- 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
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Wadler/Leijen Pretty Printer for Text values
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/wl-pprint-text
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1331793cddd844b8160301eaf4117e5d
diff --git a/metadata/md5-cache/dev-haskell/word8-0.1.3 b/metadata/md5-cache/dev-haskell/word8-0.1.3
index bcb326e78557..bffbcea06c87 100644
--- a/metadata/md5-cache/dev-haskell/word8-0.1.3
+++ b/metadata/md5-cache/dev-haskell/word8-0.1.3
@@ -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 test? ( dev-haskell/hspec ) 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 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Word8 library
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/word8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3
 SRC_URI=https://hackage.haskell.org/package/word8-0.1.3/word8-0.1.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e0675a9fb7fd3e6f9e28ce34a2f0e4e6
diff --git a/metadata/md5-cache/dev-haskell/wreq-0.5.3.2 b/metadata/md5-cache/dev-haskell/wreq-0.5.3.2
index 26a3fd85af7c..6ff12cf4bbbc 100644
--- a/metadata/md5-cache/dev-haskell/wreq-0.5.3.2
+++ b/metadata/md5-cache/dev-haskell/wreq-0.5.3.2
@@ -1,5 +1,5 @@
 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 )
+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 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=An easy-to-use HTTP client library
 EAPI=7
 HOMEPAGE=http://www.serpentine.com/wreq
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0.0.0:=[profile?] >=dev-haskell/attoparsec-0.11.1.
 RESTRICT=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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bd247a48e2167e618b5722e5e7bd612f
diff --git a/metadata/md5-cache/dev-haskell/wx-0.92.2.0 b/metadata/md5-cache/dev-haskell/wx-0.92.2.0
index 692cde4e3061..0c47f70824ef 100644
--- a/metadata/md5-cache/dev-haskell/wx-0.92.2.0
+++ b/metadata/md5-cache/dev-haskell/wx-0.92.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/stm:=[profile?] >=dev-haskell/wxcore-0.92:3.0=[profile?] >=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 )
+DEPEND=dev-haskell/stm:=[profile?] >=dev-haskell/wxcore-0.92:3.0=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Portable and native GUI library built on wxWidgets
 EAPI=7
 HOMEPAGE=https://wiki.haskell.org/WxHaskell
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=dev-haskell/stm:=[profile?] >=dev-haskell/wxcore-0.92:3.0=[profile?] >=dev-lang/ghc-7.6.1:=
 SLOT=3.0/0.92.2.0
 SRC_URI=https://hackage.haskell.org/package/wx-0.92.2.0/wx-0.92.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=06c5ecb2a339ccdf5d0b605f64493dd9
diff --git a/metadata/md5-cache/dev-haskell/wxc-0.92.3.0 b/metadata/md5-cache/dev-haskell/wxc-0.92.3.0
index 834360d9d89c..5e0f13c8ea9e 100644
--- a/metadata/md5-cache/dev-haskell/wxc-0.92.3.0
+++ b/metadata/md5-cache/dev-haskell/wxc-0.92.3.0
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=>dev-haskell/split-0:=[profile?] >=dev-haskell/wxdirect-0.90.1.1:3.0=[profile?] x11-libs/wxGTK:3.0=[X,gstreamer?,opengl] >=dev-lang/ghc-7.6.1:=
 SLOT=3.0/0.92.3.0
 SRC_URI=https://hackage.haskell.org/package/wxc-0.92.3.0/wxc-0.92.3.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=2d93dc694c703d5436b738163374812e
diff --git a/metadata/md5-cache/dev-haskell/wxcore-0.92.3.0 b/metadata/md5-cache/dev-haskell/wxcore-0.92.3.0
index 8effa4887ab8..a7a1fe9346bb 100644
--- a/metadata/md5-cache/dev-haskell/wxcore-0.92.3.0
+++ b/metadata/md5-cache/dev-haskell/wxcore-0.92.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/parsec:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/wxc-0.92:3.0=[profile?,gstreamer?] >=dev-haskell/wxdirect-0.91:3.0=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/wxGTK:3.0=[X,gstreamer?,opengl] >=dev-haskell/cabal-1.23 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/parsec:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/wxc-0.92:3.0=[profile?,gstreamer?] >=dev-haskell/wxdirect-0.91:3.0=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/wxGTK:3.0=[X,gstreamer?,opengl] >=dev-haskell/cabal-1.23 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=wxHaskell core
 EAPI=6
 HOMEPAGE=https://wiki.haskell.org/WxHaskell
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=dev-haskell/parsec:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/wxc-0.92:3.0=[profile?,gstreamer?] >=dev-haskell/wxdirect-0.91:3.0=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/wxGTK:3.0=[X,gstreamer?,opengl]
 SLOT=3.0/0.92.3.0
 SRC_URI=https://hackage.haskell.org/package/wxcore-0.92.3.0/wxcore-0.92.3.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=2c93057d83484a1b0730aa5a1290d0e9
diff --git a/metadata/md5-cache/dev-haskell/wxdirect-0.92.3.0-r1 b/metadata/md5-cache/dev-haskell/wxdirect-0.92.3.0-r1
index 9b0ccc643337..24f67b56e2b1 100644
--- a/metadata/md5-cache/dev-haskell/wxdirect-0.92.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/wxdirect-0.92.3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/strict:=[profile?] >=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 )
+DEPEND=>=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/strict:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=helper tool for building wxHaskell
 EAPI=7
 HOMEPAGE=https://wiki.haskell.org/WxHaskell
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?] dev-haskell/strict:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=3.0/0.92.3.0
 SRC_URI=https://hackage.haskell.org/package/wxdirect-0.92.3.0/wxdirect-0.92.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d6a2a2dd30066089d0d028983df763c4
diff --git a/metadata/md5-cache/dev-haskell/x11-1.9.2 b/metadata/md5-cache/dev-haskell/x11-1.9.2
index 1b2507bb9df7..b3c88c41b989 100644
--- a/metadata/md5-cache/dev-haskell/x11-1.9.2
+++ b/metadata/md5-cache/dev-haskell/x11-1.9.2
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A binding to the X11 graphics library
 EAPI=7
 HOMEPAGE=https://github.com/xmonad/X11
@@ -9,5 +9,5 @@ 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.2
 SRC_URI=https://hackage.haskell.org/package/X11-1.9.2/X11-1.9.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9c562d577132d877c31259c86fa8c6ad
diff --git a/metadata/md5-cache/dev-haskell/x11-xft-0.3.1-r1 b/metadata/md5-cache/dev-haskell/x11-xft-0.3.1-r1
index db83f4401b0a..f28f70a60745 100644
--- a/metadata/md5-cache/dev-haskell/x11-xft-0.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/x11-xft-0.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/utf8-string-0.1:=[profile?] >=dev-haskell/x11-1.2.1:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/libXft >=dev-haskell/cabal-0 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/utf8-string-0.1:=[profile?] >=dev-haskell/x11-1.2.1:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/libXft >=dev-haskell/cabal-0 virtual/pkgconfig hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Bindings to the Xft, X Free Type interface library, and some Xrender parts
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/X11-xft
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-haskell/utf8-string-0.1:=[profile?] >=dev-haskell/x11-1.2.1:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/libXft
 SLOT=0/0.3.1
 SRC_URI=https://hackage.haskell.org/package/X11-xft-0.3.1/X11-xft-0.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1d259f7c699930f2712bc18bf3c47de
diff --git a/metadata/md5-cache/dev-haskell/x509-1.7.5 b/metadata/md5-cache/dev-haskell/x509-1.7.5
index 70ba36f18bb0..d1c8dde3198d 100644
--- a/metadata/md5-cache/dev-haskell/x509-1.7.5
+++ b/metadata/md5-cache/dev-haskell/x509-1.7.5
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=X509 reader and writer
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-certificate
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index b14158b9b9b0..6a7f32150590 100644
--- a/metadata/md5-cache/dev-haskell/x509-store-1.6.7
+++ b/metadata/md5-cache/dev-haskell/x509-store-1.6.7
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=X.509 collection accessing and storing methods
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-certificate
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 10355d0803b7..0671c57fc895 100644
--- a/metadata/md5-cache/dev-haskell/x509-system-1.6.6
+++ b/metadata/md5-cache/dev-haskell/x509-system-1.6.6
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Handle per-operating-system X.509 accessors and storage
 EAPI=6
 HOMEPAGE=https://github.com/vincenthz/hs-certificate
@@ -9,5 +9,5 @@ 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 02ad3f968463..bd1701deb5db 100644
--- a/metadata/md5-cache/dev-haskell/x509-validation-1.6.11
+++ b/metadata/md5-cache/dev-haskell/x509-validation-1.6.11
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=X.509 Certificate and CRL validation
 EAPI=7
 HOMEPAGE=https://github.com/vincenthz/hs-certificate
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 0ad029902e4c..8f5ff4084bf2 100644
--- a/metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1
+++ b/metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1
@@ -1,5 +1,5 @@
 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 )
+DEPEND=>=dev-lang/ghc-8.4.2:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=An XHTML combinator library
 EAPI=7
 HOMEPAGE=https://github.com/haskell/xhtml
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8ccdda8d83cc4549a34afe947ffd3882
diff --git a/metadata/md5-cache/dev-haskell/xml-1.3.14 b/metadata/md5-cache/dev-haskell/xml-1.3.14
index 96cc9d620e25..67867aa16f82 100644
--- a/metadata/md5-cache/dev-haskell/xml-1.3.14
+++ b/metadata/md5-cache/dev-haskell/xml-1.3.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/text:=[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 )
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A simple XML library
 EAPI=7
 HOMEPAGE=http://code.galois.com
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.3.14
 SRC_URI=https://hackage.haskell.org/package/xml-1.3.14/xml-1.3.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0316adc0c035995fea2f878bd63d7d10
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
index eac96bb9fcbc..04a188ddf0ad 100644
--- a/metadata/md5-cache/dev-haskell/xml-conduit-1.9.0.0
+++ b/metadata/md5-cache/dev-haskell/xml-conduit-1.9.0.0
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Pure-Haskell utilities for dealing with XML with the conduit package
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/xml
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-html-0.5:=
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _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
index 60ee2bf5d456..4459891766ed 100644
--- a/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Hamlet-style quasiquoter for XML content
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4627c072c3185e12ac9c36a9a576694e
diff --git a/metadata/md5-cache/dev-haskell/xml-types-0.3.8 b/metadata/md5-cache/dev-haskell/xml-types-0.3.8
index 2ac9427c1315..2f11c330abec 100644
--- a/metadata/md5-cache/dev-haskell/xml-types-0.3.8
+++ b/metadata/md5-cache/dev-haskell/xml-types-0.3.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=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 )
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Basic types for representing XML
 EAPI=7
 HOMEPAGE=https://git.singpolyma.net/xml-types-haskell
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.8
 SRC_URI=https://hackage.haskell.org/package/xml-types-0.3.8/xml-types-0.3.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c3e119a9bf63c3016a6c7c1de24c4729
diff --git a/metadata/md5-cache/dev-haskell/xmlgen-0.6.2.2 b/metadata/md5-cache/dev-haskell/xmlgen-0.6.2.2
index 127e25618f2d..c97594ed74cb 100644
--- a/metadata/md5-cache/dev-haskell/xmlgen-0.6.2.2
+++ b/metadata/md5-cache/dev-haskell/xmlgen-0.6.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/text-0.10:=[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 )
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Fast XML generation library
 EAPI=6
 HOMEPAGE=https://hackage.haskell.org/package/xmlgen
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/mtl-2.0:=[prof
 RESTRICT=test
 SLOT=0/0.6.2.2
 SRC_URI=https://hackage.haskell.org/package/xmlgen-0.6.2.2/xmlgen-0.6.2.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=51ac3117fed664fc15e46627b3d4dc08
diff --git a/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6 b/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
index 43f1ea1d8f40..470f2e283897 100644
--- a/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
+++ b/metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-haskell/cabal-1.24.2.0 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-haskell/cabal-1.24.2.0 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/hunit-1.2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=sanitize untrusted HTML to prevent XSS attacks
 EAPI=6
 HOMEPAGE=https://github.com/yesodweb/haskell-xss-sanitize#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:
 RESTRICT=!test? ( test )
 SLOT=0/0.3.6
 SRC_URI=https://hackage.haskell.org/package/xss-sanitize-0.3.6/xss-sanitize-0.3.6.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ce71299ea380629b3c9cd73c2626c07b
diff --git a/metadata/md5-cache/dev-haskell/yaml-0.11.5.0 b/metadata/md5-cache/dev-haskell/yaml-0.11.5.0
index d039e32ee455..0fd5798b7f4c 100644
--- a/metadata/md5-cache/dev-haskell/yaml-0.11.5.0
+++ b/metadata/md5-cache/dev-haskell/yaml-0.11.5.0
@@ -1,5 +1,5 @@
 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 )
+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 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Support for parsing and rendering YAML documents
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/yaml#readme
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/attoparsec-0.11.3.0:=
 RESTRICT=!test? ( test )
 SLOT=0/0.11.5.0
 SRC_URI=https://hackage.haskell.org/package/yaml-0.11.5.0/yaml-0.11.5.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b83797bc78d1aa1564da0320a7554062
diff --git a/metadata/md5-cache/dev-haskell/yesod-1.6.1.0 b/metadata/md5-cache/dev-haskell/yesod-1.6.1.0
index a25b5132952f..64d62c4f7153 100644
--- a/metadata/md5-cache/dev-haskell/yesod-1.6.1.0
+++ b/metadata/md5-cache/dev-haskell/yesod-1.6.1.0
@@ -1,5 +1,5 @@
 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/file-embed:=[profile?] dev-haskell/monad-logger:=[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 )
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/fast-logger:=[profile?] dev-haskell/file-embed:=[profile?] dev-haskell/monad-logger:=[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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Creation of type-safe, RESTful web applications
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
@@ -9,5 +9,5 @@ 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/file-embed:=[profile?] dev-haskell/monad-logger:=[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.1.0
 SRC_URI=https://hackage.haskell.org/package/yesod-1.6.1.0/yesod-1.6.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d2462f05bddddac5a1961f3a2678827f
diff --git a/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9 b/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9
index 38267c2f93b0..663cdd183309 100644
--- a/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9
+++ b/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9
@@ -1,5 +1,5 @@
 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 )
+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 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Authentication for Yesod
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
@@ -9,5 +9,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5da16ac5d878abc8705a8153360d7fbc
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
index a7073ba9d2af..c93ee17ab183 100644
--- 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
@@ -1,5 +1,5 @@
 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.6.1 <dev-haskell/yesod-auth-1.7 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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.6.1 <dev-haskell/yesod-auth-1.7 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Authentication plugin for Yesod
 EAPI=7
 HOMEPAGE=https://github.com/paul-rouse/yesod-auth-hashdb
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0e78e8219116168643ea2771e55b9389
diff --git a/metadata/md5-cache/dev-haskell/yesod-core-1.6.18.8 b/metadata/md5-cache/dev-haskell/yesod-core-1.6.18.8
index 67e6bb1783f1..1214e465da7a 100644
--- a/metadata/md5-cache/dev-haskell/yesod-core-1.6.18.8
+++ b/metadata/md5-cache/dev-haskell/yesod-core-1.6.18.8
@@ -1,5 +1,5 @@
 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.3:=[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 )
+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.3:=[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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Creation of type-safe, RESTful web applications
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/auto-update:=[profile?]
 RESTRICT=test
 SLOT=0/1.6.18.8
 SRC_URI=https://hackage.haskell.org/package/yesod-core-1.6.18.8/yesod-core-1.6.18.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a89d8d965729f50a3e2fa9fc9d2b0e29
diff --git a/metadata/md5-cache/dev-haskell/yesod-default-1.2.0 b/metadata/md5-cache/dev-haskell/yesod-default-1.2.0
index 6fa01a88d6e8..0ddcea7bae04 100644
--- a/metadata/md5-cache/dev-haskell/yesod-default-1.2.0
+++ b/metadata/md5-cache/dev-haskell/yesod-default-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Default config and main functions for your yesod application (deprecated)
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0
 SRC_URI=https://hackage.haskell.org/package/yesod-default-1.2.0/yesod-default-1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=42511ac439a52bfe6374a53829f0b1a8
diff --git a/metadata/md5-cache/dev-haskell/yesod-form-1.6.7 b/metadata/md5-cache/dev-haskell/yesod-form-1.6.7
index 55603febf3b3..e13fab7aec09 100644
--- a/metadata/md5-cache/dev-haskell/yesod-form-1.6.7
+++ b/metadata/md5-cache/dev-haskell/yesod-form-1.6.7
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Form handling support for Yesod Web Framework
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fce9fa40253ed7b7f553a15a4b1c44fd
diff --git a/metadata/md5-cache/dev-haskell/yesod-json-1.2.0 b/metadata/md5-cache/dev-haskell/yesod-json-1.2.0
index f1b05617abe9..a6cf31752543 100644
--- a/metadata/md5-cache/dev-haskell/yesod-json-1.2.0
+++ b/metadata/md5-cache/dev-haskell/yesod-json-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Generate content for Yesod using the aeson package. (deprecated)
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/yesod-core-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0
 SRC_URI=https://hackage.haskell.org/package/yesod-json-1.2.0/yesod-json-1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9616c98a827521d8834590e63c9f2d90
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
index b75c9fbd8460..f42eb33e53d0 100644
--- a/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.4
+++ b/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.4
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Some helpers for using Persistent from Yesod
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=766a5e4231ad07ca01121eddd4f02586
diff --git a/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0 b/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
index bfc6fb3e24a4..05b5f3d077bf 100644
--- a/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
+++ b/metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
@@ -1,5 +1,5 @@
 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-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/rio dev-haskell/wai-extra >=dev-haskell/yesod-test-1.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/rio dev-haskell/wai-extra >=dev-haskell/yesod-test-1.6 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Static file serving subsite for Yesod Web Framework
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/1.6.1.0
 SRC_URI=https://hackage.haskell.org/package/yesod-static-1.6.1.0/yesod-static-1.6.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=85487cf0b8e3615a6f09e4fb849bad69
diff --git a/metadata/md5-cache/dev-haskell/yesod-test-1.6.12 b/metadata/md5-cache/dev-haskell/yesod-test-1.6.12
index 24cb078a5bbc..467f3d0e5050 100644
--- a/metadata/md5-cache/dev-haskell/yesod-test-1.6.12
+++ b/metadata/md5-cache/dev-haskell/yesod-test-1.6.12
@@ -1,5 +1,5 @@
 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/mtl-2.0.0:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/pretty-show-1.6:=[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 )
+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/mtl-2.0.0:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/pretty-show-1.6:=[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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=integration testing for WAI/Yesod Applications
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?]
 RESTRICT=!test? ( test )
 SLOT=0/1.6.12
 SRC_URI=https://hackage.haskell.org/package/yesod-test-1.6.12/yesod-test-1.6.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c3123d6f260928af19f4a43c5d100f8a
diff --git a/metadata/md5-cache/dev-haskell/zip-archive-0.4.1 b/metadata/md5-cache/dev-haskell/zip-archive-0.4.1
index 319e6bb6f4f9..3ebbd5c9002d 100644
--- a/metadata/md5-cache/dev-haskell/zip-archive-0.4.1
+++ b/metadata/md5-cache/dev-haskell/zip-archive-0.4.1
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Library for creating and modifying zip archives
 EAPI=7
 HOMEPAGE=https://github.com/jgm/zip-archive
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/digest-0.0.0.1:=[profile?] dev-haskell/mtl:=[profile?] >=d
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=87f8bacc8f0770567119b149d2dc3e89
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.5.4.2 b/metadata/md5-cache/dev-haskell/zlib-0.5.4.2
index e33c7f02eca6..4b328d7ef7f8 100644
--- a/metadata/md5-cache/dev-haskell/zlib-0.5.4.2
+++ b/metadata/md5-cache/dev-haskell/zlib-0.5.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Compression and decompression in the gzip and zlib formats
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/zlib
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib
 SLOT=0/0.5.4.2
 SRC_URI=https://hackage.haskell.org/package/zlib-0.5.4.2/zlib-0.5.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=becc280aad3e046e87423d44548f986b
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.6.2.2 b/metadata/md5-cache/dev-haskell/zlib-0.6.2.2
index 68ce4bb2fba1..e8416582f1ac 100644
--- a/metadata/md5-cache/dev-haskell/zlib-0.6.2.2
+++ b/metadata/md5-cache/dev-haskell/zlib-0.6.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib >=dev-haskell/cabal-1.10 virtual/pkgconfig test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/tasty-0.8 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-hunit-0.8 <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 )
+DEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib >=dev-haskell/cabal-1.10 virtual/pkgconfig test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/tasty-0.8 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Compression and decompression in the gzip and zlib formats
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/zlib
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0/0.6.2.2
 SRC_URI=https://hackage.haskell.org/package/zlib-0.6.2.2/zlib-0.6.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=333b9ec3832a4756b16247e2083d1caf
diff --git a/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5 b/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
index 4b991861d9b4..b45bc8411379 100644
--- a/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
+++ b/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/zlib-0.5.2.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/zlib-0.5.2.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.3 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Low-level bindings to the zlib package. (deprecated)
 EAPI=7
 HOMEPAGE=https://github.com/snoyberg/zlib-bindings
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/zlib-0.5.2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.1.5
 SRC_URI=https://hackage.haskell.org/package/zlib-bindings-0.1.1.5/zlib-bindings-0.1.1.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d9f425aae155b9db97771d4d9a6720b
diff --git a/metadata/md5-cache/dev-haskell/zlib-conduit-1.1.0 b/metadata/md5-cache/dev-haskell/zlib-conduit-1.1.0
index b31d0b48fa40..8519c33d0ce4 100644
--- a/metadata/md5-cache/dev-haskell/zlib-conduit-1.1.0
+++ b/metadata/md5-cache/dev-haskell/zlib-conduit-1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/zlib-conduit-1.1.0/zlib-conduit-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e54eb19938f51c03b23ded672e180438
diff --git a/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1 b/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
index 9d32861fafda..19e17c993ee8 100644
--- a/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-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 )
+DEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Enumerator interface for zlib compression
 EAPI=7
 HOMEPAGE=https://github.com/maltem/zlib-enum
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.3.1
 SRC_URI=https://hackage.haskell.org/package/zlib-enum-0.2.3.1/zlib-enum-0.2.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0d6e80dada0167015cdf56d240c275f
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 33d3e86cf031..d32860f25883 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/javatoolkit-0.6.5 b/metadata/md5-cache/dev-java/javatoolkit-0.6.5
index 99e1db405b3d..9994a3cd3531 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.5
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.5
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of Gentoo-specific tools for Java
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.5.tar.bz2
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f18856799c0b539108d93f6fe490b36
+_md5_=10220c4230ee42c2ad7f2ae1fe7c491c
diff --git a/metadata/md5-cache/dev-java/javolution-6.0.0 b/metadata/md5-cache/dev-java/javolution-6.0.0
index 2917e01233af..2d6f5130266a 100644
--- a/metadata/md5-cache/dev-java/javolution-6.0.0
+++ b/metadata/md5-cache/dev-java/javolution-6.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/osgi-compendium:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0.tar.xz https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0-build.xml.tar.xz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	45ae8c4aaec3924d533052387ad652dc	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	45ae8c4aaec3924d533052387ad652dc	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=968a2a8c9811c7e2096307d8bd05290c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.60 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.60
index d323ec0dc8f7..dc4540e5fe47 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.60
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.60
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.60/src/apache-tomcat-8.5.60-src.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	45ae8c4aaec3924d533052387ad652dc	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b8828806553c79120bcc7b4e47a0023b
+_md5_=5e1849c6d89159628d84d8c5aaae54d2
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index dc50cb8ce499..509864694c10 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.10.2 b/metadata/md5-cache/dev-lang/ghc-8.10.2
new file mode 100644
index 000000000000..a27391d5e801
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ghc-8.10.2
@@ -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 postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=>=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 ) doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )
+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
+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 )
+REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary )
+RESTRICT=!test? ( test )
+SLOT=0/8.10.2
+SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.2/ghc-8.10.2-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.2/ghc-8.10.2-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.2-i686-pc-linux-gnu.tbz2 ) )
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	check-reqs	38804be59703af0fbf462b3710024074	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f507e151201f6080823a9c86f126247f
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.6 b/metadata/md5-cache/dev-lang/mujs-1.0.6
deleted file mode 100644
index 1f59ba94b89f..000000000000
--- a/metadata/md5-cache/dev-lang/mujs-1.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/readline:0=
-DESCRIPTION=An embeddable Javascript interpreter in C.
-EAPI=7
-HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs/
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=ISC
-RDEPEND=sys-libs/readline:0=
-SLOT=0/1.0.6
-SRC_URI=https://github.com/ccxvii/mujs/archive/1.0.6.tar.gz -> mujs-1.0.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d96765df6eebb376b35f4fbc7c09f8ad
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.7 b/metadata/md5-cache/dev-lang/mujs-1.0.7
deleted file mode 100644
index dad7a4ffba74..000000000000
--- a/metadata/md5-cache/dev-lang/mujs-1.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/readline:0=
-DESCRIPTION=An embeddable Javascript interpreter in C.
-EAPI=7
-HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs/
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=ISC
-RDEPEND=sys-libs/readline:0=
-SLOT=0/1.0.7
-SRC_URI=https://mujs.com/downloads/mujs-1.0.7.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7de70f2352338ff24108b318e40b2030
diff --git a/metadata/md5-cache/dev-lang/php-7.2.34 b/metadata/md5-cache/dev-lang/php-7.2.34
index e64381bb558c..63df3e6050d2 100644
--- a/metadata/md5-cache/dev-lang/php-7.2.34
+++ b/metadata/md5-cache/dev-lang/php-7.2.34
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=7.2
 SRC_URI=https://www.php.net/distributions/php-7.2.34.tar.xz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=553d9069c4a802e16c63d842a963dd49
+_md5_=68bacf36a83ec9c7c881b3ee7b6c2420
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18-r5 b/metadata/md5-cache/dev-lang/python-2.7.18-r5
index 7bfd63f8c77b..18241fc00591 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18-r5
+++ b/metadata/md5-cache/dev-lang/python-2.7.18-r5
@@ -5,11 +5,11 @@ 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
+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 ) !<=dev-lang/python-exec-2.4.6-r1
 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-r4.tar.xz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e34cfe39fed5aba069fe922d40f748d0
+_md5_=dc4a0e9a60b1b7d37257b64f32465a85
diff --git a/metadata/md5-cache/dev-lang/vala-0.48.12 b/metadata/md5-cache/dev-lang/vala-0.48.12
new file mode 100644
index 000000000000..87923723e5bb
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.48.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.48.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.48.12 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.12.tar.xz
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1dd48cd961ee51164de3dcd3e5395232
diff --git a/metadata/md5-cache/dev-lang/vala-0.50.1 b/metadata/md5-cache/dev-lang/vala-0.50.2
similarity index 89%
rename from metadata/md5-cache/dev-lang/vala-0.50.1
rename to metadata/md5-cache/dev-lang/vala-0.50.2
index a14491fc695a..78ba1bd0ab53 100644
--- a/metadata/md5-cache/dev-lang/vala-0.50.1
+++ b/metadata/md5-cache/dev-lang/vala-0.50.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.50.1 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
+DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.50.2 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.50.1 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
+RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.50.2 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
 RESTRICT=!test? ( test )
 SLOT=0.50
-SRC_URI=mirror://gnome/sources/vala/0.50/vala-0.50.1.tar.xz
+SRC_URI=mirror://gnome/sources/vala/0.50/vala-0.50.2.tar.xz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96998ba428933e19c7fe67b34ea8cc00
diff --git a/metadata/md5-cache/dev-lang/whitespace-0.4 b/metadata/md5-cache/dev-lang/whitespace-0.4
index 738237ad6e24..473d643e5d34 100644
--- a/metadata/md5-cache/dev-lang/whitespace-0.4
+++ b/metadata/md5-cache/dev-lang/whitespace-0.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/whitespace-0.4/whitespace-0.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3db072eb8f73fbe9d8142dcaabfcd245
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index bade8343c9dd..10e3f2bb70f3 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/OpenSRF-2.1.1 b/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
index 1b48a8808692..283451a259a9 100644
--- a/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
+++ b/metadata/md5-cache/dev-libs/OpenSRF-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcached dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/Net-Server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://open-ils.org/downloads/opensrf-2.1.1.tar.gz
-_eclasses_=apache-module	ed1310f166e54de484f5d4b39d0279c9	autotools	b8cf7d8850baf5b731738e6d4f00937a	depend.apache	69ed723e2331f996dc7510598673359e	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=apache-module	ed1310f166e54de484f5d4b39d0279c9	autotools	b8cf7d8850baf5b731738e6d4f00937a	depend.apache	69ed723e2331f996dc7510598673359e	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f29c715f169d764192478edad4970351
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
index dbc2134bf933..62d461d14fe7 100644
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist mirror fetch strip
 SLOT=0
 SRC_URI=amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=d382ff64c51fe892751a129e33de67ff
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629
index 9e5ef5377e1d..07f580338cba 100644
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist mirror fetch strip
 SLOT=0
 SRC_URI=amdgpu-pro-19.30-838629-ubuntu-18.04.tar.xz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=080f165d144782d60d9ff1fa61fb8fdb
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-20.40.1147286 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-20.40.1147286
index d831c1ea99ff..57d6be7b86f7 100644
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-20.40.1147286
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-20.40.1147286
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist mirror fetch strip
 SLOT=0
 SRC_URI=amdgpu-pro-20.40-1147286-ubuntu-20.04.tar.xz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=3ab9511d36656745f4b8073e3ee4067b
diff --git a/metadata/md5-cache/dev-libs/apr-1.7.0-r1 b/metadata/md5-cache/dev-libs/apr-1.7.0-r1
index ca36a0c34d25..208e5ad3b382 100644
--- a/metadata/md5-cache/dev-libs/apr-1.7.0-r1
+++ b/metadata/md5-cache/dev-libs/apr-1.7.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Apache Portable Runtime Library
 EAPI=7
 HOMEPAGE=https://apr.apache.org/
 IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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=Apache-2.0
 RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-base-policy )
 SLOT=1/1.7
 SRC_URI=mirror://apache/apr/apr-1.7.0.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1a6fb49961522a18fc18614b12ffb2d6
+_md5_=95c86954b82d463d33827ed608ca6690
diff --git a/metadata/md5-cache/dev-libs/botan-2.15.0 b/metadata/md5-cache/dev-libs/botan-2.15.0
deleted file mode 100644
index b9d616cbeef5..000000000000
--- a/metadata/md5-cache/dev-libs/botan-2.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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-lang/python:3.8 doc? ( dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ) ( dev-lang/python:3.7 doc? ( dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) )
-DEFINED_PHASES=configure install test
-DEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_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(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
-DESCRIPTION=C++ crypto library
-EAPI=7
-HOMEPAGE=https://botan.randombit.net/
-IUSE=bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos
-LICENSE=BSD-2
-RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_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(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
-REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
-SLOT=2/2.15
-SRC_URI=https://botan.randombit.net/releases/Botan-2.15.0.tar.xz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c99d62ff27b9985e1677e2cbe92a6a7f
diff --git a/metadata/md5-cache/dev-libs/fstrm-0.6.0 b/metadata/md5-cache/dev-libs/fstrm-0.6.0
index d9fa9323ca3c..3b526f7f98ae 100644
--- a/metadata/md5-cache/dev-libs/fstrm-0.6.0
+++ b/metadata/md5-cache/dev-libs/fstrm-0.6.0
@@ -5,10 +5,10 @@ DESCRIPTION=Frame Streams implementation in C
 EAPI=7
 HOMEPAGE=https://github.com/farsightsec/fstrm
 IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=utils? ( dev-libs/libevent:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/farsightsec/fstrm/archive/v0.6.0.tar.gz -> fstrm-0.6.0.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=55124964c289939bd5b8f11d303d965f
+_md5_=4f1f02116e1f124d2107ea64748f643d
diff --git a/metadata/md5-cache/dev-libs/glib-2.62.6 b/metadata/md5-cache/dev-libs/glib-2.62.6
index e80b55d9d779..927f3a8f69ca 100644
--- a/metadata/md5-cache/dev-libs/glib-2.62.6
+++ b/metadata/md5-cache/dev-libs/glib-2.62.6
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.62/glib-2.62.6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82e9fb91f3b03e9ce09ebe740722224d
+_md5_=58bffdc4ddd9e16f18a279e71d08083c
diff --git a/metadata/md5-cache/dev-libs/glib-2.64.5 b/metadata/md5-cache/dev-libs/glib-2.64.5
index bc35822db46a..a475b8ca1cce 100644
--- a/metadata/md5-cache/dev-libs/glib-2.64.5
+++ b/metadata/md5-cache/dev-libs/glib-2.64.5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.64/glib-2.64.5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7270416e45c1a7a1e25d078d2edaccc2
+_md5_=f5703a0bdb041c4537a9b99b3c02b75a
diff --git a/metadata/md5-cache/dev-libs/glib-2.66.2 b/metadata/md5-cache/dev-libs/glib-2.66.2
index 6c5f6f2e06ee..43ba18bb2b11 100644
--- a/metadata/md5-cache/dev-libs/glib-2.66.2
+++ b/metadata/md5-cache/dev-libs/glib-2.66.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.66/glib-2.66.2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe5e67296935b16ad18b567b09cdb5a4
+_md5_=c70d386ce547a68d4c1cd94de8f98247
diff --git a/metadata/md5-cache/dev-libs/glib-2.66.3 b/metadata/md5-cache/dev-libs/glib-2.66.3
index 5378e743e74d..4413b0e97250 100644
--- a/metadata/md5-cache/dev-libs/glib-2.66.3
+++ b/metadata/md5-cache/dev-libs/glib-2.66.3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.66/glib-2.66.3.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e191cd1054d5fe7dccb2a4681de566f4
+_md5_=f2e958497392b7755d749963d0a84aed
diff --git a/metadata/md5-cache/dev-libs/gmp-6.2.1 b/metadata/md5-cache/dev-libs/gmp-6.2.1
index 6e1609378b2c..2c45a1c3e92b 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.2.1
+++ b/metadata/md5-cache/dev-libs/gmp-6.2.1
@@ -4,9 +4,9 @@ DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numb
 EAPI=7
 HOMEPAGE=https://gmplib.org/
 IUSE=+asm doc +cxx pic static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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=|| ( LGPL-3+ GPL-2+ )
 SLOT=0/10.4
 SRC_URI=ftp://ftp.gmplib.org/pub/gmp-6.2.1/gmp-6.2.1.tar.xz mirror://gnu/gmp/gmp-6.2.1.tar.xz doc? ( https://gmplib.org/gmp-man-6.2.0.pdf )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cf05928d3c93fd252f42f4bf477be19a
+_md5_=d47ad941c56327b437b3c8ab355d768d
diff --git a/metadata/md5-cache/dev-libs/hiredis-1.0.0 b/metadata/md5-cache/dev-libs/hiredis-1.0.0
index 651990e5ecc8..671700e81e0c 100644
--- a/metadata/md5-cache/dev-libs/hiredis-1.0.0
+++ b/metadata/md5-cache/dev-libs/hiredis-1.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Minimalistic C client library for the Redis database
 EAPI=7
 HOMEPAGE=https://github.com/redis/hiredis
 IUSE=examples ssl static-libs test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/redis/hiredis/archive/v1.0.0.tar.gz -> hiredis-1.0.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fe6ac05d282104a16d7a0b239da37fbb
+_md5_=8e798b2f101b1721a1d35b96352e922f
diff --git a/metadata/md5-cache/dev-libs/icu-68.2 b/metadata/md5-cache/dev-libs/icu-68.2
new file mode 100644
index 000000000000..b76940e96fd0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/icu-68.2
@@ -0,0 +1,12 @@
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=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
+DESCRIPTION=International Components for Unicode
+EAPI=7
+HOMEPAGE=http://site.icu-project.org/
+IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=BSD
+SLOT=0/68.2
+SRC_URI=https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f638a3cb785f08ed0a57e358d83ef070
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-68.2 b/metadata/md5-cache/dev-libs/icu-layoutex-68.2
new file mode 100644
index 000000000000..59e8d5540848
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-68.2
@@ -0,0 +1,14 @@
+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 test
+DEPEND=~dev-libs/icu-68.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=External layout part of International Components for Unicode
+EAPI=7
+HOMEPAGE=http://www.icu-project.org/
+IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=~dev-libs/icu-68.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/68.2
+SRC_URI=https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=cda5329ca8f73387cfe2009b87073b02
diff --git a/metadata/md5-cache/dev-libs/isl-0.22.1 b/metadata/md5-cache/dev-libs/isl-0.22.1
index b08d393a848a..975a7de740ae 100644
--- a/metadata/md5-cache/dev-libs/isl-0.22.1
+++ b/metadata/md5-cache/dev-libs/isl-0.22.1
@@ -1,5 +1,6 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst test
-DEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/xz-utils virtual/pkgconfig
+DEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=A library for manipulating integer points bounded by linear constraints
 EAPI=7
 HOMEPAGE=http://isl.gforge.inria.fr/
@@ -10,4 +11,4 @@ RDEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 SLOT=0/22
 SRC_URI=http://isl.gforge.inria.fr/isl-0.22.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6584a48f582743f458be8b7a4d7603fd
+_md5_=36cc81ef6bb6980c808da308211abd60
diff --git a/metadata/md5-cache/dev-libs/isl-0.23-r1 b/metadata/md5-cache/dev-libs/isl-0.23-r1
index 77b237bac710..f6b6f290ea82 100644
--- a/metadata/md5-cache/dev-libs/isl-0.23-r1
+++ b/metadata/md5-cache/dev-libs/isl-0.23-r1
@@ -1,13 +1,14 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst test
-DEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/xz-utils virtual/pkgconfig
+DEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=A library for manipulating integer points bounded by linear constraints
 EAPI=7
 HOMEPAGE=http://isl.gforge.inria.fr/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/23
 SRC_URI=http://isl.gforge.inria.fr/isl-0.23.tar.xz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d38c18e7b6ceccfc494ef370914791e1
+_md5_=6bf17774ad02e43adac8f03529a3cba4
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.4 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
index 8e452318ce48..f8750f6749e8 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
@@ -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 ~riscv s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( public-domain MIT )
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.9.4.tar.gz -> jsoncpp-1.9.4.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=308fc970d3dc35ac4d0b88dbf0f223ca
+_md5_=6c74b8774b8be15bd0606f439ad01b37
diff --git a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001 b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001
index 57c5c765e021..66048549572d 100644
--- a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001
+++ b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001
@@ -5,10 +5,10 @@ DESCRIPTION=OpenCL C library
 EAPI=7
 HOMEPAGE=https://libclc.llvm.org/
 IUSE=video_cards_nvidia video_cards_r600 video_cards_radeonsi
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/libclc-0.2.0_pre20201001.tar.xz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f82f263e0707eaa8f20aa40a60d7db1d
+_md5_=1319ffe81af3d01ff8dc7489a702c4ad
diff --git a/metadata/md5-cache/dev-libs/libcroco-0.6.13 b/metadata/md5-cache/dev-libs/libcroco-0.6.13
index 43aa04f3a72d..1ab80a76bf67 100644
--- a/metadata/md5-cache/dev-libs/libcroco-0.6.13
+++ b/metadata/md5-cache/dev-libs/libcroco-0.6.13
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=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_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_s390_32(-)?,abi_s390_64(-)?] dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=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_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_s390_32(-)?,abi_s390_64(-)?] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit
-EAPI=6
+EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/libcroco/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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 ~x64-solaris ~x86-solaris
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=!test? ( test )
 SLOT=0.6
 SRC_URI=mirror://gnome/sources/libcroco/0.6/libcroco-0.6.13.tar.xz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1aec8cc23ec07541cbae02c0f2199e3a
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1f499c4b1783b997d19c454c790f67a8
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.10.0 b/metadata/md5-cache/dev-libs/libevdev-1.10.0
index 457eb3ee9e88..6d4f9a0a48f9 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.10.0
+++ b/metadata/md5-cache/dev-libs/libevdev-1.10.0
@@ -5,10 +5,10 @@ DESCRIPTION=Handler library for evdev events
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev
 IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.10.0.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=360ed8ec93a1cd559bb1112dbdd395a4
+_md5_=0d8a8ac5a04b8256da1161d361d16a8d
diff --git a/metadata/md5-cache/dev-libs/libffi-3.3-r2 b/metadata/md5-cache/dev-libs/libffi-3.3-r2
index 983ae8481c29..7871af7773dc 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.3-r2
+++ b/metadata/md5-cache/dev-libs/libffi-3.3-r2
@@ -1,5 +1,5 @@
 BDEPEND=test? ( dev-util/dejagnu )
-DEFINED_PHASES=compile configure install test
+DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=a portable, high level programming interface to various calling conventions
 EAPI=7
 HOMEPAGE=https://sourceware.org/libffi/
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=834840a1556202e0a558d683259e3534
+_md5_=5c165b9175453a0818629e4ad4527e18
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.25.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.25.0
index e838016beec0..2bceb14f5a01 100644
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.25.0
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.25.0
@@ -4,11 +4,11 @@ DESCRIPTION=C++ library offering some basic functionality for platform-independe
 EAPI=7
 HOMEPAGE=https://lib.filezilla-project.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:=
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.25.0.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=910c58b06d8f023a60ef89d502e0c388
+_md5_=6ce7fa14b203b1c43dffac3c80e1f80f
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.0.1-r1 b/metadata/md5-cache/dev-libs/libgit2-1.0.1-r1
deleted file mode 100644
index bc0b966c4d50..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-1.0.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.9 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=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) 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	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d6b9d81834e8177cebe9df6f3041afa
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.1.0-r2 b/metadata/md5-cache/dev-libs/libgit2-1.1.0-r2
index ad9d46fac707..83824e04355d 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.1.0-r2
+++ b/metadata/md5-cache/dev-libs/libgit2-1.1.0-r2
@@ -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=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.1.0.tar.gz -> libgit2-1.1.0.tar.gz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80b8b510a0c01c42ef72e55c02e647ba
+_md5_=83fe76142df645c75950c57fe0d0d99f
diff --git a/metadata/md5-cache/dev-libs/libgudev-234 b/metadata/md5-cache/dev-libs/libgudev-234
new file mode 100644
index 000000000000..ed01c55127af
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgudev-234
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/glib-utils >=dev-util/gtk-doc-am-1.18 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GObject bindings for libudev
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
+IUSE=introspection static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) !sys-fs/eudev[gudev(-)] !sys-fs/udev[gudev(-)] !sys-apps/systemd[gudev(-)]
+SLOT=0/0
+SRC_URI=mirror://gnome/sources/libgudev/234/libgudev-234.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06a8d8b674dac9b51535f09c088e364b
diff --git a/metadata/md5-cache/dev-libs/libinput-1.16.4 b/metadata/md5-cache/dev-libs/libinput-1.16.4
index 8bdc35a6dc20..e9ba5ce24163 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.16.4
+++ b/metadata/md5-cache/dev-libs/libinput-1.16.4
@@ -5,11 +5,11 @@ DESCRIPTION=Library to handle input devices in Wayland
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
 IUSE=doc input_devices_wacom test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.16.4.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=9b530e0524320d4e8360e5e6b8752f77
+_md5_=6ed3957a68f8f7a31f9225f363ae1492
diff --git a/metadata/md5-cache/dev-libs/liblinear-210-r1 b/metadata/md5-cache/dev-libs/liblinear-210-r1
deleted file mode 100644
index 00d307694116..000000000000
--- a/metadata/md5-cache/dev-libs/liblinear-210-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A Library for Large Linear Classification
-EAPI=5
-HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-SLOT=0/3
-SRC_URI=https://github.com/cjlin1/liblinear/archive/v210.tar.gz -> liblinear-210.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=853b6802acfe788f178ceeb5a3ef9877
diff --git a/metadata/md5-cache/dev-libs/liblinear-221 b/metadata/md5-cache/dev-libs/liblinear-221
deleted file mode 100644
index ba657c18171e..000000000000
--- a/metadata/md5-cache/dev-libs/liblinear-221
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A Library for Large Linear Classification
-EAPI=7
-HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-SLOT=0/3
-SRC_URI=https://github.com/cjlin1/liblinear/archive/v221.tar.gz -> liblinear-221.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f9931b7e348319b85bfdd718b60d24b1
diff --git a/metadata/md5-cache/dev-libs/liblinear-230 b/metadata/md5-cache/dev-libs/liblinear-230
deleted file mode 100644
index bda6f875f21e..000000000000
--- a/metadata/md5-cache/dev-libs/liblinear-230
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A Library for Large Linear Classification
-EAPI=7
-HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-SLOT=0/3
-SRC_URI=https://github.com/cjlin1/liblinear/archive/v230.tar.gz -> liblinear-230.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f9931b7e348319b85bfdd718b60d24b1
diff --git a/metadata/md5-cache/dev-libs/liblinear-240-r1 b/metadata/md5-cache/dev-libs/liblinear-240-r1
deleted file mode 100644
index 56d338d71e03..000000000000
--- a/metadata/md5-cache/dev-libs/liblinear-240-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A Library for Large Linear Classification
-EAPI=7
-HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-SLOT=0/4
-SRC_URI=https://github.com/cjlin1/liblinear/archive/v240.tar.gz -> liblinear-240.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=298dd2e1c4a61ce16fb223da866f44e2
diff --git a/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1 b/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1
index cc45a6031517..4e545b9ac326 100644
--- a/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1
+++ b/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Hardware-based performance monitoring interface for Linux
 EAPI=7
 HOMEPAGE=http://perfmon2.sourceforge.net
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2 MIT
 SLOT=0/4
 SRC_URI=mirror://sourceforge/perfmon2/libpfm4/libpfm-4.10.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6131af1e19b0a6f2064614cff066847d
+_md5_=ddf29656d5bae7980da94e26ff78ba91
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.5.3 b/metadata/md5-cache/dev-libs/libpipeline-1.5.3
index 8437532e7036..9b5a649f8e0b 100644
--- a/metadata/md5-cache/dev-libs/libpipeline-1.5.3
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.5.3
@@ -5,9 +5,9 @@ DESCRIPTION=a pipeline manipulation library
 EAPI=7
 HOMEPAGE=http://libpipeline.nongnu.org/
 IUSE=static-libs test
-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
+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
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.5.3.tar.gz
-_md5_=ad3f59510e67be0d0846665d856402e7
+_md5_=5018cf533043a8e05e5cb6a5b77331ce
diff --git a/metadata/md5-cache/dev-libs/libpqxx-7.3.0 b/metadata/md5-cache/dev-libs/libpqxx-7.3.0
new file mode 100644
index 000000000000..8555340b0f07
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpqxx-7.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install setup test
+DEPEND=dev-db/postgresql:= || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) doc? ( app-doc/doxygen app-text/xmlto )
+DESCRIPTION=Standard front-end for writing C++ programs that use PostgreSQL
+EAPI=7
+HOMEPAGE=http://pqxx.org/development/libpqxx/
+IUSE=doc static-libs
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-db/postgresql:=
+SLOT=0
+SRC_URI=https://github.com/jtv/libpqxx/archive/7.3.0.tar.gz -> libpqxx-7.3.0.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cc5c3b36335a47ebc498f408cf836185
diff --git a/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2 b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2
new file mode 100644
index 000000000000..580f0c51ba19
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install test
+DEPEND=gmp? ( dev-libs/gmp:= ) libtommath? ( dev-libs/libtommath:= ) tomsfastmath? ( dev-libs/tomsfastmath:= )
+DESCRIPTION=LibTomCrypt is a comprehensive, modular and portable cryptographic toolkit
+EAPI=7
+HOMEPAGE=https://www.libtom.net/LibTomCrypt/ https://github.com/libtom/libtomcrypt
+IUSE=+gmp +libtommath tomsfastmath
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( WTFPL-2 public-domain )
+SLOT=0/1
+SRC_URI=https://github.com/libtom/libtomcrypt/releases/download/v1.18.2/crypt-1.18.2.tar.xz -> libtomcrypt-1.18.2.tar.xz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=67566f312c326d4756c00678e7e9e9cc
diff --git a/metadata/md5-cache/dev-libs/libtommath-1.1.0 b/metadata/md5-cache/dev-libs/libtommath-1.1.0
deleted file mode 100644
index 87f4a9f0a1a3..000000000000
--- a/metadata/md5-cache/dev-libs/libtommath-1.1.0
+++ /dev/null
@@ -1,12 +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
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Optimized and portable routines for integer theoretic applications
-EAPI=7
-HOMEPAGE=https://www.libtom.net/
-IUSE=doc examples static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=WTFPL-2
-SLOT=0
-SRC_URI=https://github.com/libtom/libtommath/releases/download/v1.1.0/ltm-1.1.0.tar.xz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=83f1d6c9a3977b7c6eea65b5db135f1f
diff --git a/metadata/md5-cache/dev-libs/libuv-1.40.0 b/metadata/md5-cache/dev-libs/libuv-1.40.0
index 68d77b80f653..87f7c401d02f 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.40.0
+++ b/metadata/md5-cache/dev-libs/libuv-1.40.0
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.40.0.tar.gz -> libuv-1.40.0.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4a190ca38a57ae60f8162a06d8660212
+_md5_=e5bf87a61c3611c9f3852a9f3ec4e2d3
diff --git a/metadata/md5-cache/dev-libs/libverto-0.3.1 b/metadata/md5-cache/dev-libs/libverto-0.3.1
index 2b33a7c7ec7b..605dcf3f8969 100644
--- a/metadata/md5-cache/dev-libs/libverto-0.3.1
+++ b/metadata/md5-cache/dev-libs/libverto-0.3.1
@@ -5,11 +5,11 @@ DESCRIPTION=Main event loop abstraction library
 EAPI=7
 HOMEPAGE=https://github.com/latchset/libverto/
 IUSE=glib +libev libevent tevent +threads static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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=MIT
 RDEPEND=glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libev? ( >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libevent? ( >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tevent? ( >=sys-libs/tevent-0.9.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=|| ( glib libev libevent tevent )
 SLOT=0
 SRC_URI=https://github.com/latchset/libverto/releases/download/0.3.1/libverto-0.3.1.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b2e933232e3dfd6200b0a17999cd7466
+_md5_=1ec8835148317f3565d269055bcd71c0
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4 b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
index f32ace94ca63..7db185b98cce 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.10-r1-patchset.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4ad3243acf624a75d21753b6347308bf
+_md5_=db2d9efc349c58bbfe4ae9515b3c9b1e
diff --git a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3 b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
index dacb89e424d5..edae204861f3 100644
--- a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
+++ b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/lockdev/lockdev_1.0.3.orig.tar.gz mirror://debian/pool/main/l/lockdev/lockdev_1.0.3-1.2.diff.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22fd95a9a7d2907030c9cc10e4acae93
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.11.2 b/metadata/md5-cache/dev-libs/pugixml-1.11.3
similarity index 97%
rename from metadata/md5-cache/dev-libs/pugixml-1.11.2
rename to metadata/md5-cache/dev-libs/pugixml-1.11.3
index 24cb384a6c18..456d95a28764 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.11.2
+++ b/metadata/md5-cache/dev-libs/pugixml-1.11.3
@@ -6,6 +6,6 @@ HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml/
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0
-SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.11.2/pugixml-1.11.2.tar.gz
+SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.11.3/pugixml-1.11.3.tar.gz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2aa12b32accf74839077af7f56ec3880
diff --git a/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1 b/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1
new file mode 100644
index 000000000000..adde94860479
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install test
+DESCRIPTION=Fast public domain large integer arithmetic library
+EAPI=7
+HOMEPAGE=https://www.libtom.net/TomsFastMath/ https://github.com/libtom/tomsfastmath
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Unlicense
+SLOT=0/1
+SRC_URI=https://github.com/libtom/tomsfastmath/releases/download/v0.13.1/tfm-0.13.1.tar.xz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=566051f3b4be645599f96d5315354fa0
diff --git a/metadata/md5-cache/dev-libs/uthash-2.0.2 b/metadata/md5-cache/dev-libs/uthash-2.0.2
deleted file mode 100644
index fe4342f5c47d..000000000000
--- a/metadata/md5-cache/dev-libs/uthash-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=test? ( dev-lang/perl )
-DESCRIPTION=An easy-to-use hash implementation for C programmers
-EAPI=6
-HOMEPAGE=https://troydhanson.github.io/uthash/index.html
-IUSE=test
-KEYWORDS=amd64 ~arm ppc ~ppc64 sparc x86
-LICENSE=BSD-1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/troydhanson/uthash/archive/v2.0.2.tar.gz -> uthash-2.0.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cb2d8e1457c7ed659c7a0513798b71b4
diff --git a/metadata/md5-cache/dev-libs/uthash-2.1.0 b/metadata/md5-cache/dev-libs/uthash-2.1.0
index cc8f9fc02321..70e2b600481c 100644
--- a/metadata/md5-cache/dev-libs/uthash-2.1.0
+++ b/metadata/md5-cache/dev-libs/uthash-2.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=An easy-to-use hash implementation for C programmers
 EAPI=7
 HOMEPAGE=https://troydhanson.github.io/uthash/index.html
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD-1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/troydhanson/uthash/archive/v2.1.0.tar.gz -> uthash-2.1.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a525f8326ca154e258f0a611c6414285
+_md5_=daee84ef570b4c55f32a6d724e06b4ea
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.48.12 b/metadata/md5-cache/dev-libs/vala-common-0.48.12
new file mode 100644
index 000000000000..9db13f6f0b37
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/vala-common-0.48.12
@@ -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.12.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
+_md5_=a88da6d0887f1c58b41cf0533978aa3d
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.50.1 b/metadata/md5-cache/dev-libs/vala-common-0.50.2
similarity index 87%
rename from metadata/md5-cache/dev-libs/vala-common-0.50.1
rename to metadata/md5-cache/dev-libs/vala-common-0.50.2
index b7b3ca798ed8..05244f370901 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.50.1
+++ b/metadata/md5-cache/dev-libs/vala-common-0.50.2
@@ -6,6 +6,6 @@ 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.50/vala-0.50.1.tar.xz
+SRC_URI=mirror://gnome/sources/vala/0.50/vala-0.50.2.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
 _md5_=a88da6d0887f1c58b41cf0533978aa3d
diff --git a/metadata/md5-cache/dev-libs/voikko-fi-2.4 b/metadata/md5-cache/dev-libs/voikko-fi-2.4
new file mode 100644
index 000000000000..7a3a5671c32d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/voikko-fi-2.4
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-libs/libvoikko verify-sig? ( app-crypt/openpgp-keys-voikko ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install setup unpack
+DEPEND=dev-libs/foma dev-libs/libvoikko
+DESCRIPTION=Finnish dictionary for libvoikko based spell checkers (vvfst format)
+EAPI=7
+HOMEPAGE=https://voikko.puimula.org/
+IUSE=verify-sig
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/foma dev-libs/libvoikko
+SLOT=0
+SRC_URI=https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.4.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.4.tar.gz.asc )
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=86bf9dc53f77dbaf9ec49d229dc5f06e
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 8626d5abfb70..18e57615bda1 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/lua-openssl-0.7.8_p0-r100 b/metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r101
similarity index 97%
rename from metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r100
rename to metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r101
index 4665c2cbc5fe..ef3d4cce6a3d 100644
--- a/metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r100
+++ b/metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r101
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zhaozg/lua-openssl/archive/0.7.8-0.tar.gz -> lua-openssl-0.7.8_p0.tar.gz https://github.com/zhaozg/lua-auxiliar/archive/8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz -> lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> lua-compat-5.3-0.10.tar.gz
 _eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=233e908bcbde6163e4ec38b6ac171ac1
+_md5_=629d09d91954561ab80a9b936a2c6621
diff --git a/metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r2 b/metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r3
similarity index 97%
rename from metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r2
rename to metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r3
index 35175bf23647..a53f7a856367 100644
--- a/metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r2
+++ b/metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r3
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zhaozg/lua-openssl/archive/0.7.8-0.tar.gz -> lua-openssl-0.7.8_p0.tar.gz https://github.com/zhaozg/lua-auxiliar/archive/8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz -> lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> lua-compat-5.3-0.10.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=71dadf1800c82596f61c337ec4c95fc2
+_md5_=53fbc97b142e1f01a7a15873ad3a4b88
diff --git a/metadata/md5-cache/dev-lua/luv-1.32.0.0 b/metadata/md5-cache/dev-lua/luv-1.32.0.0
index 812a9dca5def..5c572ac75d7e 100644
--- a/metadata/md5-cache/dev-lua/luv-1.32.0.0
+++ b/metadata/md5-cache/dev-lua/luv-1.32.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libuv-1.32.0:= luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luvit/luv/archive/1.32.0-0.tar.gz -> luv-1.32.0.0.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.7.tar.gz -> luv-lua-compat-0.7.tar.gz
-_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d2079fb1ff5099ed702fc9e1da0cffc
diff --git a/metadata/md5-cache/dev-lua/luv-1.32.0.0-r101 b/metadata/md5-cache/dev-lua/luv-1.32.0.0-r101
index 7e438045e4a9..66aa47b68089 100644
--- a/metadata/md5-cache/dev-lua/luv-1.32.0.0-r101
+++ b/metadata/md5-cache/dev-lua/luv-1.32.0.0-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luvit/luv/archive/1.32.0-0.tar.gz -> luv-1.32.0.0.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> luv-lua-compat-0.10.tar.gz
-_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf4b407a8480066cc580af02187a89a5
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 93449f7eb345..d5da5deba70a 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/findlib-1.8.1-r1 b/metadata/md5-cache/dev-ml/findlib-1.8.1-r2
similarity index 59%
rename from metadata/md5-cache/dev-ml/findlib-1.8.1-r1
rename to metadata/md5-cache/dev-ml/findlib-1.8.1-r2
index 3763c5f3aa74..48a9604c90bb 100644
--- a/metadata/md5-cache/dev-ml/findlib-1.8.1-r1
+++ b/metadata/md5-cache/dev-ml/findlib-1.8.1-r2
@@ -1,13 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
+DEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 DESCRIPTION=OCaml tool to find/use non-standard packages
 EAPI=7
 HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
 IUSE=doc +ocamlopt tk
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
+RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/findlib-1.8.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8e2fd336e987a148f1d9f65fb2e3d5bf
+_md5_=77491c487b64515af83ffceae33db802
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.1_rc2 b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.1_rc2
new file mode 100644
index 000000000000..44d5b66efb9c
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.1_rc2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-11.0.1_rc2:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_ARC] ) llvm_targets_VE? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_VE] ) !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR 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_VE
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-11.0.1_rc2:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_ARC] ) llvm_targets_VE? ( ~sys-devel/llvm-11.0.1_rc2[llvm_targets_VE] )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR 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_VE )
+RESTRICT=!test? ( test )
+SLOT=0/11.0.1_rc2
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.1-rc2.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d38c5a93c3f43051015a17eef988abbb
diff --git a/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1 b/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
index 344c413fd0b1..ad2616e16c91 100644
--- a/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
+++ b/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Linux-Pid !<www-apache/mod_perl-2.0.5 >=www-apache/mod_perl-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Apache-SizeLimit-0.97.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b11348c6ea8d65f4090404c2a29b5666
diff --git a/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0 b/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
index 05ea3a613489..689ca5f338f3 100644
--- a/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
+++ b/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sys-libs/db-2.0:* dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.55.tar.gz
-_eclasses_=db-use	d0a68876efc79f37b39ecf3f48c48e7e	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=db-use	d0a68876efc79f37b39ecf3f48c48e7e	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cf05c2867801bdee8b846d2033d4a915
diff --git a/metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0 b/metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0
index d11dc43fff56..bf5d79c486ab 100644
--- a/metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0
+++ b/metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/GD-2.300.0 >=dev-perl/Statistics-Descriptive-2.600.0 >=sci-biology/bioperl-1.5.9.1 dev-perl/CGI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Bio-Graphics-2.39.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=17b81b1bf1cf8fec2ed34c3e53e84689
diff --git a/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1 b/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
index 6d8b42594075..11e4d5df7556 100644
--- a/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
+++ b/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Module-Pluggable dev-perl/Class-Accessor dev-perl/Class-Data-In
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROKR/Color-Library-0.021.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d2e125633b1bb42eb2ad4e0c756f274d
diff --git a/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1 b/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
index bbb3a76bfb87..34e66a357c05 100644
--- a/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-MethodMaker virtual/perl-Text-Balanced virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/Config-ApacheFormat-1.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3e72e76c225011e357a5c3a66ce64668
diff --git a/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1 b/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1
index 85638376aa1a..e336b82c2464 100644
--- a/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1
+++ b/metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.59.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=29ad0cb1215e9a0e8f5e25168fb5a662
diff --git a/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0 b/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
index dd4618d92cfd..ff54d9ea7ab1 100644
--- a/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
+++ b/metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-File-Spec-3.300.0 >=virtual/perl-File-Temp-0.220.0 dev-la
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.23.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ae38b756072afcee49bddf9ef8f2db22
diff --git a/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1 b/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
index 6e316ffbfe41..49be6a664f3e 100644
--- a/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
+++ b/metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-Storable >=dev-perl/Sub-Expo
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=daf8bbe438c8e67ea5b7a8090d1ad4df
diff --git a/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1 b/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1
index 72468975f679..65a376ac9482 100644
--- a/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO-Compress virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Convert-ASCII-Armour-1.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2796da602e58070beda5f3bcd4a70e59
diff --git a/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1 b/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1
index ffd27678c8fa..e379d92d1c8a 100644
--- a/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1
+++ b/metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/Convert-BER-1.32.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9d317aed2b94b4dcf8de68eea3eb1a74
diff --git a/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1 b/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1
index 54da30dd1152..223a50c117b6 100644
--- a/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-ErrorHandler dev-perl/Convert-ASN1 dev-perl/Crypt-DES_EDE3 virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Convert-PEM-0.08.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=49ea16c0674d964fd149af427aa96ef5
diff --git a/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2 b/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2
index 1086e94c2adb..af2ad9e0adbc 100644
--- a/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2
+++ b/metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MIME-tools dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Convert-TNEF-0.18.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=db1bcd6cc96689d967aa0e8e85f0310f
diff --git a/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
index d7ed7f7e2356..1c8e471ed88b 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-Blowfish-2.14.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8aaf81284a18d07965772ee9ca60269c
diff --git a/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1 b/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1
index f04df79016dc..6c3748a2d1df 100644
--- a/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOBMATH/Crypt-CAST5_PP-1.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2a26b72eec92a9fb398b286875c83159
diff --git a/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1 b/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
index 26f5c676cf8e..f36c28f5a46e 100644
--- a/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-2.33.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7a002836f9905acc1f278d85e4574f95
diff --git a/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1 b/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1
index ae61f248ffa1..7eaba0803491 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-DES dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Crypt-DES_EDE3-0.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=24bb3e4286f043d407f94d5a14799830
diff --git a/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0 b/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
index f7aabedeefc6..618f48882355 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
+++ b/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Data-Buffer dev-perl/Digest-SHA1 virtual/perl-File-Spec dev-per
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Crypt-DSA-1.17.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b0c44848a295f5c11defbed839381da6
diff --git a/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2 b/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2
index ebdc566d85cb..8760843f623f 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2
+++ b/metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Mix-0.1.0 >=virtual/perl-MIME-Base64-2.21 virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Crypt-Eksblowfish-0.009.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f3d9e14a5147b62b0c2dd431d0b656d3
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3
index c8e4334c5b86..3dd4b7082ca6 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-OpenSSL-Bignum dev-perl/Crypt-OpenSSL-Random !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERLER/Crypt-OpenSSL-RSA-0.28.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0aabfcb763e174ed3cfdd8811b682355
diff --git a/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0 b/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0
index 338caa00581f..cc5502de5e13 100644
--- a/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0
+++ b/metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.40.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e52bea540579828d58bc844c44b92b3e
diff --git a/metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1
index 0fd09d0bb9db..d0cd22bd597d 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Math-Pari dev-perl/Crypt-Random dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Crypt-Primes-0.50.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a6cb1442d1e0b1db9349e86eca28eeca
diff --git a/metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1 b/metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1
index db4868f6a053..a2499a9756c3 100644
--- a/metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIFUKURT/Crypt-RC4-2.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6b2fbc21e1505e4bac34142aa5a73a8e
diff --git a/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1 b/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1
index fea5b6471946..58fc35129af6 100644
--- a/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Loader dev-perl/Crypt-Blowfish dev-perl/Convert-ASCII-Armour dev-perl/Crypt-CBC dev-perl/Crypt-Primes dev-perl/Crypt-Random dev-perl/Data-Buffer dev-perl/Digest-MD2 virtual/perl-Digest-MD5 dev-perl/Digest-SHA1 >=dev-perl/Math-Pari-2.010603 dev-perl/Sort-Versions dev-perl/Tie-EncryptedHash dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Crypt-RSA-1.99.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7f235695a90280152915e35549439155
diff --git a/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
index 50a9d169a095..bd343fa4e14b 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/FreezeThaw virtual/perl-IO-Compress dev-perl/Crypt-Blowfish vir
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Crypt-Simple-0.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=56146e72802d3904df68012cb1d537c7
diff --git a/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1 b/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1
index d36cdbdbeab6..65b2357ce818 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMS/Crypt-Twofish-2.17.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f496a131242e09413e1c26210b3bba68
diff --git a/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0 b/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
index 5033133e370e..b12584158b0e 100644
--- a/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
+++ b/metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AJ/AJUNG/Crypt-X509-0.51.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98efe3daf2506cc330b4c871e92ced90
diff --git a/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1 b/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
index 3d3d220caa77..d1d35f154a45 100644
--- a/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/DBI-1.37 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/DBIx-ContextualFetch-1.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a058ab7e299f0900e893dfe172fbce31
diff --git a/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0 b/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
index e10d738b1652..501f88611cd6 100644
--- a/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
+++ b/metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBI virtual/perl-Storable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.45.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50afea3aafd62703a5c3bd2e4eae46d4
diff --git a/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1 b/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1
index fbb047e2ed16..1a642970ec9f 100644
--- a/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1
+++ b/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Sys-Syscall dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRADFITZ/Danga-Socket-1.61.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7a19bfbbf01f828509036c2fd9118b95
diff --git a/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1 b/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
index f1456b3ca9ad..655e1a15c0db 100644
--- a/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/DateTime dev-perl/Any-Moose dev-perl/UNIVERSAL-require dev-perl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TY/TYPESTER/Data-AMF-0.09.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=617a3eead21a22a3bd84ca62f8c22f9a
diff --git a/metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1 b/metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1
index 05a27a8e6bbd..e3b7dbfeefa2 100644
--- a/metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Data-Buffer-0.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0fd586693b6722f3f6431004228e4fd9
diff --git a/metadata/md5-cache/dev-perl/Data-Compare-1.250.0 b/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
index 663546e25f62..3b7014b3d9c6 100644
--- a/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
+++ b/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/File-Find-Rule-0.100.0 virtual/perl-Scalar-List-Utils dev-lan
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.25.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a933c20ca54a5820bf48596767755ff
diff --git a/metadata/md5-cache/dev-perl/Data-Diver-1.010.1 b/metadata/md5-cache/dev-perl/Data-Diver-1.010.1
index d7dc7eafc0a0..a95c711aa186 100644
--- a/metadata/md5-cache/dev-perl/Data-Diver-1.010.1
+++ b/metadata/md5-cache/dev-perl/Data-Diver-1.010.1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TY/TYEMQ/Data-Diver-1.0101.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4d0ac2b5a0975f15ec2af2acf87a5886
diff --git a/metadata/md5-cache/dev-perl/Data-Dump-1.230.0 b/metadata/md5-cache/dev-perl/Data-Dump-1.230.0
index 517021d3d109..a8fe8a65bb02 100644
--- a/metadata/md5-cache/dev-perl/Data-Dump-1.230.0
+++ b/metadata/md5-cache/dev-perl/Data-Dump-1.230.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.23.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b4cbbde6712312d78be0c2189d72af1d
diff --git a/metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1 b/metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1
index 53ca133e7563..1c2d4c12bbd1 100644
--- a/metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-2 >=dev-perl/XML-Parser-2 >=dev-perl/Array-RefElem-0.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Data-DumpXML-1.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4624325d8e7164ab6c056baa5901f26e
diff --git a/metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1 b/metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1
index dccb1e114393..6373798d2137 100644
--- a/metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JV/JV/Data-Hexify-1.00.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bbfef289ef2399ff19f006a1480de70c
diff --git a/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1 b/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
index 595ea51ce73b..7fc0e8980dda 100644
--- a/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=31097a3eb6d414284052ef663104708e
diff --git a/metadata/md5-cache/dev-perl/Data-ICal-0.220.0 b/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
index 7186fb57e98c..3ace602420f2 100644
--- a/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
+++ b/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Class-Accessor dev-perl/Class-ReturnValue dev-perl/Text-vFile-a
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Data-ICal-0.22.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f47a613e01722d1a934fcdde74d92e28
diff --git a/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1 b/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
index 4969c4ffeaa3..378b26c57708 100644
--- a/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Class-Accessor-Chained dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27cc28f7e95ee8643a3f412292fd5156
diff --git a/metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0 b/metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0
index c4c4d2d2352d..6d159368af6e 100644
--- a/metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0
+++ b/metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AK/AKSTE/Data-ShowTable-4.6.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=95824ef5b7afa6fd9230d822778520f6
diff --git a/metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1 b/metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1
index 6ba6f84495eb..a9b561e20f84 100644
--- a/metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-String dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CM/CMUNGALL/Data-Stag-0.14.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2c9e11c18e5c2068faae59c6d552ee95
diff --git a/metadata/md5-cache/dev-perl/Data-Types-0.90.0 b/metadata/md5-cache/dev-perl/Data-Types-0.90.0
index 111ef5a1e7fc..a8e323b5885d 100644
--- a/metadata/md5-cache/dev-perl/Data-Types-0.90.0
+++ b/metadata/md5-cache/dev-perl/Data-Types-0.90.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/Data-Types-0.09.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=69940e8a07f1c13befe33e487c77ed5b
diff --git a/metadata/md5-cache/dev-perl/Data-UUID-1.221.0 b/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
index 6b553286b35f..3729a54be018 100644
--- a/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
+++ b/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.221.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4b40b5ec28ef47c6aa42799014fb2f39
diff --git a/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1 b/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1
index 4c61dbbcc3f2..bdc3ba703100 100644
--- a/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Math-BigInt virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MW/MWX/Data-Uniqid-0.12.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f305d1cc5f2375ba74bc514eacdcad3f
diff --git a/metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1 b/metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1
index 923658f7d33a..81c8369b4e09 100644
--- a/metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Clone dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORNELIS/Data-Utilities-0.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=132c42c82e3b0f512bef2a71c1dcedad
diff --git a/metadata/md5-cache/dev-perl/Date-Calc-6.400.0 b/metadata/md5-cache/dev-perl/Date-Calc-6.400.0
index 6b1327755782..3aa0b66119a3 100644
--- a/metadata/md5-cache/dev-perl/Date-Calc-6.400.0
+++ b/metadata/md5-cache/dev-perl/Date-Calc-6.400.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ ) LGPL-2
 RDEPEND=>=dev-perl/Bit-Vector-7.400.0 >=dev-perl/Carp-Clan-6.40.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a06bb78017d33dab75a15f4d81dd3e7
diff --git a/metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1 b/metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1
index 5a6607a3672e..9a7167c6b50d 100644
--- a/metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1
+++ b/metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Date-Leapyear virtual/perl-Time-Local virtual/perl-Time-HiRes virtual/perl-Storable dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RB/RBOW/Date-ICal-2.678.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2cb1fa045db80ab6829b4a48937b9c6d
diff --git a/metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1 b/metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1
index d7e59a83f239..ffce92556c18 100644
--- a/metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1
+++ b/metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RB/RBOW/Date-Leapyear-1.72.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=55ff876fbcb43efb29a393c61c995b6a
diff --git a/metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1 b/metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1
index 22257c2f8e8a..6d417a4581ea 100644
--- a/metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Bit-Vector-7 >=dev-perl/Carp-Clan-5.3 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STBEY/Date-Pcalc-6.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2425ef14d6c5a6ef7998374d2941fc6c
diff --git a/metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1 b/metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1
index cd254b10a78f..e817dc99f224 100644
--- a/metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IZ/IZUT/Date-Simple-3.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3cd9d20a811c526dc7c2e89d0d61f95e
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1
index 08ab81c9924a..b286f4380025 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-perl/Class-Factory-Util >=dev-perl/Params-Validate-0.91 >=dev-perl/DateTime-Format-Strptime-1.0800 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.81.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=68b2f7f72694ef7589177dd63a4bc9d2
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1
index 68e5c1298ec1..6290af2be044 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.29 dev-perl/DateTime-TimeZone dev-perl/TimeDate dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-0.05.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9ac69542e7766c94777ac8399465438d
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0 b/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
index 321a0236c43f..6f99595bdaf1 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/DateTime-0.170.0 >=dev-perl/HTTP-Date-1.440.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CK/CKRAS/DateTime-Format-HTTP-0.42.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f62e09cc2f0d84ea7f725deed353c078
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
index 15f10f42e03e..18e14de20528 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/DateTime dev-perl/DateTime-Format-Builder dev-lang/perl:=[-buil
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=99cc4340ceac6d076efbd8840a23019e
diff --git a/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1 b/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
index 2ff6e7fcc6a4..b8d31e38edb6 100644
--- a/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
+++ b/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWALSH/DelimMatch-1.06a.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27cf15cedbbab84d6411c45bc316918c
diff --git a/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0 b/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
index ee0d7628eb2a..32af399ca077 100644
--- a/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
+++ b/metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/PadWalker dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b336afc8ffda5d6729dee267bf924f2
diff --git a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0 b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
index 7a74e49c48b1..c5a52b571e52 100644
--- a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
+++ b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c26dd2d2cdeaf0ef8293e61c8d4c6b49
diff --git a/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900 b/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
index 8c1b91950eb9..a4129b9d5449 100644
--- a/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
+++ b/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-0.0009.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8571c8bc1e2297d370a50adeb14e1059
diff --git a/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0 b/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
index a7cbecdd7e5d..1a1c6f3868ff 100644
--- a/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
+++ b/metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Devel-Caller-2.03 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Devel-LexAlias-0.05.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=134617e4bbbc8f0071a2e372e7b0ce22
diff --git a/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1 b/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
index bf1347dd6548..7df6069aa105 100644
--- a/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Digest-BubbleBabble-0.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1a5acb4e74f6805ec21b65cc8c396f22
diff --git a/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1 b/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
index 266bd220fd04..e4477f0ed192 100644
--- a/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Digest-SHA dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=615dbbf5d73b97a2a7b47e9948aee8cd
diff --git a/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1 b/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
index 684f3b525718..6322ac292de3 100644
--- a/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-1.9.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=df89009cc213d4c8836deed20af958d3
diff --git a/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0 b/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0
index b396d76e2e9e..8319430f27f8 100644
--- a/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0
+++ b/metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DELTA/Digest-Perl-MD5-1.9.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=efc1569d19c5903170231611a1864de7
diff --git a/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1 b/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
index 46921c052b00..a29eaf8dc467 100644
--- a/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
+++ b/metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.13.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65dbca5e1d7c7df2a9d0495529a2a72f
diff --git a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1 b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
index 97ecf63b2694..0103c20fe80d 100644
--- a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MailTools dev-perl/Email-Valid virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Email-Find-0.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=93368c8a51183f4d521741866dec8df6
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1 b/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
index a5053e73bd52..f44292e165b2 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Email-MIME-1.900 >=dev-perl/Email-MIME-ContentType-1.012 dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Attachment-Stripper-1.317.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7bfbe38d54bd76fa239219cef37b89df
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1 b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
index 7b85e3df56c8..911c2409e89a 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-MIME-Base64-3.07 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e243402d3735e15a5883d1201676e4eb
diff --git a/metadata/md5-cache/dev-perl/Email-Send-2.201.0 b/metadata/md5-cache/dev-perl/Email-Send-2.201.0
index 81287749148f..20143a5244c7 100644
--- a/metadata/md5-cache/dev-perl/Email-Send-2.201.0
+++ b/metadata/md5-cache/dev-perl/Email-Send-2.201.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Email-Abstract >=dev-perl/Email-Address-1.800.0 >=dev-perl/Emai
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Send-2.201.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4651d654e7572a12c09cb5def94a8280
diff --git a/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0 b/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
index efb221f94b28..016ebacb5806 100644
--- a/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
+++ b/metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Authen-SASL dev-perl/Email-Address dev-perl/Email-Send dev-perl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/Email-Send-Gmail-0.33.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1458ba206baf01eaa834303589e71bea
diff --git a/metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1 b/metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1
index d7ba9109cfa8..00fc8ad84ed3 100644
--- a/metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JG/JGMYERS/Encode-Detect-1.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a319973785cb2165139d07aa40fe42ec
diff --git a/metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0 b/metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0
index ec7b921ddd80..89489cd43551 100644
--- a/metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0
+++ b/metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd74133d78e2b5af4ac4286f40cf186a
diff --git a/metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0 b/metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0
index baf13ea56559..c98138f7b5df 100644
--- a/metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0
+++ b/metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Eval-LineNumbers-0.34.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5682776c3cecc3398fb5f5e7526925ae
diff --git a/metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1 b/metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1
index 8664977f65cf..2f1bd5ac7f06 100644
--- a/metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1
+++ b/metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/AnyEvent dev-perl/libintl-perl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JRED/Event-ExecFlow-0.64.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2350613b0a14b38b4dfb7be2e0a08d0b
diff --git a/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1 b/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1
index 6d4520ccf5b8..6958340b92be 100644
--- a/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1
+++ b/metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DH/DHAGEMAN/Exporter-Cluster-0.31.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d8e248274f577a45bca128d66597b31c
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1 b/metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1
index dadf43f15bf3..7b7b992a7e3f 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1
+++ b/metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Parse-RecDescent dev-perl/Tie-IxHash dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.28.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e028501657a56becc50094667b4af854
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0 b/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
index 02fb7292f530..f1eea4fd424d 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Digest-MD5-2.0.0 >=virtual/perl-ExtUtils-ParseXS-3.70.0 d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-0.18.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=731d7e09870ea5e6a7a4521660b8afb8
diff --git a/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0 b/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
index 850b852d5254..e0491ee85450 100644
--- a/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
+++ b/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FV/FVOX/FLV-AudioExtractor-0.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=de614ebcd16010e0283f19699526d669
diff --git a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1 b/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
index fb7cb78025c7..d2b054ae2585 100644
--- a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.38.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=342c3dde8b1efd24c5dc570df99b275a
diff --git a/metadata/md5-cache/dev-perl/File-Flock-2014.10.0 b/metadata/md5-cache/dev-perl/File-Flock-2014.10.0
index 898246e96be9..5f7497ba26e7 100644
--- a/metadata/md5-cache/dev-perl/File-Flock-2014.10.0
+++ b/metadata/md5-cache/dev-perl/File-Flock-2014.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Data-Structure-Util >=dev-perl/IO-Event-0.812.0 dev-perl/AnyEve
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/File-Flock-2014.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a6124b960b19401585562f78257e8a6d
diff --git a/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1 b/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1
index dbfb62803288..b5724c3240b2 100644
--- a/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Date-6.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=404ab4f364c89d7138c47d9c034a4333
diff --git a/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1 b/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1
index f47e4ab30990..d61037ee3859 100644
--- a/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1
@@ -8,5 +8,5 @@ LICENSE=File-MMagic
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KN/KNOK/File-MMagic-1.30.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=26a41aa654721f8b544128ce07759345
diff --git a/metadata/md5-cache/dev-perl/File-Map-0.640.0 b/metadata/md5-cache/dev-perl/File-Map-0.640.0
index a93fea3c30de..08161e061102 100644
--- a/metadata/md5-cache/dev-perl/File-Map-0.640.0
+++ b/metadata/md5-cache/dev-perl/File-Map-0.640.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp dev-perl/PerlIO-Layers >=dev-perl/Sub-Exporter-Progres
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.64.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=acf19d44be0b6c5383d3bb13aa34de2d
diff --git a/metadata/md5-cache/dev-perl/File-NFSLock-1.270.0 b/metadata/md5-cache/dev-perl/File-NFSLock-1.270.0
index 11f68e10e324..dbae6b233dc5 100644
--- a/metadata/md5-cache/dev-perl/File-NFSLock-1.270.0
+++ b/metadata/md5-cache/dev-perl/File-NFSLock-1.270.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.27.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=acbe4691fada049b635a65ebb7f78e72
diff --git a/metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1 b/metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1
index 31726d90a563..2d5a6321d31e 100644
--- a/metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/File-Path-Expand-1.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c9524cbf2ad873ee8fbb03eaca722ff8
diff --git a/metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1 b/metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1
index 50e37e871b22..ae09475d342b 100644
--- a/metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UR/URI/File-ReadBackwards-1.05.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dcbb2cfc5079dcfc51356e3025005b51
diff --git a/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0 b/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0
index c36d50bc3086..c5302bac0e59 100644
--- a/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0
+++ b/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=net-misc/rsync dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CB/CBARRATT/File-RsyncP-0.74.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=09f3890f0eddfc1a4cef4e2ae413e13c
diff --git a/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0 b/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
index ad68cb53eefe..e16fe7f66dfd 100644
--- a/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
+++ b/metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=[-build
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Slurp-Tiny-0.004.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b58bc82a18c74b54f4b2950a01051ca4
diff --git a/metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1 b/metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1
index 5531775c0ee7..8dbc368a7953 100644
--- a/metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CN/CNANDOR/File-Sort-1.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=46a27c16a496d6b0fc808d79b010796a
diff --git a/metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1 b/metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1
index 82cbdafea48b..d8d7fa039d41 100644
--- a/metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FEDOROV/File-Stat-Bits-1.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=80a753b9af868309d03d17015d33b75c
diff --git a/metadata/md5-cache/dev-perl/File-Sync-0.110.0 b/metadata/md5-cache/dev-perl/File-Sync-0.110.0
index f215db5bf7e9..b1cd8aad7c30 100644
--- a/metadata/md5-cache/dev-perl/File-Sync-0.110.0
+++ b/metadata/md5-cache/dev-perl/File-Sync-0.110.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRIANSKI/File-Sync-0.11.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5399bbbdb341618154714c627e5a6af8
diff --git a/metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1 b/metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1
index 6aa709e197c1..21c2f2d6b156 100644
--- a/metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NA/NANARDON/File-Tempdir-0.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4bcf4ad0d5a8e076ff441e9e0387d185
diff --git a/metadata/md5-cache/dev-perl/File-Type-0.220.0-r1 b/metadata/md5-cache/dev-perl/File-Type-0.220.0-r1
index 73896aedf74d..3ef1302b887c 100644
--- a/metadata/md5-cache/dev-perl/File-Type-0.220.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Type-0.220.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f749607e8c02fb62f302a59728b9bcf4
diff --git a/metadata/md5-cache/dev-perl/File-chmod-0.420.0 b/metadata/md5-cache/dev-perl/File-chmod-0.420.0
index 4baed69697d5..955b8ca05799 100644
--- a/metadata/md5-cache/dev-perl/File-chmod-0.420.0
+++ b/metadata/md5-cache/dev-perl/File-chmod-0.420.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XE/XENO/File-chmod-0.42.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=24f1bcc9baa2222bb40561700dc00d93
diff --git a/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800 b/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
index f92a7acf351b..246b8a4b1d61 100644
--- a/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
+++ b/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Scalar-List-Utils-1.140.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/FileHandle-Unget-0.1628.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0137a5256255aa2bb9d20ef2d82a8557
diff --git a/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0 b/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
index 0f86c02be8c8..be6c593a77c8 100644
--- a/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
+++ b/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Filter dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.12.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b74c87c174e891d4afce9118d3fb55dc
diff --git a/metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1 b/metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1
index 9b0f41f8fa41..1db85f69c031 100644
--- a/metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Font-AFM-1.20.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f741d12ad46fcae1dc8d10a2fc48f134
diff --git a/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1 b/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
index c1810c0c0621..5ea560c12c13 100644
--- a/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
+++ b/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.5001.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fa0507fd48fad9e9d3f13cf2d731ba12
diff --git a/metadata/md5-cache/dev-perl/Fuse-0.16.1 b/metadata/md5-cache/dev-perl/Fuse-0.16.1
index 4b74e99362b6..7192f72aab2b 100644
--- a/metadata/md5-cache/dev-perl/Fuse-0.16.1
+++ b/metadata/md5-cache/dev-perl/Fuse-0.16.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/fuse dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPATES/Fuse-0.16.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=645ff51dde34399a29c60b1c6c9d187d
diff --git a/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1 b/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
index b9ec48d6d618..c8f6ffc45ec7 100644
--- a/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KW/KWITKNR/GD-Barcode-1.15.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd15679ac388157b59c05de5510dd600
diff --git a/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1 b/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
index 2f0287928288..e24cda6ef41c 100644
--- a/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/GD-1.18 >=dev-perl/GDGraph-1.30 dev-perl/GDTextUtil dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WA/WADG/GD-Graph3d-0.63.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5db3d84aa418c496486ca32fb267b834
diff --git a/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1 b/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
index c03e46e39d58..8dbb4bcaf4d6 100644
--- a/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-perl/SVG dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TW/TWH/GD-SVG-0.33.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a403ce7e3db1c2d76d4572234223f023
diff --git a/metadata/md5-cache/dev-perl/GDGraph-1.490.0 b/metadata/md5-cache/dev-perl/GDGraph-1.490.0
index 05e2d0c01883..9a1aa68aa37e 100644
--- a/metadata/md5-cache/dev-perl/GDGraph-1.490.0
+++ b/metadata/md5-cache/dev-perl/GDGraph-1.490.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GDTextUtil dev-perl/GD media-libs/gd dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.49.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1bad28e21d063d10722441332df63291
diff --git a/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1 b/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
index 1972ad1e1dc2..7f6b903320c2 100644
--- a/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
+++ b/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d70621d1dd260850713e68559c4d3263
diff --git a/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1 b/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
index f69acc35bb60..6a45afc26b80 100644
--- a/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
+++ b/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/krb5 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=713fc1557e8d1f3eb7aec8abaa4d89be
diff --git a/metadata/md5-cache/dev-perl/Geo-IP-1.510.0 b/metadata/md5-cache/dev-perl/Geo-IP-1.510.0
index 37de15d2f641..6fbfde6034d8 100644
--- a/metadata/md5-cache/dev-perl/Geo-IP-1.510.0
+++ b/metadata/md5-cache/dev-perl/Geo-IP-1.510.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.51.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50a7807a84974a37bbcecf7b2ca98aec
diff --git a/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1 b/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
index 3d627dd16b48..b12df180fbbf 100644
--- a/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Geography-Countries-2009041301.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8103fa1b1b969ad0950f80511bd8b57c
diff --git a/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1 b/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
index 69055a02863e..1f6f391c7ff8 100644
--- a/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic Artistic-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-1.11.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8215bd51608b4b81314824871ccd8d1b
diff --git a/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0 b/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
index ce1c9208bbca..d3385dcec00b 100644
--- a/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
+++ b/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Getopt-Mixed-1.12.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d766155788598c3a15d1562b7f76c24
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1 b/metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1
index 6d11fb3f4bd4..52262a722068 100644
--- a/metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Module-Load-0.10 virtual/perl-Module-Loaded recommended? ( >=dev-perl/Color-Library-0.02 dev-perl/Tie-Sub >=dev-perl/Pod-Readme-0.09 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRWO/Graphics-ColorNames-2.11.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eace82e928d87c275869350cf72a3752
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0 b/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
index 2ad62d989867..99ebf4e36865 100644
--- a/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Graphics-ColorNames-0.320.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Graphics-ColorNames-WWW-1.13.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7f17fdeac88558d6153c6258a6a1d07b
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1 b/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
index 39acd2955777..0b0c856772dd 100644
--- a/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=dev-perl/Graphics-ColorNames-0.32 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AI/AIZVORSKI/Graphics-ColorObject-0.5.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98ffd3685d828647fcd884f65b93edbe
diff --git a/metadata/md5-cache/dev-perl/Guard-1.23.0 b/metadata/md5-cache/dev-perl/Guard-1.23.0
index fe839a205979..b1c6a93c950d 100644
--- a/metadata/md5-cache/dev-perl/Guard-1.23.0
+++ b/metadata/md5-cache/dev-perl/Guard-1.23.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.023.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8ba386e1ebf42d7956e4c528ba84d657
diff --git a/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1 b/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
index a3618ba9644f..e31534276a33 100644
--- a/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Tree-3.01 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSISK/HTML-Element-Extended-1.18.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b841fcdc07d5c139962d9c32173c49c5
diff --git a/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0 b/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
index 6ca7351ed54b..341699bcdce5 100644
--- a/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
+++ b/metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/HTML-Parser virtual/perl-Carp dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/HTML-FillInForm-2.21.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4883d35d11441d5d5b6dc61d0f96a48f
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
index 34e829d332df..14cfe7e90f2a 100644
--- a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/HTML-Formatter-2 dev-perl/HTML-Tree dev-perl/URI dev-lang/per
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=36fa03a3d49746ccd7c97117c1358de7
diff --git a/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1 b/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1
index bb996a90ea8c..0539583970f5 100644
--- a/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-text/htmldoc dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MF/MFRANKL/HTML-HTMLDoc-0.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5da2f6c998af7555e50cb8b863e3ccaf
diff --git a/metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0 b/metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0
index 570c6173cc04..fc89487fbe51 100644
--- a/metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0
+++ b/metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TR/TRIPIE/HTML-Highlight-0.20.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5065d2fe9361755f56dec21e05f6c1d
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0 b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
index ecee410f93ed..b1a8eefd8dc0 100644
--- a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
@@ -10,5 +10,5 @@ RDEPEND=!modperl? ( >=dev-perl/CGI-2.460.0 ) modperl? ( www-apache/libapreq2 >=w
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.56.tar.gz
-_eclasses_=depend.apache	69ed723e2331f996dc7510598673359e	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=depend.apache	69ed723e2331f996dc7510598673359e	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a696a1d0d7b8e524bf7a7830208232a4
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0 b/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
index 14ab1ab264af..981bcd5d82b7 100644
--- a/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/CGI-PSGI dev-perl/HTML-Mason dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/HTML-Mason-PSGIHandler-0.53.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=48d2cc6d181fe55b8e2d1fe678446620
diff --git a/metadata/md5-cache/dev-perl/HTML-Object-2.29-r2 b/metadata/md5-cache/dev-perl/HTML-Object-2.29-r2
index 10c0e0d4c777..987f46ec8b2e 100644
--- a/metadata/md5-cache/dev-perl/HTML-Object-2.29-r2
+++ b/metadata/md5-cache/dev-perl/HTML-Object-2.29-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-FormValidator dev-perl/Date-Manip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/htmlobject/libhtmlobject-perl-2.29.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9b0591a573b7524448f5403204f152d9
diff --git a/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1 b/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
index 0a53db463ab8..987897ec9a36 100644
--- a/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AJ/AJPEACOCK/HTML-Table-2.08a.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=15f2fed659c2712ea9532bf95c47aee9
diff --git a/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0 b/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
index 734dd1287fc8..84d4de01f511 100644
--- a/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
+++ b/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Parser dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SD/SDRABBLE/HTML-TableContentParser-0.13.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=adf8e25d0d495e713ba64c4f0072b608
diff --git a/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0 b/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
index e5efc9502021..807169e06cc5 100644
--- a/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
+++ b/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTML-Parser dev-perl/URI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WR/WROSS/HTML-TagFilter-1.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d85b76274de24909423648400fef868d
diff --git a/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1 b/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
index a80c3491106d..cb668d895a2f 100644
--- a/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bd9447dd6834e5f49859b1408dbf34ea
diff --git a/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1 b/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
index 4c61560d3f46..7547e3939d21 100644
--- a/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Template-2.8 dev-perl/Parse-RecDescent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-Expr-0.07.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a9eb3baf0a80f61dee8b3fc3358604fa
diff --git a/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0 b/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
index 7f4a5dec3b00..8c8b23072719 100644
--- a/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
+++ b/metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-File-Path-2.0.0 virtual/perl-File-Spec >=dev-perl/JSON-2.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIY/HTML-Template-Pro-0.9510.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2248bce1dc6f09a1abb23fe12b6247fd
diff --git a/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1 b/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
index 0813463577bf..10f0d6d9d3db 100644
--- a/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Parser-3.25 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/HTML-TokeParser-Simple-3.16.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a353bf45976a73f1f339040afa0bc39
diff --git a/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0 b/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
index 91a0bbb7d56a..b153087a7084 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 >=virtual/perl-File-Temp-0.140
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.22.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3a80743309f8e87b4decba2f80cb7eae
diff --git a/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0 b/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
index 8a86360a02f4..2e0567f14973 100644
--- a/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
+++ b/metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-perl/URI dev-perl/XML-DOM dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.48.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fdbaf278a4bc7f1aae06297587831a87
diff --git a/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1 b/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
index 12113d8c4137..6509a56de54c 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Time-Local dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTTP-Date-6.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d7cf4f776b84ce1378102f5a2bf1111c
diff --git a/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1 b/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
index 54366d783c49..9a458d9b059e 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-0.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=275aad9ec6364f1559e76597329c874b
diff --git a/metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1 b/metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1
index ae6be5f46382..a8f11d102ee2 100644
--- a/metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/HTTPD-User-Manage-1.66.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f331c34a58c32b08f8414d6755520976
diff --git a/metadata/md5-cache/dev-perl/Hash-Merge-0.200.0 b/metadata/md5-cache/dev-perl/Hash-Merge-0.200.0
index d875e8b0294e..1181befcd174 100644
--- a/metadata/md5-cache/dev-perl/Hash-Merge-0.200.0
+++ b/metadata/md5-cache/dev-perl/Hash-Merge-0.200.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Clone dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Hash-Merge-0.200.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=08f83b96a327a97ab6fb8e8a8b992ff6
diff --git a/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0 b/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
index 0621dde2385c..90f1749f7aa2 100644
--- a/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
+++ b/metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AR/ARISTOTLE/Hash-MultiValue-0.16.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bc3b9e4ca258bb8764608a2356d44cab
diff --git a/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2 b/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
index dfc937b8c52d..204bb0a3d3d2 100644
--- a/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
+++ b/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/PerlIO-via-dynamic-0.10 virtual/perl-Digest dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.11.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bd7c4dcce3eee44b60b37337f85b1724
diff --git a/metadata/md5-cache/dev-perl/IO-HTML-1.1.0 b/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
index 4238a84dfa96..586f010e55d0 100644
--- a/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
+++ b/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.100.0 >=virtual/perl-Exporter-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0c5d2be4753887643aabf7b03ec574d2
diff --git a/metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1 b/metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1
index 5ed0323290ff..96e446ad85d7 100644
--- a/metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1
+++ b/metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RANI/IO-LockedFile-0.23.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a698eabca2bf59e3b3c8cb347a48a744
diff --git a/metadata/md5-cache/dev-perl/IO-String-1.80.0-r1 b/metadata/md5-cache/dev-perl/IO-String-1.80.0-r1
index 5d0e69d0b43a..987a03b5ff30 100644
--- a/metadata/md5-cache/dev-perl/IO-String-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/IO-String-1.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/IO-String-1.08.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1ff56db3057bec95cc7a5920646ba975
diff --git a/metadata/md5-cache/dev-perl/IO-Stty-0.30.0 b/metadata/md5-cache/dev-perl/IO-Stty-0.30.0
index 5e24eaaad58e..6413f71a27d4 100644
--- a/metadata/md5-cache/dev-perl/IO-Stty-0.30.0
+++ b/metadata/md5-cache/dev-perl/IO-Stty-0.30.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IO-Stty-0.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=06e803340c9964cf330f082905f2f7ae
diff --git a/metadata/md5-cache/dev-perl/IO-Tty-1.120.0 b/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
index a7236c63ddbc..8276c9f4fe4e 100644
--- a/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
+++ b/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.12.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=91d8281e08e4a4ccbf3536d59e5cf67c
diff --git a/metadata/md5-cache/dev-perl/IO-stringy-2.111.0 b/metadata/md5-cache/dev-perl/IO-stringy-2.111.0
index dc47f44ac4ff..c25d6e7a1afd 100644
--- a/metadata/md5-cache/dev-perl/IO-stringy-2.111.0
+++ b/metadata/md5-cache/dev-perl/IO-stringy-2.111.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSKOLL/IO-stringy-2.111.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=767ce363fe34ddeae54b84a8a32a2961
diff --git a/metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1 b/metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1
index 6f31c7f1154e..294b073ce86d 100644
--- a/metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-Rijndael dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JT/JTK/IP-Anonymous-0.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=526f91d865bfc3f3493751b76f467fa8
diff --git a/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1 b/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
index b0d361b181c8..d68b6a3e49f5 100644
--- a/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
+++ b/metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDYA/IPC-ShareLite-0.17.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=42b8eaac288f8552dffc84a2a26b65a3
diff --git a/metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1 b/metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1
index 0b9c9363906d..0226ae48e290 100644
--- a/metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1
+++ b/metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSOUTH/IPC-Shareable-0.61.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d5f95019651f83012364cd0e72662a8
diff --git a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0 b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
index dfc49ec09aa2..aeb879d871cb 100644
--- a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
+++ b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PJ/PJF/IPC-System-Simple-1.25.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b007be5c08e12a9c04229c574b1d627e
diff --git a/metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1 b/metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1
index 56545f3bf1d0..0ec6c0d5b743 100644
--- a/metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1
+++ b/metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBI dev-perl/Class-WhiteHole dev-perl/DBIx-ContextualFetch virtual/perl-Test-Simple >=dev-perl/Class-Data-Inheritable-0.02 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PERRIN/Ima-DBI-0.35.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f6c7efe9c3e330caa7635ba57af5f6e2
diff --git a/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1 b/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
index ffe2df4760cd..693cbfc9185c 100644
--- a/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/imlib2-1 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/Image-Imlib2-2.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d7d6da44b17ce82a2904fff472108431
diff --git a/metadata/md5-cache/dev-perl/Image-Size-3.300.0 b/metadata/md5-cache/dev-perl/Image-Size-3.300.0
index 8161b9df8a86..5d48374aee97 100644
--- a/metadata/md5-cache/dev-perl/Image-Size-3.300.0
+++ b/metadata/md5-cache/dev-perl/Image-Size-3.300.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-IO-Compress >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/Image-Size-3.300.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=88c656bd2c7cb83e75dd3884c918528f
diff --git a/metadata/md5-cache/dev-perl/Inline-0.800.0 b/metadata/md5-cache/dev-perl/Inline-0.800.0
index 100011186dbd..26221b6c10e0 100644
--- a/metadata/md5-cache/dev-perl/Inline-0.800.0
+++ b/metadata/md5-cache/dev-perl/Inline-0.800.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec dev-lang/perl:=[-build(-)
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Inline-0.80.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e5d152eec3c728bf2cebb4554aaf0e8
diff --git a/metadata/md5-cache/dev-perl/Inline-Files-0.690.0 b/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
index 68f58f80281a..6ed123070331 100644
--- a/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
+++ b/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/Inline-Files-0.69.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1feac6d33f1ee76e85b503fa5ff24901
diff --git a/metadata/md5-cache/dev-perl/JSON-Any-1.390.0 b/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
index 6c2c282e3dc5..2660fb03a59a 100644
--- a/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
+++ b/metadata/md5-cache/dev-perl/JSON-Any-1.390.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp || ( >=dev-perl/JSON-XS-2.3 virtual/perl-JSON-PP dev-p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7118d39325c5be0effed4df450c09c33
diff --git a/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1 b/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
index ce8a26de4861..9946eaa4c0a3 100644
--- a/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
+++ b/metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/JSON-XS dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LB/LBROCARD/JSON-XS-VersionOneAndTwo-0.31.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dfcf3ca30bb392e09fbe58f5c4ff36fc
diff --git a/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1 b/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
index 91bdc33da025..31f23df7e1ac 100644
--- a/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
+++ b/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Log-Log4perl >=dev-lang/spidermonkey-1.5:0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TB/TBUSCH/JavaScript-SpiderMonkey-0.21.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c10deea82576d53ea2c7e09b90fd8a8
diff --git a/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1 b/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
index e347fd396129..b4a23fb5c0dc 100644
--- a/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-2.1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/Jcode-2.07.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1ac09d6f7aaff97221fccc535987ba3a
diff --git a/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1 b/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1
index 618437db01f5..b7d04963f753 100644
--- a/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1
+++ b/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/LWP-MediaTypes-6.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6fd12e9837ddb5cdff99c8a698dd101e
diff --git a/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1 b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
index df7ed78aa896..f3a4e2fa4bd3 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2+ )
 RDEPEND=dev-perl/Log-TraceMessages dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Lingua-Preferred-0.2.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e0611a46a9719a158a2863515ecc3dbd
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1 b/metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1
index 9bb3784f82ba..535abcfa9d6c 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Snowball-Norwegian dev-perl/Snowball-Swedish dev-perl/Lingua-Stem-Snowball-Da dev-perl/Lingua-Stem-Fr dev-perl/Lingua-Stem-It dev-perl/Lingua-Stem-Ru dev-perl/Lingua-PT-Stemmer dev-perl/Text-German dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3c3d1c42b9173829008a4a9acdc680e9
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1 b/metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1
index 7ee069e1bd43..680e3e6def5c 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1ef4b7e32e4e7cc9797deed816b54e77
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1 b/metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1
index 323bcbac1336..d763022e5c0e 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=105e09b45b28b634a861461f0711018d
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1 b/metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1
index 67a435a65917..cb01b314b538 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0d6ce5b1852dcb461486f9276766f08e
diff --git a/metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1 b/metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1
index 0badf52beb03..d051adeb61ba 100644
--- a/metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1
+++ b/metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/common-sense dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-1.22.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7229211cbc249070665a4d58ab72bf6b
diff --git a/metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1 b/metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1
index 9db51a734d45..bc6e6f9d0dbe 100644
--- a/metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Linux-Pid-0.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8d0f3b489158ac7700d8b8379e6e74b6
diff --git a/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0 b/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
index c36dff982e73..aa485369ec22 100644
--- a/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
+++ b/metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OP/OPI/Linux-Smaps-0.13.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3309229be486a8c8af31c055dcfba27f
diff --git a/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0 b/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
index f3c2e9ced9d5..7860a4c6b03a 100644
--- a/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
+++ b/metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp dev-perl/File-Path-Expand >=dev-perl/Moo-1.0.0 dev-lan
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MG/MGRIMES/Lirc-Client-2.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=452ec5b383734c15dee2a4a83b881e79
diff --git a/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0 b/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
index cdd849c1a37f..f951dd384f04 100644
--- a/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
+++ b/metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/List-MoreUtils-0.280.0 >=virtual/perl-Scalar-List-Utils-1.310
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.08.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d5b773316fa5fa44413c9f0835f6f111
diff --git a/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0 b/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
index 93fa0f3ba683..23b5fafa3003 100644
--- a/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
+++ b/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=78405a9e35b5b4b0e4a707cdf02a5e6b
diff --git a/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0 b/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
index 3b53d11be777..084771777ab9 100644
--- a/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
+++ b/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Locale-Maketext-1.170.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-1.00.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=300a7731ab8f8fc4dddbb63a9cc81e3f
diff --git a/metadata/md5-cache/dev-perl/Locale-PO-0.270.0 b/metadata/md5-cache/dev-perl/Locale-PO-0.270.0
index b98af618ef8b..0210ca31bd5a 100644
--- a/metadata/md5-cache/dev-perl/Locale-PO-0.270.0
+++ b/metadata/md5-cache/dev-perl/Locale-PO-0.270.0
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/gettext dev-perl/File-Slurp dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c1fdff661addcb494296a63d87890d58
diff --git a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1 b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
index e2470f08c27f..759bd62817f2 100644
--- a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-FromText-1.004 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Log-TraceMessages-1.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=11d396fa8fb0cf5d3a154c33950e2ff3
diff --git a/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1 b/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
index 14d63e85a73c..230f5841f0a5 100644
--- a/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
+++ b/metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl[gdbm] dev-perl/XML-SAX dev-perl/Class-Accessor dev-lang/pe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GM/GMCHARLT/MARC-Charset-1.35.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d6eae545c44178d27075dca860f5bba0
diff --git a/metadata/md5-cache/dev-perl/MD5-2.30.0-r1 b/metadata/md5-cache/dev-perl/MD5-2.30.0-r1
index d51b6e8844b7..f72958d9ff34 100644
--- a/metadata/md5-cache/dev-perl/MD5-2.30.0-r1
+++ b/metadata/md5-cache/dev-perl/MD5-2.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/MD5-2.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c3cb2c927939275122d8dae1d950b365
diff --git a/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1 b/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
index e47004faa1c5..7b162ab622f4 100644
--- a/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
+++ b/metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/MLDBM dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHAMAS/MLDBM-Sync-0.30.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a4bfe757bd88aac07f8ec4181939639
diff --git a/metadata/md5-cache/dev-perl/MP4-Info-1.130.0 b/metadata/md5-cache/dev-perl/MP4-Info-1.130.0
index 59f9ebfd2caf..5ecfabba15b8 100644
--- a/metadata/md5-cache/dev-perl/MP4-Info-1.130.0
+++ b/metadata/md5-cache/dev-perl/MP4-Info-1.130.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode dev-perl/IO-String dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JH/JHAR/MP4-Info-1.13.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=43d9d284afa26b6afad87e2f286047f2
diff --git a/metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0 b/metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0
index e1dd005d674b..5159e5a73d93 100644
--- a/metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0
+++ b/metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WY/WYANT/Mac-Pasteboard-0.003.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98cb86771ee5f9fa004abc759626337b
diff --git a/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1 b/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
index e22ceed08f4c..62b64d76e54a 100644
--- a/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Mail-Builder-1.12 dev-perl/Email-Sender dev-perl/Email-Valid
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TE/TEDDY/Mail-Builder-Simple-0.16.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=71e47387713bccc733721068225c5da8
diff --git a/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1 b/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
index 75c50eaf6e2d..94cd632462cd 100644
--- a/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Net-DNS-0.34 dev-perl/MailTools dev-perl/Crypt-OpenSSL-RSA de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANTHONYU/Mail-DomainKeys-1.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=94bd1ce724c0268444a65a75fe47b922
diff --git a/metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1 b/metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1
index 5255ed1ddbd5..c8dae2aee933 100644
--- a/metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/URI dev-perl/Email-Valid dev-perl/Email-Abstract dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSTEVENS/Mail-ListDetector-1.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=596f9f46f766af871b57bd8be65c1845
diff --git a/metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0 b/metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0
index f2ae20972c79..3253c8a52eb8 100644
--- a/metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0
+++ b/metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SD/SDOWD/Mail-POP3Client-2.19.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e639d1df16c70506fcc168bb05999c53
diff --git a/metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1 b/metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1
index 328f3e2db29e..8df66b701576 100644
--- a/metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Getopt-Long >=dev-perl/MailTools-1.15 >=dev-perl/LockFile-Simple-0.2.5 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JV/JV/Mail-Procmail-1.08.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4d8a92198970f5cdf04fa064af868686
diff --git a/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2 b/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
index f9768bee1c4f..1ddd163f9809 100644
--- a/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
+++ b/metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Digest-HMAC-1.01-r1 >=dev-perl/MLDBM-2.01 >=virtual/perl-DB_F
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHEVEK/Mail-SRS-0.31.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=87396aa8dda72cb3ddf73512a6f1b24d
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index cee5d91a9bad..5fe037f77224 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/Math-Base36-0.140.0 b/metadata/md5-cache/dev-perl/Math-Base36-0.140.0
index b3256a7ada17..acc053461813 100644
--- a/metadata/md5-cache/dev-perl/Math-Base36-0.140.0
+++ b/metadata/md5-cache/dev-perl/Math-Base36-0.140.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/Math-Base36-0.14.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=68098a1cd9b9fa55fc7dcda5512e865a
diff --git a/metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1 b/metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1
index 83566f5c2cda..8887d3926a61 100644
--- a/metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Math-Bezier-0.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6d976ebc4efc5fbcffd00f93fe9e342a
diff --git a/metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1 b/metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1
index c84eb012e2ee..d77b53ef2c01 100644
--- a/metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-Local dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SF/SFINK/Math-Calc-Units-1.07.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=faddf8696672bb787c2d1d1af2cf5445
diff --git a/metadata/md5-cache/dev-perl/Math-Random-0.720.0 b/metadata/md5-cache/dev-perl/Math-Random-0.720.0
index 32da38911747..4eb9a3aec94c 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-0.720.0
+++ b/metadata/md5-cache/dev-perl/Math-Random-0.720.0
@@ -8,5 +8,5 @@ LICENSE=( || ( Artistic GPL-2 ) ) public-domain
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GROMMEL/Math-Random-0.72.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d7782a4d347910bc14cd286f4d5e8412
diff --git a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1 b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
index 11712a8b8787..9dff1c318456 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-1.004.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=05e236a7182c393b351aeef2100a992a
diff --git a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1 b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
index 76b316027122..9f0821a2efc2 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Math-Random-ISAAC dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-XS-1.004.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=00bda596c8e0d5fad68a05827de94d30
diff --git a/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0 b/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
index 20a0ec70f55f..52edecc849df 100644
--- a/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
+++ b/metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FA/FANGLY/Math-Random-MT-1.17.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1ec55c3e8af939d124a8c451e88a5cb1
diff --git a/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1 b/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
index 1038f08d7089..c3b29533e3a4 100644
--- a/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EW/EWILHELM/Math-Vec-1.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5b5abbb183d9f035a3c50a1c71f600d5
diff --git a/metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1 b/metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1
index c84ee5664866..7190b6d097e9 100644
--- a/metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASPINELLI/Math-VecStat-0.08.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4a49b25cda5b31d3a31757d9f763fe44
diff --git a/metadata/md5-cache/dev-perl/Mo-0.400.0 b/metadata/md5-cache/dev-perl/Mo-0.400.0
index bb43225eceba..5352f989cb94 100644
--- a/metadata/md5-cache/dev-perl/Mo-0.400.0
+++ b/metadata/md5-cache/dev-perl/Mo-0.400.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TINITA/Mo-0.40.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b8e6d91c37bc538cc2d3e534a9740c31
diff --git a/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0 b/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
index f1a987dd5f08..af3a53531490 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
+++ b/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-CPAN-Meta >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtU
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8f988883e8bc9260b0246d72556c03a3
diff --git a/metadata/md5-cache/dev-perl/Module-Find-0.130.0 b/metadata/md5-cache/dev-perl/Module-Find-0.130.0
index b3c589143d9a..d789d730ec02 100644
--- a/metadata/md5-cache/dev-perl/Module-Find-0.130.0
+++ b/metadata/md5-cache/dev-perl/Module-Find-0.130.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.13.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=15dd92096b58237e2634e5302de0f13a
diff --git a/metadata/md5-cache/dev-perl/Module-Locate-1.800.0 b/metadata/md5-cache/dev-perl/Module-Locate-1.800.0
index cba45d277c9b..98e0ced1d0d8 100644
--- a/metadata/md5-cache/dev-perl/Module-Locate-1.800.0
+++ b/metadata/md5-cache/dev-perl/Module-Locate-1.800.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Module-Locate-1.80.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=207aa9bb736b8284631535cc3d6fb13f
diff --git a/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0 b/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
index c76e9fc5dc0e..34981ff83d9d 100644
--- a/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
+++ b/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-File-Spec-3 virtual/perl-if dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cf1b0e5c0210ef8785c7b828dcdffa54
diff --git a/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1 b/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
index 6349a5b2855e..244ba9dea8ca 100644
--- a/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Module-Refresh-0.17.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6c2a0bb6c1000c004df94c6d5fe76efd
diff --git a/metadata/md5-cache/dev-perl/Module-Util-1.90.0 b/metadata/md5-cache/dev-perl/Module-Util-1.90.0
index 64aa15f4afa9..60999f9f38ea 100644
--- a/metadata/md5-cache/dev-perl/Module-Util-1.90.0
+++ b/metadata/md5-cache/dev-perl/Module-Util-1.90.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eae6b7091ace663fff132689d47d52c4
diff --git a/metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1 b/metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1
index 12f74eedc4db..7a96442d4e7c 100644
--- a/metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Module-Versions-Report-1.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=23ade618047f986d39c3c132d292d1e8
diff --git a/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1 b/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
index 53c2f95907a8..116fddc3ffdc 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Moose-1.90.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/MooseX-Aliases-0.11.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d7e922d24a5c3baa86b539a36db3bc3f
diff --git a/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100 b/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
index 27dc3ae38e65..f72bdf9ed756 100644
--- a/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
+++ b/metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Moose-0.96 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/MooseX-GlobRef-0.0701.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1f40fefb836dc4d5a97f26d10b47204
diff --git a/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0 b/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
index 6a6d6fc664bb..3eff6e6e5acb 100644
--- a/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
+++ b/metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Moose dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FRODWITH/MooseX-MultiInitArg-0.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7a2d9188d430add35ae754e71399f122
diff --git a/metadata/md5-cache/dev-perl/Net-Amazon-0.620.0 b/metadata/md5-cache/dev-perl/Net-Amazon-0.620.0
index 508f732ac984..8cccae328f2d 100644
--- a/metadata/md5-cache/dev-perl/Net-Amazon-0.620.0
+++ b/metadata/md5-cache/dev-perl/Net-Amazon-0.620.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-perl/HTTP-Message >=dev-perl/XML-Simple-2.80.0 >=virtual/perl-Time-HiRes-1.0.0 >=dev-perl/Log-Log4perl-0.300.0 virtual/perl-Digest-SHA dev-perl/URI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOUMENOT/Net-Amazon-0.62.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=75a4ac10f3c2fa0f1e560eb4a58bf0e1
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1 b/metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1
index 71d9420c984e..1bef5b6da9bb 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Net-DNS dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHEVEK/Net-DNS-Async-1.07.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c02bb00ddffa224de7b7945265463a04
diff --git a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1 b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1
index 4fbfadf6f60e..3f0399ff7097 100644
--- a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-Socket-SSL dev-perl/Net-IMAP-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CW/CWEST/Net-IMAP-Simple-SSL-1.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1c01d68695984c5c447d69afa2ff986
diff --git a/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1 b/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
index 8e14e254c109..6a5d81ed9047 100644
--- a/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.26.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=220cfb5fbb38dd77971b51784c703a03
diff --git a/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0 b/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0
index ec1115d9ed2e..dbedcd505a8b 100644
--- a/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0
+++ b/metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Net-IP-Minimal-0.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3ee068f7756a85741892a7954589129f
diff --git a/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0 b/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0
index 62ce007d9711..b6cbe57fd0f7 100644
--- a/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0
+++ b/metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FRAJULAC/Net-IPv4Addr-0.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a6e82f076c8705f2aa1085ff15174d2
diff --git a/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1 b/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1
index d33c85ad4ceb..2b2b1c84757b 100644
--- a/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AP/APEIRON/Net-IRC-0.79.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cc8d51550d1e9f5585b7009c1c700907
diff --git a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1 b/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1
index dc2b940520cc..d69e07059def 100644
--- a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-Stream dev-perl/Net-XMPP dev-perl/Digest-SHA1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REATMON/Net-Jabber-2.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e3a12f68e9f8d39d5da8dfd9e51c910d
diff --git a/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200 b/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200
index c60adf24b65f..e54ce3c1de8d 100644
--- a/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200
+++ b/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Net-Netmask-1.9022.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd99696043af28153c8b76b90e4ddeba
diff --git a/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1 b/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
index b154c9ce90e6..9008cf984df5 100644
--- a/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Class-Accessor-0.31 >=dev-perl/Class-Data-Inheritable-0.06 de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fa9831222996d9b891a8bfe3e5d57d25
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2 b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2
index 2913aaa5f7ad..d6f014d20cff 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0269ac76a3a084f9b01c1e2d46aa8e3
diff --git a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1 b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1
index be42e7f3dcad..7cd35bcec45b 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO virtual/perl-libnet >=dev-perl/IO-Socket-SSL-1.760.0 dev-perl/Net-SSLeay virtual/perl-MIME-Base64 dev-perl/Digest-HMAC dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e28c7adbe11220eb36b3e57ef2dfb2f3
diff --git a/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0 b/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
index 638e8dcc0a17..267c8a8ebc9e 100644
--- a/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
+++ b/metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=ipv6? ( dev-perl/Socket6 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.078.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22524eccf63d09450d7d1ce994c2c5ac
diff --git a/metadata/md5-cache/dev-perl/NetPacket-1.6.0 b/metadata/md5-cache/dev-perl/NetPacket-1.6.0
index 61b83ea09a43..9a56936b0c64 100644
--- a/metadata/md5-cache/dev-perl/NetPacket-1.6.0
+++ b/metadata/md5-cache/dev-perl/NetPacket-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YA/YANICK/NetPacket-1.6.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=686d80a4528868a092d032bc66aff111
diff --git a/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1 b/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
index 6c6c4dbd8963..718dcb05f700 100644
--- a/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=83b31a7f3d65958354190d90bae91115
diff --git a/metadata/md5-cache/dev-perl/Number-Format-1.750.0 b/metadata/md5-cache/dev-perl/Number-Format-1.750.0
index f76bd6064e4d..7bde114bf365 100644
--- a/metadata/md5-cache/dev-perl/Number-Format-1.750.0
+++ b/metadata/md5-cache/dev-perl/Number-Format-1.750.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.75.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a7d640b258f9e74c5e0f0db6809fb502
diff --git a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1 b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1
index 83f2283fee3e..c81aa5f19d99 100644
--- a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1
+++ b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.19.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f70053bdca1e58a3124c383d3d428c64
diff --git a/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0 b/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
index ac6666f5c695..936afbbae87b 100644
--- a/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
+++ b/metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GM/GMPASSOS/Object-MultiType-0.05.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe9f69c2394ac20eb1df32e3c598c2cd
diff --git a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0 b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
index 386160adb9c3..809a75892a9b 100644
--- a/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
+++ b/metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Object-Realize-Later-0.19.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=24adcf9ca76948a08b4b340042218ea8
diff --git a/metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1 b/metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1
index a283b9a0dfee..0cba912be5a7 100644
--- a/metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1
+++ b/metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp || ( dev-perl/YAML-Syck dev-perl/YAML ) dev-perl/Archive-Zip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.49.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f7712e3ec0ea8ec0f51133f16bfa7a41
diff --git a/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1 b/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1
index b08516bf2338..e6b88ed70e72 100644
--- a/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1
+++ b/metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b3d9d4681873c68883cd8433abbca100
diff --git a/metadata/md5-cache/dev-perl/POE-1.367 b/metadata/md5-cache/dev-perl/POE-1.367
index 778cf648e22a..807713e8279f 100644
--- a/metadata/md5-cache/dev-perl/POE-1.367
+++ b/metadata/md5-cache/dev-perl/POE-1.367
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/YAML dev-perl/Filter dev-perl/IO-Pipely dev-perl/FreezeThaw >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-1.367.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=95c2311ca88fbc51fc3524ee6ed3f466
diff --git a/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1 b/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1
index b2a11bbfa67c..598039f6edfb 100644
--- a/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1
+++ b/metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/Devel-Size >=dev-perl/POE-1.311.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/POE-API-Peek-2.20.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=07107d5880ddffd1bbb0ee2f1a24a614
diff --git a/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0 b/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0
index 5aac8ff94388..84233e862c85 100644
--- a/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0
+++ b/metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-IP-Minimal-0.20.0 >=dev-perl/POE-1.311.0 >=dev-perl/POE-Component-Resolver-0.917.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Component-Client-Keepalive-0.272.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a75a75b03d406a7f232ef56bfa4fd31
diff --git a/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0 b/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0
index 78f492c9ad66..c7c0253ebafe 100644
--- a/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0
+++ b/metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/POE-1.311.0 >=virtual/perl-Scalar-List-Utils-1.230.0 >=virtual/perl-Socket-2.1.0 >=virtual/perl-Storable-2.180.0 >=virtual/perl-Test-Simple-0.96 >=virtual/perl-Time-HiRes-1.971.100 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Component-Resolver-0.921.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d579710e023b99216780d6eedcffb9f
diff --git a/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0 b/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0
index 88d600847aa7..59aa7226a568 100644
--- a/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0
+++ b/metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Test-Loops-1.360.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a41aaf749741fa8ff6ed581c281d1d5
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0 b/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0
index 3f7483bcd973..e6ee2dadb1fa 100644
--- a/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0
+++ b/metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/POE-1.287 >=dev-perl/POE-Test-Loops-1.033 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Loop-EPoll-1.003.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=608165a9343a051c0ac0d2233a7d0d8f
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1 b/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
index 78d6fa1acf8e..f2cf009165b7 100644
--- a/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/POE-1.287 >=dev-perl/POE-Test-Loops-1.033 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Loop-Poll-1.000.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bd4864fdc9193df11c9fccc91221240b
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1 b/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
index e5b6e3737953..e7d822998dc9 100644
--- a/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
+++ b/metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/POE dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Queue-Array-0.006.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58b6fb101a2b61256e8cdcdfa36687db
diff --git a/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1 b/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
index 18b9c8be3968..0d7ef432b769 100644
--- a/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
+++ b/metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/PPI-1.208 dev-perl/Exception-Class dev-perl/Readonly virtual/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bd7f3561fc9a0a693656887010a622fd
diff --git a/metadata/md5-cache/dev-perl/Package-Constants-0.60.0 b/metadata/md5-cache/dev-perl/Package-Constants-0.60.0
index a8ebee155ddd..6c83f3987f17 100644
--- a/metadata/md5-cache/dev-perl/Package-Constants-0.60.0
+++ b/metadata/md5-cache/dev-perl/Package-Constants-0.60.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8722550d105641b158dc64a52da97a61
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0 b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
index e5a249d6b4e3..95e8e59f33da 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dd840df833e9837d21aca3c999bbc061
diff --git a/metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1 b/metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1
index 5e5ab49b22ad..db61a08351a7 100644
--- a/metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1
+++ b/metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ ) public-domain
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Parse-ExuberantCTags-1.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e8b02673871e14b3790f3235fe02bb56
diff --git a/metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1 b/metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1
index 8ad757dcf3dd..5a74025034d8 100644
--- a/metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-Local dev-perl/File-Tail dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSCHWEI/Parse-Syslog-1.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=44117d62ee820079d82d15e66ac7dbe4
diff --git a/metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1 b/metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1
index aedf4d160046..e3d4a1406c1f 100644
--- a/metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1
+++ b/metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=virtual/perl-File-Temp dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMANNERM/PatchReader-0.9.6.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c99c75ebb36726018221a6c698a00fd9
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
index df3227e4760b..86f6450b7961 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Perl-Critic dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KC/KCOWGILL/Perl-Critic-Nits-v1.0.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3ecb307a1b3f805f382f0007d99d84d7
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
index f39d388befbc..f7d72f735c9d 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/indirect-0.250.0 dev-perl/Perl-Critic-Dynamic dev-perl/Perl-C
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/Perl-Critic-Policy-Dynamic-NoIndirect-0.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b7ae41024a1aa4faa50d227a54f800db
diff --git a/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0 b/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0
index fd0c74abf5c2..1fc52a694f00 100644
--- a/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0
+++ b/metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFRANKS/Perl6-Junction-1.60000.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b16dd03557f491f3a12192e1102357bc
diff --git a/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0 b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
index c22bf5b605c3..1ef6e51d46ca 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-Li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.011.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=69be0b365da0ab40a0d28a0d2c60c1ab
diff --git a/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1 b/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
index 0e2a1e26f9d9..a168c157c78c 100644
--- a/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Perlbal dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/Perlbal-XS-HTTPHeaders-0.20.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b937f3d731855aea137b9a39fd125874
diff --git a/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2 b/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
index f5011db20c6e..2bbf5e016327 100644
--- a/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
+++ b/metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Bit-Vector-Minimal-1.0.0 virtual/perl-Carp >=dev-perl/Class-A
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Plucene-1.25.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=720fe1c3bb923e34a7068bf0cee7b39c
diff --git a/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1 b/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
index d9a4bf1e144f..a2b0e1dd462f 100644
--- a/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
+++ b/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Pod-Parser-1.13 >=dev-perl/Devel-Symdump-2.01 dev-lang/pe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ae994d468a96028eb8a03b843292ff99
diff --git a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0 b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
index f44ba19640e6..de6bfa86e428 100644
--- a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
+++ b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Pod-Parser virtual/perl-if dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d5c9e5dd2c6db851097ba365225238a
diff --git a/metadata/md5-cache/dev-perl/Pod-POM-2.10.0 b/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
index 354cd5bc4be0..ae8c2b181302 100644
--- a/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
+++ b/metadata/md5-cache/dev-perl/Pod-POM-2.10.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-parent dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Pod-POM-2.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5367c2c15560b52605108a3a6e56dbbe
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4 b/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
index c887e7b16f38..92b815109f3c 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.mpsna.de/opensource/PortageXS/PortageXS-0.02.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=31973648525ec1ad92e8310f3a5eba6b
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5 b/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
index 1b82d4e86b0f..b460fd7c9e2a 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-perl/IO-Socket-SSL virtual/perl-Sys-Syslog ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.mpsna.de/opensource/PortageXS/PortageXS-0.02.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e0c2b1e53e47684cb91ea293d666867c
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1 b/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
index 4ee1cb1d0f28..00b346dbb34e 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/PortageXS-0.2.12.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4b63232bdd4581bec6d16b8c5a352425
diff --git a/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1 b/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
index 4da9e4e6a552..266036dd48ef 100644
--- a/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAWNPW/PostScript-0.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0849b8e6f23071b8405068bcc57530c0
diff --git a/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1 b/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1
index fdc9b2fa2521..9ed93b8aa857 100644
--- a/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BZ/BZAJAC/Proc-Background-1.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2571eb80c782b76d3f304237d708c9fd
diff --git a/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1 b/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1
index ff1247aea6e2..16c1e7634cc3 100644
--- a/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IPC-Signal dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a52a0dac822a3d5affaae6f2ffe0dc43
diff --git a/metadata/md5-cache/dev-perl/RPC-XML-0.790.0 b/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
index 3908d4b4c56b..ffde505d9cb5 100644
--- a/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
+++ b/metadata/md5-cache/dev-perl/RPC-XML-0.790.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-File-Spec-0.800.0 >=dev-perl/libwww-perl-5.834.0 >=virtua
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.79.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5df066c6d10c9ae4969604441fb3cbf3
diff --git a/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2 b/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
index 7379cb86753c..a0e40339787f 100644
--- a/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
+++ b/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Image-Size dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/RTF-Writer-1.11.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9b532c0103d5af689ea85df04e9b03be
diff --git a/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1 b/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1
index 88e4c1c4e852..644527a80611 100644
--- a/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Readonly dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROODE/Readonly-XS-1.05.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=624b992afa47e1dbd75a87aab83939c1
diff --git a/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1 b/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1
index 41f7a8e0d47b..eb67abbe533a 100644
--- a/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Regexp-IPv6-0.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b182e07692f6de7fb5523a032eefa6dd
diff --git a/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1 b/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1
index d3c2981f645b..fee144674d47 100644
--- a/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1
+++ b/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RB/RBS/Regexp-Shellish-0.93.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd6647566a8eb84fdb6b6fb56e3f6b53
diff --git a/metadata/md5-cache/dev-perl/Role-Basic-0.130.0 b/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
index 6f8fa86e9805..584e2c6e3153 100644
--- a/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
+++ b/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=264a295d3b6cd6284045128fef97cc14
diff --git a/metadata/md5-cache/dev-perl/Roman-1.240.0 b/metadata/md5-cache/dev-perl/Roman-1.240.0
index 813e0df223b1..938a4e6c4a17 100644
--- a/metadata/md5-cache/dev-perl/Roman-1.240.0
+++ b/metadata/md5-cache/dev-perl/Roman-1.240.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Roman-1.24.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=86a69732f03f88976f71e320942b97fa
diff --git a/metadata/md5-cache/dev-perl/SDL-2.546 b/metadata/md5-cache/dev-perl/SDL-2.546
index 4da5b72855f6..7f96c8f17f1c 100644
--- a/metadata/md5-cache/dev-perl/SDL-2.546
+++ b/metadata/md5-cache/dev-perl/SDL-2.546
@@ -8,5 +8,5 @@ LICENSE=GPL-2 OFL-1.1
 RDEPEND=>=dev-perl/Alien-SDL-1.434 dev-perl/Capture-Tiny dev-perl/File-ShareDir dev-perl/Test-Most dev-perl/Tie-Simple media-libs/libpng:0 media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf media-libs/smpeg media-libs/tiff:0 virtual/glu virtual/jpeg:0 virtual/opengl virtual/perl-ExtUtils-CBuilder >=dev-perl/Module-Build-0.400.0 virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FROGGS/SDL-2.546.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9aa91cd31a6dd8272243d5f994bf0fc5
diff --git a/metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2 b/metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2
index ef63deafad4d..5be9f7bfac50 100644
--- a/metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2
+++ b/metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2
@@ -8,5 +8,5 @@ LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/SNMP_Session-1.13.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0fad1f355dd5be8216e0a6a311fafd83
diff --git a/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1 b/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
index a8e55404e179..e6435adbaac3 100644
--- a/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
+++ b/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/SQL-Abstract dev-perl/DBI dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-0.141.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=47a4c40fe79b66388e52159c338915c2
diff --git a/metadata/md5-cache/dev-perl/SRU-1.10.0 b/metadata/md5-cache/dev-perl/SRU-1.10.0
index 6f1410ef4a6b..f3d920895e15 100644
--- a/metadata/md5-cache/dev-perl/SRU-1.10.0
+++ b/metadata/md5-cache/dev-perl/SRU-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/CQL-Parser-1.120.0 virtual/perl-Carp dev-perl/Class-Accessor
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/SRU-1.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=47721e19acd018161436cdc0acc3d9dd
diff --git a/metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1 b/metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1
index 203c11e285a9..a215579d6a0d 100644
--- a/metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1
+++ b/metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic-2
 RDEPEND=dev-perl/Math-Derivative dev-perl/Math-Spline >=dev-perl/Statistics-Descriptive-2.6 dev-perl/SVG >=dev-perl/Tree-DAG_Node-1.04 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALLENDAY/SVG-Graph-0.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4b542c07769752ce9f65794cb4583171
diff --git a/metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1 b/metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1
index 4fdd14e3f749..64bc5846667b 100644
--- a/metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1
+++ b/metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.13.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1006e2af83c6a38b3a3cf8896c7f6e74
diff --git a/metadata/md5-cache/dev-perl/Sane-0.50.0-r1 b/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
index 539fe2959816..2b41613a54f2 100644
--- a/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/sane-backends-1.0.19 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RATCLIFFE/Sane-0.05.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=64e6438b2d27324eb80949c0b06891b6
diff --git a/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1 b/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
index da3c75b7ae68..36161f0ad849 100644
--- a/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
+++ b/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARCEL/Scalar-Properties-1.100860.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2f222cde6b866828793aba36a5ec1c25
diff --git a/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0 b/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0
index 64228a3a84ad..54d3b174335d 100644
--- a/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0
+++ b/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMS/Set-Crontab-1.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0aca8d4d52d157e4ec487779d7dcb34b
diff --git a/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1 b/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
index 76d6e16ee1b3..319d8a98aa0b 100644
--- a/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
+++ b/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/Set-Infinite-0.65.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ffca66ecee97aeb81105898b0efb0a34
diff --git a/metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1 b/metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1
index ba05c904eaeb..230d09473d6d 100644
--- a/metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1
+++ b/metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0560321fca62ed0a0293123166b7db63
diff --git a/metadata/md5-cache/dev-perl/Set-Scalar-1.290.0 b/metadata/md5-cache/dev-perl/Set-Scalar-1.290.0
index b8362eaf658a..e0668e165c34 100644
--- a/metadata/md5-cache/dev-perl/Set-Scalar-1.290.0
+++ b/metadata/md5-cache/dev-perl/Set-Scalar-1.290.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVIDO/Set-Scalar-1.29.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8cefe1ad3c81cfd91f8677856a1d3fb2
diff --git a/metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2 b/metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2
index 99730c4fceb9..9bd7cbc5e792 100644
--- a/metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2
+++ b/metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-MethodMaker-2 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DF/DFARALDO/Shell-EnvImporter-1.07.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a60c0b23b5eb18fe9a5b9aa14127579d
diff --git a/metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1 b/metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1
index dfb7e914de1d..c46affaa4d69 100644
--- a/metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=46a3105cedfc252c043e94e10f3b65d2
diff --git a/metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1 b/metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1
index 32a62f3b01d1..74ce23b4d163 100644
--- a/metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3fe5f4b520cd1ab5168f216b85f98e35
diff --git a/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0 b/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
index 17aa1e50255a..ba2c7ab6b104 100644
--- a/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
+++ b/metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Exporter virtual/perl-Socket dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Socket-GetAddrInfo-0.22.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2b9c98c3edbbeead8ecc05c92def4bcf
diff --git a/metadata/md5-cache/dev-perl/Socket6-0.270.0 b/metadata/md5-cache/dev-perl/Socket6-0.270.0
index efd39332670f..39fa4a70e079 100644
--- a/metadata/md5-cache/dev-perl/Socket6-0.270.0
+++ b/metadata/md5-cache/dev-perl/Socket6-0.270.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UM/UMEMOTO/Socket6-0.27.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=03e226e82d8d9af2c183658d2772f8d9
diff --git a/metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1 b/metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1
index 088f9a9a1131..96dbba75a7b2 100644
--- a/metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Sort-Naturally-1.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c967ed5448282d460a3e9b1d76be03da
diff --git a/metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1 b/metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1
index 25e350e90736..b7841392b1d9 100644
--- a/metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRYCE/Sort-Tree-1.09.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c2a8e4e173aa4f36438f081f6ea5e1c4
diff --git a/metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1 b/metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1
index acae393264e2..a3e2fe2dc779 100644
--- a/metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1
+++ b/metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-accessibility/sphinx2 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DJ/DJHD/Speech-Recognizer-SPX-0.0801.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cf4131158a5ddf1dcb8e590a528c379a
diff --git a/metadata/md5-cache/dev-perl/Spiffy-0.460.0 b/metadata/md5-cache/dev-perl/Spiffy-0.460.0
index 93c701006ee2..3b9c88b5d502 100644
--- a/metadata/md5-cache/dev-perl/Spiffy-0.460.0
+++ b/metadata/md5-cache/dev-perl/Spiffy-0.460.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Spiffy-0.46.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=77c9601e4830f808733066ced89cbe22
diff --git a/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0 b/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
index 4a0f2e191346..8168d468e86b 100644
--- a/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
+++ b/metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/OLE-StorageLite-0.19 dev-perl/IO-stringy dev-perl/Text-CSV_XS
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOUGW/Spreadsheet-ParseExcel-0.65.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bdcbe69dee77a0882f91588b3a7ccd4a
diff --git a/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0 b/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
index 4852e5c7149d..ae4579fcef41 100644
--- a/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
+++ b/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp dev-perl/Parse-RecDescent >=dev-perl/OLE-StorageLite-0.19 dev-perl/IO-stringy dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-WriteExcel-2.40.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bdbdea0a85151974081e57b6c3e22b92
diff --git a/metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1 b/metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1
index 18a30672f39c..3687eef32345 100644
--- a/metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MJ/MJD/Stat-lsMode-0.50.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e97ca636a1ea8cb0176d6b646fa8f2bc
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
index 97b4586014fe..f3e08492020e 100644
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHETTBULL/Statistics-Descriptive-Discrete-0.07.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8e2d6ab3aeb30b5e8582d6ea94e9712d
diff --git a/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1 b/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1
index a6c9849da26f..231e789b37ff 100644
--- a/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOXZOU/String-Ediff-0.09.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30c3f1ad35cae44669342d4892907ae3
diff --git a/metadata/md5-cache/dev-perl/String-Format-1.170.0-r1 b/metadata/md5-cache/dev-perl/String-Format-1.170.0-r1
index de5ab3a00550..38ecb1a5f190 100644
--- a/metadata/md5-cache/dev-perl/String-Format-1.170.0-r1
+++ b/metadata/md5-cache/dev-perl/String-Format-1.170.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DARREN/String-Format-1.17.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f74d44af0fa2ecc86fe1752c074e0551
diff --git a/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1 b/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
index 08b197cda375..d8d466609a70 100644
--- a/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0f1b57098bf247c95bdb11cd7ac306a4
diff --git a/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0 b/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
index 6242ea877dd6..4f45e5ce4370 100644
--- a/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
+++ b/metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sub-Install-0.920.0 >=dev-perl/Data-OptList-0.100.0 >=dev-perl/Params-Util-0.140.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b7717c2a349a7fbf48359f170f5fb63c
diff --git a/metadata/md5-cache/dev-perl/Sub-Install-0.928.0 b/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
index 8466eeda8f17..765d4846918a 100644
--- a/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
+++ b/metadata/md5-cache/dev-perl/Sub-Install-0.928.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8f0c3c7f8445b43ab8242101f5c67714
diff --git a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0 b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
index 85df556f78f7..a67757277d61 100644
--- a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
+++ b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Sub-Override-0.09.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=90dadadf12fa3dd02c71f23a4f1a4665
diff --git a/metadata/md5-cache/dev-perl/Switch-2.170.0 b/metadata/md5-cache/dev-perl/Switch-2.170.0
index 53c5b320854f..0f0ca0953eab 100644
--- a/metadata/md5-cache/dev-perl/Switch-2.170.0
+++ b/metadata/md5-cache/dev-perl/Switch-2.170.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Switch-2.17.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=325cfdaafd5d28607afc85b51d33a738
diff --git a/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1 b/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
index 0ae81ee71b10..ccccc8feb596 100644
--- a/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
+++ b/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b63d7d1df1fbf8039b25a13dc04b828
diff --git a/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0 b/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0
index 396878f2cb71..72c0a66a46b3 100644
--- a/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0
+++ b/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MZ/MZSANFORD/Sys-CPU-0.61.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7b2cccfdbfc1ad0b0246ddb8b0110072
diff --git a/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1 b/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
index 0dea3bc88cab..10617fc4c5c3 100644
--- a/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
+++ b/metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/YAML-Syck dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BL/BLOONIX/Sys-Statistics-Linux-0.66.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cba0663f282955e145616da091d06174
diff --git a/metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2 b/metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2
index a0c59e956488..2a5e6db6c0c6 100644
--- a/metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2
+++ b/metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRADFITZ/Sys-Syscall-0.25.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8cfdd8af77b39c82dd0661dfde49cb99
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2 b/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
index 3d54aa27b376..f9efdd4c654d 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-emulation/libvirt-1.1.2 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-1.1.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9ff20091845ed3a5da7f5d967d321cee
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9 b/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
index ffd99526934a..945d945cc537 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
@@ -10,5 +10,5 @@ RDEPEND=>=app-emulation/libvirt-1.2.9 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-1.2.9.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0913f95ddf3698fb7a7eac84d25ccc79
diff --git a/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1 b/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
index 33b1373d6f22..ec339900c224 100644
--- a/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/Taint-Runtime-0.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=71b3b9a22f3a66e7f485413aa675243f
diff --git a/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1 b/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
index 261318c88e15..014a3501414d 100644
--- a/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph dev-perl/GD-Graph3d >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Template-GD-2.66.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=db6d56895a5d2abe45d7053ee4a63428
diff --git a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0 b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
index ac6e1c7ed02b..f8d158daeb4f 100644
--- a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
+++ b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/LaTeX-Driver dev-perl/LaTeX-Encode dev-perl/LaTeX-Table >=dev-p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/Template-Plugin-Latex-3.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f5ead0f2641f0f23b6ac7f914ba9a54
diff --git a/metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1 b/metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1
index 649c42f17e74..d3d6e26e2c29 100644
--- a/metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-1.12.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=16501cd40f46b85526e284f726148e18
diff --git a/metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1 b/metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1
index f23eeb7d8b21..299c0c00fc41 100644
--- a/metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Template-Toolkit-2.15-r1 dev-perl/XML-DOM dev-perl/XML-Parser dev-perl/XML-RSS dev-perl/XML-Simple dev-perl/XML-XPath dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Template-XML-2.17.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d4c7a5960c87bb76fca3569c67c121b0
diff --git a/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1 b/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1
index aae595f4ca12..d0df29af2a16 100644
--- a/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1
+++ b/metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1
@@ -8,5 +8,5 @@ LICENSE=CC0-1.0
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Term-ANSIScreen-1.50.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=398dc9d77d2d9453cd46f5b2ce23eed2
diff --git a/metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1 b/metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1
index cbdd614c40df..14c1811b94b5 100644
--- a/metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=dev-perl/Term-Screen-1.30.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUITTENB/Term-ScreenColor-1.20.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=01b0c4cd9d6953f55f49670ab00024a9
diff --git a/metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1 b/metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1
index 5f3f63bf245a..67908f79e4bc 100644
--- a/metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1
+++ b/metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-perl/Term-ReadLine-Gnu dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRONSON/Term-ShellUI-0.92.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=33f5807c0797333388c6ac761341806b
diff --git a/metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1 b/metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1
index 5134e99d77ba..6bdd51d85710 100644
--- a/metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1
+++ b/metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/constant-boolean >=dev-perl/Exception-Base-0.22.01 dev-perl/Symbol-Util dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Test-Assert-0.0504.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ebcefce6da3de73f0f556aa9d11be0ac
diff --git a/metadata/md5-cache/dev-perl/Test-Base-0.880.0 b/metadata/md5-cache/dev-perl/Test-Base-0.880.0
index 5378df9e6fab..7cc725b99eac 100644
--- a/metadata/md5-cache/dev-perl/Test-Base-0.880.0
+++ b/metadata/md5-cache/dev-perl/Test-Base-0.880.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Filter >=dev-perl/Spiffy-0.400.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Test-Base-0.88.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b364d9f6a8ca68e6c048394793b558fb
diff --git a/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0 b/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
index 6785601f4c5b..ad9c1e92be4e 100644
--- a/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
+++ b/metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.25.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e89fe3afe994a520f846ba85129ebece
diff --git a/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0 b/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
index 51d8b191a683..abbcf6395e5c 100644
--- a/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
+++ b/metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-CPAN-Meta-2.120.920 >=dev-perl/CPAN-Meta-Check-0.7.0 >=vi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.010.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d2bdf211c577283f0df68a20455e6568
diff --git a/metadata/md5-cache/dev-perl/Test-Class-0.500.0 b/metadata/md5-cache/dev-perl/Test-Class-0.500.0
index 02a908cb8cea..0e07be1d03dd 100644
--- a/metadata/md5-cache/dev-perl/Test-Class-0.500.0
+++ b/metadata/md5-cache/dev-perl/Test-Class-0.500.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Attribute-Handlers-0.770.0 virtual/perl-Carp virtual/perl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Class-0.50.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ac6f5c5229f9d8d7cfac4c30bc8bdbe7
diff --git a/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0 b/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
index 87aca817f623..dcfdaf15a034 100644
--- a/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
+++ b/metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMCBRIDE/Test-Command-Simple-0.05.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=381594a089b4d03f056f500ff70aa8b0
diff --git a/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0 b/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
index bd141bdb6157..51cf5650d9d7 100644
--- a/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
+++ b/metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-ExtUtils-Manifest virtual/perl-File-Spec >=dev-perl/Module-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.014.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2b50ab0ff7894b8994017291d03b26fe
diff --git a/metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1 b/metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1
index eef1fac91d73..359535851b2a 100644
--- a/metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Pod-Coverage-0.20 >=dev-perl/File-Find-Rule-0.30 dev-perl/Test-Pod-Coverage >=virtual/perl-Module-CoreList-2.17 >=dev-perl/Test-Pod-1.26 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SRSHAH/Test-Distribution-2.00.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0c59a3bd21df4f77753a00914482edf
diff --git a/metadata/md5-cache/dev-perl/Test-LongString-0.170.0 b/metadata/md5-cache/dev-perl/Test-LongString-0.170.0
index 81e447479091..bd74a01c5c80 100644
--- a/metadata/md5-cache/dev-perl/Test-LongString-0.170.0
+++ b/metadata/md5-cache/dev-perl/Test-LongString-0.170.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Test-LongString-0.17.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bce8490f7b345beeabd04e080013a4c8
diff --git a/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0 b/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
index c84cabff80f7..1bd83cb9f769 100644
--- a/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
+++ b/metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Test-Simple-0.950.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=776eb884cf6b78ec1aaf68c750e3bd8c
diff --git a/metadata/md5-cache/dev-perl/Test-Most-0.340.0 b/metadata/md5-cache/dev-perl/Test-Most-0.340.0
index ae20f772ae40..799c526e7524 100644
--- a/metadata/md5-cache/dev-perl/Test-Most-0.340.0
+++ b/metadata/md5-cache/dev-perl/Test-Most-0.340.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Exception-Class-1.140.0 >=dev-perl/Test-Warn-0.230.0 >=dev-perl/Test-Deep-0.106 >=dev-perl/Test-Differences-0.610.0 >=dev-perl/Test-Exception-0.310.0 >=virtual/perl-Test-Harness-3.210.0 >=virtual/perl-Test-Simple-0.88 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.34.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30af2652a9991375db83a0f3157d5b7e
diff --git a/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3 b/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
index 9e1322c82108..7f5bacd315da 100644
--- a/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
+++ b/metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=851ed0c9dfa00694fa792eceff1b7ae0
diff --git a/metadata/md5-cache/dev-perl/Test-Pod-1.510.0 b/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
index fba8fc34db05..bd21b13906ee 100644
--- a/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
+++ b/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/perl-Pod-Simple-3.50.0 >=virtual/perl-Test-Simple-0.620.0 dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Pod-1.51.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd93518b924f89a8e01cfea11315e260
diff --git a/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1 b/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
index eb9f785cecf2..a748e692a104 100644
--- a/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Test-Taint-1.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=13ab6ae249b54f7672a61505734c8aaf
diff --git a/metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1 b/metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1
index dfc503d5ff74..60ef7d4f5a18 100644
--- a/metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1
+++ b/metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Test-Unit-Lite-0.1202.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b3841a9527b0ff80ca5b4077cbd6ed4c
diff --git a/metadata/md5-cache/dev-perl/Text-BibTeX-0.880.0 b/metadata/md5-cache/dev-perl/Text-BibTeX-0.880.0
index 98ef45ca18f7..11ece19d8979 100644
--- a/metadata/md5-cache/dev-perl/Text-BibTeX-0.880.0
+++ b/metadata/md5-cache/dev-perl/Text-BibTeX-0.880.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Perl library for reading, parsing, and processing BibTeX files
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Text-BibTeX
 IUSE=test examples
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!dev-libs/btparse virtual/perl-Encode virtual/perl-Scalar-List-Utils virtual/perl-Unicode-Normalize dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ee01407e5af0ae7113bb2ebdfc28d5a5
+_md5_=54ff1efad985b44a98641ad8574cecf5
diff --git a/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1 b/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
index 5ddf7dc71aed..f8aaf10d5f78 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Text-CSV_XS dev-perl/Class-Trigger dev-perl/File-Slurp dev-lang
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Text-CSV-Simple-1.00.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ad533bd7bcd26c2cc6b2eee70d671128
diff --git a/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1 b/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
index 7103e35faf42..a5cdd765c848 100644
--- a/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-CharWidth-0.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f6848f83f24c34464c3ad60d5763cfb1
diff --git a/metadata/md5-cache/dev-perl/Text-German-0.60.0-r1 b/metadata/md5-cache/dev-perl/Text-German-0.60.0-r1
index 82419aff4dd0..e2dec3020119 100644
--- a/metadata/md5-cache/dev-perl/Text-German-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-German-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UL/ULPFR/Text-German-0.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=31fbc53e90b619d146bb0141ebc581e8
diff --git a/metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1 b/metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1
index ed893c20bfd4..6a55a06e4a33 100644
--- a/metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.09.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2e55330568ee61f6f7c9c776a92d60c4
diff --git a/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1 b/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
index c1ccc4b04e4b..3df6aa617cad 100644
--- a/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JG/JGOLDBERG/Text-LevenshteinXS-0.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe36102e9a822a74031bd9786a5cd332
diff --git a/metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1 b/metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1
index 7063d9d2028a..5128427e6432 100644
--- a/metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JRAFTERY/Text-Netstring-0.07.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b215dfe5ef8e3565d63ad2280c146f5
diff --git a/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1 b/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
index 6dcefb20b5ad..d293e664c8bf 100644
--- a/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSIBLEY/Text-Password-Pronounceable-0.30.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=560b24f9cd224701f001c775cc7c0594
diff --git a/metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1 b/metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1
index 3eca440b5d27..0026202d2819 100644
--- a/metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Text-Diff dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CADE/Text-Patch-1.8.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9627a96092b868b4225bd2ccb85312dd
diff --git a/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1 b/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
index c643cbc8b66d..9748221aad04 100644
--- a/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Text-Reform-1.20.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5e49dc0090e4974c8d3b2d7efa385133
diff --git a/metadata/md5-cache/dev-perl/Text-Roman-3.500.0 b/metadata/md5-cache/dev-perl/Text-Roman-3.500.0
index 6e6f53d6e1a1..30d3471e4c55 100644
--- a/metadata/md5-cache/dev-perl/Text-Roman-3.500.0
+++ b/metadata/md5-cache/dev-perl/Text-Roman-3.500.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SY/SYP/Text-Roman-3.5.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=82975ee2ef8660dd07d8aca1c1226af2
diff --git a/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1 b/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
index 9765ed07eaae..6612e801fd85 100644
--- a/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Text-Shellwords-1.08.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=df7143f8ed0731e41c2c8361c86203cc
diff --git a/metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1 b/metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1
index d32f2a97a49a..8cc00c24b0d0 100644
--- a/metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDACHARY/Text-Unaccent-1.08.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=716ffdeb093f8f0e6932631d0f2aca4e
diff --git a/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0 b/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
index 15fb3f447ad1..095658e16f97 100644
--- a/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
+++ b/metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/URI virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.81.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=450718cc359f0847fe1d8146a6f5834b
diff --git a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1 b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
index a7e09315c2de..20465f0ffdfc 100644
--- a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Text-CharWidth dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc0037b6ae76714b9ed2214587d4bf8c
diff --git a/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0 b/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
index 5b31e1e880a8..cdc38f0099cf 100644
--- a/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
+++ b/metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Class-Accessor-Chained dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7dc6db2c2d95e85f3cc57765c83e5d5c
diff --git a/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1 b/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
index 6737666be7d6..440f7ef9a4f0 100644
--- a/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Tie-Array-Sorted-1.41.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0991a15b13842f238393c3f98b95513d
diff --git a/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0 b/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
index 5638429a0651..dda3a227c9a2 100644
--- a/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
+++ b/metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Tie-CPHash-2.000.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2bc27b74a264ab515be5ffb6e8d230d5
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0 b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
index df7c339ef200..6be74b61eadb 100644
--- a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
+++ b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/enum dev-perl/Carp-Assert dev-perl/Class-Virtual dev-perl/Class
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Tie-Cache-LRU-20150301.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7613cab61d45583ac61ad9863e1bacce
diff --git a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1 b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1
index a7e14a6dccdc..80e2d9672e8f 100644
--- a/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/Tie-Cache-LRU dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OE/OESTERHOL/Tie-Cache-LRU-Expires-0.55.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e728243602768548412d544ba4d2048a
diff --git a/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1 b/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1
index 732a410e5309..4e41cd43beec 100644
--- a/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-Blowfish dev-perl/Crypt-DES dev-perl/Crypt-CBC dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Tie-EncryptedHash-1.24.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=81bebfc4e7ee2b40a3097297e6ca4cd7
diff --git a/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0 b/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
index b3794544871a..8bab075f9763 100644
--- a/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
+++ b/metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Tie-Hash-Method-0.02.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1cd9780395d65b7ff1f68537ade7705a
diff --git a/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0 b/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
index 12891bc267ad..2bd70db226be 100644
--- a/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
+++ b/metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a524678e9372c24654f71e3fa318154
diff --git a/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1 b/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1
index 159a82bb1e02..f706c4c20530 100644
--- a/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRA/Tie-ShadowHash-1.00.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=14d81b664a83df40e45b05aa16991592
diff --git a/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1 b/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1
index e02f41a282db..af7c47dd0d2d 100644
--- a/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KV/KVAIL/Tie-StrictHash-1.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7cd8e15928f794a71061c6e1b8f3f64b
diff --git a/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1 b/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
index 9112f39b204d..c07180cb1c51 100644
--- a/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Params-Validate dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a2a8557a328bd27be2f143fdab2fdcf
diff --git a/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1 b/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
index 44d25af3f615..9571a9383fc1 100644
--- a/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bd9154c9841596788d5acabee1ae96da
diff --git a/metadata/md5-cache/dev-perl/Time-Period-1.250.0 b/metadata/md5-cache/dev-perl/Time-Period-1.250.0
index 2089efd1edd2..2df54110eda6 100644
--- a/metadata/md5-cache/dev-perl/Time-Period-1.250.0
+++ b/metadata/md5-cache/dev-perl/Time-Period-1.250.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PB/PBOYD/Time-Period-1.25.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=123d0c468bd4c3bc4bf0e1c36492c840
diff --git a/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1 b/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1
index 10fbbb4a63e1..0f87cf51e66c 100644
--- a/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Time-Piece-1.15 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Time-Piece-MySQL-0.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ae2581723ece021f75efd98cbd083043
diff --git a/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0 b/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
index 456a3c9e15fd..96845ee15209 100644
--- a/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
+++ b/metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILTZU/Time-Stopwatch-1.00.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=17d808bcffd0197e235eab38adeef1e1
diff --git a/metadata/md5-cache/dev-perl/TimeDate-2.300.0 b/metadata/md5-cache/dev-perl/TimeDate-2.300.0
index 550bc22baabd..67b764d0050c 100644
--- a/metadata/md5-cache/dev-perl/TimeDate-2.300.0
+++ b/metadata/md5-cache/dev-perl/TimeDate-2.300.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/TimeDate-2.30.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bf2fc1b84c2902d6acedd1dd72db64c4
diff --git a/metadata/md5-cache/dev-perl/Tk-804.33.0 b/metadata/md5-cache/dev-perl/Tk-804.33.0
index ef442fd58490..31b6717181fe 100644
--- a/metadata/md5-cache/dev-perl/Tk-804.33.0
+++ b/metadata/md5-cache/dev-perl/Tk-804.33.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ ) tcltk BSD
 RDEPEND=media-libs/freetype >=media-libs/libpng-1.4:0 virtual/jpeg x11-libs/libX11 x11-libs/libXft dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.033.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc9a83344b12185fbe9380e3de62d6bb
diff --git a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1 b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
index 45227c118937..25f0508c4bb8 100644
--- a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNNIGANJ/Tk-CursorControl-0.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e4c34b29836f7aa3a2eead0b9e468430
diff --git a/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1 b/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1
index 631cc22cbab1..d44fd14eb63c 100644
--- a/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1
+++ b/metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/jpeg dev-perl/Tk dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Tk-JPEG-Lite-2.01403.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=39de7a9d0c6b527e259de79c8d154e31
diff --git a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1 b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
index baf382e26a32..14f67729ece7 100644
--- a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
+++ b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CE/CERNEY/Tk-TableMatrix-1.23.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=57b1f131027381de380ca835a555f1a5
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280 b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
index efda2bbbacf7..2a7808ee7b4c 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20140328.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cf1e98c05eb1b16e5da1f80516ebb1d2
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1 b/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
index 4cda2681f1a0..899c753fabca 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/UNIVERSAL-moniker-0.08.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1ba3382f066a65255e5002eed925e5e3
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0 b/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
index ec796953a626..9ba0706b0841 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.18.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=45c0d1c071a5a7c03a795f10f1aa1a25
diff --git a/metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0 b/metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0
index 3ab7df782b16..752794c39385 100644
--- a/metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0
+++ b/metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAUGUSTIN/UUID-Tiny-1.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0926fb018eb022902b19f4125f3fa1ee
diff --git a/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1 b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
index abf9a796cf0c..e6f8b0f9c66b 100644
--- a/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
@@ -8,5 +8,5 @@ LICENSE=CC0-1.0
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AU/AUDREYT/Unicode-EastAsianWidth-1.33.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=794f45a3bfe52da684cd8e3d28b6e322
diff --git a/metadata/md5-cache/dev-perl/Unicode-LineBreak-2019.1.0 b/metadata/md5-cache/dev-perl/Unicode-LineBreak-2019.1.0
index 42674aa45be9..4f790e9c27ba 100644
--- a/metadata/md5-cache/dev-perl/Unicode-LineBreak-2019.1.0
+++ b/metadata/md5-cache/dev-perl/Unicode-LineBreak-2019.1.0
@@ -4,10 +4,10 @@ DEPEND=dev-perl/MIME-Charset virtual/perl-Encode dev-lang/perl
 DESCRIPTION=UAX #14 Unicode Line Breaking Algorithm
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Unicode-LineBreak
-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=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/MIME-Charset virtual/perl-Encode dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2019.001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e680d44817a3ac6ad5b0b3b1fc4f4d55
+_md5_=30e7b76a410044854a54378a18c7f1a1
diff --git a/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1 b/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
index a72f8ca4c006..269a55c22a77 100644
--- a/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
+++ b/metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2ebee7c532b35fe002cbd46f21c41c36
diff --git a/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0 b/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
index f51d4a769fb6..64dc3dcf08dc 100644
--- a/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
+++ b/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Unicode-String-2.06 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Unicode-Map8-0.13.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0048d86b134e3ffda437626ae080b937
diff --git a/metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0 b/metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0
index 9e86fe357ede..aa27c090a193 100644
--- a/metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0
+++ b/metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUS/Unicode-UTF8simple-1.06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5059ae0cf4b519840db5a2e905ee4a45
diff --git a/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0 b/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0
index b2d4cfc8b6a2..8dd71b33a74f 100644
--- a/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0
+++ b/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0
@@ -8,5 +8,5 @@ LICENSE=|| ( MPL-1.0 MPL-1.1 MIT )
 RDEPEND=net-misc/curl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=68b6cdaf5648c4439260fb1ea9f7f230
diff --git a/metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1 b/metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1
index 1c719635ccc3..4de4460032ce 100644
--- a/metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1
+++ b/metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-perl/Device-SerialPort dev-perl/Time-TAI64 virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/wattsup-daemon/WattsUp-Daemon-0.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=87f360364eb391ffc1d036516c802cbb
diff --git a/metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1 b/metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1
index 55c147c06ad5..fc9cde8991e1 100644
--- a/metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LU/LUKKA/WeakRef-0.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0124175b6ec59ca547e53dd35f90236
diff --git a/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0 b/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
index e696639bfc24..188d677c64b4 100644
--- a/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
+++ b/metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/JSON dev-perl/libwww-perl dev-perl/LWP-Protocol-https dev-lang/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEGRB/WebService-Linode-0.28.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3271ccb797b503ca3945d42d047c87c0
diff --git a/metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1 b/metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1
index fba8a013d9c3..37eeab564f76 100644
--- a/metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBROWN/X11-FreeDesktop-DesktopEntry-0.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e4dbce2ecf5c9a3ebf772ca79f3a136a
diff --git a/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1 b/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1
index 282fa74b3f90..08ba970d393d 100644
--- a/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1
+++ b/metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ ) MIT
 RDEPEND=x11-libs/libXrender x11-libs/libXext dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMCCAM/X11-Protocol-0.56.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=70e198c2a512223f7e0802cb0e290f3d
diff --git a/metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1 b/metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1
index acf511d1cde2..0b8f11729456 100644
--- a/metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1
+++ b/metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Parse-RecDescent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJOOP/X500-DN-0.29.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=da74f30a64272ff26f71a94b1cc92e8e
diff --git a/metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1 b/metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1
index f5e7ff07d96a..009a19129923 100644
--- a/metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JENDA/XML-DTDParser-2.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=55833b041a3d1b6912fc9143f012da7a
diff --git a/metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1 b/metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1
index 8f37a046f8c2..0d494a76f22f 100644
--- a/metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.16 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEWONG/XML-Dumper-0.81.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=370752bc1cbff9c46b882f7a6b9440c0
diff --git a/metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1 b/metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1
index 53f1ba59b0e6..d21261faebe1 100644
--- a/metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/Class-Accessor dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMA/XML-Elemental-2.11.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8e3b1712c8614fdbe9eab6f213ccb5a3
diff --git a/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1 b/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
index 22cd7565599b..553183fa40c5 100644
--- a/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-SAX-0.12 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RB/RBERJON/XML-Filter-BufferText-1.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c906cfc453a399be4ff3d8d35212fbab
diff --git a/metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1 b/metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1
index f081723e1fb2..2943624a95cc 100644
--- a/metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/expat dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BH/BHOLZMAN/XML-Generator-1.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=565f2d38cd9c1128aa61c14f3630e45b
diff --git a/metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2 b/metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2
index b066687e2aa3..858e80f77957 100644
--- a/metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2
+++ b/metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=>=dev-perl/libxml-perl-0.07-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KM/KMACLEOD/XML-Grove-0.46alpha.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=85dd00537be3c6f88222bf54ea6f820c
diff --git a/metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1 b/metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1
index 2810313f6297..6d398499feb7 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-LibXML dev-perl/XML-NodeFilter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHISH/XML-LibXML-Iterator-1.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a31a6f8d1b7e3d4bc7814644c6332593
diff --git a/metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1 b/metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1
index 502f318b408f..3f074422410d 100644
--- a/metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PD/PDEEGAN/XML-Mini-1.38.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dccd873b833e909b1164a89bf0652d4c
diff --git a/metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1 b/metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1
index b235e2a5c879..ca5f75e4ac3e 100644
--- a/metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHISH/XML-NodeFilter-0.01.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5cec48c1ede22360ee82091c99601d89
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-2.440.0 b/metadata/md5-cache/dev-perl/XML-Parser-2.440.0
index 29bf96500f2c..254599eb4e4f 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-2.440.0
+++ b/metadata/md5-cache/dev-perl/XML-Parser-2.440.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-libs/expat-1.95.1-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8a8fff9e6453a209d1c81b2b6067898e
diff --git a/metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1 b/metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1
index 5434badb6e6d..35c68d10674a 100644
--- a/metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1
+++ b/metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=>=dev-perl/TimeDate-1.16 dev-perl/XML-Elemental >=dev-perl/XML-RSS-Parser-4 dev-perl/Class-XPath dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMA/XML-RAI-1.3031.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e8275c4e5d29423e73d3b8577159075d
diff --git a/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1 b/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
index dd9a5ba368a7..06bc1e01b2bb 100644
--- a/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/HTML-Parser dev-perl/XML-RSS dev-perl/Clone virtual/perl-Time-H
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JB/JBISBEE/XML-RSS-Feed-2.4.tar.gz https://dev.gentoo.org/~tove/distfiles/dev-perl/XML-RSS-Feed/XML-RSS-Feed-2.320.0-patch.tar.bz2
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=636e9dac33c461f1e60d69c13d26c039
diff --git a/metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1 b/metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1
index 3d73e23ca175..6e82ba42f756 100644
--- a/metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/Class-ErrorHandler >=dev-perl/Class-XPath-1.4 >=dev-perl/XML-Elemental-2.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMA/XML-RSS-Parser-4.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=666cfe8a8dd35bd2a4a916a8217b3846
diff --git a/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1 b/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
index e0437b94b33c..9523d4e99087 100644
--- a/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.29 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8a914daab8777ee54b65054259689af4
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1 b/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
index d2b0813ad7bc..d76db913742e 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-SAX-Base >=dev-perl/XML-NamespaceSupport-1.40.0 >=dev-libs/libxml2-2.4.1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-0.99.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8c40f4204de5f0594f336924987f28b8
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0 b/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
index c533666908b4..d1634d97dc30 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/XML-SAX-0.15-r1 >=dev-perl/XML-NamespaceSupport-1.09 dev-perl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=80a711e5ba8df9b60591b7ab44dcb236
diff --git a/metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1 b/metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1
index 5ae5d6cea198..4d1e607bba93 100644
--- a/metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.34 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/XML-Simple-DTDReader-0.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d0e39a1dd2350512e08876f4f92c7967
diff --git a/metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1 b/metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1
index 9335ea1535a3..ca3419efe9e6 100644
--- a/metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.30 >=dev-perl/XML-LibXML-1.54 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DB/DBRIAN/XML-SimpleObject-0.53.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=93fef0f74f8fddb66396d692379831d8
diff --git a/metadata/md5-cache/dev-perl/XML-Smart-1.790.0 b/metadata/md5-cache/dev-perl/XML-Smart-1.790.0
index 08cf64799d05..7b08d68b5316 100644
--- a/metadata/md5-cache/dev-perl/XML-Smart-1.790.0
+++ b/metadata/md5-cache/dev-perl/XML-Smart-1.790.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/Object-MultiType-0.30.0 dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMHARISH/XML-Smart-1.79.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7fe0c04d5ec2f2f268da2526a4a2ae57
diff --git a/metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0 b/metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0
index afce763bec42..0737a5fbf91b 100644
--- a/metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0
+++ b/metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-SAX dev-perl/Tree-DAG_Node dev-perl/XML-Filter-BufferText dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/XML-Validator-Schema-1.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a8df9e8afbd9da94ad3f2bfb1b83e2ad
diff --git a/metadata/md5-cache/dev-perl/XML-Writer-0.625.0 b/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
index eb2e1bbb1d9b..0ad36d63511f 100644
--- a/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
+++ b/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.625.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3edf74c119793063a97d0f2685e37662
diff --git a/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1 b/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
index c4b7a1e8b38c..6b0d55b9dad9 100644
--- a/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIROD/XML-XPathEngine-0.14.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1d3066f35ec3c48e2f32ef4dd3b4953e
diff --git a/metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1 b/metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1
index 79024d68565b..8f21888bb0df 100644
--- a/metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/libxml-perl-0.07-r1 >=dev-perl/XML-DOM-1.39-r1 >=dev-perl/Parse-Yapp-1.05 dev-perl/libwww-perl >=dev-perl/Date-Manip-5.40-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJMATHER/XML-XQL-0.68.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5ba6f133968bd9a5a36ca34cff139148
diff --git a/metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1 b/metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1
index 9c07370fd084..f217faac7fd8 100644
--- a/metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.29 >=dev-perl/XML-DOM-1.25 >=dev-perl/libwww-perl-5.48 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTOWE/XML-XSLT-0.48.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=94691269ccac0a49fcdc8ea0d8cc9eb5
diff --git a/metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1 b/metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1
index 13389c0815b7..a4d58242cca1 100644
--- a/metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PAJAS/XML-XUpdate-LibXML-0.6.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c2ce1aa756049a86773e8d76cc73f1e7
diff --git a/metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0 b/metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0
index a8e4a73d3488..7aa5f55ebdf1 100644
--- a/metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0
+++ b/metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/SOAP-Lite dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/XMLRPC-Lite-0.717.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4c68a04b8e2563b04cc9b470e174bf49
diff --git a/metadata/md5-cache/dev-perl/YAML-1.150.0 b/metadata/md5-cache/dev-perl/YAML-1.150.0
index 77725df56428..d48b667285d2 100644
--- a/metadata/md5-cache/dev-perl/YAML-1.150.0
+++ b/metadata/md5-cache/dev-perl/YAML-1.150.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/YAML-1.15.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7715284f77be545cd63c4b5ecbbb5fde
diff --git a/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0 b/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
index 5938fa9e3477..0500b936fc84 100644
--- a/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
+++ b/metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.30.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7091bdd1239e030f477981222e639d71
diff --git a/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0 b/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
index 36507201146b..0b3335eb7b93 100644
--- a/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
+++ b/metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.69.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eb1ae0eaf386b16a05efef5731ef9a5f
diff --git a/metadata/md5-cache/dev-perl/capitalization-0.30.0-r1 b/metadata/md5-cache/dev-perl/capitalization-0.30.0-r1
index 891580f4403c..77322263563d 100644
--- a/metadata/md5-cache/dev-perl/capitalization-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/capitalization-0.30.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Devel-Symdump dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/capitalization-0.03.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=52088f03a37fbc6e6922d69afb807ead
diff --git a/metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1 b/metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1
index 6823195c3b40..5f44ca9d0614 100644
--- a/metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1
+++ b/metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-perl/Gtk2 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JRED/Gtk2-Ex-FormFactory-0.67.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=013e85dfabd9412088f6ca78a109a3d3
diff --git a/metadata/md5-cache/dev-perl/maybe-0.20.200-r1 b/metadata/md5-cache/dev-perl/maybe-0.20.200-r1
index 4ccaa7f17a0e..cb409f257f00 100644
--- a/metadata/md5-cache/dev-perl/maybe-0.20.200-r1
+++ b/metadata/md5-cache/dev-perl/maybe-0.20.200-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/maybe-0.0202.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1245ee32fec6fd1cc8ef0d9564e081c9
diff --git a/metadata/md5-cache/dev-perl/prefork-1.40.0-r2 b/metadata/md5-cache/dev-perl/prefork-1.40.0-r2
index d39929fd4bd5..0027db1ca453 100644
--- a/metadata/md5-cache/dev-perl/prefork-1.40.0-r2
+++ b/metadata/md5-cache/dev-perl/prefork-1.40.0-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-0.80 >=virtual/perl-Scalar-List-Utils-1.10 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/prefork-1.04.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b4987272d150a3895571239064807973
diff --git a/metadata/md5-cache/dev-perl/rename-1.900.0 b/metadata/md5-cache/dev-perl/rename-1.900.0
index f71b55f2c643..77a07c3d5a36 100644
--- a/metadata/md5-cache/dev-perl/rename-1.900.0
+++ b/metadata/md5-cache/dev-perl/rename-1.900.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEDERST/rename-1.9.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d79feb78dc8fd5265f68583d3fddb1ba
diff --git a/metadata/md5-cache/dev-perl/txt2html-2.520.100 b/metadata/md5-cache/dev-perl/txt2html-2.520.100
index 15ca557fb96b..420840222ea1 100644
--- a/metadata/md5-cache/dev-perl/txt2html-2.520.100
+++ b/metadata/md5-cache/dev-perl/txt2html-2.520.100
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!dev-perl/TextToHTML virtual/perl-Getopt-Long dev-perl/YAML-Syck dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUBYKAT/txt2html-2.5201.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=982cf1d3328dda8b073a66951053ac84
diff --git a/metadata/md5-cache/dev-python/Babel-2.9.0 b/metadata/md5-cache/dev-python/Babel-2.9.0
index 7ad62233f4cf..7755b41aa6d5 100644
--- a/metadata/md5-cache/dev-python/Babel-2.9.0
+++ b/metadata/md5-cache/dev-python/Babel-2.9.0
@@ -5,7 +5,7 @@ DESCRIPTION=Collection of tools for internationalizing Python applications
 EAPI=7
 HOMEPAGE=https://babel.pocoo.org/ https://pypi.org/project/Babel/
 IUSE=doc 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 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=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(-)] python_targets_pypy3? ( dev-python/backports-zoneinfo[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_6? ( dev-python/backports-zoneinfo[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_7? ( dev-python/backports-zoneinfo[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_8? ( dev-python/backports-zoneinfo[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_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(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=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/B/Babel/Babel-2.9.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=831b2aa541518734b8d916889263faa1
+_md5_=9d773f5dcd6119e302e02e394fafea77
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index bb8dd7b6011f..e6fd7a3ad38b 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/aiohttp-3.7.3 b/metadata/md5-cache/dev-python/aiohttp-3.7.3
index 272de6f4c48c..c6cf1c3d2786 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.7.3
+++ b/metadata/md5-cache/dev-python/aiohttp-3.7.3
@@ -4,7 +4,7 @@ DESCRIPTION=http client/server for asyncio
 EAPI=7
 HOMEPAGE=https://pypi.org/project/aiohttp/
 IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/async_timeout-3.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/attrs-17.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/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/multidict-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(-)] >=dev-python/yarl-1.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/idna-ssl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/typing-extensions[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/a/aiohttp/aiohttp-3.7.3.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1dc2410739e164743c620b14ac76077e
+_md5_=7a9595fac45a88cbb64901b3b357b3cf
diff --git a/metadata/md5-cache/dev-python/backports-1.0-r1 b/metadata/md5-cache/dev-python/backports-1.0-r1
deleted file mode 100644
index d9441c981339..000000000000
--- a/metadata/md5-cache/dev-python/backports-1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-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=Namespace for backported Python features
-EAPI=7
-HOMEPAGE=https://pypi.org/project/backports/
-IUSE=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 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=PYTHON
-RDEPEND=!<dev-python/backports-lzma-0.0.2-r1 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=https://dev.gentoo.org/~radhermit/dist/backports-1.0.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a7ba678cb00ab0da1d5186a17757312d
diff --git a/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1 b/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1
similarity index 96%
rename from metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1
rename to metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1
index 3bc602cf8777..bf352736c6a9 100644
--- a/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1
+++ b/metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Backport of the standard library zoneinfo module
 EAPI=7
 HOMEPAGE=https://github.com/pganssle/zoneinfo/
 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 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pganssle/zoneinfo/archive/0.2.1.tar.gz -> zoneinfo-0.2.1.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3af49f1da51dcd35c0d394e8a34797bb
+_md5_=7af4d62a3598319feca44f76f2e74ba4
diff --git a/metadata/md5-cache/dev-python/boto3-1.16.40 b/metadata/md5-cache/dev-python/boto3-1.16.40
new file mode 100644
index 000000000000..a0e0f7324b8a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.16.40
@@ -0,0 +1,15 @@
+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(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_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/guzzle_sphinx_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/guzzle_sphinx_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/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/botocore-1.19.40[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.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/s3transfer-0.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/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test 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=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.19.40[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.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/s3transfer-0.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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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/boto/boto3/archive/1.16.40.tar.gz -> boto3-1.16.40.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/botocore-1.19.40 b/metadata/md5-cache/dev-python/botocore-1.19.40
new file mode 100644
index 000000000000..1db7d440db06
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.19.40
@@ -0,0 +1,15 @@
+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/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/guzzle_sphinx_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/guzzle_sphinx_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/guzzle_sphinx_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/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) 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/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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-1.25.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/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test 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=Apache-2.0
+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(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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-1.25.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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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/b/botocore/botocore-1.19.40.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f5530f62319f8a88c8d1822506f374be
diff --git a/metadata/md5-cache/dev-python/brotlicffi-0.8.0 b/metadata/md5-cache/dev-python/brotlicffi-0.8.0
index 82373a8f84c6..0b66217b1e6f 100644
--- a/metadata/md5-cache/dev-python/brotlicffi-0.8.0
+++ b/metadata/md5-cache/dev-python/brotlicffi-0.8.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python binding to the Brotli library
 EAPI=7
 HOMEPAGE=https://github.com/python-hyper/brotlicffi/ https://pypi.org/project/brotlicffi/
 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 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=app-arch/brotli:= virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/brotlicffi/archive/v0.8.0.tar.gz -> brotlicffi-0.8.0.gh.tar.gz test? ( https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz )
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8f3acf306690ee59f3a0ead8903e45ff
+_md5_=02c7b421dea2b86a7929fa2deccd4c3e
diff --git a/metadata/md5-cache/dev-python/brotlipy-0.7.0-r3 b/metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
index 9fa8facf87f4..5b852714d11c 100644
--- a/metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
+++ b/metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Python binding to the Brotli library
 EAPI=6
 HOMEPAGE=https://github.com/python-hyper/brotlipy/ https://pypi.python.org/pypi/brotlipy
 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 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !app-arch/brotli[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/brotlipy/archive/v0.7.0.tar.gz -> brotlipy-0.7.0.tar.gz https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fbc29de6e0f12400240064145c48bdad
+_md5_=838a1a448ce9f2cc0189c1c25d79d410
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.44.1 b/metadata/md5-cache/dev-python/cfn-python-lint-0.44.1
new file mode 100644
index 000000000000..046ff2c6cf21
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-python-lint-0.44.1
@@ -0,0 +1,15 @@
+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(-)] ) test? ( >=dev-python/aws-sam-translator-1.25.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/importlib_resources[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/jsonpatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-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/junit-xml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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-2.15.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.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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=CloudFormation Linter
+EAPI=7
+HOMEPAGE=https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.25.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/importlib_resources[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/jsonpatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-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/junit-xml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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-2.15.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.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/aws-cloudformation/cfn-python-lint/archive/v0.44.1.tar.gz -> cfn-python-lint-0.44.1.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c23590cef985a7b9830eb01a05d4ad00
diff --git a/metadata/md5-cache/dev-python/clang-python-11.0.1_rc2 b/metadata/md5-cache/dev-python/clang-python-11.0.1_rc2
new file mode 100644
index 000000000000..8b36cd0f605d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-11.0.1_rc2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-11.0.1_rc2:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[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 ) 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 bindings for sys-devel/clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+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=>=sys-devel/clang-11.0.1_rc2:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[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 ) 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/llvm/llvm-project/archive/llvmorg-11.0.1-rc2.tar.gz
+_eclasses_=llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=61feec4f497091aae60bf4d12c504011
diff --git a/metadata/md5-cache/dev-python/coverage-5.3.1 b/metadata/md5-cache/dev-python/coverage-5.3.1
new file mode 100644
index 000000000000..b50b6c136264
--- /dev/null
+++ b/metadata/md5-cache/dev-python/coverage-5.3.1
@@ -0,0 +1,15 @@
+BDEPEND=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 prepare test
+DESCRIPTION=Code coverage measurement for Python
+EAPI=7
+HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/
+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 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=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
+SLOT=0
+SRC_URI=mirror://pypi/c/coverage/coverage-5.3.1.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0700b879b18cd475ffde0f053ad1a694
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.20.0 b/metadata/md5-cache/dev-python/dbusmock-0.20.0
new file mode 100644
index 000000000000..f6f1e0e79cae
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dbusmock-0.20.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( 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-python/pygobject: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(-)] ) 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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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 create mock objects on D-Bus for software testing
+EAPI=7
+HOMEPAGE=https://github.com/martinpitt/python-dbusmock
+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 ~sparc ~x86
+LICENSE=LGPL-3+
+RDEPEND=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-python/pygobject: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(-)] 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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/martinpitt/python-dbusmock/releases/download/0.20.0/python-dbusmock-0.20.0.tar.gz -> dbusmock-0.20.0.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f0b6c256199d5e1ed53dcc88645e35fd
diff --git a/metadata/md5-cache/dev-python/denonavr-0.9.9 b/metadata/md5-cache/dev-python/denonavr-0.9.9
new file mode 100644
index 000000000000..a5d8378e2dc0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/denonavr-0.9.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/requests-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/testtools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/netifaces[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=[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=Automation Library for Denon AVR receivers
+EAPI=7
+HOMEPAGE=https://github.com/scarface-4711/denonavr
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/netifaces[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/denonavr/denonavr-0.9.9.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f7c368e56b3fb14fcf1a2ecbda92a511
diff --git a/metadata/md5-cache/dev-python/diff-match-patch-20200713 b/metadata/md5-cache/dev-python/diff-match-patch-20200713
index a2bf322b0d17..0bb970e9c1a1 100644
--- a/metadata/md5-cache/dev-python/diff-match-patch-20200713
+++ b/metadata/md5-cache/dev-python/diff-match-patch-20200713
@@ -4,7 +4,7 @@ DESCRIPTION=Diff, match and patch algorithms for plain text
 EAPI=7
 HOMEPAGE=https://pypi.org/project/diff-match-patch/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diff-match-patch/diff-match-patch-20200713.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5b6592ce3d161973ae69472e8aa467af
+_md5_=75d5342556a20c7540c58344d651200b
diff --git a/metadata/md5-cache/dev-python/funcy-1.14-r1 b/metadata/md5-cache/dev-python/funcy-1.14-r1
new file mode 100644
index 000000000000..f9be5f7409a9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/funcy-1.14-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/whatever[python_targets_python3_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[python_targets_python3_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=A collection of fancy functional tools focused on practicality
+EAPI=7
+HOMEPAGE=https://github.com/Suor/funcy
+IUSE=test 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(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/funcy/funcy-1.14.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=87112c7068bbf2b72a637b54ccec8466
diff --git a/metadata/md5-cache/dev-python/hiredis-1.0.1 b/metadata/md5-cache/dev-python/hiredis-1.0.1
deleted file mode 100644
index 59e27001ec5f..000000000000
--- a/metadata/md5-cache/dev-python/hiredis-1.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-DEPEND=dev-libs/hiredis:0/0.14
-DESCRIPTION=Python extension that wraps hiredis
-EAPI=7
-HOMEPAGE=https://github.com/pietern/hiredis-py
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm x86
-LICENSE=BSD
-RDEPEND=dev-libs/hiredis:0/0.14 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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/h/hiredis/hiredis-1.0.1.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=63f343d56fe1d86784db5c6456178e49
diff --git a/metadata/md5-cache/dev-python/hiredis-1.0.1-r1 b/metadata/md5-cache/dev-python/hiredis-1.0.1-r1
deleted file mode 100644
index 1476c703443f..000000000000
--- a/metadata/md5-cache/dev-python/hiredis-1.0.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-DEPEND=system-libs? ( dev-libs/hiredis:0/0.14 )
-DESCRIPTION=Python extension that wraps hiredis
-EAPI=7
-HOMEPAGE=https://github.com/pietern/hiredis-py
-IUSE=system-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=system-libs? ( dev-libs/hiredis:0/0.14 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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/h/hiredis/hiredis-1.0.1.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3ae2ceec02006a8a8a46a5524e0b6685
diff --git a/metadata/md5-cache/dev-python/hiredis-1.1.0 b/metadata/md5-cache/dev-python/hiredis-1.1.0
index 20c36fea31e8..14c7d6dd014c 100644
--- a/metadata/md5-cache/dev-python/hiredis-1.1.0
+++ b/metadata/md5-cache/dev-python/hiredis-1.1.0
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=system-libs? ( dev-libs/hiredis:0/0.14 )
 DESCRIPTION=Python extension that wraps hiredis
 EAPI=7
-HOMEPAGE=https://github.com/pietern/hiredis-py
+HOMEPAGE=https://github.com/redis/hiredis-py/
 IUSE=system-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=system-libs? ( dev-libs/hiredis:0/0.14 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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/h/hiredis/hiredis-1.1.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=89c9d5b7c45ab6220d1dfe53d8219a6e
+_md5_=715f87f8a7cbdccce62f7624d1f27b2b
diff --git a/metadata/md5-cache/dev-python/joblib-1.0.0 b/metadata/md5-cache/dev-python/joblib-1.0.0
index e40d5ee0f495..def62c28ac55 100644
--- a/metadata/md5-cache/dev-python/joblib-1.0.0
+++ b/metadata/md5-cache/dev-python/joblib-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Tools to provide lightweight pipelining in Python
 EAPI=7
 HOMEPAGE=https://joblib.readthedocs.io/en/latest/ https://github.com/joblib/joblib
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/cloudpickle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/loky[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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=https://github.com/joblib/joblib/archive/1.0.0.tar.gz -> joblib-1.0.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dc5ea095114132fc815cf838fccf1ac8
+_md5_=c2e8fd47a58f9587b0dd3cfd94973c8b
diff --git a/metadata/md5-cache/dev-python/libtmux-0.8.3 b/metadata/md5-cache/dev-python/libtmux-0.8.3
deleted file mode 100644
index 2683b16e1019..000000000000
--- a/metadata/md5-cache/dev-python/libtmux-0.8.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=app-misc/tmux-3.0a >=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-python/alagitpull[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/docutils[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/alagitpull[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/docutils[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/alagitpull[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/docutils[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/alagitpull[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/docutils[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=python api for tmux
-EAPI=7
-HOMEPAGE=https://libtmux.git-pull.com/
-IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=app-misc/tmux-3.0a 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/tmux-python/libtmux/archive/v0.8.3.tar.gz -> libtmux-v0.8.3.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e74c914fe46b8bec88144dc88699dbaf
diff --git a/metadata/md5-cache/dev-python/libtmux-0.8.5 b/metadata/md5-cache/dev-python/libtmux-0.8.5
index d3cddb0cef8a..9bf8ea0ebdaf 100644
--- a/metadata/md5-cache/dev-python/libtmux-0.8.5
+++ b/metadata/md5-cache/dev-python/libtmux-0.8.5
@@ -4,7 +4,7 @@ DESCRIPTION=python api for tmux
 EAPI=7
 HOMEPAGE=https://libtmux.git-pull.com/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=app-misc/tmux-3.0a 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/tmux-python/libtmux/archive/v0.8.5.tar.gz -> libtmux-v0.8.5.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6de17b023fd84de9e1f4854d67667c94
+_md5_=533af97f20035ce2ea2ada938fe6f9cc
diff --git a/metadata/md5-cache/dev-python/lit-11.0.1_rc2 b/metadata/md5-cache/dev-python/lit-11.0.1_rc2
new file mode 100644
index 000000000000..d8410e5e549c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-11.0.1_rc2
@@ -0,0 +1,14 @@
+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_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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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.1-rc2.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b60d0945034a1736ab6ba38655095a4c
diff --git a/metadata/md5-cache/dev-python/loky-2.9.0 b/metadata/md5-cache/dev-python/loky-2.9.0
index 3209ffe70f02..7a83ccd90ec9 100644
--- a/metadata/md5-cache/dev-python/loky-2.9.0
+++ b/metadata/md5-cache/dev-python/loky-2.9.0
@@ -4,7 +4,7 @@ DESCRIPTION=Robust and reusable Executor for joblib
 EAPI=7
 HOMEPAGE=https://github.com/joblib/loky
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-python/cloudpickle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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=https://github.com/joblib/loky/archive/2.9.0.tar.gz -> loky-2.9.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b9aa31ec4628365cd04aa636db20743d
+_md5_=869581cdb84fb13362e0e2ba0d1b9893
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.10.0 b/metadata/md5-cache/dev-python/marshmallow-3.10.0
new file mode 100644
index 000000000000..10f1c26d5574
--- /dev/null
+++ b/metadata/md5-cache/dev-python/marshmallow-3.10.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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=A lightweight library for converting complex datatypes to and from native Python datatypes.
+EAPI=7
+HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/m/marshmallow/marshmallow-3.10.0.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a0c9ac743f00908af5831a1664a6a27f
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.1.20201016 b/metadata/md5-cache/dev-python/miniupnpc-2.1.20201016
deleted file mode 100644
index c31728427125..000000000000
--- a/metadata/md5-cache/dev-python/miniupnpc-2.1.20201016
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( app-crypt/openpgp-keys-miniupnp ) 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(-)] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=net-libs/miniupnpc-2.1.20201016:0=
-DESCRIPTION=Python bindings for UPnP client library
-EAPI=7
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 verify-sig
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=>=net-libs/miniupnpc-2.1.20201016: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 )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20201016.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.1.20201016.tar.gz.sig )
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=6a2912e0ef3ff11f066cecabdce1d425
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.2.0 b/metadata/md5-cache/dev-python/miniupnpc-2.2.0
index 6e47f42406c5..836daf57186b 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.2.0
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.2.0
@@ -1,15 +1,15 @@
-BDEPEND=verify-sig? ( app-crypt/openpgp-keys-miniupnp ) 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(-)] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=verify-sig? ( app-crypt/openpgp-keys-miniupnp ) 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(-)] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=net-libs/miniupnpc-2.2.0:0=
 DESCRIPTION=Python bindings for UPnP client library
 EAPI=7
 HOMEPAGE=http://miniupnp.free.fr/
-IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 verify-sig
-KEYWORDS=amd64 ppc ~ppc64 ~x86
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 verify-sig
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
-RDEPEND=>=net-libs/miniupnpc-2.2.0: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 )
+RDEPEND=>=net-libs/miniupnpc-2.2.0: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 ) 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=http://miniupnp.free.fr/files/miniupnpc-2.2.0.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.0.tar.gz.sig )
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=ee4ec6fed80f354e20197398442f751a
+_md5_=4fb4993eae971008f35e7ccc44b97523
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.2.1 b/metadata/md5-cache/dev-python/miniupnpc-2.2.1
new file mode 100644
index 000000000000..ca9bd20405f5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.2.1
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( app-crypt/openpgp-keys-miniupnp ) 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(-)] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=net-libs/miniupnpc-2.2.1:0=
+DESCRIPTION=Python bindings for UPnP client library
+EAPI=7
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 verify-sig
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=net-libs/miniupnpc-2.2.1: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 ) 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=http://miniupnp.free.fr/files/miniupnpc-2.2.1.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.1.tar.gz.sig )
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=3ed67affd2ed42a8bac6db6b01259bde
diff --git a/metadata/md5-cache/dev-python/msgpack-1.0.2 b/metadata/md5-cache/dev-python/msgpack-1.0.2
new file mode 100644
index 000000000000..f041b8b67503
--- /dev/null
+++ b/metadata/md5-cache/dev-python/msgpack-1.0.2
@@ -0,0 +1,15 @@
+BDEPEND=native-extensions? ( python_targets_python3_6? ( >=dev-python/cython-0.16[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/cython-0.16[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/cython-0.16[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/cython-0.16[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/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(-)] ) 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=MessagePack (de)serializer for Python
+EAPI=7
+HOMEPAGE=https://msgpack.org https://github.com/msgpack/msgpack-python/ https://pypi.org/project/msgpack/
+IUSE=+native-extensions test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+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/m/msgpack/msgpack-1.0.2.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=70771c0e72d1f8eb5c023c80efac6e4d
diff --git a/metadata/md5-cache/dev-python/namespace-jaraco-2-r2 b/metadata/md5-cache/dev-python/namespace-jaraco-2-r2
deleted file mode 100644
index d8f3707e9a35..000000000000
--- a/metadata/md5-cache/dev-python/namespace-jaraco-2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-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 jaraco
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
-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 ~riscv s390 sparc x86 ~x64-macos
-LICENSE=public-domain
-RDEPEND=!<dev-python/jaraco-packaging-5.1 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	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1b2b29bd4719414f37a583fab4e36ec5
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.3.2 b/metadata/md5-cache/dev-python/oslo-config-8.3.2
deleted file mode 100644
index 9859baa8cc4e..000000000000
--- a/metadata/md5-cache/dev-python/oslo-config-8.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-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/pbr-1.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=Oslo Configuration API
-EAPI=7
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.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(-)] >=dev-python/debtcollector-1.2.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/netaddr-0.7.18[python_targets_python3_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/stevedore-1.20.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/oslo-i18n-3.15.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(-)] >=dev-python/rfc3986-1.2.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/pyyaml-3.12.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/requests-2.18.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/importlib_metadata[python_targets_python3_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 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.config/oslo.config-8.3.2.tar.gz -> oslo-config-8.3.2.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b08a6b5191f21e2b15786b7b3bf951e0
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.3.3 b/metadata/md5-cache/dev-python/oslo-config-8.3.3
index cdc357f35228..df9525158f3d 100644
--- a/metadata/md5-cache/dev-python/oslo-config-8.3.3
+++ b/metadata/md5-cache/dev-python/oslo-config-8.3.3
@@ -5,11 +5,11 @@ DESCRIPTION=Oslo Configuration API
 EAPI=7
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.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(-)] >=dev-python/debtcollector-1.2.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/netaddr-0.7.18[python_targets_python3_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/stevedore-1.20.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/oslo-i18n-3.15.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(-)] >=dev-python/rfc3986-1.2.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/pyyaml-3.12.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/requests-2.18.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/importlib_metadata[python_targets_python3_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 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.config/oslo.config-8.3.3.tar.gz -> oslo-config-8.3.3.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a2f42acd80faacca74700eb5fbe70341
+_md5_=b08a6b5191f21e2b15786b7b3bf951e0
diff --git a/metadata/md5-cache/dev-python/packaging-20.8 b/metadata/md5-cache/dev-python/packaging-20.8
index 9fdbccb7f3b1..ad2f5aa85e5e 100644
--- a/metadata/md5-cache/dev-python/packaging-20.8
+++ b/metadata/md5-cache/dev-python/packaging-20.8
@@ -5,7 +5,7 @@ DESCRIPTION=Core utilities for Python packages
 EAPI=7
 HOMEPAGE=https://github.com/pypa/packaging/ https://pypi.org/project/packaging/
 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 ~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
+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=|| ( Apache-2.0 BSD-2 )
 RDEPEND=>=dev-python/pyparsing-2.1.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/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(-)] 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/pypa/packaging/archive/20.8.tar.gz -> packaging-20.8.gh.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1812d4f61c1ee88b2db9e64cc5215692
+_md5_=465ec4ce8e6f5f33f1d9f6905d21a882
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.2.1 b/metadata/md5-cache/dev-python/pyfakefs-4.2.1
deleted file mode 100644
index 4e31c4202fda..000000000000
--- a/metadata/md5-cache/dev-python/pyfakefs-4.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-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 fake file system that mocks the Python file system modules
-EAPI=7
-HOMEPAGE=https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/
-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 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-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=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.2.1.tar.gz -> pyfakefs-4.2.1.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d8df20c537804f56165d2752fac980c4
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.3.1 b/metadata/md5-cache/dev-python/pyfakefs-4.3.1
deleted file mode 100644
index c676c3364937..000000000000
--- a/metadata/md5-cache/dev-python/pyfakefs-4.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-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 fake file system that mocks the Python file system modules
-EAPI=7
-HOMEPAGE=https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/
-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 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0
-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=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.3.1.tar.gz -> pyfakefs-4.3.1.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d38052ba111a2ed277aa999a81850359
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.3.2 b/metadata/md5-cache/dev-python/pyfakefs-4.3.2
index 0fdde7e2cff0..aaabd2a7af52 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.3.2
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=a fake file system that mocks the Python file system modules
 EAPI=7
 HOMEPAGE=https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/
 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 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 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=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.3.2.tar.gz -> pyfakefs-4.3.2.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2b07be9d0c14443b370af32437363c0a
+_md5_=f7b0899125fd7d1783a4b5fbb58fbfb2
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.3.0 b/metadata/md5-cache/dev-python/pyfakefs-4.3.3
similarity index 94%
rename from metadata/md5-cache/dev-python/pyfakefs-4.3.0
rename to metadata/md5-cache/dev-python/pyfakefs-4.3.3
index 552e8e0ff5ae..9138ab764a0e 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.3.0
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.3.3
@@ -4,12 +4,12 @@ DESCRIPTION=a fake file system that mocks the Python file system modules
 EAPI=7
 HOMEPAGE=https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/
 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 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0
 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=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.3.0.tar.gz -> pyfakefs-4.3.0.tar.gz
+SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.3.3.tar.gz -> pyfakefs-4.3.3.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d38052ba111a2ed277aa999a81850359
+_md5_=2b07be9d0c14443b370af32437363c0a
diff --git a/metadata/md5-cache/dev-python/pygit2-1.3.0 b/metadata/md5-cache/dev-python/pygit2-1.3.0
deleted file mode 100644
index f13b0e6caaaa..000000000000
--- a/metadata/md5-cache/dev-python/pygit2-1.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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-libs/libgit2-1.0* dev-python/cached-property[python_targets_python3_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/cffi-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(-)] 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(-)] )
-DESCRIPTION=Python bindings for libgit2
-EAPI=7
-HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND==dev-libs/libgit2-1.0* dev-python/cached-property[python_targets_python3_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/cffi-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? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pygit2/pygit2-1.3.0.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f661f6359bc6ce96d219d91b074ec0bb
diff --git a/metadata/md5-cache/dev-python/pygit2-1.4.0 b/metadata/md5-cache/dev-python/pygit2-1.4.0
index 3c54ec25d9c9..7ba4a38c64cc 100644
--- a/metadata/md5-cache/dev-python/pygit2-1.4.0
+++ b/metadata/md5-cache/dev-python/pygit2-1.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for libgit2
 EAPI=7
 HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2-with-linking-exception
 RDEPEND==dev-libs/libgit2-1.1* dev-python/cached-property[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cffi-1.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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygit2/pygit2-1.4.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=892a4280a815c953c889c05ce89e610f
+_md5_=174cde45e84f9eb25637c36781af9661
diff --git a/metadata/md5-cache/dev-python/pyglet-1.5.10 b/metadata/md5-cache/dev-python/pyglet-1.5.10
index e57851e49bf6..781156b9cc19 100644
--- a/metadata/md5-cache/dev-python/pyglet-1.5.10
+++ b/metadata/md5-cache/dev-python/pyglet-1.5.10
@@ -4,7 +4,7 @@ DESCRIPTION=Cross-platform windowing and multimedia library for Python
 EAPI=7
 HOMEPAGE=http://www.pyglet.org/
 IUSE=examples image +sound test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/glu virtual/opengl image? ( || ( dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:2 ) ) sound? ( || ( media-libs/openal media-sound/pulseaudio ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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 ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyglet/pyglet/archive/v1.5.10.tar.gz -> pyglet-1.5.10.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d487805a80479b0c288f78904cb65e72
+_md5_=83eb038af907af2429389531658c8932
diff --git a/metadata/md5-cache/dev-python/pyglet-1.5.13 b/metadata/md5-cache/dev-python/pyglet-1.5.13
new file mode 100644
index 000000000000..1277b6304dd5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyglet-1.5.13
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/gst-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(-)] ) test? ( virtual/glu virtual/opengl image? ( || ( dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:2 ) ) sound? ( || ( media-libs/openal media-sound/pulseaudio ) ) >=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? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Cross-platform windowing and multimedia library for Python
+EAPI=7
+HOMEPAGE=http://www.pyglet.org/
+IUSE=examples image +sound test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=virtual/glu virtual/opengl image? ( || ( dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:2 ) ) sound? ( || ( media-libs/openal media-sound/pulseaudio ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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/pyglet/pyglet/archive/v1.5.13.tar.gz -> pyglet-1.5.13.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d487805a80479b0c288f78904cb65e72
diff --git a/metadata/md5-cache/dev-python/pygresql-5.2.2 b/metadata/md5-cache/dev-python/pygresql-5.2.2
new file mode 100644
index 000000000000..609b4337818c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygresql-5.2.2
@@ -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 ) 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 setup test
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) 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= )
+DESCRIPTION=A Python interface for the PostgreSQL database
+EAPI=7
+HOMEPAGE=https://pygresql.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 postgres_targets_postgres13 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_postgres13? ( dev-db/postgresql:13= ) 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 ) 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/P/PyGreSQL/PyGreSQL-5.2.2.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	2a85ebea21ca1da22ccc419fe84a8788	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=c572db1f33514f4ade21e307ef9750e0
diff --git a/metadata/md5-cache/dev-python/pyls-black-0.4.6 b/metadata/md5-cache/dev-python/pyls-black-0.4.6
index 6a735e3bba53..7bf042f3b2e0 100644
--- a/metadata/md5-cache/dev-python/pyls-black-0.4.6
+++ b/metadata/md5-cache/dev-python/pyls-black-0.4.6
@@ -4,7 +4,7 @@ DESCRIPTION=Black plugin for the Python Language Server
 EAPI=7
 HOMEPAGE=https://github.com/rupert/pyls-black https://pypi.org/project/pyls-black/
 IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/python-language-server[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/black[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rupert/pyls-black/archive/v0.4.6.tar.gz -> pyls-black-0.4.6-gh.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1160146986f7691d874b00802bfc66d9
+_md5_=250c75fcd48b9b91191a68fb3bc05e69
diff --git a/metadata/md5-cache/dev-python/pyls-spyder-0.1.1 b/metadata/md5-cache/dev-python/pyls-spyder-0.1.1
index b1c547c56977..60e4215243e6 100644
--- a/metadata/md5-cache/dev-python/pyls-spyder-0.1.1
+++ b/metadata/md5-cache/dev-python/pyls-spyder-0.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Spyder extensions for the python language server
 EAPI=7
 HOMEPAGE=https://github.com/spyder-ide/pyls-spyder https://pypi.org/project/pyls-spyder/
 IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/python-language-server[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/pyls-spyder/archive/v0.1.1.tar.gz -> pyls-spyder-0.1.1-gh.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b61f158205d9157fca0b19bcd1fc04b8
+_md5_=13012b247e07ccd42c77dd172aca2151
diff --git a/metadata/md5-cache/dev-python/pyparted-3.11.7 b/metadata/md5-cache/dev-python/pyparted-3.11.7
index 5e7eb03c1ef8..ff7a87ab0e3a 100644
--- a/metadata/md5-cache/dev-python/pyparted-3.11.7
+++ b/metadata/md5-cache/dev-python/pyparted-3.11.7
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for sys-block/parted
 EAPI=7
 HOMEPAGE=https://github.com/dcantrell/pyparted/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=sys-block/parted-3.2 dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dcantrell/pyparted/archive/v3.11.7.tar.gz -> pyparted-3.11.7.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=67dcf54a4e8458450d45409a06a2172c
+_md5_=1ae79f06d9cda7ab075f8fd7dbfe4514
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-9 b/metadata/md5-cache/dev-python/pyproject2setuppy-9
index 2b770063cdcb..77a879610449 100644
--- a/metadata/md5-cache/dev-python/pyproject2setuppy-9
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-9
@@ -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 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 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/v9.tar.gz -> pyproject2setuppy-9.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d9ac5eaf27557d2779b59aed65112f87
+_md5_=5b47802dbf70103a9af0a3e5b63d1645
diff --git a/metadata/md5-cache/dev-python/pysimdjson-3.1.1 b/metadata/md5-cache/dev-python/pysimdjson-3.1.1
deleted file mode 100644
index 37e2c58bad39..000000000000
--- a/metadata/md5-cache/dev-python/pysimdjson-3.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/pybind11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/simdjson >=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 bindings for simdjson
-EAPI=7
-HOMEPAGE=https://github.com/TkTech/pysimdjson
-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-libs/simdjson python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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/TkTech/pysimdjson/archive/v3.1.1.tar.gz -> pysimdjson-3.1.1.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=04f5bbc51d402124681d765445bfa1d1
diff --git a/metadata/md5-cache/dev-python/pysimdjson-3.1.1-r1 b/metadata/md5-cache/dev-python/pysimdjson-3.1.1-r1
new file mode 100644
index 000000000000..6c61f8dc410e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pysimdjson-3.1.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pybind11-2.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(-)] test? ( dev-libs/simdjson >=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 bindings for simdjson
+EAPI=7
+HOMEPAGE=https://github.com/TkTech/pysimdjson
+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-libs/simdjson python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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/TkTech/pysimdjson/archive/v3.1.1.tar.gz -> pysimdjson-3.1.1.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3d9d6d021641244c2411800c1a90f97e
diff --git a/metadata/md5-cache/dev-python/pytaglib-1.4.6 b/metadata/md5-cache/dev-python/pytaglib-1.4.6
index 847c08c23ef4..f3357fb56189 100644
--- a/metadata/md5-cache/dev-python/pytaglib-1.4.6
+++ b/metadata/md5-cache/dev-python/pytaglib-1.4.6
@@ -5,11 +5,11 @@ DESCRIPTION=Python wrapper for taglib library
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytaglib/
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3
 RDEPEND=media-libs/taglib python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_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 )
 SLOT=0
 SRC_URI=https://github.com/supermihi/pytaglib/archive/v1.4.6.tar.gz -> pytaglib-1.4.6.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0de09eb3789d7ad44aa36711ecdabb77
+_md5_=5d7168790634d3b6a3be3568cbcf795e
diff --git a/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2 b/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
deleted file mode 100644
index 97312b408cc8..000000000000
--- a/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-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_python3_6
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-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	8f9bfcc33705104f56748d9dedb3177a	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22f74f14cff8684c877d20111cbf3871
diff --git a/metadata/md5-cache/dev-python/pytest-faulthandler-1.6.0 b/metadata/md5-cache/dev-python/pytest-faulthandler-1.6.0
index 5a82d028ad3a..de7d348c6020 100644
--- a/metadata/md5-cache/dev-python/pytest-faulthandler-1.6.0
+++ b/metadata/md5-cache/dev-python/pytest-faulthandler-1.6.0
@@ -5,7 +5,7 @@ DESCRIPTION=Pytest plugin that activates the fault handler module for tests
 EAPI=7
 HOMEPAGE=https://github.com/pytest-dev/pytest-faulthandler
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-faulthandler/pytest-faulthandler-1.6.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d1c68b44dc8d92ad5782deb93b20bf48
+_md5_=86fa651d0ed84a1d3e2b3df14ffdf900
diff --git a/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1 b/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
index 54a110a8c99b..2f194f22c6be 100644
--- a/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
+++ b/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Pytest plugin that activates the fault handler module for tests
 EAPI=7
 HOMEPAGE=https://github.com/pytest-dev/pytest-faulthandler
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pytest-5.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(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_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 )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-faulthandler/archive/2.0.1.tar.gz -> pytest-faulthandler-2.0.1.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=78dff1f994a6c17ba8e096ccec5eb3e7
+_md5_=3aaeff2b20a1ae79b38883d17ce9d2f2
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.2.0-r1 b/metadata/md5-cache/dev-python/pytest-xdist-2.2.0-r1
new file mode 100644
index 000000000000..dd09f2493932
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-xdist-2.2.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=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/filelock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/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/psutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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-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/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=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_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+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(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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-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/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/p/pytest-xdist/pytest-xdist-2.2.0.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=20de2717cd5391be592c6de0caf1bcf3
diff --git a/metadata/md5-cache/dev-python/python-bugzilla-3.0.2 b/metadata/md5-cache/dev-python/python-bugzilla-3.0.2
index e27fb65daf6f..14f5272fccf5 100644
--- a/metadata/md5-cache/dev-python/python-bugzilla-3.0.2
+++ b/metadata/md5-cache/dev-python/python-bugzilla-3.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=A python module for interacting with Bugzilla over XMLRPC
 EAPI=7
 HOMEPAGE=https://github.com/python-bugzilla/python-bugzilla
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=|| ( dev-python/python-magic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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-apps/file[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-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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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/p/python-bugzilla/python-bugzilla-3.0.2.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=453b78fe7721abc6927a8ad06cc718cd
+_md5_=3cc5d0328011856958da985dcc166d09
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.35.1-r1 b/metadata/md5-cache/dev-python/python-language-server-0.35.1-r1
deleted file mode 100644
index 626b3fb491f7..000000000000
--- a/metadata/md5-cache/dev-python/python-language-server-0.35.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/versioneer[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/autopep8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flaky[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flake8-3.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mccabe-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pandas[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pycodestyle-2.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pycodestyle-2.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pydocstyle-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyflakes-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pyflakes-2.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pylint-2.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/QtPy[gui,testlib,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/rope-0.10.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/yapf[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/jedi-0.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/jedi-0.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pluggy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-jsonrpc-server-0.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ujson-3[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 postinst prepare test
-DESCRIPTION=An implementation of the Language Server Protocol for Python
-EAPI=7
-HOMEPAGE=https://github.com/palantir/python-language-server
-IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/jedi-0.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/jedi-0.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pluggy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-jsonrpc-server-0.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ujson-3[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=mirror://pypi/p/python-language-server/python-language-server-0.35.1.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1470c83c8383687ffe14ef3d9b69990a
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.36.1 b/metadata/md5-cache/dev-python/python-language-server-0.36.1
index 6ff9a380ea04..8ade3c5e143b 100644
--- a/metadata/md5-cache/dev-python/python-language-server-0.36.1
+++ b/metadata/md5-cache/dev-python/python-language-server-0.36.1
@@ -4,7 +4,7 @@ DESCRIPTION=An implementation of the Language Server Protocol for Python
 EAPI=7
 HOMEPAGE=https://github.com/palantir/python-language-server
 IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jedi-0.17.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/jedi-0.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pluggy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-jsonrpc-server-0.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ujson-3[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.36.1.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d8f571b28beaba16e8e36c833730b08e
+_md5_=852043f6462af2b33f192a18552b5a1b
diff --git a/metadata/md5-cache/dev-python/redis-py-3.3.11 b/metadata/md5-cache/dev-python/redis-py-3.3.11
deleted file mode 100644
index d1dde868dffd..000000000000
--- a/metadata/md5-cache/dev-python/redis-py-3.3.11
+++ /dev/null
@@ -1,16 +0,0 @@
-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=test? ( dev-db/redis 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.7.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(-)] )
-DESCRIPTION=Python client for Redis key-value store
-EAPI=7
-HOMEPAGE=https://github.com/andymccurdy/redis-py
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 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 ) >=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/r/redis/redis-3.3.11.tar.gz -> redis-py-3.3.11.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c455402afe77f1021693c758b2162550
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.3.0 b/metadata/md5-cache/dev-python/secretstorage-3.3.0
index 55c2eab4bc08..160f72a528e5 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.3.0
+++ b/metadata/md5-cache/dev-python/secretstorage-3.3.0
@@ -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=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~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.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(-)] 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.3.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5874066d232b1d2bc1d8e05b52f29f36
+_md5_=6ecf65c32ba21a450622f145e8e93c80
diff --git a/metadata/md5-cache/dev-python/sphinx-3.4.0 b/metadata/md5-cache/dev-python/sphinx-3.4.0
new file mode 100644
index 000000000000..1c42567e13f5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-3.4.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[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(-)] media-gfx/graphviz ) test? ( <dev-python/alabaster-0.8[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/Babel[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/docutils[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/imagesize[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/jinja[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/pygments[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/requests[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/snowballstemmer[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/sphinxcontrib-applehelp[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/sphinxcontrib-devhelp[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/sphinxcontrib-jsmath[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/sphinxcontrib-htmlhelp[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/sphinxcontrib-serializinghtml[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/sphinxcontrib-qthelp[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/packaging[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_python3_7? ( dev-python/typed-ast[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) dev-python/html5lib[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/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(-)] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra 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_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_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=Python documentation generator
+EAPI=7
+HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx
+IUSE=doc latex test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+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
+LICENSE=BSD
+RDEPEND=<dev-python/alabaster-0.8[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/Babel[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/docutils[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/imagesize[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/jinja[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/pygments[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/requests[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/snowballstemmer[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/sphinxcontrib-applehelp[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/sphinxcontrib-devhelp[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/sphinxcontrib-jsmath[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/sphinxcontrib-htmlhelp[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/sphinxcontrib-serializinghtml[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/sphinxcontrib-qthelp[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/packaging[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_python3_7? ( dev-python/typed-ast[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) latex? ( 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_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_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(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/Sphinx/Sphinx-3.4.0.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1b1fb8112fff6d0b4f11f7ed3c963977
diff --git a/metadata/md5-cache/dev-python/sphinx-gallery-0.8.2 b/metadata/md5-cache/dev-python/sphinx-gallery-0.8.2
index cfd3e3db9895..91221fca5d08 100644
--- a/metadata/md5-cache/dev-python/sphinx-gallery-0.8.2
+++ b/metadata/md5-cache/dev-python/sphinx-gallery-0.8.2
@@ -4,7 +4,7 @@ DESCRIPTION=Sphinx extension to automatically generate an examples gallery
 EAPI=7
 HOMEPAGE=https://sphinx-gallery.github.io/ https://github.com/sphinx-gallery/sphinx-gallery
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=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(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/s/sphinx-gallery/sphinx-gallery-0.8.2.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7c8db1c298cae6c32722e8755bd7905f
+_md5_=d79300562147aa4254b0cb77a4343ab0
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-1.10.1 b/metadata/md5-cache/dev-python/spyder-kernels-1.10.1
new file mode 100644
index 000000000000..8ddfe4782bf1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-kernels-1.10.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/cython[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/flaky[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/mock[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[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/pandas[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/scipy[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/xarray[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? ( dev-python/cloudpickle[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/ipykernel-5.1.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(-)] >=dev-python/ipython-7.6.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/jupyter_client-5.3.4[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/pyzmq-17[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/wurlitzer-1.0.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(-)] >=dev-python/pytest-4.5.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(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Kernels used by spyder on its ipython console
+EAPI=7
+HOMEPAGE=https://github.com/spyder-ide/spyder-kernels/ https://pypi.org/project/spyder-kernels/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/cloudpickle[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/ipykernel-5.1.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(-)] >=dev-python/ipython-7.6.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/jupyter_client-5.3.4[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/pyzmq-17[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/wurlitzer-1.0.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(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_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=https://github.com/spyder-ide/spyder-kernels/archive/v1.10.1.tar.gz -> spyder-kernels-1.10.1-gh.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a9b69173ac94264b98f080a90b4b5980
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.22 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.22
new file mode 100644
index 000000000000..885ed7853ff9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.22
@@ -0,0 +1,15 @@
+BDEPEND=test? ( 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-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(-)] ) 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=[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 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_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=|| ( 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.22.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9f0c6a0df310bdffcf598144f8242da8
diff --git a/metadata/md5-cache/dev-python/sympy-1.7 b/metadata/md5-cache/dev-python/sympy-1.7
deleted file mode 100644
index cc33f78d5908..000000000000
--- a/metadata/md5-cache/dev-python/sympy-1.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[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 ) python_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_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? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Computer Algebra System in pure Python
-EAPI=7
-HOMEPAGE=https://sympy.org
-IUSE=examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-python/mpmath[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(-)] imaging? ( dev-python/pillow[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(-)] ) ipython? ( dev-python/ipython[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(-)] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2: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(-)] ) opengl? ( dev-python/pyopengl[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(-)] ) pyglet? ( dev-python/pyglet[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(-)] ) symengine? ( dev-python/symengine[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(-)] ) texmacs? ( app-office/texmacs ) theano? ( dev-python/theano[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 ) python_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_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(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sympy/sympy/archive/sympy-1.7.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=115dd84ef7be330bef1ea3682bcb2cb3
diff --git a/metadata/md5-cache/dev-python/threadpoolctl-2.1.0 b/metadata/md5-cache/dev-python/threadpoolctl-2.1.0
index f7552d733e58..ba1817b7607d 100644
--- a/metadata/md5-cache/dev-python/threadpoolctl-2.1.0
+++ b/metadata/md5-cache/dev-python/threadpoolctl-2.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Limit the number of threads used in native libs that have their own
 EAPI=7
 HOMEPAGE=https://github.com/joblib/threadpoolctl
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 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 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/threadpoolctl/archive/2.1.0.tar.gz -> threadpoolctl-2.1.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7037232eac34e4a0b74107b175ff40ca
+_md5_=7f3166c9d16fc60191d464f31875c427
diff --git a/metadata/md5-cache/dev-python/three-merge-0.1.1 b/metadata/md5-cache/dev-python/three-merge-0.1.1
index 717419f7466f..f67da78041e3 100644
--- a/metadata/md5-cache/dev-python/three-merge-0.1.1
+++ b/metadata/md5-cache/dev-python/three-merge-0.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Simple Python library to perform a 3-way merge between strings
 EAPI=7
 HOMEPAGE=https://github.com/spyder-ide/three-merge https://pypi.org/project/three-merge/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/diff-match-patch[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 ) python_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_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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/three-merge/archive/v0.1.1.tar.gz -> three-merge-0.1.1-gh.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ae49f9c0cc401ff5047018f9c1f10d24
+_md5_=b77d2b5ec6a52d6854fff5080468dcd7
diff --git a/metadata/md5-cache/dev-python/trustme-0.6.0-r1 b/metadata/md5-cache/dev-python/trustme-0.6.0-r1
index 160694924550..f73b4ff862af 100644
--- a/metadata/md5-cache/dev-python/trustme-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/trustme-0.6.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=#1 quality TLS certs while you wait, for the discerning tester
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/trustme
 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 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Apache-2.0 MIT )
 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/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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/trustme/trustme-0.6.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4e0346cdc3d0c895caac75cc92d1699f
+_md5_=24b22bbacff373c585a7809bdc7a2385
diff --git a/metadata/md5-cache/dev-python/txaio-20.12.1 b/metadata/md5-cache/dev-python/txaio-20.12.1
new file mode 100644
index 000000000000..13c049ee7a40
--- /dev/null
+++ b/metadata/md5-cache/dev-python/txaio-20.12.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/mock-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(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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=Compatibility API between asyncio/Twisted/Trollius
+EAPI=7
+HOMEPAGE=https://github.com/crossbario/txaio https://pypi.org/project/txaio/
+IUSE=doc test 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=MIT
+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/t/txaio/txaio-20.12.1.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a39b076b85eb8666d140fb0e7bd51a03
diff --git a/metadata/md5-cache/dev-python/unidecode-0.04.21 b/metadata/md5-cache/dev-python/unidecode-0.04.21
deleted file mode 100644
index b35ea66386bf..000000000000
--- a/metadata/md5-cache/dev-python/unidecode-0.04.21
+++ /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 ) >=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=Module providing ASCII transliterations of Unicode text
-EAPI=6
-HOMEPAGE=https://pypi.org/project/Unidecode/
-IUSE=python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-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=mirror://pypi/U/Unidecode/Unidecode-0.04.21.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b988430c7736c486e686cbd75d222bb
diff --git a/metadata/md5-cache/dev-python/unidecode-1.1.2 b/metadata/md5-cache/dev-python/unidecode-1.1.2
new file mode 100644
index 000000000000..7e52bbcc5aaf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/unidecode-1.1.2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[wide-unicode(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[wide-unicode(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[wide-unicode(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[wide-unicode(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[wide-unicode(+)] ) >=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=Module providing ASCII transliterations of Unicode text
+EAPI=7
+HOMEPAGE=https://pypi.org/project/Unidecode/
+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 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[wide-unicode(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[wide-unicode(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[wide-unicode(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[wide-unicode(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[wide-unicode(+)] ) >=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/U/Unidecode/Unidecode-1.1.2.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a0b992c274f187c509d2c44d0fb3c884
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.2-r1 b/metadata/md5-cache/dev-python/urllib3-1.26.2-r1
index 178637f7e2bf..e43955d5b7f1 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.26.2-r1
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and mor
 EAPI=7
 HOMEPAGE=https://github.com/urllib3/urllib3
 IUSE=brotli 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-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/PySocks-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/certifi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/cryptography-1.3.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(-)] >=dev-python/pyopenssl-0.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/idna-2.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(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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=[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=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/u/urllib3/urllib3-1.26.2.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4df324fb0dd48e1644fb164c5dd2da88
+_md5_=28dec64632fb999458de3b7ce59a3130
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.2.1 b/metadata/md5-cache/dev-python/virtualenv-20.2.1
index 24fc7fd134b8..ae9875a942d8 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.2.1
+++ b/metadata/md5-cache/dev-python/virtualenv-20.2.1
@@ -4,7 +4,7 @@ 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_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 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/appdirs-1.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(-)] >=dev-python/distlib-0.3.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/filelock-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(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-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/six-1.9.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-0.12[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-0.12[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-0.12[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/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),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_python3_6(-)?,-python_single_target_python3_6(-)] ) 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/v/virtualenv/virtualenv-20.2.1.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=99fe7b594190d4212fd54193fae15c58
+_md5_=8c38be371676ed993a854db05c2f6bb2
diff --git a/metadata/md5-cache/dev-python/watchdog-1.0.2 b/metadata/md5-cache/dev-python/watchdog-1.0.2
new file mode 100644
index 000000000000..4300ac5427b9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/watchdog-1.0.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( 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/argh[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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 postinst prepare test
+DEPEND=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(-)] test? ( >=dev-python/pytest-timeout-0.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(-)] )
+DESCRIPTION=Python API and shell utilities to monitor file system events
+EAPI=7
+HOMEPAGE=https://github.com/gorakhargosh/watchdog
+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=Apache-2.0
+RDEPEND=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/argh[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/gorakhargosh/watchdog/archive/v1.0.2.tar.gz -> watchdog-1.0.2.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=49f3a5ce806ba4c054b1e68a44bc29a2
diff --git a/metadata/md5-cache/dev-python/websockets-8.1 b/metadata/md5-cache/dev-python/websockets-8.1
index 35c1d62fdc2d..d77d203d4a5b 100644
--- a/metadata/md5-cache/dev-python/websockets-8.1
+++ b/metadata/md5-cache/dev-python/websockets-8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library for building WebSocket servers and clients in Python
 EAPI=7
 HOMEPAGE=https://websockets.readthedocs.io/
 IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=BSD
 RDEPEND=python_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=https://github.com/aaugustin/websockets/archive/8.1.tar.gz -> websockets-8.1-src.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c5acaad9b57cc91a1aa9bf12e989cf4d
+_md5_=40b6a421c6d373fb43e1ad27a7585f70
diff --git a/metadata/md5-cache/dev-python/whatever-0.6 b/metadata/md5-cache/dev-python/whatever-0.6
new file mode 100644
index 000000000000..127a77aef2bb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/whatever-0.6
@@ -0,0 +1,14 @@
+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-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/whatever
+IUSE=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(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/w/whatever/whatever-0.6.tar.gz
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0d53ac9ccd9fee994129219d29fd9677
diff --git a/metadata/md5-cache/dev-python/zstd-1.4.5.1 b/metadata/md5-cache/dev-python/zstd-1.4.5.1
index b7e46dbb6c31..535c245d7eab 100644
--- a/metadata/md5-cache/dev-python/zstd-1.4.5.1
+++ b/metadata/md5-cache/dev-python/zstd-1.4.5.1
@@ -5,11 +5,11 @@ DESCRIPTION=Simple python bindings to Yann Collet ZSTD compression library.
 EAPI=7
 HOMEPAGE=https://github.com/sergey-dryabzhinsky/python-zstd
 IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=app-arch/zstd !dev-python/zstandard[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/z/zstd/zstd-1.4.5.1.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e89e4d849b607f92d287e625f6c70cf4
+_md5_=5b4686b9fc435fb9c7303ba38f584e2b
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 6715ad7275e1..7b0a91908756 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/actioncable-6.0.3.4 b/metadata/md5-cache/dev-ruby/actioncable-6.0.3.4
index 49108c1d79a0..b6040a934de4 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.0.3.4
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.0.3.4
@@ -5,7 +5,7 @@ DESCRIPTION=Integrated WebSockets for Rails
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby25(-)] dev-ruby/nio4r:2[ruby_targets_ruby25(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1420ad774e4d0b68fbfa5ded5b8cb145
+_md5_=aabc7992773731cbe6b50b99383be9b6
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.4 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.4
index ceaa58f2b11e..fe9c3a3f0586 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.4
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.4
@@ -5,7 +5,7 @@ DESCRIPTION=Framework for designing email-service layers
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c1ea03fc3711e3dc41a30b34b6561de8
+_md5_=5e5be60170a574f11825879e2eef06d1
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.4 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.4
index c4855edec3a7..34ae9f63b03d 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.4
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.4
@@ -5,7 +5,7 @@ DESCRIPTION=Framework for designing email-service layers
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5d4bb66a7776d770e3b76b1cb3051274
+_md5_=bc1c3e6e00efd562bbfc7d364a20b4d3
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.3.4 b/metadata/md5-cache/dev-ruby/actionpack-6.0.3.4
index 0155e1fbfafb..8c71e58387b5 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.0.3.4
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.0.3.4
@@ -5,7 +5,7 @@ DESCRIPTION=Eases web-request routing, handling, and response
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby25(-)] || ( dev-ruby/rack:2.2[ruby_targets_ruby25(-)] dev-ruby/rack:2.1[ruby_targets_ruby25(-)] >=dev-ruby/rack-2.0.8:2.0[ruby_targets_ruby25(-)] ) >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby26(-)] || ( dev-ruby/rack:2.2[ruby_targets_ruby26(-)] dev-ruby/rack:2.1[ruby_targets_ruby26(-)] >=dev-ruby/rack-2.0.8:2.0[ruby_targets_ruby26(-)] ) >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.3.4[ruby_targets_ruby27(-)] || ( dev-ruby/rack:2.2[ruby_targets_ruby27(-)] dev-ruby/rack:2.1[ruby_targets_ruby27(-)] >=dev-ruby/rack-2.0.8:2.0[ruby_targets_ruby27(-)] ) >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6bf9621504f7db1b3d181c9f0e5865a1
+_md5_=ab88cb44f9f551578a331e6739cd1f84
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.3.4 b/metadata/md5-cache/dev-ruby/actiontext-6.0.3.4
index bd29eb83b700..3abf45937f9f 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.0.3.4
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.0.3.4
@@ -5,7 +5,7 @@ DESCRIPTION=Edit and display rich text in Rails applications
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cdabeafe75e9feb132061a63c009c6ed
+_md5_=1860911658cae0df72b30807cc3486f9
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.3.4 b/metadata/md5-cache/dev-ruby/actionview-6.0.3.4
index 1e1604487385..15bc4436c148 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.0.3.4
+++ b/metadata/md5-cache/dev-ruby/actionview-6.0.3.4
@@ -5,7 +5,7 @@ DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=00fb56c4525f0677f06506361f2071aa
+_md5_=edcecb6630e520f1f4b28b5677356352
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.3.4 b/metadata/md5-cache/dev-ruby/activejob-6.0.3.4
index c1c34ba2c2e8..bd7948fd0ed9 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.0.3.4
+++ b/metadata/md5-cache/dev-ruby/activejob-6.0.3.4
@@ -5,7 +5,7 @@ DESCRIPTION=Job framework with pluggable queues
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a8e05d8689fd5e301592c9485fb7d528
+_md5_=7874224eb114dbb8da9c9a790092a480
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.3.4 b/metadata/md5-cache/dev-ruby/activemodel-6.0.3.4
index 0c2b13e927fd..34f66350c868 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.0.3.4
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.0.3.4
@@ -5,7 +5,7 @@ DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Acti
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4:*[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5336489af9b4aec6d849192c15f544cc
+_md5_=ca7cd821ebd083bb6db6236f0c9f7cc7
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.3.4 b/metadata/md5-cache/dev-ruby/activerecord-6.0.3.4
index 4ca190db04f9..395dc7bfb944 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.0.3.4
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.0.3.4
@@ -5,7 +5,7 @@ DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=mysql postgres sqlite test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby25(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby25(-)] ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby25(-)] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby25(-)] ) ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby26(-)] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby26(-)] ) ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.3.4[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby27(-)] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby27(-)] ) ) ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5c4e020947bbed1e716ac6fa6254572e
+_md5_=03ec8fa6019f6ba9b068a8bef5c68f5d
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.3.4 b/metadata/md5-cache/dev-ruby/activestorage-6.0.3.4
index 5debe594ab65..4d9a37b25298 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.3.4
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.0.3.4
@@ -5,7 +5,7 @@ DESCRIPTION=Attach cloud and local files in Rails applications
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.4:*[ruby_targets_ruby25(-)] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby25(-)] =dev-ruby/marcel-0.3*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.4:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.4:*[ruby_targets_ruby26(-)] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby26(-)] =dev-ruby/marcel-0.3*[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6bbda2198867bbb3c9c88a49fc0a8761
+_md5_=761ff414663f6f799385d9dc21731d49
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.3.4-r1 b/metadata/md5-cache/dev-ruby/activesupport-6.0.3.4-r1
index 870bb9966038..feb299c21415 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.3.4-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] dev-ruby/i18n:1[ruby_targets_ruby25(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=78dc229615daaed45817aaa8159b8e7b
+_md5_=dbb44eac3624a830114cf9bf2f1e221d
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.34.0 b/metadata/md5-cache/dev-ruby/capybara-3.34.0
index 56884ccf4366..f139ad7718fa 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.34.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.34.0
@@ -5,7 +5,7 @@ DESCRIPTION=Capybara aims to simplify the process of integration testing Rack ap
 EAPI=7
 HOMEPAGE=https://github.com/jnicklas/capybara
 IUSE=test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby25(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby26(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/addressable[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby27(-)] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.34.0.gem
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=613694b7b7cd4ebe766562b73f2728d9
+_md5_=e5b91971aae024c219f57dd6e4fbcafd
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.11 b/metadata/md5-cache/dev-ruby/dalli-2.7.11
index 1a0015fc3564..255462dac3f8 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.11
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.11
@@ -5,7 +5,7 @@ DESCRIPTION=A high performance pure Ruby client for accessing memcached servers
 EAPI=7
 HOMEPAGE=https://github.com/petergoldstein/dalli
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.11.tar.gz -> dalli-2.7.11.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a60bdb957f9e90c06cc161ed29237036
+_md5_=95cf9bc441e80a5857569b88e9d62614
diff --git a/metadata/md5-cache/dev-ruby/docile-1.3.3 b/metadata/md5-cache/dev-ruby/docile-1.3.3
new file mode 100644
index 000000000000..23be75ff9652
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/docile-1.3.3
@@ -0,0 +1,16 @@
+BDEPEND=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_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_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_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_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Turns any Ruby object into a DSL
+EAPI=7
+HOMEPAGE=https://ms-ati.github.io/docile/
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ms-ati/docile/archive/v1.3.3.tar.gz -> docile-1.3.3.tar.gz
+_eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c183f79100737055e3616e4c8c8fe8fc
diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.13 b/metadata/md5-cache/dev-ruby/facter-3.14.13
deleted file mode 100644
index af5c449a940f..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.14.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/rspec:2[ruby_targets_ruby25(-)] dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rspec:2[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/rspec:2[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) dev-util/ninja >=dev-util/cmake-3.9.6 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl dev-libs/boost:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=7
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl dev-libs/boost:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.14.13.tar.gz -> facter-3.14.13.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48f2a70e65bf5a9c6d0d97030238459f
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1 b/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
index 58d63666faa4..879699b286b5 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Instafailing RSpec progress bar formatter
 EAPI=7
 HOMEPAGE=https://github.com/thekompanee/fuubar
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/thekompanee/fuubar/archive/releases/v2.5.0.tar.gz -> fuubar-2.5.0.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=187a9a54257d5255d5ff0394d5dd41e8
+_md5_=9ff463776225a16c7a5e9ce62df6682f
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.4.2-r1 b/metadata/md5-cache/dev-ruby/globalid-0.4.2-r1
index f9ac14f4c38d..eefee7358657 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/globalid-0.4.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Reference models by URI
 EAPI=7
 HOMEPAGE=https://github.com/rails/globalid
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.4.2.tar.gz -> globalid-0.4.2.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=afe61e1439830f1c2183ea80681a6247
+_md5_=dc64c0e734789915194479457984119c
diff --git a/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1 b/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
index d90b22715d75..5abac23767ab 100644
--- a/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Hashie is a small collection of tools that make hashes more powerful
 EAPI=7
 HOMEPAGE=https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/intridea/hashie/archive/v4.1.0.tar.gz -> hashie-4.1.0.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=de43da69b5feff2209ae1330698b5396
+_md5_=bce21913fc6320c21c0b37bc693a559d
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.8.5 b/metadata/md5-cache/dev-ruby/i18n-1.8.5
index 677edc7b5c83..8726b4986fe4 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.8.5
+++ b/metadata/md5-cache/dev-ruby/i18n-1.8.5
@@ -5,7 +5,7 @@ DESCRIPTION=Add Internationalization support to your Ruby application
 EAPI=7
 HOMEPAGE=http://rails-i18n.org/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.8.5.tar.gz -> i18n-1.8.5.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7708bf781e4d998765ab5f1dad79c9af
+_md5_=c416f80409ffdc04683ec2346fc3343a
diff --git a/metadata/md5-cache/dev-ruby/image_processing-1.12.1 b/metadata/md5-cache/dev-ruby/image_processing-1.12.1
index a16b97412161..70b8cccf4eeb 100644
--- a/metadata/md5-cache/dev-ruby/image_processing-1.12.1
+++ b/metadata/md5-cache/dev-ruby/image_processing-1.12.1
@@ -5,7 +5,7 @@ DESCRIPTION=High-level image processing helper methods with libvips and ImageMag
 EAPI=7
 HOMEPAGE=https://github.com/janko/image_processing
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/mini_magick-4.9.5:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/mini_magick-4.9.5:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janko/image_processing/archive/v1.12.1.tar.gz -> image_processing-1.12.1.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fda2185a4358d559e83b968dbd4ce811
+_md5_=a7e587619f9cde1fc01daf87724c1b91
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.5.0 b/metadata/md5-cache/dev-ruby/launchy-2.5.0
index 647db1086282..8ecc05c7aaec 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.5.0
+++ b/metadata/md5-cache/dev-ruby/launchy-2.5.0
@@ -5,7 +5,7 @@ DESCRIPTION=Helper class for launching cross-platform applications
 EAPI=7
 HOMEPAGE=https://github.com/copiousfreetime/launchy
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=ISC
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/launchy-2.5.0.gem
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a824cb9c6f0134cc55ad75678d66e833
+_md5_=0cb801da07d3f5b26c6ad36c86a79147
diff --git a/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1 b/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
index 56075ddcc8c9..f031a220508e 100644
--- a/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
+++ b/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
@@ -5,7 +5,7 @@ DESCRIPTION=Define and access metadata in MiniTest::Spec descriptions and specs
 EAPI=7
 HOMEPAGE=https://github.com/ordinaryzelig/minispec-metadata
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/minitest[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minispec-metadata-3.3.1.gem
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cdba9482d93493673805679602fee5c5
+_md5_=b425c9445875f6649831ed561d61d2a6
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.13.1 b/metadata/md5-cache/dev-ruby/multi_json-1.13.1
deleted file mode 100644
index 0238df3312db..000000000000
--- a/metadata/md5-cache/dev-ruby/multi_json-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby25(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby26(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby26(-)] ) ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/json[ruby_targets_ruby25(-)] dev-ruby/yajl-ruby[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/json[ruby_targets_ruby26(-)] dev-ruby/yajl-ruby[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) 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_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=A gem to provide swappable JSON backends
-EAPI=6
-HOMEPAGE=https://github.com/intridea/multi_json
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 arm ~arm64 ~hppa 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=ruby_targets_ruby25? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby25(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby26(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intridea/multi_json/archive/v1.13.1.tar.gz -> multi_json-1.13.1.tar.gz
-_eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=beda23b3f3004a835ffec7b0a4f63229
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.12.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.12.0
index fbcff98899c9..5530c3b9447d 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.12.0
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.12.0
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_6.12.0-1stretch_all.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=8487378a920cb95d503eceec907aca8e
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.13.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.13.0
index f0a59fb36017..9c6886d24d75 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.13.0
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.13.0
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_6.13.0-1stretch_all.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=8487378a920cb95d503eceec907aca8e
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-7.0.1 b/metadata/md5-cache/dev-ruby/puppetdb-termini-7.0.1
new file mode 100644
index 000000000000..9cdce446ee2e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-7.0.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Library needed to connect puppet to puppetdb
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_7.0.1-1stretch_all.deb
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
+_md5_=ba3066b564a51300a700761c95873c9b
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
index 824b4ba1b8a0..e81110527339 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Compare doms and assert certain elements exists in doms using Nokogi
 EAPI=6
 HOMEPAGE=https://github.com/kaspth/rails-dom-testing
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rails-dom-testing-2.0.3.gem
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4344812cf5f8a5a5ed1becf0e0481c95
+_md5_=3d1193137f603aece994716688ffe63e
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
index 9368f1a7b145..f212c52808aa 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Sanitize HTML fragments in Rails applications
 EAPI=7
 HOMEPAGE=https://github.com/rafaelfranca/rails-html-sanitizer
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rails-html-sanitizer-1.3.0.gem
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=55d0c21aa664f89e4a0db98595ca92db
+_md5_=4ac02ad66afde058e6fb617d815e93db
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.3.4 b/metadata/md5-cache/dev-ruby/railties-6.0.3.4
index 426fdc3bd5a3..1934751a44c4 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.0.3.4
+++ b/metadata/md5-cache/dev-ruby/railties-6.0.3.4
@@ -5,7 +5,7 @@ DESCRIPTION=Tools for creating, working with, and running Rails applications
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby25(-)] || ( dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby25(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby26(-)] || ( dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby26(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.4[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.3.4[ruby_targets_ruby27(-)] || ( dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby27(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.3.4.tar.gz -> rails-6.0.3.4.tgz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=889696cbe40031ad815465258d7df43f
+_md5_=929c81dbf7b1c770b5153752bc17b62a
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2 b/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
index 5baf797ba687..49049a493961 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
@@ -5,7 +5,7 @@ DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressio
 EAPI=7
 HOMEPAGE=https://github.com/ammar/regexp_parser
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v1.8.2.tar.gz -> regexp_parser-1.8.2.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=735ab342184ec5b1240d3d6886ecfa15
+_md5_=342dc666070c5a23881919a35e543d58
diff --git a/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0 b/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
index 1ec94db5848d..24a55d0ab195 100644
--- a/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
+++ b/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=See which property values are supported by the regular expression en
 EAPI=6
 HOMEPAGE=https://github.com/janosch-x/regexp_property_values
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/janosch-x/regexp_property_values/archive/v1.0.0.tar.gz -> regexp_property_values-1.0.0.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b5e367792c62ce279a4233bc3b65adba
+_md5_=6cf4210c63238e38c7b8223db8f9ccb1
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1 b/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
index 26974194c97c..f96e7ac6d765 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
@@ -5,7 +5,7 @@ DESCRIPTION=RSpec support and matchers
 EAPI=7
 HOMEPAGE=https://github.com/thekompanee/rspectacular
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby25(-)] dev-ruby/fuubar:2[ruby_targets_ruby25(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby26(-)] dev-ruby/fuubar:2[ruby_targets_ruby26(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby27(-)] dev-ruby/fuubar:2[ruby_targets_ruby27(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rspectacular-0.70.8.gem
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=63ee8f4559d33c46862fb6aa3b954eb0
+_md5_=78a6367e412ae4f033442f5870a1964f
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
index 798a16af0063..f46564d06ab1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A Text Progress Bar Library for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jfelchner/ruby-progressbar/archive/releases/v1.10.1.tar.gz -> ruby-progressbar-1.10.1.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=137cb21d6b6802b92fff70e8e131a857
+_md5_=a93ca1d9ff28e9436839979077eca1af
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
index 275d86dd89c3..61e9ab285d15 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
@@ -5,7 +5,7 @@ DESCRIPTION=This gem provides Ruby bindings for WebDriver
 EAPI=7
 HOMEPAGE=https://github.com/seleniumhq/selenium
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby25(-)] >=dev-ruby/rubyzip-1.2.2:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby26(-)] >=dev-ruby/rubyzip-1.2.2:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby27(-)] >=dev-ruby/rubyzip-1.2.2:*[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/selenium-webdriver-3.142.7.gem
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3950a5ce83c853129bd602a67f8db0e2
+_md5_=0dc5c57347aa3d8c1f8757a67713d0a4
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1
index a64a4859ac9e..d34186ca507a 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=6
 HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/shoulda-matchers-3.1.3.gem
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0cf444a76faf5f65665895b5fb503904
+_md5_=b6c3ae100654dd0bf15f088cc5ab0e97
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
index 2a471aff97ee..c47b04631b89 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
@@ -5,7 +5,7 @@ DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=7
 HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v4.4.1.tar.gz -> shoulda-matchers-4.4.1.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bf266f872fdbdef3245b4b143a9cef34
+_md5_=67ef7791a3419ff4c2de4addd2c3fb84
diff --git a/metadata/md5-cache/dev-ruby/sinatra-2.1.0 b/metadata/md5-cache/dev-ruby/sinatra-2.1.0
index 66f086695b40..f83a2c5d7159 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-2.1.0
+++ b/metadata/md5-cache/dev-ruby/sinatra-2.1.0
@@ -5,7 +5,7 @@ DESCRIPTION=A DSL for quickly creating web applications in Ruby with minimal eff
 EAPI=7
 HOMEPAGE=http://www.sinatrarb.com/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/mustermann:1[ruby_targets_ruby25(-)] dev-ruby/rack:2.2[ruby_targets_ruby25(-)] ~dev-ruby/rack-protection-2.1.0[ruby_targets_ruby25(-)] dev-ruby/tilt:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/mustermann:1[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] ~dev-ruby/rack-protection-2.1.0[ruby_targets_ruby26(-)] dev-ruby/tilt:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/mustermann:1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] ~dev-ruby/rack-protection-2.1.0[ruby_targets_ruby27(-)] dev-ruby/tilt:2[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/sinatra/sinatra/archive/v2.1.0.tar.gz -> sinatra-2.1.0.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a059aa5c87a414d9b0ce9ddd638a8499
+_md5_=330db7b593fbab7e0ec3537c71dbc7d0
diff --git a/metadata/md5-cache/dev-ruby/xpath-3.2.0 b/metadata/md5-cache/dev-ruby/xpath-3.2.0
index 66966fb522c5..d38254566d26 100644
--- a/metadata/md5-cache/dev-ruby/xpath-3.2.0
+++ b/metadata/md5-cache/dev-ruby/xpath-3.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=XPath is a Ruby DSL around a subset of XPath 1.0
 EAPI=6
 HOMEPAGE=https://github.com/jnicklas/xpath
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/xpath-3.2.0.gem
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ec65c31a81e587cd39ca3dc10fcf04ec
+_md5_=f7fd619a4e871df718956eaaa142e65a
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2 b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
index 9095c2869d92..4d6a78ac61ca 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
@@ -5,7 +5,7 @@ DESCRIPTION=Efficient and thread-safe code loader for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/fxn/zeitwerk
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.4.2.tar.gz -> zeitwerk-2.4.2.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9597854c2018b209449ec5bf6b21b294
+_md5_=d7fd2f63d52ddc4706fa58536d7a1895
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index a5bd6efe6623..1dce64821d80 100644
Binary files a/metadata/md5-cache/dev-tcltk/Manifest.gz and b/metadata/md5-cache/dev-tcltk/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tcltk/tcllib-1.20 b/metadata/md5-cache/dev-tcltk/tcllib-1.20
index 48f3a8fda152..06d5bb6032ad 100644
--- a/metadata/md5-cache/dev-tcltk/tcllib-1.20
+++ b/metadata/md5-cache/dev-tcltk/tcllib-1.20
@@ -5,11 +5,11 @@ DESCRIPTION=Tcl Standard Library
 EAPI=7
 HOMEPAGE=http://www.tcl.tk/software/tcllib/
 IUSE=examples test
-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=BSD
 RDEPEND=dev-lang/tcl:0= dev-tcltk/tdom
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/tcllib/tcllib/1.20/tcllib-1.20.tar.xz
 _eclasses_=virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=2ce495644aaba8a214722261e005c172
+_md5_=e65e4fe9ee4da2b134ee2e6cebd0c9d4
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 0c0300b18918..2580fb202ee7 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/biber-2.14 b/metadata/md5-cache/dev-tex/biber-2.14
index 737c0eb49052..3e64363b6670 100644
--- a/metadata/md5-cache/dev-tex/biber-2.14
+++ b/metadata/md5-cache/dev-tex/biber-2.14
@@ -5,11 +5,11 @@ DESCRIPTION=A BibTeX replacement for users of biblatex
 EAPI=7
 HOMEPAGE=http://biblatex-biber.sourceforge.net/ https://github.com/plk/biber/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Artistic-2
 RDEPEND=>=dev-lang/perl-5.30 dev-perl/autovivification dev-perl/Business-ISBN dev-perl/Business-ISMN dev-perl/Business-ISSN dev-perl/Class-Accessor dev-perl/Data-Compare dev-perl/Data-Dump dev-perl/Data-Uniqid dev-perl/DateTime-Calendar-Julian dev-perl/DateTime-Format-Builder dev-perl/Encode-EUCJPASCII dev-perl/Encode-HanExtra dev-perl/Encode-JIS2K dev-perl/File-Slurper dev-perl/IPC-Run3 dev-perl/libwww-perl[ssl] >=dev-perl/Lingua-Translit-0.280 dev-perl/List-AllUtils dev-perl/List-MoreUtils dev-perl/List-MoreUtils-XS dev-perl/Log-Log4perl dev-perl/LWP-Protocol-https dev-perl/Mozilla-CA dev-perl/Parse-RecDescent dev-perl/PerlIO-utf8_strict dev-perl/Regexp-Common dev-perl/Sort-Key >=dev-perl/Text-BibTeX-0.880.0 dev-perl/Text-CSV dev-perl/Text-CSV_XS dev-perl/Text-Roman dev-perl/URI >=dev-perl/Unicode-LineBreak-2019.1.0 >=virtual/perl-Unicode-Normalize-1.260.0 >=dev-perl/XML-LibXML-1.70 dev-perl/XML-LibXML-Simple dev-perl/XML-LibXSLT dev-perl/XML-Writer ~dev-tex/biblatex-3.14 virtual/perl-IPC-Cmd >=virtual/perl-Unicode-Collate-1.270.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/plk/biber/archive/v2.14.tar.gz -> biber-2.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2b44fec860c5a4d50b7491541db04c26
+_md5_=4607455ae06a97437a3922e353eec98c
diff --git a/metadata/md5-cache/dev-tex/biblatex-3.14 b/metadata/md5-cache/dev-tex/biblatex-3.14
index b0c6df235d5f..6a8265051987 100644
--- a/metadata/md5-cache/dev-tex/biblatex-3.14
+++ b/metadata/md5-cache/dev-tex/biblatex-3.14
@@ -4,11 +4,11 @@ DESCRIPTION=Reimplementation of the bibliographic facilities provided by LaTeX
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex https://github.com/plk/biblatex/
 IUSE=+biber doc examples
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LPPL-1.3
 PDEPEND=biber? ( ~dev-tex/biber-2.14 )
 RDEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/biblatex/biblatex-3.14.tds.tgz
 _eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
-_md5_=fcc6f4d8f4d39d05a14d086fde937034
+_md5_=ebcd6706b7afc62e2ce4ddafeac2d069
diff --git a/metadata/md5-cache/dev-tex/hevea-2.29 b/metadata/md5-cache/dev-tex/hevea-2.29
deleted file mode 100644
index 14a73f50af0f..000000000000
--- a/metadata/md5-cache/dev-tex/hevea-2.29
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=HeVeA is a quite complete and fast LaTeX to HTML translator
-EAPI=5
-HOMEPAGE=http://hevea.inria.fr/
-IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=QPL
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-texlive/texlive-latexextra
-SLOT=0
-SRC_URI=http://hevea.inria.fr/distri/hevea-2.29.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=17cb909b65defb6a2469a5771bf1d831
diff --git a/metadata/md5-cache/dev-tex/hevea-2.30 b/metadata/md5-cache/dev-tex/hevea-2.30
deleted file mode 100644
index fc3eac4879a5..000000000000
--- a/metadata/md5-cache/dev-tex/hevea-2.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=HeVeA is a quite complete and fast LaTeX to HTML translator
-EAPI=5
-HOMEPAGE=http://hevea.inria.fr/
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=QPL
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-texlive/texlive-latexextra
-SLOT=0
-SRC_URI=http://hevea.inria.fr/distri/hevea-2.30.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=40ca0f8e21f6b5e8227abc88829d13f2
diff --git a/metadata/md5-cache/dev-tex/hevea-2.31 b/metadata/md5-cache/dev-tex/hevea-2.31
index 1f6503f4ddf5..b25d1b563998 100644
--- a/metadata/md5-cache/dev-tex/hevea-2.31
+++ b/metadata/md5-cache/dev-tex/hevea-2.31
@@ -4,10 +4,10 @@ DESCRIPTION=HeVeA is a quite complete and fast LaTeX to HTML translator
 EAPI=5
 HOMEPAGE=http://hevea.inria.fr/
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=QPL
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-texlive/texlive-latexextra
 SLOT=0
 SRC_URI=http://hevea.inria.fr/distri/hevea-2.31.tar.gz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0b70e0c8960ed6d85ff355ff20fd9094
+_md5_=1155eef37b0650fc754c0aba60b3bbc3
diff --git a/metadata/md5-cache/dev-tex/html2latex-1.1-r1 b/metadata/md5-cache/dev-tex/html2latex-1.1-r1
index 2bbb9b9733c1..e9ceaa69f5d1 100644
--- a/metadata/md5-cache/dev-tex/html2latex-1.1-r1
+++ b/metadata/md5-cache/dev-tex/html2latex-1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/html2latex/html2latex-1.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=86bc6105526dd923e9daefc9da88b324
diff --git a/metadata/md5-cache/dev-tex/latexdiff-1.3.1.1 b/metadata/md5-cache/dev-tex/latexdiff-1.3.1.1
index 8e035f1338a8..7f23df2f2ac7 100644
--- a/metadata/md5-cache/dev-tex/latexdiff-1.3.1.1
+++ b/metadata/md5-cache/dev-tex/latexdiff-1.3.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=Compare two latex files and mark up significant differences
 EAPI=7
 HOMEPAGE=https://www.ctan.org/tex-archive/support/latexdiff/ https://github.com/ftilmann/latexdiff/
 IUSE=test
-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=GPL-3
 RDEPEND=>=dev-lang/perl-5.8 virtual/latex-base dev-texlive/texlive-plaingeneric dev-perl/Algorithm-Diff
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ftilmann/latexdiff/archive/1.3.1.1.tar.gz -> latexdiff-1.3.1.1.tar.gz
-_md5_=4daf7c8eb826dc7b51df9a29841842c3
+_md5_=28a5e0e9222a4ed9d7ccb236193b9f73
diff --git a/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1 b/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
index 7544dd371ab8..d6bdae7872cd 100644
--- a/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
+++ b/metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl dev-perl/YAML-Syck dev-perl/IO-All dev-vcs/subversion dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INFINOID/App-SVN-Bisect-1.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c18357180c9cccaf6c95bcfb51f6b847
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 4da739611cfa..ae58cf5c348a 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/bnfc-2.8.1 b/metadata/md5-cache/dev-util/bnfc-2.8.1
index 3fd898d7014b..f6d2f7b3eb1d 100644
--- a/metadata/md5-cache/dev-util/bnfc-2.8.1
+++ b/metadata/md5-cache/dev-util/bnfc-2.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.8 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:= dev-haskell/alex >=dev-haskell/cabal-1.8 dev-haskell/happy hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A compiler front-end generator
 EAPI=6
 HOMEPAGE=http://bnfc.digitalgrammars.com/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/2.8.1
 SRC_URI=https://hackage.haskell.org/package/BNFC-2.8.1/BNFC-2.8.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4be33ed8676d43c02e164bb6b50e7197
diff --git a/metadata/md5-cache/dev-util/bnfc-2.8.3 b/metadata/md5-cache/dev-util/bnfc-2.8.3
index 0409692a4920..8349d642f882 100644
--- a/metadata/md5-cache/dev-util/bnfc-2.8.3
+++ b/metadata/md5-cache/dev-util/bnfc-2.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-7.6.1:= dev-haskell/alex >=dev-haskell/cabal-1.16.0 dev-haskell/happy test? ( >=dev-haskell/doctest-0.8 dev-haskell/hspec dev-haskell/hunit >=dev-haskell/quickcheck-2.5 dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lang/ghc-7.6.1:= dev-haskell/alex >=dev-haskell/cabal-1.16.0 dev-haskell/happy test? ( >=dev-haskell/doctest-0.8 dev-haskell/hspec dev-haskell/hunit >=dev-haskell/quickcheck-2.5 dev-haskell/temporary ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A compiler front-end generator
 EAPI=7
 HOMEPAGE=http://bnfc.digitalgrammars.com/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-lan
 RESTRICT=test
 SLOT=0/2.8.3
 SRC_URI=https://hackage.haskell.org/package/BNFC-2.8.3/BNFC-2.8.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0529337713b66df2aa7e4fed68b0658d
diff --git a/metadata/md5-cache/dev-util/bustle-0.5.4 b/metadata/md5-cache/dev-util/bustle-0.5.4
index 0a15a6589b30..f9861c94e866 100644
--- a/metadata/md5-cache/dev-util/bustle-0.5.4
+++ b/metadata/md5-cache/dev-util/bustle-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/cairo:= >=dev-haskell/dbus-0.10:= dev-haskell/gio:= dev-hask
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/bustle-0.5.4/bustle-0.5.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a677f565bb0eb56fd12d71e8b678032c
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.14 b/metadata/md5-cache/dev-util/catalyst-3.0.14
index bb02d0c3441f..ccd3414e4e1a 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.14
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.14
@@ -7,9 +7,9 @@ IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_6 pyt
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2+
 PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) sys-boot/syslinux sys-boot/shim )
-RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_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/pydecomp-0.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(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( virtual/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_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/snakeoil-0.6.5[python_targets_python3_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/pydecomp-0.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(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( app-cdr/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_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://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.14.tar.bz2
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd7e8bd317b4c18ed656ab35a0a49cf9
+_md5_=ecc5d5babe1245b6acb9fe5af58fdf0c
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.15 b/metadata/md5-cache/dev-util/catalyst-3.0.15
index d3a102289671..e7a98e35f1db 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.15
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.15
@@ -7,9 +7,9 @@ IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_7 pyt
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2+
 PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) sys-boot/syslinux sys-boot/shim )
-RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pydecomp-0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( virtual/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_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(-)]
+RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pydecomp-0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( app-cdr/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_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=https://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.15.tar.bz2
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d52bfeeb7e3355e21375bf20bd25699
+_md5_=b3e6c8cbb1b000ae9f4424497263fbef
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index e3ebe944c9f0..b341c07ae043 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -7,8 +7,8 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
 IUSE=doc +iso python_targets_python3_8 kernel_linux
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/snakeoil-0.6.5[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/toml[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] sys-apps/util-linux[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pydecomp-0.3[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] app-arch/lbzip2 app-arch/pixz app-arch/tar[xattr] dev-vcs/git sys-fs/dosfstools sys-fs/squashfs-tools-ng iso? ( virtual/cdrtools amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) alpha? ( dev-libs/libisoburn ) ia64? ( dev-libs/libisoburn sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ppc? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) ppc64? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) sparc? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/snakeoil-0.6.5[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/toml[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] sys-apps/util-linux[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pydecomp-0.3[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] app-arch/lbzip2 app-arch/pixz app-arch/tar[xattr] dev-vcs/git sys-fs/dosfstools sys-fs/squashfs-tools-ng[tools] iso? ( app-cdr/cdrtools amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) alpha? ( dev-libs/libisoburn ) ia64? ( dev-libs/libisoburn sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ppc? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) ppc64? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) sparc? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cb1b169f99305c787c6f333d67440d2a
+_md5_=8da152e43c00a033e1d8f71b9e07289a
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.20.5 b/metadata/md5-cache/dev-util/checkbashisms-2.20.5
new file mode 100644
index 000000000000..9dae6c1d014e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.20.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
+EAPI=7
+HOMEPAGE=https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.20.5.tar.xz
+_md5_=748be12260c5739004551a5a34a52f45
diff --git a/metadata/md5-cache/dev-util/cmake-3.19.2 b/metadata/md5-cache/dev-util/cmake-3.19.2
index 601ad2fd7d85..bfe80beb39ed 100644
--- a/metadata/md5-cache/dev-util/cmake-3.19.2
+++ b/metadata/md5-cache/dev-util/cmake-3.19.2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.19/cmake-3.19.2.tar.gz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	b9df8d576b8e3d10e3da1c292b027912	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4926710248270381bd32fe08e682b9e
+_md5_=eb033989b3e7b0eac8d1db0ec760dd7d
diff --git a/metadata/md5-cache/dev-util/cvise-1.6.0 b/metadata/md5-cache/dev-util/cvise-1.6.0
deleted file mode 100644
index 4510c66af005..000000000000
--- a/metadata/md5-cache/dev-util/cvise-1.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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] ) sys-devel/flex test? ( python_single_target_python3_6? ( dev-python/pebble[python_targets_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pebble[python_targets_python3_7(-)] dev-python/pytest[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pebble[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pebble[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) <=sys-devel/clang-13:= !!sys-devel/llvm:0
-DESCRIPTION=Super-parallel Python port of the C-Reduce
-EAPI=7
-HOMEPAGE=https://github.com/marxin/cvise/
-IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=UoI-NCSA
-RDEPEND=|| ( sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) <=sys-devel/clang-13:= 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] ) python_single_target_python3_6? ( dev-python/pebble[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pebble[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pebble[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pebble[python_targets_python3_9(-)] ) dev-util/unifdef sys-devel/flex
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marxin/cvise/archive/v1.6.0.tar.gz -> cvise-1.6.0.tar.gz
-_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c319326cdaf429f51fe2705247bb3ba
diff --git a/metadata/md5-cache/dev-util/cvise-1.7.0-r1 b/metadata/md5-cache/dev-util/cvise-1.7.0-r1
deleted file mode 100644
index 75c6f490cc2d..000000000000
--- a/metadata/md5-cache/dev-util/cvise-1.7.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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] ) sys-devel/flex test? ( python_single_target_python3_6? ( dev-python/pebble[python_targets_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pebble[python_targets_python3_7(-)] dev-python/pytest[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pebble[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pebble[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) <=sys-devel/clang-13:= !!sys-devel/llvm:0
-DESCRIPTION=Super-parallel Python port of the C-Reduce
-EAPI=7
-HOMEPAGE=https://github.com/marxin/cvise/
-IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=UoI-NCSA
-RDEPEND=|| ( sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) <=sys-devel/clang-13:= 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] ) python_single_target_python3_6? ( dev-python/pebble[python_targets_python3_6(-)] dev-python/psutil[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pebble[python_targets_python3_7(-)] dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pebble[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pebble[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) dev-util/unifdef sys-devel/flex
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marxin/cvise/archive/v1.7.0.tar.gz -> cvise-1.7.0.tar.gz
-_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c63ec333316bce860971023562f4d6d8
diff --git a/metadata/md5-cache/dev-util/cvise-1.8.0 b/metadata/md5-cache/dev-util/cvise-1.8.0
deleted file mode 100644
index 48c0036dc783..000000000000
--- a/metadata/md5-cache/dev-util/cvise-1.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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] ) sys-devel/flex test? ( python_single_target_python3_6? ( dev-python/pebble[python_targets_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pebble[python_targets_python3_7(-)] dev-python/pytest[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pebble[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pebble[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) <=sys-devel/clang-13:= !!sys-devel/llvm:0
-DESCRIPTION=Super-parallel Python port of the C-Reduce
-EAPI=7
-HOMEPAGE=https://github.com/marxin/cvise/
-IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=UoI-NCSA
-RDEPEND=|| ( sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) <=sys-devel/clang-13:= 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] ) python_single_target_python3_6? ( dev-python/pebble[python_targets_python3_6(-)] dev-python/psutil[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pebble[python_targets_python3_7(-)] dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pebble[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pebble[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) dev-util/unifdef sys-devel/flex
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marxin/cvise/archive/v1.8.0.tar.gz -> cvise-1.8.0.tar.gz
-_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c63ec333316bce860971023562f4d6d8
diff --git a/metadata/md5-cache/dev-util/cvise-1.9.0 b/metadata/md5-cache/dev-util/cvise-1.9.0
index 62aa1dcc7bbe..9ccfffd69978 100644
--- a/metadata/md5-cache/dev-util/cvise-1.9.0
+++ b/metadata/md5-cache/dev-util/cvise-1.9.0
@@ -5,7 +5,7 @@ DESCRIPTION=Super-parallel Python port of the C-Reduce
 EAPI=7
 HOMEPAGE=https://github.com/marxin/cvise/
 IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=UoI-NCSA
 RDEPEND=|| ( sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) <=sys-devel/clang-13:= 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] ) python_single_target_python3_6? ( dev-python/pebble[python_targets_python3_6(-)] dev-python/psutil[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pebble[python_targets_python3_7(-)] dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pebble[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pebble[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) dev-util/unifdef sys-devel/flex
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marxin/cvise/archive/v1.9.0.tar.gz -> cvise-1.9.0.tar.gz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a7aede3a3aa190fdc506032f13ee0b5
+_md5_=1b2bfc93d8cf5e3b51f73be9ee5d306b
diff --git a/metadata/md5-cache/dev-util/debhelper-13.2.1 b/metadata/md5-cache/dev-util/debhelper-13.2.1
index b3a91f82ba8b..4b06f037df6f 100644
--- a/metadata/md5-cache/dev-util/debhelper-13.2.1
+++ b/metadata/md5-cache/dev-util/debhelper-13.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of programs that can be used to automate common tasks in
 EAPI=7
 HOMEPAGE=https://tracker.debian.org/pkg/debhelper
 IUSE=test l10n_de l10n_es l10n_fr
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_13.2.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d42e9d2b892f852ebbc6008cef1b7f81
+_md5_=b08a0b4d523775d91268c6ae1eb39aea
diff --git a/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1 b/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
index 16dee148d682..0fc6dfb152d5 100644
--- a/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
+++ b/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Command line utilities to work with desktop menu entries
 EAPI=7
 HOMEPAGE=https://freedesktop.org/wiki/Software/desktop-file-utils
 IUSE=emacs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.12:2
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.26.tar.xz
 _eclasses_=elisp-common	b9df8d576b8e3d10e3da1c292b027912	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fbb9e39ea974093b68be7b2dbc304892
+_md5_=64539e6b11ba88445adea7e3e594c8ba
diff --git a/metadata/md5-cache/dev-util/diffoscope-162 b/metadata/md5-cache/dev-util/diffoscope-162
deleted file mode 100644
index 4d3df3361a58..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-162
+++ /dev/null
@@ -1,15 +0,0 @@
-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/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Will try to get to the bottom of what makes files or directories different
-EAPI=7
-HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
-IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar tcpdump xz zip zstd python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/libarchive-c[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/distro[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-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_7(-)?,python_targets_python3_8(-)?,-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_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 )
-SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-162.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=922f9400172213e7d3bf968f201c7131
diff --git a/metadata/md5-cache/dev-util/diffoscope-163 b/metadata/md5-cache/dev-util/diffoscope-163
index 05fea289d21e..611f4d9cf4f4 100644
--- a/metadata/md5-cache/dev-util/diffoscope-163
+++ b/metadata/md5-cache/dev-util/diffoscope-163
@@ -7,9 +7,9 @@ HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
 IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar tcpdump xz zip zstd python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/libarchive-c[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/distro[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-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_7(-)?,python_targets_python3_8(-)?,-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_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(-)]
+RDEPEND=dev-python/python-magic[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/libarchive-c[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/distro[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-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? ( app-cdr/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_7(-)?,python_targets_python3_8(-)?,-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_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 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-163.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=922f9400172213e7d3bf968f201c7131
+_md5_=851601dbadf7953619bfb6e186e2265f
diff --git a/metadata/md5-cache/dev-util/edb-debugger-1.2.0 b/metadata/md5-cache/dev-util/edb-debugger-1.2.0
deleted file mode 100644
index caaa2efdeb1e..000000000000
--- a/metadata/md5-cache/dev-util/edb-debugger-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost virtual/pkgconfig dev-libs/capstone:= dev-libs/double-conversion dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 graphviz? ( media-gfx/graphviz )
-DESCRIPTION=edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg
-EAPI=7
-HOMEPAGE=https://github.com/eteran/edb-debugger
-IUSE=graphviz
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/capstone:= dev-libs/double-conversion dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 graphviz? ( media-gfx/graphviz )
-SLOT=0
-SRC_URI=https://github.com/eteran/edb-debugger/releases/download/1.2.0/edb-debugger-1.2.0.tgz
-_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ecf944521f395f2b76beebd8348ef40
diff --git a/metadata/md5-cache/dev-util/egypt-1.10 b/metadata/md5-cache/dev-util/egypt-1.10
index 8314e809b9f5..3bebf0a79f1b 100644
--- a/metadata/md5-cache/dev-util/egypt-1.10
+++ b/metadata/md5-cache/dev-util/egypt-1.10
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.gson.org/egypt/download/egypt-1.10.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3af27e2197b3947c438cb8ff7ce0ea01
diff --git a/metadata/md5-cache/dev-util/goland-2020.2.3 b/metadata/md5-cache/dev-util/goland-2020.3
similarity index 91%
rename from metadata/md5-cache/dev-util/goland-2020.2.3
rename to metadata/md5-cache/dev-util/goland-2020.3
index b156a0f5a742..88efba9bdf86 100644
--- a/metadata/md5-cache/dev-util/goland-2020.2.3
+++ b/metadata/md5-cache/dev-util/goland-2020.3
@@ -7,6 +7,6 @@ LICENSE=|| ( JetBrains-business JetBrains-classroom JetBrains-educational JetBra
 RDEPEND=virtual/jdk dev-lang/go
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=https://download.jetbrains.com/go/goland-2020.2.3.tar.gz
+SRC_URI=https://download.jetbrains.com/go/goland-2020.3.tar.gz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c72d5f0be1c49ec176579178c7dcb866
diff --git a/metadata/md5-cache/dev-util/indent-2.2.12 b/metadata/md5-cache/dev-util/indent-2.2.12
index 73e29f3e5cd8..6039a701ef01 100644
--- a/metadata/md5-cache/dev-util/indent-2.2.12
+++ b/metadata/md5-cache/dev-util/indent-2.2.12
@@ -4,10 +4,10 @@ DESCRIPTION=Indent program source files
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/indent/
 IUSE=nls
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/indent/indent-2.2.12.tar.xz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8d4602fbeeac7e7428310aef5f8267ce
+_md5_=2608cb60a1252300b1056058c5dfd868
diff --git a/metadata/md5-cache/dev-util/itstool-2.0.6-r1 b/metadata/md5-cache/dev-util/itstool-2.0.6-r1
index 6db6c6d802c9..2ca53dc87bd3 100644
--- a/metadata/md5-cache/dev-util/itstool-2.0.6-r1
+++ b/metadata/md5-cache/dev-util/itstool-2.0.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Translation tool for XML documents that uses gettext files and ITS r
 EAPI=7
 HOMEPAGE=http://itstool.org/
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/libxml2[python,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 )
 SLOT=0
 SRC_URI=http://files.itstool.org/itstool/itstool-2.0.6.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=14b09f9ef3665e26234843f9e1840121
+_md5_=9ea02e3dcd72381d92903116963bdf9a
diff --git a/metadata/md5-cache/dev-util/lldb-11.0.1_rc2 b/metadata/md5-cache/dev-util/lldb-11.0.1_rc2
new file mode 100644
index 000000000000..0c3a260ac88b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-11.0.1_rc2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_6? ( ~dev-python/lit-11.0.1_rc2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( ~dev-python/lit-11.0.1_rc2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( ~dev-python/lit-11.0.1_rc2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-11.0.1_rc2[python_targets_python3_9(-)] ) sys-devel/lld ) 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] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_9? ( dev-python/six[python_targets_python3_9(-)] ) 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] ) ) ~sys-devel/clang-11.0.1_rc2[xml] ~sys-devel/llvm-11.0.1_rc2 !<sys-devel/llvm-4.0 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM debugger
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=libedit lzma ncurses +python test test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+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_9? ( dev-python/six[python_targets_python3_9(-)] ) 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] ) ) ~sys-devel/clang-11.0.1_rc2[xml] ~sys-devel/llvm-11.0.1_rc2 !<sys-devel/llvm-4.0
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.1-rc2.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1260e6595ba9ffda0ada925e599c90fa
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.2-r1 b/metadata/md5-cache/dev-util/ninja-1.10.2-r1
new file mode 100644
index 000000000000..f7278a2d2ff0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ninja-1.10.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
+DEFINED_PHASES=compile install postinst postrm setup test
+DESCRIPTION=A small build system similar to make
+EAPI=7
+HOMEPAGE=https://ninja-build.org/
+IUSE=doc emacs test vim-syntax
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.2.tar.gz -> ninja-1.10.2.tar.gz
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	elisp-common	b9df8d576b8e3d10e3da1c292b027912	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1dd86e5d3b73b29fab5785d210cc6af8
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.1.243 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.1.243
index bca68d3bcbb1..04a4c7938de5 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.1.243
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.1.243
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-10.1.243 media-libs/freeglut examples? ( m
 RESTRICT=test
 SLOT=0/10.1.243
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run -> cuda_10.1.243_418.87.00_linux.run
-_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=34d6fa051f0ffad67cd887d3d3809629
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89
index 90254c4ac3e6..6cc5b65d47f0 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-10.2.89 media-libs/freeglut examples? ( me
 RESTRICT=test
 SLOT=0/10.2.89
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run
-_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6c7f1c85f8b244db12119e10a212614f
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19
index 0c9293b12671..40177b84f384 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-6.5.19 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_32.run )
-_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc7295952ea8ba925d85ff40cb406931
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18
index 5c6fb8b2b516..fa8379f01eed 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-7.5.18 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run
-_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=233b873990951382de1ad4c91f676b5a
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
index 22ec5abcdb74..fbbb6ff0719a 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-8.0.44 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run -> cuda_8.0.44_linux.run
-_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dd5ff1d1a3f46ecf7d2500f4957064ea
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61
index 003a97c9b1dc..1ba9a0cf54c8 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-8.0.61 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run -> cuda_8.0.61_375.26_linux.run
-_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=83ec1bd3dd5c1985da3918ce52fc0dc2
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176
index 0cb62da3eb2c..acda103928d0 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-9.0.176 media-libs/freeglut examples? ( me
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run -> cuda_9.0.176_384.81_linux.run
-_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cc9764c2a8eb75964c44f059cfa00ec2
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85
index 17e79e85a6f7..11377f5487a4 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-9.1.85 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.1/Prod2/local_installers/cuda_9.1.85_387.26_linux -> cuda_9.1.85_387.26_linux.run
-_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f36aad04c20ab126f5f630e8801499b9
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
index 663f3464a42c..9c1bab6d25a0 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
@@ -10,5 +10,5 @@ RDEPEND=~dev-util/nvidia-cuda-toolkit-9.2.88 media-libs/freeglut examples? ( med
 RESTRICT=test
 SLOT=0
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
-_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6ebf1ad155c983ccabb011b7cd850295
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130
index bd585f59fb2c..6eefc0541541 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-8[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugge
 RESTRICT=bindist mirror
 SLOT=0/10.0.130
 SRC_URI=https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux -> cuda_10.0.130_410.48_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=42b134436f05cd04acdcb6bd3bf9877e
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r3 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r3
index 2e07c8a3f3ee..2c935af26828 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r3
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r3
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-9[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugge
 RESTRICT=bindist mirror
 SLOT=0/10.1.105
 SRC_URI=https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.105_418.39_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9d7d1b29b83afa941d7389762c7a4f0f
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168-r2
index 39920da2460b..c8cbd20d93c3 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168-r2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168-r2
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-9[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugge
 RESTRICT=bindist mirror
 SLOT=0/10.1.168
 SRC_URI=https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.168_418.67_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b1781369a86a21d56c9e080844c1ad9
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.243-r3 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.243-r3
index 50e31705eb8b..4d9f7310c030 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.243-r3
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.243-r3
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-9[cxx] !prefix? ( >=x11-drivers/nvidia-drivers-418.87.00[
 RESTRICT=bindist mirror
 SLOT=0/10.1.243
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6bfbbe6e43c5cdf6ea3b3bb36b6b8b5c
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r2
index 89e00b1ffd02..0a5fad2b0f48 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r2
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-9[cxx] >=x11-drivers/nvidia-drivers-440.33.01[X,uvm] debu
 RESTRICT=bindist mirror
 SLOT=0/10.2.89
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2bf772f6794775f7e1264a3be9ea46c5
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.0.3 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.0.3
index 77bfcb9ea77f..a6117616478a 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.0.3
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.0.3
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-10[cxx] >=x11-drivers/nvidia-drivers-450.51.06[X,uvm] deb
 RESTRICT=bindist mirror
 SLOT=0/11.0.3
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_450.51.06_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f2fe15a9d7081f95fbc1706c25f0d057
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.0 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.0
index 6c9964699cbc..5b781243194a 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.0
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.0
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-455.23.05[X,uvm]
 RESTRICT=bindist mirror
 SLOT=0/11.1.0
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.1.0/local_installers/cuda_11.1.0_455.23.05_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6ffb310d399a15599771d24a0739d74a
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1
index dbdd713c559d..ae33248606f6 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-455.32.00[X,uvm]
 RESTRICT=bindist mirror
 SLOT=0/11.1.1
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda_11.1.1_455.32.00_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f0fbee07b1c94886686ac2349401f261
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
index 6974f10a97dc..7641ce83735e 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-4.9[cxx] debugger? ( sys-libs/libtermcap-compat sys-libs/
 RESTRICT=bindist mirror
 SLOT=0/6.5.14
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.14_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.14_linux_32.run )
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7dfad5180ccabedca16b4a134c4fae0
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
index 2529c466a905..078436219ac4 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-4.9[cxx] debugger? ( sys-libs/libtermcap-compat sys-libs/
 RESTRICT=bindist mirror
 SLOT=0/6.5.19
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_32.run )
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=40f654b1154d63be6cb4645aa204e621
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2
index a50ae3731c79..597b03e98fa6 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2
@@ -9,5 +9,5 @@ RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-5[cxx] >=x11-drivers/nvidia-driv
 RESTRICT=bindist mirror
 SLOT=0/7.5.18
 SRC_URI=http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cc4e4252747a1724825848ae4c7b0c2b
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44
index 95d16773121b..f2edb6fd06c6 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44
@@ -9,5 +9,5 @@ RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-6[cxx] >=x11-drivers/nvidia-driv
 RESTRICT=bindist mirror
 SLOT=0/8.0.44
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run -> cuda_8.0.44_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30728caafd0f84b23f24b7234df21715
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61
index 92d2d7b7a04a..3bf24719fa6f 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61
@@ -9,5 +9,5 @@ RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-6[cxx] >=x11-drivers/nvidia-driv
 RESTRICT=bindist mirror
 SLOT=0/8.0.61
 SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run -> cuda_8.0.61_375.26_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=97f404e14e40c9e16b7c24e0b73b92ae
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176
index 28ac45b13893..f5e2163f1d40 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176
@@ -9,5 +9,5 @@ RDEPEND=>=sys-devel/gcc-4.7[cxx] <sys-devel/gcc-7[cxx] >=x11-drivers/nvidia-driv
 RESTRICT=bindist mirror
 SLOT=0/9.0.176
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run -> cuda_9.0.176_384.81_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=70195d0099a5bc2521b2d6c11a9e813f
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85
index 78d674b0c383..ae5fdc5b36ce 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-7[cxx] >=x11-drivers/nvidia-drivers-387.26[X,uvm] debugge
 RESTRICT=bindist mirror
 SLOT=0/9.1.85
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux -> cuda_9.1.85_387.26_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9161726697fe84622fa1e4de966a89c2
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88
index 6ea63dc51b5b..d05ced88e784 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-8[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugge
 RESTRICT=bindist mirror
 SLOT=0/9.2.88
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cuda	ce959cd41714e176c96adce4f0e04d15	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e309cf23f78f657b23dc55ad1085fe9c
diff --git a/metadata/md5-cache/dev-util/objconv-2.51 b/metadata/md5-cache/dev-util/objconv-2.51
index 2d960a7a0542..3e23ba957f8c 100644
--- a/metadata/md5-cache/dev-util/objconv-2.51
+++ b/metadata/md5-cache/dev-util/objconv-2.51
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/objconv-2.51.zip
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=a2eb577746b28d63ea34ba0e055bb4e2
diff --git a/metadata/md5-cache/dev-util/perf-5.9.9 b/metadata/md5-cache/dev-util/perf-5.9.9
index 8486ddbdd927..d4f4ce84ffb5 100644
--- a/metadata/md5-cache/dev-util/perf-5.9.9
+++ b/metadata/md5-cache/dev-util/perf-5.9.9
@@ -5,11 +5,11 @@ DESCRIPTION=Userland tools for Linux Performance Counters
 EAPI=7
 HOMEPAGE=https://perf.wiki.kernel.org/
 IUSE=audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sys-devel/clang-10:* <sys-devel/llvm-10:* ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) libpfm? ( dev-libs/libpfm ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl:= ) 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(-)] ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) dev-libs/elfutils
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.9.9.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=59cf878d4bb5810b924d4b9e1acf2f61
+_md5_=6114d0574c29cf32af55aa2881527927
diff --git a/metadata/md5-cache/dev-util/shellcheck-0.7.1 b/metadata/md5-cache/dev-util/shellcheck-0.7.1
index 918f409066e0..6e74303e4543 100644
--- a/metadata/md5-cache/dev-util/shellcheck-0.7.1
+++ b/metadata/md5-cache/dev-util/shellcheck-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/diff-0.2.0:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/parsec-3.0:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?] dev-haskell/regex-tdfa:=[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 )
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/diff-0.2.0:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/parsec-3.0:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Shell script analysis tool
 EAPI=7
 HOMEPAGE=https://www.shellcheck.net/
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/diff-0.2.0:=[profile?] >=dev
 RESTRICT=!test? ( test )
 SLOT=0/0.7.1
 SRC_URI=https://hackage.haskell.org/package/ShellCheck-0.7.1/ShellCheck-0.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=24f61c0b63cacdf9644b8d9ebf0aae55
diff --git a/metadata/md5-cache/dev-util/shelltestrunner-1.9 b/metadata/md5-cache/dev-util/shelltestrunner-1.9
index 10c6f79b2107..06709f079db7 100644
--- a/metadata/md5-cache/dev-util/shelltestrunner-1.9
+++ b/metadata/md5-cache/dev-util/shelltestrunner-1.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cmdargs-0.7:= >=dev-haskell/diff-0.2.0:= >=dev-haskell/fil
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/shelltestrunner-1.9/shelltestrunner-1.9.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=973b4e28495f2a2f45ecd7b802a4236f
diff --git a/metadata/md5-cache/dev-util/shflags-1.2.3 b/metadata/md5-cache/dev-util/shflags-1.2.3
index e30f35c6ea78..bbe89bd71d4d 100644
--- a/metadata/md5-cache/dev-util/shflags-1.2.3
+++ b/metadata/md5-cache/dev-util/shflags-1.2.3
@@ -3,8 +3,8 @@ DESCRIPTION=Command-line flags module for Unix shell scripts
 EAPI=7
 HOMEPAGE=https://github.com/kward/shflags
 IUSE=examples
-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
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/kward/shflags/archive/v1.2.3.tar.gz -> shflags-1.2.3.tgz
-_md5_=9b574bcd9e011a96b3f6a26ffb7c2fc2
+_md5_=5a7f99cf2e14cdc5b23849b53f8de303
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index e374fbacd0a5..621eb1a74d79 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.5 b/metadata/md5-cache/dev-vcs/darcs-2.14.5
deleted file mode 100644
index ff0b620d97b8..000000000000
--- a/metadata/md5-cache/dev-vcs/darcs-2.14.5
+++ /dev/null
@@ -1,14 +0,0 @@
-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.5
-SRC_URI=https://hackage.haskell.org/package/darcs-2.14.5/darcs-2.14.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=00b19b45687856a282f3024cbda12394
diff --git a/metadata/md5-cache/dev-vcs/darcs-2.16.3 b/metadata/md5-cache/dev-vcs/darcs-2.16.3
index af6a7d523f55..521472890bc9 100644
--- a/metadata/md5-cache/dev-vcs/darcs-2.16.3
+++ b/metadata/md5-cache/dev-vcs/darcs-2.16.3
@@ -1,5 +1,5 @@
 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.1.7:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?] >=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/constraints-0.11:=[profile?] <dev-haskell/constraints-0.13:=[profile?] >=dev-haskell/cryptonite-0.24:=[profile?] <dev-haskell/cryptonite-0.28:=[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/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-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.12.1:=[profile?] <dev-haskell/http-types-0.12.4:=[profile?] >=dev-haskell/memory-0.14:=[profile?] <dev-haskell/memory-0.16:=[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.8:=[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/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/stm-2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/temporary-1.2.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.5:=[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.2.1:= curl? ( net-misc/curl ) terminfo? ( >=dev-haskell/terminfo-0.4.0.2:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] ) >=dev-haskell/cabal-2.2 <dev-haskell/cabal-3.3 test? ( >=dev-haskell/cmdargs-0.10.10 <dev-haskell/cmdargs-0.11 >=dev-haskell/exceptions-0.6 >=dev-haskell/findbin-0.0.5 <dev-haskell/findbin-0.1 >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.7 >=dev-haskell/leancheck-0.9 <dev-haskell/leancheck-0.10 >=dev-haskell/monad-control-0.3.2 <dev-haskell/monad-control-1.1 >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14 <dev-haskell/system-fileio-0.4 >=dev-haskell/system-filepath-0.4.7 <dev-haskell/system-filepath-0.5 >=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-leancheck-0.0.1 <dev-haskell/test-framework-leancheck-0.1 >=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4 dev-haskell/transformers-base ) curl? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+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.1.7:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?] >=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/constraints-0.11:=[profile?] <dev-haskell/constraints-0.13:=[profile?] >=dev-haskell/cryptonite-0.24:=[profile?] <dev-haskell/cryptonite-0.28:=[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/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-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.12.1:=[profile?] <dev-haskell/http-types-0.12.4:=[profile?] >=dev-haskell/memory-0.14:=[profile?] <dev-haskell/memory-0.16:=[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.8:=[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/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/stm-2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/temporary-1.2.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.5:=[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.2.1:= curl? ( net-misc/curl ) terminfo? ( >=dev-haskell/terminfo-0.4.0.2:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] ) >=dev-haskell/cabal-2.2 <dev-haskell/cabal-3.3 test? ( >=dev-haskell/cmdargs-0.10.10 <dev-haskell/cmdargs-0.11 >=dev-haskell/exceptions-0.6 >=dev-haskell/findbin-0.0.5 <dev-haskell/findbin-0.1 >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.7 >=dev-haskell/leancheck-0.9 <dev-haskell/leancheck-0.10 >=dev-haskell/monad-control-0.3.2 <dev-haskell/monad-control-1.1 >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14 <dev-haskell/system-fileio-0.4 >=dev-haskell/system-filepath-0.4.7 <dev-haskell/system-filepath-0.5 >=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-leancheck-0.0.1 <dev-haskell/test-framework-leancheck-0.1 >=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4 dev-haskell/transformers-base ) curl? ( virtual/pkgconfig ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=a distributed, interactive, smart revision control system
 EAPI=7
 HOMEPAGE=http://darcs.net/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
 RESTRICT=test
 SLOT=0/2.16.3
 SRC_URI=https://hackage.haskell.org/package/darcs-2.16.3/darcs-2.16.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bd45a6c7dd2434493c8cdc6ea4158ca4
diff --git a/metadata/md5-cache/dev-vcs/git-2.30.0_rc0 b/metadata/md5-cache/dev-vcs/git-2.30.0_rc1
similarity index 94%
rename from metadata/md5-cache/dev-vcs/git-2.30.0_rc0
rename to metadata/md5-cache/dev-vcs/git-2.30.0_rc1
index d84b2f4d052d..4252412c1d90 100644
--- a/metadata/md5-cache/dev-vcs/git-2.30.0_rc0
+++ b/metadata/md5-cache/dev-vcs/git-2.30.0_rc1
@@ -10,6 +10,6 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/scm/git/testing/git-2.30.0.rc0.tar.xz https://www.kernel.org/pub/software/scm/git/testing/git-manpages-2.30.0.rc0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/testing/git-htmldocs-2.30.0.rc0.tar.xz )
+SRC_URI=https://www.kernel.org/pub/software/scm/git/testing/git-2.30.0.rc1.tar.xz https://www.kernel.org/pub/software/scm/git/testing/git-manpages-2.30.0.rc1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/testing/git-htmldocs-2.30.0.rc1.tar.xz )
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	elisp-common	b9df8d576b8e3d10e3da1c292b027912	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=728b2a59daa1dccab017c63af21c0800
diff --git a/metadata/md5-cache/dev-vcs/git-annex-8.20200810 b/metadata/md5-cache/dev-vcs/git-annex-8.20200810
index bdc4e8837b42..9186b479c06b 100644
--- a/metadata/md5-cache/dev-vcs/git-annex-8.20200810
+++ b/metadata/md5-cache/dev-vcs/git-annex-8.20200810
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/aeson:= dev-haskell/async:= dev-haskell/attoparsec:= >=dev-h
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/git-annex-8.20200810/git-annex-8.20200810.tar.gz
-_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e6919339abd5347a4dfa2fe70f3d2ac8
diff --git a/metadata/md5-cache/dev-vcs/git-cola-3.5-r1 b/metadata/md5-cache/dev-vcs/git-cola-3.5-r1
index 4ecbb9361d62..7502b7f5f158 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-3.5-r1
+++ b/metadata/md5-cache/dev-vcs/git-cola-3.5-r1
@@ -1,15 +1,15 @@
-BDEPEND=sys-devel/gettext python_single_target_python3_6? ( doc? ( dev-python/sphinx[python_targets_python3_6(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost dev-python/mock[python_targets_python3_6(-)] dev-python/nose[python_targets_python3_6(-)] ) ) python_single_target_python3_8? ( doc? ( dev-python/sphinx[python_targets_python3_8(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost dev-python/mock[python_targets_python3_8(-)] dev-python/nose[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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=sys-devel/gettext python_single_target_python3_6? ( doc? ( dev-python/sphinx[python_targets_python3_6(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost dev-python/mock[python_targets_python3_6(-)] dev-python/nose[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( doc? ( dev-python/sphinx[python_targets_python3_7(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost dev-python/mock[python_targets_python3_7(-)] dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( doc? ( dev-python/sphinx[python_targets_python3_8(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost dev-python/mock[python_targets_python3_8(-)] dev-python/nose[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] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DESCRIPTION=The highly caffeinated git GUI
 EAPI=7
 HOMEPAGE=https://git-cola.github.io/
-IUSE=doc test python_single_target_python3_6 python_single_target_python3_8 test
+IUSE=doc test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/PyQt5[network,python_targets_python3_6(-)] dev-python/QtPy[gui,python_targets_python3_6(-)] dev-python/send2trash[python_targets_python3_6(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[network,python_targets_python3_8(-)] dev-python/QtPy[gui,python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] ) dev-vcs/git python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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_8 )
+RDEPEND=python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/PyQt5[network,python_targets_python3_6(-)] dev-python/QtPy[gui,python_targets_python3_6(-)] dev-python/send2trash[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/PyQt5[network,python_targets_python3_7(-)] dev-python/QtPy[gui,python_targets_python3_7(-)] dev-python/send2trash[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[network,python_targets_python3_8(-)] dev-python/QtPy[gui,python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] ) dev-vcs/git 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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v3.5.tar.gz -> git-cola-3.5.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6ce4d562e21719c4d280decd157107d
+_md5_=d45a4c91d2853a256c1dfaa3a2bca567
diff --git a/metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1
index 1a7706afc2ee..e88acf54ed20 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://milki.github.com/gitolite/gitolite-2.3.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a26731990e7bfe74f203d1f42fa16efc
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
index 8d747222c172..c00d6fc43e9d 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-2.3.1.tar.bz2
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2fca5436d7f89f421f35edbebbeb5adf
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index b9c15a90a373..0ec663f6aedd 100644
Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ
diff --git a/metadata/md5-cache/games-action/apotheon-1.26v b/metadata/md5-cache/games-action/apotheon-1.26v
index df14657da951..4ea9bdffb439 100644
--- a/metadata/md5-cache/games-action/apotheon-1.26v
+++ b/metadata/md5-cache/games-action/apotheon-1.26v
@@ -8,5 +8,5 @@ RDEPEND=dev-lang/mono media-libs/libsdl2[joystick,opengl,threads,video] media-li
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=apotheon-12302015-bin
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7e716b73ba01a1b8cbe92a63422431a
diff --git a/metadata/md5-cache/games-action/beathazardultra-20130308-r2 b/metadata/md5-cache/games-action/beathazardultra-20130308-r2
index 28b95bf3225c..8ef172790b36 100644
--- a/metadata/md5-cache/games-action/beathazardultra-20130308-r2
+++ b/metadata/md5-cache/games-action/beathazardultra-20130308-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl amd64? ( !bundled-libs? ( >=media-libs/libpng-compat-1.2.
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=beathazard-installer_03-08-13
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=da58e3761f7f5f0cf19c1abad29ee7b3
diff --git a/metadata/md5-cache/games-action/brutal-legend-20130615-r2 b/metadata/md5-cache/games-action/brutal-legend-20130615-r2
index 604acc463d0e..64bde8ebff19 100644
--- a/metadata/md5-cache/games-action/brutal-legend-20130615-r2
+++ b/metadata/md5-cache/games-action/brutal-legend-20130615-r2
@@ -9,5 +9,5 @@ RDEPEND=amd64? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[ab
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=BrutalLegend-Linux-2013-06-15-setup.bin
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f66cd8c0b5e0873f5522e473af871f1
diff --git a/metadata/md5-cache/games-action/descent1-demodata-1.4-r1 b/metadata/md5-cache/games-action/descent1-demodata-1.4-r1
index 34cce72a1ec8..3c6e1fb958bd 100644
--- a/metadata/md5-cache/games-action/descent1-demodata-1.4-r1
+++ b/metadata/md5-cache/games-action/descent1-demodata-1.4-r1
@@ -8,5 +8,5 @@ LICENSE=free-noncomm
 RDEPEND=!games-action/descent1-data
 SLOT=0
 SRC_URI=http://icculus.org/d2x/data/desc14sw.exe ftp://ftp.funet.fi/pub/msdos/games/interplay/desc14sw.exe
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=f76ac61ea0003a61ae4a3bc4dfb9f1d8
diff --git a/metadata/md5-cache/games-action/descent3-1.4.0b-r2 b/metadata/md5-cache/games-action/descent3-1.4.0b-r2
index 498128778e89..5edf9bb59fc3 100644
--- a/metadata/md5-cache/games-action/descent3-1.4.0b-r2
+++ b/metadata/md5-cache/games-action/descent3-1.4.0b-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc media-libs/libsdl[abi_x86_32(-)] media-libs/smpeg[abi_x86
 RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/descent3/descent3-1.4.0a-x86.run mirror://lokigames/descent3/descent3-1.4.0b-x86.run
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1a3f882e02e0c3d4a31f0345c1c2bd61
diff --git a/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1 b/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
index 4a1c8a0b2848..d329f3bedd77 100644
--- a/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
+++ b/metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( alsa pulseaudio )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=mirror://lokigames/loki_demos/descent3-demo.run
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=58131cf0997822fa065e4972f63a49f4
diff --git a/metadata/md5-cache/games-action/guacamelee-20140222 b/metadata/md5-cache/games-action/guacamelee-20140222
index 9ccd01a08dae..a8923edfa234 100644
--- a/metadata/md5-cache/games-action/guacamelee-20140222
+++ b/metadata/md5-cache/games-action/guacamelee-20140222
@@ -8,5 +8,5 @@ RDEPEND=media-libs/libsdl2[abi_x86_32,joystick,opengl,sound,threads,video] virtu
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=Guacamelee_linux_1393037377.sh
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9aa7c1257c7c14a1073935eeb35dfcc
diff --git a/metadata/md5-cache/games-action/heretic2-1.06c-r1 b/metadata/md5-cache/games-action/heretic2-1.06c-r1
index 5b2eafd7bf66..79148af700bf 100644
--- a/metadata/md5-cache/games-action/heretic2-1.06c-r1
+++ b/metadata/md5-cache/games-action/heretic2-1.06c-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl amd64? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-lib
 RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/heretic2/heretic2-1.06b-unified-x86.run mirror://lokigames/heretic2/heretic2-1.06c-unified-x86.run mirror://lokigames/heretic2/heretic2-maps-1.0.run
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f1f8ec0176672c97b287cfedf4baf03f
diff --git a/metadata/md5-cache/games-action/heretic2-demo-1.06a b/metadata/md5-cache/games-action/heretic2-demo-1.06a
index d253049c8c87..23bc484e20ab 100644
--- a/metadata/md5-cache/games-action/heretic2-demo-1.06a
+++ b/metadata/md5-cache/games-action/heretic2-demo-1.06a
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] games-mis
 RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/loki_demos/heretic2-demo.run
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a81997323ddb2da815f17ddba67c93b1
diff --git a/metadata/md5-cache/games-action/rive-1.15 b/metadata/md5-cache/games-action/rive-1.15
index a65b95dc4dcd..0d8633d5aa41 100644
--- a/metadata/md5-cache/games-action/rive-1.15
+++ b/metadata/md5-cache/games-action/rive-1.15
@@ -9,5 +9,5 @@ RDEPEND=media-libs/libsdl2[opengl,video] media-libs/openal
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=RIVE-Linux-2017-02-28.sh
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d00b49e4a46251970207cf6340eb808
diff --git a/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1 b/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1
index 9d50069594c2..f50f5426d095 100644
--- a/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1
+++ b/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1
@@ -9,5 +9,5 @@ RDEPEND=>=sys-libs/glibc-2.4 >=sys-devel/gcc-4.3.0 !amd64? ( gnome-base/libglade
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=shadowgroundsUpdate1.run
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d14977c0a1f03388129186d3c494c0e7
diff --git a/metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1 b/metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1
index 44b3ed93672d..dc2712df7500 100644
--- a/metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1
+++ b/metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1
@@ -9,5 +9,5 @@ RDEPEND=>=sys-libs/glibc-2.4 >=sys-devel/gcc-4.3.0 !amd64? ( gnome-base/libglade
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=survivorUpdate1.run
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=301ea84d794019a8b67ddf2d7842ac12
diff --git a/metadata/md5-cache/games-action/super-hexagon-20160217 b/metadata/md5-cache/games-action/super-hexagon-20160217
index f6d6f58248fb..348b0ee4c791 100644
--- a/metadata/md5-cache/games-action/super-hexagon-20160217
+++ b/metadata/md5-cache/games-action/super-hexagon-20160217
@@ -9,5 +9,5 @@ RDEPEND=media-libs/glew:1.6 media-libs/libsdl2[opengl,sound,video] media-libs/li
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=superhexagon-02172016-bin
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d840f70659ed17da18ff73178fc9b9d
diff --git a/metadata/md5-cache/games-action/trine-1.08-r3 b/metadata/md5-cache/games-action/trine-1.08-r3
index 22436f448a26..1e1e1d3ebf87 100644
--- a/metadata/md5-cache/games-action/trine-1.08-r3
+++ b/metadata/md5-cache/games-action/trine-1.08-r3
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/nvidia-cg-toolkit >=media-libs/libsdl-1.2[opengl,video] >=medi
 RESTRICT=bindist fetch strip
 SLOT=0
 SRC_URI=TrineUpdate4.64.run
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f9e04e0f615f5ae156d2f44510e2a69
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 3371a78ac874..e66d224e6ba6 100644
Binary files a/metadata/md5-cache/games-arcade/Manifest.gz and b/metadata/md5-cache/games-arcade/Manifest.gz differ
diff --git a/metadata/md5-cache/games-arcade/aquaria-1.1.3-r1 b/metadata/md5-cache/games-arcade/aquaria-1.1.3-r1
index 708b7413d38e..168a9443018e 100644
--- a/metadata/md5-cache/games-arcade/aquaria-1.1.3-r1
+++ b/metadata/md5-cache/games-arcade/aquaria-1.1.3-r1
@@ -9,5 +9,5 @@ RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] >=media-libs/openal-1.15.1[
 RESTRICT=strip fetch bindist
 SLOT=0
 SRC_URI=aquaria-lnx-humble-bundle.mojo.run
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cb5af0371671120fe9957f6929ca1b7d
diff --git a/metadata/md5-cache/games-arcade/gunocide2ex-1.0 b/metadata/md5-cache/games-arcade/gunocide2ex-1.0
index e0bd1d59faed..004c84d49f60 100644
--- a/metadata/md5-cache/games-arcade/gunocide2ex-1.0
+++ b/metadata/md5-cache/games-arcade/gunocide2ex-1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/g2ex/g2ex-setup.run
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d9ae98fc4f3d1bc6b68583ff84931772
diff --git a/metadata/md5-cache/games-arcade/shovel-knight-3.3 b/metadata/md5-cache/games-arcade/shovel-knight-3.3
index 3b53b7bfe894..961efc9b5426 100644
--- a/metadata/md5-cache/games-arcade/shovel-knight-3.3
+++ b/metadata/md5-cache/games-arcade/shovel-knight-3.3
@@ -8,5 +8,5 @@ RDEPEND=media-libs/glew:1.10 media-libs/libsdl2[opengl,sound,video] virtual/open
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=shovel_knight_treasure_trove_en_3_3_15418.sh
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19178f1f7f459eaf31f2aed1068c25a8
diff --git a/metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3 b/metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3
index 1ac59453a028..9c2b1602a8b9 100644
--- a/metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3
+++ b/metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3
@@ -8,5 +8,5 @@ RDEPEND=media-libs/libsdl[video,joystick,abi_x86_32(-)] media-libs/libogg[abi_x8
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ggdev-1.homelan.com/thinktanks/ThinkTanksDemo_v1.1.sh.bin
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=72494249f263f835f73c50334e10ecf7
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index a5f446645426..b82a22a141f4 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-board/goatee-gtk-0.3.1.1 b/metadata/md5-cache/games-board/goatee-gtk-0.3.1.1
index fda9944eeb03..29e73f850be7 100644
--- a/metadata/md5-cache/games-board/goatee-gtk-0.3.1.1
+++ b/metadata/md5-cache/games-board/goatee-gtk-0.3.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-games/goatee-0.3:=[profile?] <dev-games/goatee-0.4:=[profile?] >=dev-haskell/cairo-0.13:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13:=[profile?] <dev-haskell/glib-0.14:=[profile?] >=dev-haskell/gtk-0.13:=[profile?] <dev-haskell/gtk-0.15:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-games/goatee-0.3:=[profile?] <dev-games/goatee-0.4:=[profile?] >=dev-haskell/cairo-0.13:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13:=[profile?] <dev-haskell/glib-0.14:=[profile?] >=dev-haskell/gtk-0.13:=[profile?] <dev-haskell/gtk-0.15:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A monadic take on a 2,500-year-old board game - GTK+ UI
 EAPI=6
 HOMEPAGE=http://khumba.net/projects/goatee
@@ -10,5 +10,5 @@ RDEPEND=>=dev-games/goatee-0.3:=[profile?] <dev-games/goatee-0.4:=[profile?] >=d
 RESTRICT=!test? ( test )
 SLOT=0/0.3.1.1
 SRC_URI=https://hackage.haskell.org/package/goatee-gtk-0.3.1.1/goatee-gtk-0.3.1.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=791086f01f6678b344cf1768218a0e6f
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index c6a2c0c60b6d..7abf44ba3393 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/dolphin-9999 b/metadata/md5-cache/games-emulation/dolphin-9999
index 213821524ff2..ea5287316d42 100644
--- a/metadata/md5-cache/games-emulation/dolphin-9999
+++ b/metadata/md5-cache/games-emulation/dolphin-9999
@@ -1,13 +1,13 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/hidapi:0= dev-libs/libfmt:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc )
+DEPEND=dev-libs/hidapi:0= >=dev-libs/libfmt-7.1:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc )
 DESCRIPTION=Gamecube and Wii game emulator
 EAPI=7
 HOMEPAGE=https://www.dolphin-emu.org/
 IUSE=alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile pulseaudio +qt5 systemd upnp vulkan
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/hidapi:0= dev-libs/libfmt:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) media-libs/vulkan-loader
+RDEPEND=dev-libs/hidapi:0= >=dev-libs/libfmt-7.1:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) media-libs/vulkan-loader
 SLOT=0
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=962c89e9a5d54c4296b5555fcae45045
+_md5_=4202ae71ad21b4ba0c8155831276c3de
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index aa51ed93d1f0..28d18c2448d4 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/stratagus-3.0.0-r1 b/metadata/md5-cache/games-engines/stratagus-3.0.0-r1
new file mode 100644
index 000000000000..58d0d069e080
--- /dev/null
+++ b/metadata/md5-cache/games-engines/stratagus-3.0.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-db/sqlite:3 >=dev-lang/lua-5:0 dev-lua/toluapp media-libs/libpng:0 x11-libs/libX11 media-libs/libsdl2[sound,opengl,video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-image[png] sys-libs/zlib bzip2? ( app-arch/bzip2 ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) )
+DESCRIPTION=A realtime strategy game engine
+EAPI=7
+HOMEPAGE=https://wargus.github.io/stratagus.html https://github.com/Wargus/stratagus
+IUSE=bzip2 debug doc mng theora vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite:3 >=dev-lang/lua-5:0 dev-lua/toluapp media-libs/libpng:0 x11-libs/libX11 media-libs/libsdl2[sound,opengl,video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-image[png] sys-libs/zlib bzip2? ( app-arch/bzip2 ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) )
+REQUIRED_USE=theora? ( vorbis )
+SLOT=0/3
+SRC_URI=https://github.com/Wargus/stratagus/archive/v3.0.0.tar.gz -> stratagus-3.0.0.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f7531c979564d2d6a84fa4fb2dbc7202
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 3df8dcb2d33f..5b2eb096ea3e 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/darkplaces-20140513-r1 b/metadata/md5-cache/games-fps/darkplaces-20140513-r1
index 62bc4043dccf..a6303e0bc1a9 100644
--- a/metadata/md5-cache/games-fps/darkplaces-20140513-r1
+++ b/metadata/md5-cache/games-fps/darkplaces-20140513-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl cdinstall? ( games-fps/quake1-data ) demo? ( games-fps/quake1-demodata ) textures? ( >=games-fps/quake1-textures-20050820 ) opengl? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) !opengl? ( sdl? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !opengl? ( !sdl? ( !dedicated? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) )
 SLOT=0
 SRC_URI=http://icculus.org/twilight/darkplaces/files/darkplacesengine20140513.zip lights? ( http://www.fuhquake.net/files/extras/fuhquake-lits.rar http://www.kgbsyndicate.com/romi/id1.pk3 )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4abef158208be99ef6fe60c6411e1b6a
diff --git a/metadata/md5-cache/games-fps/duke3d-data-1.0-r4 b/metadata/md5-cache/games-fps/duke3d-data-1.0-r4
index c69e90f1df44..86c522cb0843 100644
--- a/metadata/md5-cache/games-fps/duke3d-data-1.0-r4
+++ b/metadata/md5-cache/games-fps/duke3d-data-1.0-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( cdinstall gog )
 RESTRICT=mirror bindist gog? ( fetch )
 SLOT=0
 SRC_URI=gog? ( gog_duke_nukem_3d_atomic_edition_2.0.0.9.sh )
-_eclasses_=cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=087755c73a7e4b753d7fd912a41dc9a7
diff --git a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2 b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2
index 6ec5f404f520..b74c4c1f8df0 100644
--- a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2
+++ b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2
@@ -9,5 +9,5 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] virtual/jpeg-compat:62[abi_x86_3
 RESTRICT=bindist strip mirror
 SLOT=0
 SRC_URI=mirror://idsoftware/etqw/ETQW-demo2-client-full.r1.x86.run
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fcf0e051b9e00b4ca8053eb7f8a2ccfa
diff --git a/metadata/md5-cache/games-fps/legends-0.4.1.43-r2 b/metadata/md5-cache/games-fps/legends-0.4.1.43-r2
index 799dd96633b5..e85e25c59797 100644
--- a/metadata/md5-cache/games-fps/legends-0.4.1.43-r2
+++ b/metadata/md5-cache/games-fps/legends-0.4.1.43-r2
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) media-fonts/font-adob
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://legendsthegame.net/files/legends_linux-0.4.1.43.run mirror://gentoo/legends.png
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a318570afbbb73e07389dc050ef59aa5
diff --git a/metadata/md5-cache/games-fps/quake2-data-3.20 b/metadata/md5-cache/games-fps/quake2-data-3.20
index 58b8987397cc..04b2ae107f52 100644
--- a/metadata/md5-cache/games-fps/quake2-data-3.20
+++ b/metadata/md5-cache/games-fps/quake2-data-3.20
@@ -10,5 +10,5 @@ PROPERTIES=interactive
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/quake2/q2-3.20-x86-full-ctf.exe
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=53b9e5586f5a64a9a83ee6a9eead30f3
diff --git a/metadata/md5-cache/games-fps/quake2-demodata-3.14 b/metadata/md5-cache/games-fps/quake2-demodata-3.14
index 41d70ef7d374..6b2ad762ea82 100644
--- a/metadata/md5-cache/games-fps/quake2-demodata-3.14
+++ b/metadata/md5-cache/games-fps/quake2-demodata-3.14
@@ -9,5 +9,5 @@ LICENSE=quake2-demodata
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/quake2/q2-314-demo-x86.exe
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bdd64c6ec20dbd537a8a6d13208a6059
diff --git a/metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1 b/metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1
index 4c31e7526e2c..9acc7748c265 100644
--- a/metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1
+++ b/metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libogg-1.3.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[X
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=http://icculus.org/betas/ssam/ssamtse-beta1.sh.bin
-_eclasses_=cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6303c8de4a77930da1fd46a62db89487
diff --git a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1 b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
index 80b6e00ae2cd..2b35759b457b 100644
--- a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
+++ b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x8
 RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/sof/sof-1.06a-cdrom-x86.run
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	check-reqs	38804be59703af0fbf462b3710024074	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	check-reqs	38804be59703af0fbf462b3710024074	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=56b641b177d29569c14d33e869d3081d
diff --git a/metadata/md5-cache/games-fps/tribes2-25034 b/metadata/md5-cache/games-fps/tribes2-25034
index 838e70a9588e..925c27b89071 100644
--- a/metadata/md5-cache/games-fps/tribes2-25034
+++ b/metadata/md5-cache/games-fps/tribes2-25034
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc games-util/loki_patch virtual/opengl games-misc/games-env
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/tribes2/release/tribes2-25034-cdrom-x86.run
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b4355aac59e82c87bb1895b4c16a4ede
diff --git a/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1 b/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1
index b8bb0a9cff60..a352442a3918 100644
--- a/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1
+++ b/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1
@@ -9,5 +9,5 @@ RDEPEND=games-fps/ut2003 games-misc/games-envd
 RESTRICT=bindist mirror strip
 SLOT=1
 SRC_URI=https://downloads.unrealadmin.org/UT2003/BonusPack/cbp2003.zip
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d6cb24473e3f257048f9e906b2ef7202
diff --git a/metadata/md5-cache/games-fps/ut2003-data-2107 b/metadata/md5-cache/games-fps/ut2003-data-2107
index 3e325b5e8a7e..77b70c82ba79 100644
--- a/metadata/md5-cache/games-fps/ut2003-data-2107
+++ b/metadata/md5-cache/games-fps/ut2003-data-2107
@@ -10,5 +10,5 @@ RDEPEND=games-misc/games-envd
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~chewi/distfiles/UT2003CrashFix.zip
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7ffb52ceb42da34ea7db02fcca3ea630
diff --git a/metadata/md5-cache/games-fps/ut2003-demo-2206-r4 b/metadata/md5-cache/games-fps/ut2003-demo-2206-r4
index 400d1b6dedb7..353c8e6c4e53 100644
--- a/metadata/md5-cache/games-fps/ut2003-demo-2206-r4
+++ b/metadata/md5-cache/games-fps/ut2003-demo-2206-r4
@@ -9,5 +9,5 @@ RDEPEND=sys-devel/bc sys-libs/libstdc++-v3:5 virtual/opengl[abi_x86_32(-)] x11-l
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://unreal.epicgames.com/linux/ut2003/ut2003demo-lnx-2206.sh.bin http://download.factoryunreal.com/mirror/UT2003CrashFix.zip https://dev.gentoo.org/~wolf31o2/sources/ut2003-demo/ut2003-demo-misc.tar.bz2
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2fc3dffe4a9511aa488c532cee43f050
diff --git a/metadata/md5-cache/games-fps/ut2004-data-3186-r5 b/metadata/md5-cache/games-fps/ut2004-data-3186-r5
index 413c92c9e43a..098de6c85e6c 100644
--- a/metadata/md5-cache/games-fps/ut2004-data-3186-r5
+++ b/metadata/md5-cache/games-fps/ut2004-data-3186-r5
@@ -9,5 +9,5 @@ PDEPEND=>=games-fps/ut2004-3369.3-r2
 PROPERTIES=interactive
 RDEPEND=!games-fps/ut2004-ded
 SLOT=0
-_eclasses_=cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc48eee771dd34ddfb985e00ac12cfdb
diff --git a/metadata/md5-cache/games-fps/ut2004-demo-3334-r1 b/metadata/md5-cache/games-fps/ut2004-demo-3334-r1
index dfea961a44f7..69887da3d555 100644
--- a/metadata/md5-cache/games-fps/ut2004-demo-3334-r1
+++ b/metadata/md5-cache/games-fps/ut2004-demo-3334-r1
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/libstdc++-v3:5 x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/ut2004-lnx-demo3334.run
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2810f7beb3da30489b6d55275eb22c6a
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 44e1df7567f0..1d458f3bddaa 100644
Binary files a/metadata/md5-cache/games-misc/Manifest.gz and b/metadata/md5-cache/games-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/games-misc/little-inferno-20130509 b/metadata/md5-cache/games-misc/little-inferno-20130509
index ae9d74d1ae80..b2b813032b4c 100644
--- a/metadata/md5-cache/games-misc/little-inferno-20130509
+++ b/metadata/md5-cache/games-misc/little-inferno-20130509
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/curl-7.37.0-r1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)]
 RESTRICT=bindist fetch bundled-libs? ( splitdebug )
 SLOT=0
 SRC_URI=LittleInferno-20130509.sh
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8c20f1ad3f3b1e373e303234fe70229
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 1dda2d66b560..f01b93a7a042 100644
Binary files a/metadata/md5-cache/games-puzzle/Manifest.gz and b/metadata/md5-cache/games-puzzle/Manifest.gz differ
diff --git a/metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337 b/metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337
index f022ab70b600..811ac9f573fc 100644
--- a/metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337
+++ b/metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337
@@ -11,5 +11,5 @@ RDEPEND=!bundled-libs? ( media-libs/libsdl2[opengl,sound,video] media-libs/sdl2-
 RESTRICT=bindist fetch strip bundled-libs? ( splitdebug )
 SLOT=0
 SRC_URI=world_of_goo_1_51_29337.sh
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a4065a0a6d54500f18fc43389c1c42a
diff --git a/metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53 b/metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53
index 555a71163b53..90bd7424d4ed 100644
--- a/metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53
+++ b/metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53
@@ -11,5 +11,5 @@ RDEPEND=!bundled-libs? ( media-libs/libsdl2[opengl,sound,video] media-libs/sdl2-
 RESTRICT=bindist fetch strip bundled-libs? ( splitdebug )
 SLOT=0
 SRC_URI=WorldOfGoo.Linux.1.53.sh
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=310a5868b74d3bda3beb0f7bd1055998
diff --git a/metadata/md5-cache/games-roguelike/FTL-gog-1.6.9.25330 b/metadata/md5-cache/games-roguelike/FTL-gog-1.6.9.25330
index e67d07252936..53c86bce0e17 100644
--- a/metadata/md5-cache/games-roguelike/FTL-gog-1.6.9.25330
+++ b/metadata/md5-cache/games-roguelike/FTL-gog-1.6.9.25330
@@ -9,5 +9,5 @@ RDEPEND=media-libs/freetype media-libs/libsdl[X,sound,opengl,video] media-libs/l
 RESTRICT=bindist fetch mirror strip test
 SLOT=0
 SRC_URI=ftl_advanced_edition_1_6_9_25330.sh
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=288e7affa6daea9bca95e7e6b3dbf1d3
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index e5d1b1f3220d..f572d9858933 100644
Binary files a/metadata/md5-cache/games-roguelike/Manifest.gz and b/metadata/md5-cache/games-roguelike/Manifest.gz differ
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 99399f8c4efe..45a6abc7787d 100644
Binary files a/metadata/md5-cache/games-rpg/Manifest.gz and b/metadata/md5-cache/games-rpg/Manifest.gz differ
diff --git a/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904 b/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
index 58c489260b1e..910de7b8ffbc 100644
--- a/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
+++ b/metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
@@ -9,5 +9,5 @@ RDEPEND=media-libs/libsdl[opengl,video] media-libs/openal
 RESTRICT=fetch bindist
 SLOT=0
 SRC_URI=avadon-linux-1331768904-bin.txt
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44169fc12698c64934c3591e9094a3a3
diff --git a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1 b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
index a4d4afca97e3..aa555001f210 100644
--- a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
+++ b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/expat[abi_x86_32(-)] dev-libs/json-c[abi_x86_32(-)] dev-libs/op
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65500b856f2345f63f8f4cd12ae4ec10
diff --git a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121 b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
index e7ca8746757b..f89979d71ee4 100644
--- a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
+++ b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/expat dev-libs/openssl:0 media-libs/openal virtual/opengl x11-l
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=baldur_s_gate_enhanced_edition_en_2_5_23121.sh
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=598afa2d1f029fe5e055724027221692
diff --git a/metadata/md5-cache/games-rpg/bastion-20161016 b/metadata/md5-cache/games-rpg/bastion-20161016
index 9051d7be6502..86a09959190b 100644
--- a/metadata/md5-cache/games-rpg/bastion-20161016
+++ b/metadata/md5-cache/games-rpg/bastion-20161016
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl2[joystick,opengl,sound,video] media-libs/libvorbis
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=bastion-10162016-bin
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=45c5f4e991d35a0e9b5b285f891fd106
diff --git a/metadata/md5-cache/games-rpg/costume-quest-2.0.0.3 b/metadata/md5-cache/games-rpg/costume-quest-2.0.0.3
index 2dfeeb6b48e1..a9914e2e409e 100644
--- a/metadata/md5-cache/games-rpg/costume-quest-2.0.0.3
+++ b/metadata/md5-cache/games-rpg/costume-quest-2.0.0.3
@@ -8,5 +8,5 @@ RDEPEND=media-libs/glu[abi_x86_32] media-libs/libsdl2[abi_x86_32,joystick,opengl
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=gog_costume_quest_2.0.0.3.sh
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=535ae2482ba31f769cad27e1993b700b
diff --git a/metadata/md5-cache/games-rpg/dear-esther-20130608 b/metadata/md5-cache/games-rpg/dear-esther-20130608
index e5288fe55509..11dcf85586ce 100644
--- a/metadata/md5-cache/games-rpg/dear-esther-20130608
+++ b/metadata/md5-cache/games-rpg/dear-esther-20130608
@@ -9,5 +9,5 @@ RDEPEND=>=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=dearesther-linux-06082013-bin
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=084f7f23b5d0c53c7935efcb6c5721ac
diff --git a/metadata/md5-cache/games-rpg/dungeon-defenders-20130305-r1 b/metadata/md5-cache/games-rpg/dungeon-defenders-20130305-r1
index 591582aa9179..aa38d44d778e 100644
--- a/metadata/md5-cache/games-rpg/dungeon-defenders-20130305-r1
+++ b/metadata/md5-cache/games-rpg/dungeon-defenders-20130305-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl2[abi_x86_32,opengl,video] media-libs/openal[abi_x86_32
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=dundef-linux-03052013.mojo.run
-_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54ea1b3d3ba4ff95b4ebca3c60cf09fa
diff --git a/metadata/md5-cache/games-rpg/grimrock-20150707 b/metadata/md5-cache/games-rpg/grimrock-20150707
index 89d7550a5869..7e42b979b9a9 100644
--- a/metadata/md5-cache/games-rpg/grimrock-20150707
+++ b/metadata/md5-cache/games-rpg/grimrock-20150707
@@ -9,5 +9,5 @@ RDEPEND=media-libs/freeimage media-libs/freetype:2 media-libs/openal media-libs/
 RESTRICT=fetch bindist splitdebug
 SLOT=0
 SRC_URI=Grimrock-Linux-2015-07-07.sh
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12024eb42c3c4c92346ceaba63e6ee04
diff --git a/metadata/md5-cache/games-rpg/to-the-moon-0 b/metadata/md5-cache/games-rpg/to-the-moon-0
index 0394fa244518..57d8ac1dd120 100644
--- a/metadata/md5-cache/games-rpg/to-the-moon-0
+++ b/metadata/md5-cache/games-rpg/to-the-moon-0
@@ -9,5 +9,5 @@ RDEPEND=!bundled-libs? ( dev-libs/libsigc++:2 >=media-libs/libsdl2-2.0.1[X,joyst
 RESTRICT=fetch bindist splitdebug
 SLOT=0
 SRC_URI=ToTheMoon_linux_1389114090.sh
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d796de3135b68c4476d2dd1126a87fa2
diff --git a/metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1 b/metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1
index 405f52a596ef..6f91abae7780 100644
--- a/metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1
+++ b/metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1
@@ -9,5 +9,5 @@ RDEPEND=virtual/opengl x11-libs/gtk+:2
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=amd64? ( http://mirror.cle.vendetta-online.com/vendetta-linux-amd64-installer.sh -> vendetta-online-bin-1.8.296-amd64.sh ) x86? ( http://mirror.cle.vendetta-online.com/vendetta-linux-ia32-installer.sh -> vendetta-online-bin-1.8.296-x86.sh )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e8043f171156caeec0effede580b63e5
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 67521f2f294c..ef2e47f26567 100644
Binary files a/metadata/md5-cache/games-simulation/Manifest.gz and b/metadata/md5-cache/games-simulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1 b/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
index 909fa94e2a5f..ee05cd5d94e6 100644
--- a/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
+++ b/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
@@ -8,5 +8,5 @@ RDEPEND=media-libs/libsdl[abi_x86_32(-)] sys-libs/glibc x11-libs/libX11[abi_x86_
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ggdev-1.homelan.com/bcs/bcsdemo_v1_3.sh.bin http://www.highprogrammer.com/alan/pfx2/openal-alan-hack-0.0.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=54f632376d84748ea2f2658d1fe3fa73
diff --git a/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605 b/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
index 321bc2443ed7..2134b2568c97 100644
--- a/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
+++ b/metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc virtual/opengl
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=slime_rancher_1_4_1c_34605.sh
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbba890681391a101eaede1b8ff09645
diff --git a/metadata/md5-cache/games-simulation/train-valley-1.3.31403 b/metadata/md5-cache/games-simulation/train-valley-1.3.31403
index de6b3e4f5160..41b8c7816963 100644
--- a/metadata/md5-cache/games-simulation/train-valley-1.3.31403
+++ b/metadata/md5-cache/games-simulation/train-valley-1.3.31403
@@ -9,5 +9,5 @@ RDEPEND=virtual/opengl x11-libs/libX11 x11-libs/libXrandr gui? ( dev-libs/glib:2
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=train_valley_1_3_31403.sh
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99cc096340db6d2b530d94241a6e8c78
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index b637b53e32fd..48a34f095591 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r1 b/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r1
index 6d599638aa24..cccb18c3eee8 100644
--- a/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r1
+++ b/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/libstdc++-v3:5 media-libs/libsdl[abi_x86_32(-)] media-libs/libv
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=http://www.introversion.co.uk/darwinia/downloads/darwinia-full-1.4.0b9.sh
-_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=base	c1ada9d5e2476b8888dea6fa878beaaf	cdrom	c3a14bb54eef4e8dc8b133b20262b766	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	games	9d243da279b8a6f86a76eab575bf69ab	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f3ae6cb35ed23c641ac662128867280
diff --git a/metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r2 b/metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r2
index 2436ba4bf94f..833190ea8b58 100644
--- a/metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r2
+++ b/metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r2
@@ -8,5 +8,5 @@ RDEPEND=media-libs/libsdl[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] vir
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=http://www.introversion.co.uk/darwinia/downloads/darwinia-demo2-1.3.0.sh
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9b03f41a61430eb03655c77826e82557
diff --git a/metadata/md5-cache/games-strategy/knights-demo-1.32-r2 b/metadata/md5-cache/games-strategy/knights-demo-1.32-r2
index 67c3022d15e5..a94067a1c693 100644
--- a/metadata/md5-cache/games-strategy/knights-demo-1.32-r2
+++ b/metadata/md5-cache/games-strategy/knights-demo-1.32-r2
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/knights-demo-1.32.run
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e865f9a5641587ca9e9f71ba3bfdcd37
diff --git a/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1 b/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
index 43ff4f314b46..6c4227a4a4b0 100644
--- a/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
+++ b/metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_3
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=http://ftp2.za.freebsd.org/pub/FreeBSD/ports/distfiles/majesty_demo.run
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9faf9b13b7e6d10bce1ac585f7b9b116
diff --git a/metadata/md5-cache/games-strategy/spaz-1.605-r1 b/metadata/md5-cache/games-strategy/spaz-1.605-r1
index 6c8e98029898..bc4311306493 100644
--- a/metadata/md5-cache/games-strategy/spaz-1.605-r1
+++ b/metadata/md5-cache/games-strategy/spaz-1.605-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)] >=media-libs
 RESTRICT=bindist fetch strip
 SLOT=0
 SRC_URI=spaz-linux-humblebundle-09182012-bin
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5cc1765ec04feb713d931e41b45b2313
diff --git a/metadata/md5-cache/games-strategy/war1gus-3.0.0 b/metadata/md5-cache/games-strategy/war1gus-3.0.0
new file mode 100644
index 000000000000..57eb890b5f90
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/war1gus-3.0.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==games-engines/stratagus-3.0.0*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
+DESCRIPTION=Warcraft: Orcs & Humans for the Stratagus game engine
+EAPI=7
+HOMEPAGE=https://wargus.github.io/war1gus.html https://github.com/Wargus/war1gus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==games-engines/stratagus-3.0.0*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/Wargus/war1gus/archive/v3.0.0.tar.gz -> war1gus-3.0.0.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=20ba700a4c5eeb186cff60d854b106b9
diff --git a/metadata/md5-cache/games-strategy/wargus-3.0.0-r1 b/metadata/md5-cache/games-strategy/wargus-3.0.0-r1
new file mode 100644
index 000000000000..c3a80085ab95
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/wargus-3.0.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend test
+DEPEND==games-engines/stratagus-3.0.0*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11 bne? ( app-arch/stormlib:= ) !games-strategy/wargus-data
+DESCRIPTION=Warcraft II for the Stratagus game engine
+EAPI=7
+HOMEPAGE=https://wargus.github.io/ https://github.com/Wargus/wargus
+IUSE=+bne
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==games-engines/stratagus-3.0.0*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11 bne? ( app-arch/stormlib:= ) !games-strategy/wargus-data
+SLOT=0
+SRC_URI=https://github.com/Wargus/wargus/archive/v3.0.0.tar.gz -> wargus-3.0.0.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f166fb7799e98edec1eaebd108892b36
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 4082f47379ce..b6797fb184f3 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/gnome-desktop-3.36.7 b/metadata/md5-cache/gnome-base/gnome-desktop-3.36.8
similarity index 93%
rename from metadata/md5-cache/gnome-base/gnome-desktop-3.36.7
rename to metadata/md5-cache/gnome-base/gnome-desktop-3.36.8
index 793b03bbf411..bc597054d224 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.36.7
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.36.8
@@ -5,11 +5,11 @@ DESCRIPTION=Library with common API for various GNOME modules
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
 IUSE=debug gtk-doc +introspection seccomp systemd udev test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1+
 RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config app-text/iso-codes x11-libs/libX11 systemd? ( sys-apps/systemd:= ) udev? ( sys-apps/hwids virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:=[X] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) seccomp? ( sys-apps/bubblewrap )
 RESTRICT=!test? ( test )
 SLOT=3/19
-SRC_URI=mirror://gnome/sources/gnome-desktop/3.36/gnome-desktop-3.36.7.tar.xz
+SRC_URI=mirror://gnome/sources/gnome-desktop/3.36/gnome-desktop-3.36.8.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1ccbf2c135a612292e10111573a450c
+_md5_=fcc8a92da09b7bbb46631dd6818bee79
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.38.1 b/metadata/md5-cache/gnome-base/gnome-desktop-3.38.1
deleted file mode 100644
index e9fca266fc8a..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.38.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen gtk-doc? ( >=dev-util/gtk-doc-1.14 ) dev-util/itstool >=sys-devel/gettext-0.19.8 x11-base/xorg-proto 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=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config app-text/iso-codes systemd? ( sys-apps/systemd:= ) udev? ( sys-apps/hwids virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:= introspection? ( >=dev-libs/gobject-introspection-1.54:= ) media-libs/fontconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Library with common API for various GNOME modules
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
-IUSE=debug gtk-doc +introspection seccomp systemd udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+ FDL-1.1+
-RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config app-text/iso-codes systemd? ( sys-apps/systemd:= ) udev? ( sys-apps/hwids virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:= introspection? ( >=dev-libs/gobject-introspection-1.54:= ) seccomp? ( sys-apps/bubblewrap )
-SLOT=3/19
-SRC_URI=mirror://gnome/sources/gnome-desktop/3.38/gnome-desktop-3.38.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b29c4aab542acbaffd4a6eaa39fa269b
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.40.21 b/metadata/md5-cache/gnome-base/librsvg-2.40.21
index 71df610d4de2..f392610971bc 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.40.21
+++ b/metadata/md5-cache/gnome-base/librsvg-2.40.21
@@ -1,15 +1,16 @@
+BDEPEND=dev-libs/gobject-introspection-common dev-libs/vala-common dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 virtual/pkgconfig x11-libs/gdk-pixbuf vala? ( || ( dev-lang/vala:0.50[vapigen(+)] 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 || ( >=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
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libcroco-0.6.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) tools? ( >=x11-libs/gtk+-3.10.0:3 ) dev-libs/gobject-introspection-common dev-libs/vala-common dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.50[vapigen(+)] 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 || ( >=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
+DEPEND=>=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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libcroco-0.6.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) tools? ( >=x11-libs/gtk+-3.10.0:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
-EAPI=6
+EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
 IUSE=+introspection tools +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha arm hppa ~ia64 ~mips ppc s390 sparc x86 ~amd64-linux ~x86-linux ~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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libcroco-0.6.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) tools? ( >=x11-libs/gtk+-3.10.0:3 )
+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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libcroco-0.6.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) tools? ( >=x11-libs/gtk+-3.10.0:3 )
 REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.40/librsvg-2.40.21.tar.xz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0a0f23d06d04b507903866126fa4ae8
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f6ccf1918de5c15d5841dfb9ff630389
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 22a1a060e579..5e3a7e52645d 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/gnome-boxes-3.36.6 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.36.6
index 7b5274842d92..f3b65c9a1cb4 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.36.6
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-3.36.6
@@ -7,8 +7,8 @@ HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
 IUSE=rdp kernel_linux
 KEYWORDS=amd64
 LICENSE=LGPL-2+ CC-BY-2.0
-RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.20:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-3.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:0/2.0 >=x11-libs/vte-0.40.2:2.91 net-libs/webkit-gtk:4 >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) >=app-misc/tracker-miners-2[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools virtual/cdrtools sys-auth/polkit
+RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.20:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-3.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:0/2.0 >=x11-libs/vte-0.40.2:2.91 net-libs/webkit-gtk:4 >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) app-cdr/cdrtools >=app-misc/tracker-miners-2[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools sys-auth/polkit
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/3.36/gnome-boxes-3.36.6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da21d2ee7d4f2834423132e88020c0b8
+_md5_=ab5e93b5b3b5403d87bbccec424e33d0
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-3.38.2 b/metadata/md5-cache/gnome-extra/gnome-calendar-3.38.2
new file mode 100644
index 000000000000..4f89ed746ba0
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-3.38.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=dev-libs/libdazzle-3.33.1 >=gui-libs/libhandy-0.0.9:0.0= >=dev-libs/glib-2.58.0:2 >=x11-libs/gtk+-3.22.0:3 >=net-libs/gnome-online-accounts-3.2.0:= >=dev-libs/libgweather-3.27.2:= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Manage your online calendars with simple and modern interface
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=dev-libs/libdazzle-3.33.1 >=gui-libs/libhandy-0.0.9:0.0= >=dev-libs/glib-2.58.0:2 >=x11-libs/gtk+-3.22.0:3 >=net-libs/gnome-online-accounts-3.2.0:= >=dev-libs/libgweather-3.27.2:= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-calendar/3.38/gnome-calendar-3.38.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=69698de5d7e9bea00e535e7faff6881d
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.36.2 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.36.2
index a98ec593b1c6..8aa0ba0a52fb 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-3.36.2
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-3.36.2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=dev-libs/gobject-introspection-1.54 dev-libs/folks[vala(+)] net-libs/gnome-online-accounts[vala] gnome-extra/evolution-data-server[gtk,vala] telepathy? ( net-libs/telepathy-glib[vala] ) gui-libs/libhandy:0.0[vala] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxml2:2 dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+BDEPEND=|| ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) >=dev-libs/gobject-introspection-1.54 dev-libs/folks[vala(+)] net-libs/gnome-online-accounts[vala] gnome-extra/evolution-data-server[gtk,vala] telepathy? ( net-libs/telepathy-glib[vala] ) gui-libs/libhandy:0.0[vala] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxml2:2 dev-libs/libxslt >=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=>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.44:2 >=dev-libs/libgee-0.10:0.8 >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.23.1:3 v4l? ( >=media-video/cheese-3.5.91:= ) telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-0.0.12:0.0= dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNOME contact management application
@@ -11,4 +11,4 @@ RDEPEND=>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=d
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/3.36/gnome-contacts-3.36.2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2f5fc9a153667b1a8f0f68a4f783bca0
+_md5_=02eafeee9fe382e5e311e65c33f817e0
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.38.1 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.38.1
new file mode 100644
index 000000000000..0e1ef870d8a6
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-3.38.1
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 ) >=dev-libs/gobject-introspection-1.54 dev-libs/folks[vala(+)] net-libs/gnome-online-accounts[vala] gnome-extra/evolution-data-server[gtk,vala] telepathy? ( net-libs/telepathy-glib[vala] ) >=gui-libs/libhandy-1.0.0:1[vala] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxml2:2 dev-libs/libxslt >=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=>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8 >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.23.1:3 v4l? ( >=media-video/cheese-3.5.91:= ) telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-0.0.12:0.0= dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME contact management application
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
+IUSE=telepathy v4l
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8 >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.23.1:3 v4l? ( >=media-video/cheese-3.5.91:= ) telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-0.0.12:0.0=
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-contacts/3.38/gnome-contacts-3.38.1.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0ce3609d012c3eb9abe4802b553213a0
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.36.6 b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.36.6
new file mode 100644
index 000000000000..a9644c1723bd
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.36.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=test? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME end user documentation
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-user-docs
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=CC-BY-3.0
+RESTRICT=binchecks strip !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-user-docs/3.36/gnome-user-docs-3.36.6.tar.xz
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=076fcaaf3f2813e0e0d8946b96abc7db
diff --git a/metadata/md5-cache/gnome-extra/yelp-3.36.2 b/metadata/md5-cache/gnome-extra/yelp-3.36.2
new file mode 100644
index 000000000000..33d7633ec39f
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/yelp-3.36.2
@@ -0,0 +1,13 @@
+BDEPEND=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
+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-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Help browser for GNOME
+EAPI=7
+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.2.tar.xz
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ef19f8f49a4fd40821d8dfde239c5696
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index c68159400f16..0c480956b4d7 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/libhandy-1.0.2 b/metadata/md5-cache/gui-libs/libhandy-1.0.2
new file mode 100644
index 000000000000..bd64b2ed02d3
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/libhandy-1.0.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Building blocks for modern adaptive GNOME apps
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/libhandy/
+IUSE=examples glade gtk-doc +introspection test +vala test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=1
+SRC_URI=mirror://gnome/sources/libhandy/1.0/libhandy-1.0.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b5883dff956561d6c99b4677c58f4e5d
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 0a81f7e8657d..7bde0289b074 100644
Binary files a/metadata/md5-cache/gui-wm/Manifest.gz and b/metadata/md5-cache/gui-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-wm/sway-1.5.1-r1 b/metadata/md5-cache/gui-wm/sway-1.5.1-r1
new file mode 100644
index 000000000000..f3a4925547c2
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/sway-1.5.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.53.0 virtual/pkgconfig man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239[policykit] ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239[policykit] ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) =gui-libs/wlroots-0.12.0*:=[elogind=,seatd=,systemd=,X=]
+DESCRIPTION=i3-compatible Wayland window manager
+EAPI=7
+HOMEPAGE=https://swaywm.org
+IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239[policykit] ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239[policykit] ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) =gui-libs/wlroots-0.12.0*:=[elogind=,seatd=,systemd=,X=]
+REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
+SLOT=0
+SRC_URI=https://github.com/swaywm/sway/archive/1.5.1.tar.gz -> sway-1.5.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2d6b4f6efacd08bf7262d7bcf0a0eddc
diff --git a/metadata/md5-cache/gui-wm/sway-9999 b/metadata/md5-cache/gui-wm/sway-9999
index 8013e4e9045d..2f6ee74d4b69 100644
--- a/metadata/md5-cache/gui-wm/sway-9999
+++ b/metadata/md5-cache/gui-wm/sway-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.53.0 virtual/pkgconfig man? ( ~app-text/scdoc-9999 ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]
+DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239[policykit] ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239[policykit] ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]
 DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
 IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]
+RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] elogind? ( >=sys-auth/elogind-239[policykit] ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239[policykit] ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7010e933f2c29a82af09fa919ab020d2
+_md5_=2d6b4f6efacd08bf7262d7bcf0a0eddc
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 9989cca901b9..802f555abbb9 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/k3b-20.08.3 b/metadata/md5-cache/kde-apps/k3b-20.08.3
index 6b9ff4dbabf4..c57e11f1d12f 100644
--- a/metadata/md5-cache/kde-apps/k3b-20.08.3
+++ b/metadata/md5-cache/kde-apps/k3b-20.08.3
@@ -7,10 +7,10 @@ HOMEPAGE=https://apps.kde.org/en/k3b https://userbase.kde.org/K3b
 IUSE=dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis debug +handbook test
 KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-apps/libkcddb-20.08.3:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kfilemetadata-5.74.0:5[taglib?] >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-apps/libkcddb-20.08.3:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kfilemetadata-5.74.0:5[taglib?] >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) app-cdr/cdrdao app-cdr/cdrtools dev-libs/libburn media-sound/cdparanoia dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.3/src/k3b-20.08.3.tar.xz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	ecm	1debe80a481e8d4ed5d2eefb52a27558	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	kde.org	8a81008797ecdb979e3100d782ab5513	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0763d7dbb9422cb29429e127ccb22c8
+_md5_=198adb774b4bffbdf733b4d5621dbe4d
diff --git a/metadata/md5-cache/kde-apps/k3b-20.12.0 b/metadata/md5-cache/kde-apps/k3b-20.12.0
index d7f8b4ad4ff7..9fd4dc9e40e6 100644
--- a/metadata/md5-cache/kde-apps/k3b-20.12.0
+++ b/metadata/md5-cache/kde-apps/k3b-20.12.0
@@ -7,10 +7,10 @@ HOMEPAGE=https://apps.kde.org/en/k3b https://userbase.kde.org/K3b
 IUSE=dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis debug +handbook test
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-apps/libkcddb-20.12.0:5 >=kde-frameworks/karchive-5.75.0:5 >=kde-frameworks/kbookmarks-5.75.0:5 >=kde-frameworks/kcmutils-5.75.0:5 >=kde-frameworks/kcompletion-5.75.0:5 >=kde-frameworks/kconfig-5.75.0:5 >=kde-frameworks/kconfigwidgets-5.75.0:5 >=kde-frameworks/kcoreaddons-5.75.0:5 >=kde-frameworks/kfilemetadata-5.75.0:5[taglib?] >=kde-frameworks/ki18n-5.75.0:5 >=kde-frameworks/kiconthemes-5.75.0:5 >=kde-frameworks/kio-5.75.0:5 >=kde-frameworks/kjobwidgets-5.75.0:5 >=kde-frameworks/knewstuff-5.75.0:5 >=kde-frameworks/knotifications-5.75.0:5 >=kde-frameworks/knotifyconfig-5.75.0:5 >=kde-frameworks/kservice-5.75.0:5 >=kde-frameworks/kwidgetsaddons-5.75.0:5 >=kde-frameworks/kxmlgui-5.75.0:5 >=kde-frameworks/solid-5.75.0:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-apps/libkcddb-20.12.0:5 >=kde-frameworks/karchive-5.75.0:5 >=kde-frameworks/kbookmarks-5.75.0:5 >=kde-frameworks/kcmutils-5.75.0:5 >=kde-frameworks/kcompletion-5.75.0:5 >=kde-frameworks/kconfig-5.75.0:5 >=kde-frameworks/kconfigwidgets-5.75.0:5 >=kde-frameworks/kcoreaddons-5.75.0:5 >=kde-frameworks/kfilemetadata-5.75.0:5[taglib?] >=kde-frameworks/ki18n-5.75.0:5 >=kde-frameworks/kiconthemes-5.75.0:5 >=kde-frameworks/kio-5.75.0:5 >=kde-frameworks/kjobwidgets-5.75.0:5 >=kde-frameworks/knewstuff-5.75.0:5 >=kde-frameworks/knotifications-5.75.0:5 >=kde-frameworks/knotifyconfig-5.75.0:5 >=kde-frameworks/kservice-5.75.0:5 >=kde-frameworks/kwidgetsaddons-5.75.0:5 >=kde-frameworks/kxmlgui-5.75.0:5 >=kde-frameworks/solid-5.75.0:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) app-cdr/cdrdao app-cdr/cdrtools dev-libs/libburn media-sound/cdparanoia dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.0/src/k3b-20.12.0.tar.xz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	ecm	1debe80a481e8d4ed5d2eefb52a27558	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	kde.org	8a81008797ecdb979e3100d782ab5513	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6049652360cd17ef386b031a95364479
+_md5_=bf0a1c024dd59a73ae82166c0c6e3036
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index fca4b826ba2e..90a900aa0604 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.77.0 b/metadata/md5-cache/kde-frameworks/kdav-5.77.0-r1
similarity index 97%
rename from metadata/md5-cache/kde-frameworks/kdav-5.77.0
rename to metadata/md5-cache/kde-frameworks/kdav-5.77.0-r1
index d35709eba4d4..88e9e6066c56 100644
--- a/metadata/md5-cache/kde-frameworks/kdav-5.77.0
+++ b/metadata/md5-cache/kde-frameworks/kdav-5.77.0-r1
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=dev-qt/qtxmlpatterns-5.15.1:5 >=kde-frameworks/kcoreaddons-5.77:5 >=kde-frameworks/ki18n-5.77:5 >=kde-frameworks/kio-5.77:5 !kde-apps/kdav:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
+SLOT=5/5.77
 SRC_URI=mirror://kde/stable/frameworks/5.77/kdav-5.77.0.tar.xz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	ecm	1debe80a481e8d4ed5d2eefb52a27558	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	kde.org	8a81008797ecdb979e3100d782ab5513	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c29ef033516afa59a08e34d95322d296
+_md5_=aef37cf45a5677f11c704593eb2067a7
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.77.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.77.0-r1
similarity index 98%
rename from metadata/md5-cache/kde-frameworks/knewstuff-5.77.0
rename to metadata/md5-cache/kde-frameworks/knewstuff-5.77.0-r1
index 1c7cb3a922fc..614f981e63ca 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.77.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.77.0-r1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwo
 SLOT=5/5.77
 SRC_URI=mirror://kde/stable/frameworks/5.77/knewstuff-5.77.0.tar.xz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	ecm	1debe80a481e8d4ed5d2eefb52a27558	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	kde.org	8a81008797ecdb979e3100d782ab5513	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c69f0fe4e15445e107fcdc635b8d2299
+_md5_=ad0f20990509bd263278cf0f9f909f85
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.77.0 b/metadata/md5-cache/kde-frameworks/plasma-5.77.0-r1
similarity index 96%
rename from metadata/md5-cache/kde-frameworks/plasma-5.77.0
rename to metadata/md5-cache/kde-frameworks/plasma-5.77.0-r1
index 613423578806..04ce86ab1775 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.77.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.77.0-r1
@@ -10,6 +10,6 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5[gles2-only=] >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 =kde-frameworks/kactivities-5.77*:5 =kde-frameworks/karchive-5.77*:5 =kde-frameworks/kconfig-5.77*:5 =kde-frameworks/kconfigwidgets-5.77*:5 =kde-frameworks/kcoreaddons-5.77*:5 =kde-frameworks/kdeclarative-5.77*:5 =kde-frameworks/kglobalaccel-5.77*:5 =kde-frameworks/kguiaddons-5.77*:5 =kde-frameworks/ki18n-5.77*:5 =kde-frameworks/kiconthemes-5.77*:5 =kde-frameworks/kio-5.77*:5 =kde-frameworks/kirigami-5.77*:5 =kde-frameworks/knotifications-5.77*:5 =kde-frameworks/kpackage-5.77*:5 =kde-frameworks/kservice-5.77*:5 =kde-frameworks/kwidgetsaddons-5.77*:5 =kde-frameworks/kwindowsystem-5.77*:5 =kde-frameworks/kxmlgui-5.77*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.77*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.77
-SRC_URI=mirror://kde/stable/frameworks/5.77/plasma-framework-5.77.0.tar.xz
+SRC_URI=mirror://kde/stable/frameworks/5.77/plasma-framework-5.77.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-5.77.0-fix-broken-background.patch.xz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	ecm	1debe80a481e8d4ed5d2eefb52a27558	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	kde.org	8a81008797ecdb979e3100d782ab5513	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=427b75be9055fbc8db548adef58f8d44
+_md5_=ea6459c83ffa92f10d283bf847b2a84b
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 1b926ebe5904..f8ee09af9efb 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/krename-5.0.1-r1 b/metadata/md5-cache/kde-misc/krename-5.0.1-r1
new file mode 100644
index 000000000000..c5f20f7591d9
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/krename-5.0.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=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/qtdeclarative-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-frameworks/kcompletion-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/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kjobwidgets-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 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo:= ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Powerful batch file renamer
+EAPI=7
+HOMEPAGE=https://apps.kde.org/en/krename https://userbase.kde.org/KRename
+IUSE=exif pdf taglib truetype debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-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-frameworks/kcompletion-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/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kjobwidgets-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 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo:= ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) || ( 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/krename/5.0.1/src/krename-5.0.1.tar.xz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	ecm	1debe80a481e8d4ed5d2eefb52a27558	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	kde.org	8a81008797ecdb979e3100d782ab5513	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d8c0780d6401adca62dbeeaa1fee4852
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 3af30fef7dfe..e668313ee7b1 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/postgrey-1.37 b/metadata/md5-cache/mail-filter/postgrey-1.37
index ac44c3bb6090..dcd8a5596752 100644
--- a/metadata/md5-cache/mail-filter/postgrey-1.37
+++ b/metadata/md5-cache/mail-filter/postgrey-1.37
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Postgrey is a Postfix policy server implementing greylisting
 EAPI=5
 HOMEPAGE=http://postgrey.schweikert.ch/
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ~ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/Net-Server dev-perl/IO-Multiplex dev-perl/BerkeleyDB dev-perl/Net-DNS dev-perl/NetAddr-IP dev-perl/Net-RBLClient dev-perl/Parse-Syslog virtual/perl-Digest-SHA >=sys-libs/db-4.1
 SLOT=0
 SRC_URI=http://postgrey.schweikert.ch/pub/postgrey-1.37.tar.gz http://postgrey.schweikert.ch/pub/old/postgrey-1.37.tar.gz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=56a5650fadab0859384c534a21d238ae
+_md5_=ca65ae9550e32f81565ceff0081a70da
diff --git a/metadata/md5-cache/mail-filter/postgrey-1.37_p20190625-r1 b/metadata/md5-cache/mail-filter/postgrey-1.37_p20190625-r1
new file mode 100644
index 000000000000..8d8a14cc20ff
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/postgrey-1.37_p20190625-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=acct-group/postgrey acct-user/postgrey
+DESCRIPTION=Postgrey is a Postfix policy server implementing greylisting
+EAPI=7
+HOMEPAGE=http://postgrey.schweikert.ch/
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/postgrey acct-user/postgrey >=dev-lang/perl-5.6.0 dev-perl/Net-Server dev-perl/IO-Multiplex dev-perl/BerkeleyDB dev-perl/Net-DNS dev-perl/NetAddr-IP dev-perl/Net-RBLClient dev-perl/Parse-Syslog virtual/perl-Digest-SHA >=sys-libs/db-4.1
+SLOT=0
+SRC_URI=https://github.com/schweikert/postgrey/archive/eb420c5dee57dd54e6f63bad5d74e85f5cc9535d.tar.gz -> postgrey-1.37_p20190625.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7bb4649fc00acb3c239ae67ae40aff92
diff --git a/metadata/md5-cache/mail-filter/postsrsd-1.10 b/metadata/md5-cache/mail-filter/postsrsd-1.10
new file mode 100644
index 000000000000..ce06c5912920
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/postsrsd-1.10
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-util/cmake-2.4 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Postfix Sender Rewriting Scheme daemon
+EAPI=7
+HOMEPAGE=https://github.com/roehling/postsrsd
+KEYWORDS=~amd64 x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/roehling/postsrsd/archive/1.10.tar.gz -> postsrsd-1.10.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=31bc1f52c2a364a18e19956c012ea16e
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.6-r2 b/metadata/md5-cache/mail-filter/rspamd-2.6-r2
index a872a3f3bee7..9bd87be2c521 100644
--- a/metadata/md5-cache/mail-filter/rspamd-2.6-r2
+++ b/metadata/md5-cache/mail-filter/rspamd-2.6-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Rapid spam filtering system
 EAPI=7
 HOMEPAGE=https://rspamd.com https://github.com/rspamd/rspamd
 IUSE=blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB
 RDEPEND=acct-group/rspamd acct-user/rspamd app-arch/zstd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-libs/snowball-stemmer net-libs/libnsl sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) jit? ( dev-lang/luajit:2 ) !jit? ( dev-lang/lua:0= dev-lua/LuaBitOp ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/rspamd/rspamd/archive/2.6.tar.gz -> rspamd-2.6.tar.gz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2de8c2c1d98cd494cb54fa5c3515b24a
+_md5_=3f1f8dd529f22925ab8dc90714d0900b
diff --git a/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1 b/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
index bb96ba9132fe..86b49cb9ea6d 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
+++ b/metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=mail-filter/spamassassin-3.0.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://people.ucsc.edu/~jrudd/spamassassin/Botnet-0.8.tar
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6f7c8adc0a717c8e20d6eb28c1bed875
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index b5154ccf584f..8d30e647fdce 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2 b/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
index 978813d72b6b..b2c47e2979c5 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://smtpd.develooper.com/files/qpsmtpd-0.84.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3477be92730bd08ae9cea64f3c6f8fb0
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.95 b/metadata/md5-cache/mail-mta/qpsmtpd-0.95
index dc1c90264d07..f12a218d7d90 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.95
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.95
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/smtpd/qpsmtpd/archive/v0.95.tar.gz -> qpsmtpd-0.95.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8abfbeb1f459c66958a9e7ac8f5568f8
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-9999 b/metadata/md5-cache/mail-mta/qpsmtpd-9999
index bf2c1a966c97..9ef8c54c3068 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-9999
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=[-build(-)]
 SLOT=0
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eeabca5b63ade4cfffa14292f4c6fc2a
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index c34a31725415..0a7af80243d1 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/liberation-fonts-2.1.2 b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.2
new file mode 100644
index 000000000000..7314343f1931
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/liberation-fonts-2.1.2
@@ -0,0 +1,13 @@
+BDEPEND=fontforge? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) media-gfx/fontforge || ( ( dev-lang/python:3.9 dev-python/fonttools[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/fonttools[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/fonttools[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/fonttools[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) )
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat
+EAPI=7
+HOMEPAGE=https://github.com/liberationfonts/liberation-fonts
+IUSE=fontforge X X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=OFL-1.1
+SLOT=0
+SRC_URI=fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/5722232/liberation-fonts-2.1.2.tar.gz ) !fontforge? ( https://github.com/liberationfonts/liberation-fonts/files/5722233/liberation-fonts-ttf-2.1.2.tar.gz )
+_eclasses_=font	e052246186f22bd6a37797238374613b	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3e0d8d013432d050ba2e22c331fab776
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index bd77d6ec77fe..c8da10b0cb62 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-2.5.0 b/metadata/md5-cache/media-gfx/cairosvg-2.5.0
index 35c17e4f2aae..517085839b22 100644
--- a/metadata/md5-cache/media-gfx/cairosvg-2.5.0
+++ b/metadata/md5-cache/media-gfx/cairosvg-2.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=CLI and library to export SVG to PDF, PostScript, and PNG
 EAPI=7
 HOMEPAGE=https://cairosvg.org/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=LGPL-3
 RDEPEND=dev-python/cairocffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cssselect2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/defusedxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/tinycss2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/CairoSVG/CairoSVG-2.5.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=841dbea2deed76f270ccf8b398c6ef82
+_md5_=cf9dfb07a32af2972de7deefb9d78dca
diff --git a/metadata/md5-cache/media-gfx/eog-3.36.4 b/metadata/md5-cache/media-gfx/eog-3.36.4
new file mode 100644
index 000000000000..80892bfa8b31
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/eog-3.36.4
@@ -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.4.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=04d12cc30ebe62816875e1569d3557a6
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.44.1-r1 b/metadata/md5-cache/media-gfx/graphviz-2.44.1-r1
index f9b065347129..68338eb505b0 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.44.1-r1
+++ b/metadata/md5-cache/media-gfx/graphviz-2.44.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Open Source Graph Visualization Software
 EAPI=7
 HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
 IUSE=+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD elibc_FreeBSD java python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=CPL-1.0
 RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( 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] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) pdf? ( cairo ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www2.graphviz.org/Packages/stable/portable_source/graphviz-2.44.1.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	45ae8c4aaec3924d533052387ad652dc	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a16ebec58009a49e89967ab31d3c3229
+_md5_=6928b8bcaade2d0f0cb97c6b021ea0bd
diff --git a/metadata/md5-cache/media-gfx/hugin-2020.0.0 b/metadata/md5-cache/media-gfx/hugin-2020.0.0
deleted file mode 100644
index f9701af2ff62..000000000000
--- a/metadata/md5-cache/media-gfx/hugin-2020.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) 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] ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GUI for the creation & processing of panoramic images
-EAPI=6
-HOMEPAGE=http://hugin.sf.net
-IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
-RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) 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] ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/hugin/hugin-2020.0.0.tar.bz2
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35642401999507193fc6af52a247b081
diff --git a/metadata/md5-cache/media-gfx/hugin-2020.0.0-r1 b/metadata/md5-cache/media-gfx/hugin-2020.0.0-r1
new file mode 100644
index 000000000000..72ae23bd7180
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hugin-2020.0.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) 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] ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GUI for the creation & processing of panoramic images
+EAPI=7
+HOMEPAGE=http://hugin.sf.net
+IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
+RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) 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] ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/hugin/hugin-2020.0.0.tar.bz2
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aabe14d233bda2cd385208060e761ace
diff --git a/metadata/md5-cache/media-gfx/hugin-9999 b/metadata/md5-cache/media-gfx/hugin-9999
index daee8da5c754..4f6218e1bcf6 100644
--- a/metadata/md5-cache/media-gfx/hugin-9999
+++ b/metadata/md5-cache/media-gfx/hugin-9999
@@ -1,13 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) 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] ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-vcs/mercurial sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) 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] ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-vcs/mercurial dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GUI for the creation & processing of panoramic images
-EAPI=6
+EAPI=7
 HOMEPAGE=http://hugin.sf.net
-IUSE=debug lapack python sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
 PROPERTIES=live
-RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) 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] ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
+RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) 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] ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mercurial	d22fe98ea362174612a57c233239102f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35e43fe866a1d9465adc1086d0bbe839
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	mercurial	d22fe98ea362174612a57c233239102f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=91d11fe785846f829c181a1de9c8b86e
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.46 b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.46
index 3f93413cf10d..ce1933eecfd1 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.46
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.46
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6.9.11-37
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.11-46.tar.xz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9f8071afe09e2a862455299e0886e47d
+_md5_=a288e97b22563ba9bbb8e83abd2f3971
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.44 b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.52
similarity index 92%
rename from metadata/md5-cache/media-gfx/imagemagick-6.9.11.44
rename to metadata/md5-cache/media-gfx/imagemagick-6.9.11.52
index 3b8dc13bef11..de594c955a28 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.11.44
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.11.52
@@ -4,12 +4,12 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
 RESTRICT=!test? ( test )
 SLOT=0/6.9.11-37
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.11-44.tar.xz
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.11-52.tar.xz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a288e97b22563ba9bbb8e83abd2f3971
+_md5_=9f8071afe09e2a862455299e0886e47d
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.46 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.46
index 29c815be7ae1..94ef20e3a5cf 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.46
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.46
@@ -5,7 +5,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-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 ~sparc-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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7.0.10-37
 SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-46.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=508f1f83addc9c6128a192bba0e9d490
+_md5_=04c0432905f58cab3967a0b80cfb0810
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.44 b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.52
similarity index 91%
rename from metadata/md5-cache/media-gfx/imagemagick-7.0.10.44
rename to metadata/md5-cache/media-gfx/imagemagick-7.0.10.52
index 81d2c7066287..2e011385ba36 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.10.44
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.10.52
@@ -5,12 +5,12 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-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 ~sparc-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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
 RESTRICT=!test? ( test )
 SLOT=0/7.0.10-37
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-44.tar.xz
+SRC_URI=mirror://imagemagick/ImageMagick-7.0.10-52.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=04c0432905f58cab3967a0b80cfb0810
+_md5_=508f1f83addc9c6128a192bba0e9d490
diff --git a/metadata/md5-cache/media-gfx/pstoedit-3.70-r1 b/metadata/md5-cache/media-gfx/pstoedit-3.70-r1
deleted file mode 100644
index fb4c99539328..000000000000
--- a/metadata/md5-cache/media-gfx/pstoedit-3.70-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/gd-2.0.35-r1:= >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2:=[cxx] ) plotutils? ( media-libs/plotutils ) pptx? ( dev-libs/libzip ) 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=Translate PostScript and PDF graphics into other vector formats
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/pstoedit/
-IUSE=emf imagemagick plotutils pptx static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=media-libs/gd-2.0.35-r1:= >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2:=[cxx] ) plotutils? ( media-libs/plotutils ) pptx? ( dev-libs/libzip )
-SLOT=0
-SRC_URI=mirror://sourceforge/pstoedit/pstoedit-3.70.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=85e3612dcd5f3162a259eea2fe15303d
diff --git a/metadata/md5-cache/media-gfx/pstoedit-3.75 b/metadata/md5-cache/media-gfx/pstoedit-3.75
index 41b427cf96a8..a61d141cd031 100644
--- a/metadata/md5-cache/media-gfx/pstoedit-3.75
+++ b/metadata/md5-cache/media-gfx/pstoedit-3.75
@@ -5,10 +5,10 @@ DESCRIPTION=Translate PostScript and PDF graphics into other vector formats
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/pstoedit/
 IUSE=emf imagemagick plotutils pptx
-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=GPL-2
 RDEPEND=>=app-text/ghostscript-gpl-8.71-r1 >=media-libs/gd-2.0.35-r1:= emf? ( >=media-libs/libemf-1.0.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2:=[cxx] ) plotutils? ( media-libs/plotutils ) pptx? ( dev-libs/libzip:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/pstoedit/pstoedit-3.75.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=54b28313c0b40da5a3abc7f2a0deecaa
+_md5_=8942d831568f0f0f89094340691e2f2f
diff --git a/metadata/md5-cache/media-gfx/scrot-0.8_p13-r1 b/metadata/md5-cache/media-gfx/scrot-0.8_p13-r1
deleted file mode 100644
index 60ea3192585f..000000000000
--- a/metadata/md5-cache/media-gfx/scrot-0.8_p13-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/imlib2-1.0.3 >=media-libs/giblib-1.2.3 || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] )
-DESCRIPTION=Screen capture utility using imlib2 library
-EAPI=5
-HOMEPAGE=http://scrot.sourcearchive.com/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=feh LGPL-2+
-RDEPEND=>=media-libs/imlib2-1.0.3 >=media-libs/giblib-1.2.3 || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] )
-SLOT=0
-SRC_URI=http://scrot.sourcearchive.com/downloads/0.8-13/scrot_0.8.orig.tar.gz http://scrot.sourcearchive.com/downloads/0.8-13/scrot_0.8-13.debian.tar.gz
-_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a99d71d52821a1a2a5c44e8968bbe395
diff --git a/metadata/md5-cache/media-gfx/scrot-1.2 b/metadata/md5-cache/media-gfx/scrot-1.2
deleted file mode 100644
index d5730b11b057..000000000000
--- a/metadata/md5-cache/media-gfx/scrot-1.2
+++ /dev/null
@@ -1,13 +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
-DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] ) x11-base/xorg-proto
-DESCRIPTION=Screen capture utility using imlib2 library
-EAPI=7
-HOMEPAGE=https://github.com/resurrecting-open-source-projects/scrot
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=feh LGPL-2+
-RDEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] )
-SLOT=0
-SRC_URI=https://github.com/resurrecting-open-source-projects/scrot/archive/1.2.tar.gz -> scrot-1.2.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7ebb42efdcc38fdb2900edb35a13fc9a
diff --git a/metadata/md5-cache/media-gfx/scrot-1.3-r1 b/metadata/md5-cache/media-gfx/scrot-1.3-r1
deleted file mode 100644
index c70c7baa0222..000000000000
--- a/metadata/md5-cache/media-gfx/scrot-1.3-r1
+++ /dev/null
@@ -1,13 +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
-DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] ) x11-base/xorg-proto
-DESCRIPTION=Screen capture utility using imlib2 library
-EAPI=7
-HOMEPAGE=https://github.com/resurrecting-open-source-projects/scrot
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=feh LGPL-2+
-RDEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] )
-SLOT=0
-SRC_URI=https://github.com/resurrecting-open-source-projects/scrot/archive/1.3.tar.gz -> scrot-1.3.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=56d9161cd0d300a69c7d88f62097f7c1
diff --git a/metadata/md5-cache/media-gfx/scrot-1.4 b/metadata/md5-cache/media-gfx/scrot-1.4
index 8fd10c826f01..7fc25ebbc615 100644
--- a/metadata/md5-cache/media-gfx/scrot-1.4
+++ b/metadata/md5-cache/media-gfx/scrot-1.4
@@ -4,10 +4,10 @@ DEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcomposite x11-libs
 DESCRIPTION=Screen capture utility using imlib2 library
 EAPI=7
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/scrot
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=feh LGPL-2+
 RDEPEND=>=media-libs/giblib-1.2.3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes || ( media-libs/imlib2[gif] media-libs/imlib2[jpeg] media-libs/imlib2[png] media-libs/imlib2[tiff] )
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/scrot/archive/1.4.tar.gz -> scrot-1.4.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ce8577e0760bd244126717640ee5c096
+_md5_=e0df5d157a95e2fec262ec38436a2359
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.36.7 b/metadata/md5-cache/media-gfx/simple-scan-3.36.7
new file mode 100644
index 000000000000..ce207e6d0ca9
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/simple-scan-3.36.7
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-libs/libgusb[vala] colord? ( x11-misc/colord[vala] ) 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.38:2 >=x11-libs/gtk+-3.22:3 >=sys-libs/zlib-1.2.3.1:= x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=dev-libs/libgusb-0.2.7 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) webp? ( media-libs/libwebp ) >=media-gfx/sane-backends-1.0.20:= virtual/jpeg:0= dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple document scanning utility
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/simple-scan
+IUSE=colord webp
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.22:3 >=sys-libs/zlib-1.2.3.1:= x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=dev-libs/libgusb-0.2.7 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) webp? ( media-libs/libwebp ) >=media-gfx/sane-backends-1.0.20:= virtual/jpeg:0= x11-misc/xdg-utils
+SLOT=0
+SRC_URI=mirror://gnome/sources/simple-scan/3.36/simple-scan-3.36.7.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=30d8eb53cb1f79d7877636a3768562eb
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 0848a1e47c6d..a118d7faf70c 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/allegro-5.2.6.0 b/metadata/md5-cache/media-libs/allegro-5.2.6.0
index 1a4f9723c658..ffc32989a0b0 100644
--- a/metadata/md5-cache/media-libs/allegro-5.2.6.0
+++ b/metadata/md5-cache/media-libs/allegro-5.2.6.0
@@ -5,7 +5,7 @@ DESCRIPTION=Cross-platform library aimed at video game and multimedia programmin
 EAPI=7
 HOMEPAGE=https://liballeg.org/
 IUSE=alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD ZLIB
 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_s390_32(-)?,abi_s390_64(-)?] ) dumb? ( >=media-libs/dumb-0.9.3-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flac? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) physfs? ( >=dev-games/physfs-2.0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.5.18:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=X? ( opengl ) xinerama? ( X ) || ( alsa openal oss pulseaudio )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://github.com/liballeg/allegro5/releases/download/5.2.6.0/allegro-5.2.6.0.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=030f33ff97fdecc97e092d3d3622be3d
+_md5_=4a548dd46426649755fcc7daec90b7d1
diff --git a/metadata/md5-cache/media-libs/jbig2dec-0.19 b/metadata/md5-cache/media-libs/jbig2dec-0.19
index 6eb02eba0311..19c0fb637014 100644
--- a/metadata/md5-cache/media-libs/jbig2dec-0.19
+++ b/metadata/md5-cache/media-libs/jbig2dec-0.19
@@ -5,11 +5,11 @@ DESCRIPTION=A decoder implementation of the JBIG2 image compression format
 EAPI=7
 HOMEPAGE=https://jbig2dec.com/
 IUSE=png static-libs test
-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=AGPL-3
 RDEPEND=png? ( media-libs/libpng:0= )
 RESTRICT=!test? ( test )
 SLOT=0/0.19
 SRC_URI=https://github.com/ArtifexSoftware/jbig2dec/archive/0.19.tar.gz -> jbig2dec-0.19.tar.gz test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=043b05df05c40e6c17ee6bdfba911718
+_md5_=9d9d6d73e1e6063aaa8d47de810307f0
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.22_p20201105 b/metadata/md5-cache/media-libs/libexif-0.6.22_p20201105
index 6c09932ae01c..7fa0cb17ba76 100644
--- a/metadata/md5-cache/media-libs/libexif-0.6.22_p20201105
+++ b/metadata/md5-cache/media-libs/libexif-0.6.22_p20201105
@@ -11,4 +11,4 @@ RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/libexif/libexif/archive/9266d14b5ca4e29b970fa03272318e5f99386e06.tar.gz -> libexif-0.6.22_p20201105.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d6f02587757dfcff9d3f0c7e7b37769c
+_md5_=2cc2522d49809ecfffd1a26e57fd2bc6
diff --git a/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1 b/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
index 9a97daa55633..152c946fecae 100644
--- a/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
+++ b/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-2 )
 RDEPEND=>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/libs/ieee1394/libiec61883-1.2.0.tar.xz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	autotools-multilib	9c600605e4462da7f90f41008447ba1c	autotools-utils	dc1fb07740f526e874bb43214131a21c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	autotools-multilib	9c600605e4462da7f90f41008447ba1c	autotools-utils	dc1fb07740f526e874bb43214131a21c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=56503dc1a0ff9ce3118bf27147657c41
diff --git a/metadata/md5-cache/media-libs/mesa-20.2.4 b/metadata/md5-cache/media-libs/mesa-20.2.4
index cf2f3e441790..ab74e2613a96 100644
--- a/metadata/md5-cache/media-libs/mesa-20.2.4
+++ b/metadata/md5-cache/media-libs/mesa-20.2.4
@@ -5,7 +5,7 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) )
 REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-20.2.4.tar.xz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ae5f624e36786afd043838be1a9b6536
+_md5_=fba8c58b73561e97e6efe5c4a3e5de32
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 224852c5eca8..bd65f57ce22c 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r60
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ad2cb6158fa6ad531e9dce4b1a583849
+_md5_=1c6e29a358df68bfb0b60b501fdd682e
diff --git a/metadata/md5-cache/media-libs/speex-1.2.0-r2 b/metadata/md5-cache/media-libs/speex-1.2.0-r2
index 23e17d19efb1..34640ec3acb2 100644
--- a/metadata/md5-cache/media-libs/speex-1.2.0-r2
+++ b/metadata/md5-cache/media-libs/speex-1.2.0-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Audio compression format designed for speech
 EAPI=7
 HOMEPAGE=https://www.speex.org/
 IUSE=cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils +vbr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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=BSD
 RDEPEND=utils? ( media-libs/libogg:= media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/speex/speex-1.2.0.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=51b0648e9712509f1aafac26e73c8720
+_md5_=1d34398f96af5a09c962c84c5d6d89b6
diff --git a/metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r3 b/metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r3
index d3c6575a3d28..87f5c7e269b5 100644
--- a/metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r3
+++ b/metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Audio compression format designed for speech -- DSP
 EAPI=7
 HOMEPAGE=https://www.speex.org/
 IUSE=cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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=BSD
 RDEPEND=!<media-libs/speex-1.2.0
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/speex/speexdsp-1.2rc3.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c142b2ad6086143be659ff5e4f504a43
+_md5_=5be38ddc9c6a7de5b9e13a83a0978f21
diff --git a/metadata/md5-cache/media-libs/tiff-4.2.0 b/metadata/md5-cache/media-libs/tiff-4.2.0
new file mode 100644
index 000000000000..dbcd80bf3c6d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/tiff-4.2.0
@@ -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 test
+DEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Tag Image File Format (TIFF) library
+EAPI=7
+HOMEPAGE=http://libtiff.maptools.org
+IUSE=+cxx jbig jpeg lzma static-libs test webp zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=libtiff
+RDEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test? ( jpeg )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.osgeo.org/libtiff/tiff-4.2.0.tar.gz
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8171d2658cc76ee0f9bc3fdd2376b931
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.10 b/metadata/md5-cache/media-libs/xine-lib-1.2.10
index 758a594cf7e3..7eac9e194965 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.10
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.10
@@ -4,11 +4,11 @@ DESCRIPTION=Core libraries for Xine movie player
 EAPI=6
 HOMEPAGE=http://xine.sourceforge.net/
 IUSE=a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc nls
-KEYWORDS=amd64 arm64 ~hppa ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~hppa ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:0= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:0=[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
 SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.10.tar.xz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=20466e68c1d88c087a30e603c2b623c5
+_md5_=29ea53678e9b4d1fceb407fc0e3c78ff
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.9-r2 b/metadata/md5-cache/media-libs/xine-lib-1.2.9-r2
deleted file mode 100644
index b19a43d96a57..000000000000
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.9-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( virtual/libintl ) dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:0= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:0=[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) nls? ( sys-devel/gettext ) app-arch/xz-utils >=sys-devel/libtool-2.2.6b virtual/pkgconfig oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-base/xorg-proto x11-libs/libXt ) xv? ( x11-base/xorg-proto ) xvmc? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=Core libraries for Xine movie player
-EAPI=6
-HOMEPAGE=http://xine.sourceforge.net/
-IUSE=a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X xinerama +xv xvmc nls
-KEYWORDS=amd64 arm64 ~hppa ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:0= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:0=[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
-REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
-SLOT=1
-SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.9.tar.xz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=de965b4147f9154339d30db813d54725
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 4f2ca95a3d64..fcba328c148b 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/mythplugins-31.0-r1 b/metadata/md5-cache/media-plugins/mythplugins-31.0-r1
index 43b3e1fb517a..1b0e9ceffd2b 100644
--- a/metadata/md5-cache/media-plugins/mythplugins-31.0-r1
+++ b/metadata/md5-cache/media-plugins/mythplugins-31.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst setup
-DEPEND=dev-libs/glib:2 dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:= virtual/libudev:= x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm alsa? ( media-libs/alsa-lib ) hls? ( media-libs/faac media-libs/libvpx:= media-libs/x264:= media-sound/lame ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) libass? ( media-libs/libass:= ) =media-tv/mythtv-31*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,raw?,xml?,xvid] mytharchive? ( python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-cdr/dvd+rw-tools dev-python/pillow dev-python/mysqlclient =media-tv/mythtv-31*[python] media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythbrowser? ( dev-qt/qtwebkit:5 ) mythgame? ( sys-libs/zlib[minizip] dev-perl/XML-Twig ) mythmusic? ( dev-qt/qtwebkit:5 media-libs/flac media-libs/libogg media-libs/libvorbis media-libs/taglib media-sound/lame fftw? ( sci-libs/fftw:3.0= ) opengl? ( virtual/opengl ) cdda? ( media-sound/cdparanoia dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/lxml dev-python/oauth2 dev-python/pycurl dev-python/urllib3 =media-tv/mythtv-31*[python] ) mythweather? ( dev-perl/Date-Manip dev-perl/XML-Simple dev-perl/XML-XPath dev-perl/DateTime dev-perl/Image-Size dev-perl/DateTime-Format-ISO8601 dev-perl/SOAP-Lite dev-perl/JSON =media-tv/mythtv-31*[perl] ) mythzmserver? ( dev-db/mysql-connector-c:= ) theora? ( media-libs/libtheora ) xml? ( dev-libs/libxml2:= ) xvid? ( media-libs/xvid )
+DEPEND=dev-libs/glib:2 dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:= virtual/libudev:= x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm alsa? ( media-libs/alsa-lib ) hls? ( media-libs/faac media-libs/libvpx:= media-libs/x264:= media-sound/lame ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) libass? ( media-libs/libass:= ) =media-tv/mythtv-31*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,raw?,xml?,xvid] mytharchive? ( python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-cdr/dvd+rw-tools dev-python/pillow dev-python/mysqlclient =media-tv/mythtv-31*[python] media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode app-cdr/cdrtools ) mythbrowser? ( dev-qt/qtwebkit:5 ) mythgame? ( sys-libs/zlib[minizip] dev-perl/XML-Twig ) mythmusic? ( dev-qt/qtwebkit:5 media-libs/flac media-libs/libogg media-libs/libvorbis media-libs/taglib media-sound/lame fftw? ( sci-libs/fftw:3.0= ) opengl? ( virtual/opengl ) cdda? ( media-sound/cdparanoia dev-libs/libcdio:= cdr? ( app-cdr/cdrtools ) ) ) mythnetvision? ( python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/lxml dev-python/oauth2 dev-python/pycurl dev-python/urllib3 =media-tv/mythtv-31*[python] ) mythweather? ( dev-perl/Date-Manip dev-perl/XML-Simple dev-perl/XML-XPath dev-perl/DateTime dev-perl/Image-Size dev-perl/DateTime-Format-ISO8601 dev-perl/SOAP-Lite dev-perl/JSON =media-tv/mythtv-31*[perl] ) mythzmserver? ( dev-db/mysql-connector-c:= ) theora? ( media-libs/libtheora ) xml? ( dev-libs/libxml2:= ) xvid? ( media-libs/xvid )
 DESCRIPTION=Official MythTV plugins
 EAPI=7
 HOMEPAGE=https://www.mythtv.org https://github.com/MythTV/mythtv
 IUSE=mytharchive mythbrowser mythgame mythmusic mythnetvision mythnews mythweather mythzmserver mythzoneminder alsa cdda cdr exif fftw +hls ieee1394 libass +opengl raw +theora +vorbis +xml xvid python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:= virtual/libudev:= x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm alsa? ( media-libs/alsa-lib ) hls? ( media-libs/faac media-libs/libvpx:= media-libs/x264:= media-sound/lame ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) libass? ( media-libs/libass:= ) =media-tv/mythtv-31*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,raw?,xml?,xvid] mytharchive? ( python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-cdr/dvd+rw-tools dev-python/pillow dev-python/mysqlclient =media-tv/mythtv-31*[python] media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythbrowser? ( dev-qt/qtwebkit:5 ) mythgame? ( sys-libs/zlib[minizip] dev-perl/XML-Twig ) mythmusic? ( dev-qt/qtwebkit:5 media-libs/flac media-libs/libogg media-libs/libvorbis media-libs/taglib media-sound/lame fftw? ( sci-libs/fftw:3.0= ) opengl? ( virtual/opengl ) cdda? ( media-sound/cdparanoia dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/lxml dev-python/oauth2 dev-python/pycurl dev-python/urllib3 =media-tv/mythtv-31*[python] ) mythweather? ( dev-perl/Date-Manip dev-perl/XML-Simple dev-perl/XML-XPath dev-perl/DateTime dev-perl/Image-Size dev-perl/DateTime-Format-ISO8601 dev-perl/SOAP-Lite dev-perl/JSON =media-tv/mythtv-31*[perl] ) mythzmserver? ( dev-db/mysql-connector-c:= ) theora? ( media-libs/libtheora ) xml? ( dev-libs/libxml2:= ) xvid? ( media-libs/xvid )
+RDEPEND=dev-libs/glib:2 dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:= virtual/libudev:= x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm alsa? ( media-libs/alsa-lib ) hls? ( media-libs/faac media-libs/libvpx:= media-libs/x264:= media-sound/lame ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) libass? ( media-libs/libass:= ) =media-tv/mythtv-31*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,raw?,xml?,xvid] mytharchive? ( python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-cdr/dvd+rw-tools dev-python/pillow dev-python/mysqlclient =media-tv/mythtv-31*[python] media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode app-cdr/cdrtools ) mythbrowser? ( dev-qt/qtwebkit:5 ) mythgame? ( sys-libs/zlib[minizip] dev-perl/XML-Twig ) mythmusic? ( dev-qt/qtwebkit:5 media-libs/flac media-libs/libogg media-libs/libvorbis media-libs/taglib media-sound/lame fftw? ( sci-libs/fftw:3.0= ) opengl? ( virtual/opengl ) cdda? ( media-sound/cdparanoia dev-libs/libcdio:= cdr? ( app-cdr/cdrtools ) ) ) mythnetvision? ( python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/lxml dev-python/oauth2 dev-python/pycurl dev-python/urllib3 =media-tv/mythtv-31*[python] ) mythweather? ( dev-perl/Date-Manip dev-perl/XML-Simple dev-perl/XML-XPath dev-perl/DateTime dev-perl/Image-Size dev-perl/DateTime-Format-ISO8601 dev-perl/SOAP-Lite dev-perl/JSON =media-tv/mythtv-31*[perl] ) mythzmserver? ( dev-db/mysql-connector-c:= ) theora? ( media-libs/libtheora ) xml? ( dev-libs/libxml2:= ) xvid? ( media-libs/xvid )
 REQUIRED_USE=!mythnetvision mytharchive? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) mythnetvision? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) mythmusic? ( vorbis ) mythnews? ( mythbrowser )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/v31.0.tar.gz -> mythplugins-31.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=615b42ea64f75802b1b9ca42f8aef2fc
+_md5_=8464072b2431e7cee42039972211a8e5
diff --git a/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1 b/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
index ceaa92972387..45138b49aef1 100644
--- a/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://ventoso.org/luca/vdr/vdr-actuator-1.2.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a52498708a6f023c62f06526f56c871c
diff --git a/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025 b/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
index a0873ce42a93..6c2315997b8f 100644
--- a/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
+++ b/metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/olivluca/vdr-actuator-plugin/archive/c810abffbf6dc6f1f354b0c545abe65311203fd8.tar.gz -> vdr-actuator-2.4.1_pre20181025.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b47a23c63d4d857f6535ac465ac147fd
diff --git a/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1 b/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1
index 6bea9776eb38..2bcd1dc6d448 100644
--- a/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.fepg.org/files/vdr-atscepg-0.3.0.tgz mirror://gentoo/atscepg-0.3.0_vdr-1.7.13.tbz https://dev.gentoo.org/~hd_brummy/distfiles/atscepg-0.3.0_vdr-1.7.13.tbz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a837bf996a60b49e06c5c3a5734fd260
diff --git a/metadata/md5-cache/media-plugins/vdr-avards-0.2.4 b/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
index 074eda7f4ea6..7efc50f41045 100644
--- a/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-avards-0.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/avards/vdr-avards-0.2.4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3918630bcee92ecdb62bb02ffd0dcd5e
diff --git a/metadata/md5-cache/media-plugins/vdr-avards-0.2.6 b/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
index 2e003e4e6213..305914ac17c3 100644
--- a/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
+++ b/metadata/md5-cache/media-plugins/vdr-avards-0.2.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/avards/vdr-avards-0.2.6.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b575825a5676cb3e01b32e4b9952dde8
diff --git a/metadata/md5-cache/media-plugins/vdr-beep-0.1.2 b/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
index 22f773ffb631..61ac5b8a31a7 100644
--- a/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-beep-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-beep/vdr-beep-0.1.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c467feb10e2a2e79f1c51b0f445917a1
diff --git a/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0 b/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
index cc6dc7032dde..c1f5c9317c56 100644
--- a/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.reelbox.org/software/vdr/vdr-bgprocess-0.1.0.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9aa190c21d15b5c583de58559bfb8c6d
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1 b/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1
index 491e1c8b30a5..804afa3799d2 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=media-video/vdr media-libs/gd[png,truetype,jpeg] >=dev-libs/libcdio-0.71
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1252/vdr-burn-0.2.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb18dfc646aa066c1ce797bce9b0bf62
diff --git a/metadata/md5-cache/media-plugins/vdr-burn-0.3.0 b/metadata/md5-cache/media-plugins/vdr-burn-0.3.0
index fc13ae23b759..46252fc34b2c 100644
--- a/metadata/md5-cache/media-plugins/vdr-burn-0.3.0
+++ b/metadata/md5-cache/media-plugins/vdr-burn-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/gd[png,truetype,jpeg] media-video/vdr app-cdr/dvd+rw-tools dev-libs/libcdio media-fonts/corefonts media-video/dvdauthor media-video/mjpegtools[png] media-video/projectx media-video/transcode virtual/eject >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2028/vdr-burn-0.3.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=582b71c354c8fc566c33e5b7f349002d
diff --git a/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5 b/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
index 10fe9fc50af3..f189cd99cab0 100644
--- a/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
+++ b/metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-calc/vdr-calc-0[1].0.1-rc5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5e349da83a3e807360ff13f652bce0c6
diff --git a/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2 b/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
index d40896b67ba9..ef396abd3eee 100644
--- a/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=dev-libs/libcdio-0.8.0 >=media-libs/libcddb-1.3.0 cdparanoia? ( >=dev-libs/libcdio-paranoia-0.90 ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://www.uli-eckhardt.de/vdr/download/vdr-cdplayer-1.2.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4d776e9daba5a695c1f4268ea00bf70
diff --git a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5 b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
index 161a53b43d2b..2247a405ad11 100644
--- a/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-cinebars-0.0.5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=572a26682e3fe2cb7afaebefd9dd2952
diff --git a/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2 b/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
index d8d69bdee4c0..8530d69e0d26 100644
--- a/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/madmartin/vdr-clock/archive/v1.0.0.tar.gz -> vdr-clock-1.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f3cf0ce18bf07a3cd0fe5f87c9ad028c
diff --git a/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1 b/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1
index aead3d73f342..73907b5095ae 100644
--- a/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1
+++ b/metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.44 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.christianglass.de/cpumon//vdr-cpumon-0.0.6a.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=989465271ff8ec8911b3f10c4b84e760
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4 b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
index 68dc06b9a903..9cd84e426b05 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/jasmin-j/vdr-plugin-ddci2/archive/1.0.4.tar.gz -> vdr-ddci2-1.0.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65e12300bc2f89b1dc2e5326e408d9d4
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5 b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
index 0f72d250c019..c3a837c5e66d 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/jasmin-j/vdr-plugin-ddci2/archive/1.0.5.tar.gz -> vdr-ddci2-1.0.5.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65e12300bc2f89b1dc2e5326e408d9d4
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-9999 b/metadata/md5-cache/media-plugins/vdr-ddci2-9999
index 3b00729ec0c1..ea9c1806905e 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-9999
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65e12300bc2f89b1dc2e5326e408d9d4
diff --git a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1 b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
index 3bb53b136907..af70915eeb4e 100644
--- a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.u32.de/download/vdr-devstatus-0.4.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7960515ffabcbe506c6dc5b3f9c53c45
diff --git a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1 b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
index 44680b2fc2ad..5987221541be 100644
--- a/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.u32.de/download/vdr-devstatus-0.4.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5712a1e55763c84abb378a7555798834
diff --git a/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0 b/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
index 306abacebdc9..af62a8f545bb 100644
--- a/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-dummydevice/vdr-dummydevice-2.0.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b81bbfe0ffc0059cf0922dd983d94380
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
index 66f98f9aa23e..f9c6b1ceaf4b 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.0.5.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5ae02aa4c2678a5b5cfdd52c1dba48a5
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
index caea54a70c66..dbc2ade28df2 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.0.5.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d623b9858fe94f0c46c969990cb51799
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0 b/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
index 61fa84ea4524..cc3631f559c3 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.1.0.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=336c949700287f44f0c51d4cc30ed0e3
diff --git a/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1 b/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
index 34a8ddeb3c25..326c2101b2cc 100644
--- a/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-duplicates.git/snapshot/vdr-plugin-duplicates-68739fd72beb9745b3e47b9e466311ef23a8ca97.tar.gz -> vdr-duplicates-1.0.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=14ee08282f564159af75536b7ba7d73b
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4 b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
index d9046f694241..4e7316988f70 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.1.4 dvbcsa? ( media-libs/libdvbcsa ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/manio/vdr-plugin-dvbapi/archive/v2.2.4.tar.gz -> vdr-plugin-dvbapi-2.2.4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=baac8fd160e0447918c663d187c70628
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5 b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
index dcec76c14f10..dc1c3bae95a9 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
+++ b/metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.4.1 dvbcsa? ( media-libs/libdvbcsa ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/manio/vdr-plugin-dvbapi/archive/v2.2.5.tar.gz -> vdr-plugin-dvbapi-2.2.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e2f3b6c5802d823554bf6d21b5cad28a
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115 b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
index 69eec99658c4..8e345538bd51 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
+++ b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/dvbhddevice/get/60c58ae453d0.tar.gz -> dvbhddevice-2.1.3_p20140115.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c9d4e09c84b87bf99157cf9c875ece78
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1 b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1
index a42576233aec..1efe166bc971 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1
+++ b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/dvbhddevice/get/6a3e75484d90.tar.bz2 -> vdr-dvbhddevice-2.2.0_p20180420.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=729eb51a28b09b25479a2e0078eac5a3
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0 b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0
index 851f8a0a1be9..9720f2cea2eb 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.36 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hd_brummy/distfiles/vdr-dvbsddevice-2.0.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=833408bc4505e0deb1637dcdc16a02be
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0 b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
index 2d71e77d2398..cfb60fb8e811 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-dvbsddevice-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-dvbsddevice-2.2.0.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6877c33328340ad4b6dd05b3a2e9ac19
diff --git a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1 b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
index d033b42033f1..754dddc3bf00 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
+++ b/metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-libs/libdvdnav-4.2.0 >=media-libs/a52dec-0.7.4 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-dvd-cvs-20090106.tar.bz2
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=478da0e8a903f7fc165d7d85541e3d29
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2 b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
index b5820219338a..afe7bed9f285 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-dvd >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1323/vdr-dvdswitch-0.2.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2b4723259b88f85c33dfffa4675a3851
diff --git a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3 b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
index 6af758616b2b..d2173d7fb72d 100644
--- a/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
+++ b/metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/vdr-dvd >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2084/vdr-dvdswitch-0.2.3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3bcc9b199d4dd096ee6c67126b1892d1
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1 b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1
index f4d93d613547..778443d75c49 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1
@@ -10,5 +10,5 @@ RDEPEND=media-video/vdr pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.tar.gz -> vdr-epgsearch-1.0.1_p20141227.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9b9b7f46f6d6aef5ee753b9b76a60293
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0 b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
index c856aa4a30a8..8a5d8bc51fe6 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
@@ -10,5 +10,5 @@ RDEPEND==media-video/vdr-2.2* pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-2.2.0.tar.gz -> vdr-epgsearch-2.2.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb7e0fe1286ad5f96ff7f3c6fbb46bfc
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0 b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0
index d00ddcaf2fbb..c5d5762b0892 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-2.4.0.tar.gz -> vdr-epgsearch-2.4.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b589aa1837085365d4ac202bdfb49df
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20191202 b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20191202
index f631a4426f15..40bcc759676f 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20191202
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20191202
@@ -11,5 +11,5 @@ RDEPEND=>=media-video/vdr-2.4 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >
 REQUIRED_USE=?? ( pcre tre )
 SLOT=0
 SRC_URI=http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-602d66c55964998ce25c6c57b302949a9517f149.tar.gz -> vdr-epgsearch-2.4.0_p20191202.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e1e44311a531957b994470858ef6c564
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1 b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
index aeb32c464c9f..2d9248af6653 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/epgsync/vdr-epgsync-1.0.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5649f1e552057b9150247450f26d0711
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1 b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
index e126f0807fbb..016f2a3be4ea 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/epgsync/vdr-epgsync-1.0.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=41a5b89b4b3eca78cc28549ec0d3644a
diff --git a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3 b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
index f5c6b6310ad5..e4a63e69fa2a 100644
--- a/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-exec-0.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-exec/vdr-exec-0.0.3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7be1624275e12c5e7f5348e96491781
diff --git a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4 b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
index 217d5c95f9fc..2146b6c18ef1 100644
--- a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
+++ b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1783/vdr-extrecmenu-1.2.4.tgz mirror://gentoo/dvdarchive-2.3-beta.sh.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=80fad907d5c2cfcd14b468e4ab6dc3c6
diff --git a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r1 b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r1
index 651d56275e33..b49a789c25fc 100644
--- a/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-extrecmenu.git/snapshot/vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b.tar.gz -> vdr-extrecmenu-1.2.4-r1.tar.gz mirror://gentoo/dvdarchive-2.3-beta.sh.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=249d09504beab30186b7345f30dc7279
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.0.4 b/metadata/md5-cache/media-plugins/vdr-femon-2.0.4
index 6a2fca65d932..20cbf1930223 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.0.4.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0391a4a7a3d5f401a95086212dc4d51d
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.4.0 b/metadata/md5-cache/media-plugins/vdr-femon-2.4.0
index f92cd2f6a80a..25e0df8e5741 100644
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-femon-2.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.4.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ef5c2e583df63feca95f3ad6d133ca89
diff --git a/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2 b/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
index ad1052ea1df2..6ea95c1fcfde 100644
--- a/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/837/vdr-ffnetdev-0.1.2.tar.bz2
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bbd0fc3f9138f4edaa0a339f9affaccc
diff --git a/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1 b/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
index c72f563e6163..b0446d8578a0 100644
--- a/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.nasenbaeren.net/filebrowser/vdr-filebrowser-0.2.1.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=101b27b142877aa1cbd8cbca314169fd
diff --git a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3 b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
index 40bc585eaf11..c61f537326c5 100644
--- a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
+++ b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-freecell/vdr-freecell-0.0.2.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=61940d4f16a8247bb2fa83517c2a2b76
diff --git a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4 b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
index a614ffc0c89b..d3107fc5223b 100644
--- a/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
+++ b/metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-freecell/vdr-freecell-0.0.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=85914c956c84c74f6ca46be8fa29421a
diff --git a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r1 b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r1
index 68ddcd9851b8..e8d07d8e2b82 100644
--- a/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r1
+++ b/metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libgcrypt:0 dev-libs/boost[threads] >=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-fritz/releases/download/1.5.3/vdr-fritzbox-1.5.3.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4cdd3e068dffa5e0ef8b3735cd3874af
diff --git a/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1 b/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1
index eb5efb305d4f..95321c192b94 100644
--- a/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-misc/graphlcd-base-1.0.1 media-fonts/corefonts media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-graphlcd.git/snapshot/vdr-plugin-graphlcd-1.0.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c43b909c80a9786eb8f87f62d44ab9a3
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2 b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
index 2c6ddbe6d251..8d0f539221b4 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2086/vdr-imonlcd-1.0.2.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=127b5d71196a3568494b7aa973f6b154
diff --git a/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1 b/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
index f7188f16635a..7e9269ef4420 100644
--- a/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.1.6 net-misc/curl >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/vdr-iptv-2.2.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=20224ed271d8566781ce4fddb83e068e
diff --git a/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0 b/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
index 048ee23abfc7..d194fde806c4 100644
--- a/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.4.0 net-misc/curl >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/vdr-iptv-2.4.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=51616d8ad7fac7fcfb770f4944ecadd2
diff --git a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3 b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
index 6336c118a7f3..4ff30f97beb8 100644
--- a/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-joystick/vdr-joystick-0.0.3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a785b4793ccfd4e8e989b4618b53a60
diff --git a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4 b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
index fa2d8a026079..17d6edf0affc 100644
--- a/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/launcher/downloads/vdr-launcher-0.0.4.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5101afef103b2497293d0b292015d901
diff --git a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9 b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
index 522c6d24d47e..4b5abb08dba4 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
+++ b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 >=app-misc/lcdproc-0.4.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/932/vdr-lcdproc-0.0.10-jw9.tgz -> vdr-lcdproc-0.0.10.9.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=84b08e03f15c4aef814090b4807bc583
diff --git a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1 b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
index a5ffa30f0fc0..0d265a67c4a7 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
+++ b/metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/932/vdr-lcdproc-0.0.10-jw9.tgz -> vdr-lcdproc-0.0.10.9.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1dc0729a56f74523f679e8fe554f660d
diff --git a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1 b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
index f9bf39ab6177..619f4ec2afe3 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
+++ b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 RSA
 RDEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-live-0.3.0_p20130504.tar.bz2 https://dev.gentoo.org/~hd_brummy/distfiles/vdr-live-0.3.0_p20130504.tar.bz2
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	6ba9452db3e1108ce9b4a017a005fd79	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	6ba9452db3e1108ce9b4a017a005fd79	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=174e8ad2930ae1b4dac8d7199972a213
diff --git a/metadata/md5-cache/media-plugins/vdr-live-2.3.1 b/metadata/md5-cache/media-plugins/vdr-live-2.3.1
index bc4634b262a8..bf115dae9685 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-2.3.1
+++ b/metadata/md5-cache/media-plugins/vdr-live-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 RSA
 RDEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/release_2-3-1.tar.bz2 -> vdr-live-2.3.1.tar.bz2
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	6ba9452db3e1108ce9b4a017a005fd79	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	6ba9452db3e1108ce9b4a017a005fd79	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b9406dfc13a6bc4eb940c362043477c6
diff --git a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7 b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
index e03054397a1a..d4a16261816e 100644
--- a/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
+++ b/metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lukkinosat.altervista.org/vdr-loadepg-0.2.7.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e137549efc924879edd9d85bd91874b5
diff --git a/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1 b/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1
index 2c7aa080a8bc..c99213671979 100644
--- a/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0[menuorg] dev-cpp/libxmlpp:2.6 dev-cpp/glibmm >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1312/vdr-menuorg-0.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cce9c2cf7095c8f421d889fdb97996ed
diff --git a/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2 b/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
index e34c1181779e..c7479835054d 100644
--- a/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-mlist/archive/1.0.2.tar.gz -> vdr-mlist-1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=10f13e3882336f65f9da2b59123e52b2
diff --git a/metadata/md5-cache/media-plugins/vdr-mount-0.0.2 b/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
index a686b8588ad5..54d271474460 100644
--- a/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-mount-0.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-mount/vdr-mount-0.0.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2cb269f7517ed63746e795a9cf1efaa0
diff --git a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r2 b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r2
index 7fc60e8883d3..1b0ee63d93c3 100644
--- a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r2
+++ b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-mp3ng/vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz mirror://gentoo/vdr-mp3ng-pictures-0.0.1.tar.gz mirror://gentoo/vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c71103a1ce4d70263641e0707d2ecaba
diff --git a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r3 b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r3
index 18b6d62d70b8..ce356f71e368 100644
--- a/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r3
+++ b/metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-mp3ng/vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz mirror://gentoo/vdr-mp3ng-pictures-0.0.1.tar.gz mirror://gentoo/vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2df6e36567bff2351bf35edcb4ac0bcd
diff --git a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2 b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
index e2db3bf144f1..f67285ccb8b5 100644
--- a/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
+++ b/metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.2 || ( media-video/mplay-sh >=media-video/mplayer-sh-0.8.6-r1 ) virtual/eject >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.muempf.de/down/vdr-mp3-0.10.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d7e0f9e0648ea510ed9974d373e71184
diff --git a/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4 b/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
index 4f0635eab62f..f0023ebd940d 100644
--- a/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-newsticker/vdr-newsticker-0.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=24ce89394cbf3fe9bdb2206104dd0cf6
diff --git a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4 b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
index 1a4dd93cea69..25443e2f0f98 100644
--- a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
+++ b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-noepg/archive/v0.0.4.tar.gz -> vdr-noepg-0.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=54e9303daec358a8d0ad12fc5ad9e5f4
diff --git a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5 b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
index d279b9bc440f..de6ad9ddc386 100644
--- a/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-noepg/archive/v0.0.5.tar.gz -> vdr-noepg-0.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c7e6090a00034475769d8879da32bf37
diff --git a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2 b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
index c7f2909c3efc..2d2aafefb04a 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
+++ b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.udo-richter.de/vdr/files/vdr-osdserver-0.1.2.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1a00ffc8ca56ebc1a5ae96498f7bcba4
diff --git a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3 b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
index 6f76e83ff6dd..29ce69d12cbc 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.udo-richter.de/vdr/files/vdr-osdserver-0.1.3.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a36e171feaa0efd3ba49d599d3e98897
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1
index 589f52888508..5ec7bc34795f 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1282/vdr-osdteletext-0.9.4.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=06197b2cb509a1b22dd1d1d6d07eca3e
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5
index e14b6a50a504..57543b8221d8 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.39 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1881/vdr-osdteletext-0.9.5.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c895b1964f6e48a15596a21a6df6195f
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7 b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7
index 1c271168cbea..8fda02d9eaa9 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ public-domain
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/attachments/download/2161/vdr-osdteletext-0.9.7.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b3d375d0be71ef5b460068255ba50b7
diff --git a/metadata/md5-cache/media-plugins/vdr-peer-0.0.1 b/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
index a1aaf0bb5313..cfc743101717 100644
--- a/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-peer-0.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/peer/vdr-peer-0.0.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=981a325c664bb04527f2a4ef38eb604b
diff --git a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1 b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
index 10af4a929415..20e947cb87d8 100644
--- a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=~media-video/vdr-2.2.0[permashift] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://ein-eike.de/wordpress/wp-content/uploads/2014/11/vdr-permashift-1.0.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1a5477e6ea526768d7f6c402a9483191
diff --git a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301 b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
index e6e573cd48ec..4ce9aae2b9e4 100644
--- a/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
+++ b/metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=|| ( ~media-video/vdr-2.2.0[permashift] >=media-video/vdr-2.4.1-r3[permashift] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/eikesauer/Permashift/archive/f3541d7c0e3e201daf06a49304db0a0d7d5f8dd1.tar.gz -> vdr-permashift-1.0.4_pre20200301.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5081546453d0db7f454ef2bb20cdabf
diff --git a/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1 b/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
index 5ba7e6d14ad5..71a5dc8cdd3a 100644
--- a/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
+++ b/metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://famillejacques.free.fr/vdr/pilot/vdr-pilot-0.0.9.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7040d7ce352480fc094ab8c5c17bb52b
diff --git a/metadata/md5-cache/media-plugins/vdr-pin-0.1.14 b/metadata/md5-cache/media-plugins/vdr-pin-0.1.14
index c8832c424273..ee3843e626b3 100644
--- a/metadata/md5-cache/media-plugins/vdr-pin-0.1.14
+++ b/metadata/md5-cache/media-plugins/vdr-pin-0.1.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.2-r1[pinplugin] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1379/vdr-pin-0.1.14.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=825ac4fa81444d69991f628fe108f1fe
diff --git a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5 b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
index 377ef46e0a5e..8c58667227bf 100644
--- a/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-powermate/vdr-powermate-0.0.5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c8747200383bbccf81dd8e4b2d4ec787
diff --git a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1 b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
index 4a535737e74d..95d722a38a5c 100644
--- a/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
+++ b/metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-proxy/vdr-proxy-0.1.4.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e39e5b0c1ad1369af50e4b602cd13ab9
diff --git a/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5 b/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
index a44dce55d107..497a3fd78661 100644
--- a/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
+++ b/metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2 media-sound/mpg123 media-sound/twolame media-libs/a52dec >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1657/vdr-pvr350-1.7.5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=34b7dd2c8af4e90909a4f3e7633ec5a5
diff --git a/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1 b/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
index ce25082a02bc..7b17598cd917 100644
--- a/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-quicktimer-0.1.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dbf567be745e30d49835701c49572ee2
diff --git a/metadata/md5-cache/media-plugins/vdr-radio-0.9.1 b/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
index c68137f87e94..027116578609 100644
--- a/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
+++ b/metadata/md5-cache/media-plugins/vdr-radio-0.9.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.egal-vdr.de/plugins/vdr-radio-0.9.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=970102551be020ec37bc5076d99a172f
diff --git a/metadata/md5-cache/media-plugins/vdr-radio-1.1.0 b/metadata/md5-cache/media-plugins/vdr-radio-1.1.0
index 0bc5be768f83..01440681ec96 100644
--- a/metadata/md5-cache/media-plugins/vdr-radio-1.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-radio-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-radio.git/snapshot/vdr-plugin-radio-1.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30b8ab5e53be5b7c3a6fb0aaec180159
diff --git a/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2 b/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
index 7b8398a44635..308e02146dd3 100644
--- a/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-radiolist/vdr-radiolist-0.0.2.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7b7dd0d1b1d2d259230c25cef696b5c8
diff --git a/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0 b/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
index b32fc9965502..c01d50acb4e4 100644
--- a/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-rcu-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-rcu-2.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7b579ecc7b0a56a02ea744e6f199082e
diff --git a/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7 b/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
index 3c3a5a9d2ffd..61a0e320dc40 100644
--- a/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
+++ b/metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/flensrocker/vdr-plugin-recsearch/releases/download/v0.3.7/vdr-recsearch-0.3.7.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=46d96959df6abdd5f0cc3d73431af11e
diff --git a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0 b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0
index 56587082906f..64c7f7d34d32 100644
--- a/metadata/md5-cache/media-plugins/vdr-remote-0.7.0
+++ b/metadata/md5-cache/media-plugins/vdr-remote-0.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.escape-edv.de/endriss/vdr/vdr-remote-0.7.0.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1e01b47e15b102ea443f31719931fa1
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0 b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
index a44dacd5a63c..bf7704bf138a 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remoteosd/vdr-remoteosd-1.0.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6ecb843ebab4af603a7b4b53fbd2ab12
diff --git a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1 b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
index ca7faea2c9a6..6248c7c71087 100644
--- a/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remoteosd/vdr-remoteosd-1.0.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=685403cc1f9d801f1b2bd6c465bc2de1
diff --git a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2 b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
index 94d2c11277ce..6e87f867a6e9 100644
--- a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remotetimers/vdr-remotetimers-1.0.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1742d4a653abdfa4a67188a662272fa
diff --git a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1 b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
index 4d297e89d6ac..411f6f9ef884 100644
--- a/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
+++ b/metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/remotetimers/vdr-remotetimers-1.0.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b98c1c6a2e6628e3559c65ab4fed0dd
diff --git a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3 b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
index c2285ca16bb5..0e6bb8dc36f3 100644
--- a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2045/vdr-rpihddevice-1.0.3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=46756c65adeb548199a6eb861597d639
diff --git a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5 b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
index a6a428dbe138..7ef1fae9ed0b 100644
--- a/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2193/vdr-rpihddevice-1.0.5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b613abedfc81cf7316c95be5b8e712f0
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
index 87f7d03250b1..831fc525334e 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.2.1.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0c81d93b7f3eb659fb687aa8c353fcf
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2 b/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
index ca7e4c0177e0..9a144fd394c6 100644
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
+++ b/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/vdr-satip-2.2.3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=17fa586ddd75f265fb01bc8d1232731d
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.2.5 b/metadata/md5-cache/media-plugins/vdr-satip-2.2.5
index 4052ef71c0a6..9a31d961e165 100644
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.2.5
+++ b/metadata/md5-cache/media-plugins/vdr-satip-2.2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/vdr-satip-2.2.5.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=86dd2445e1e9d66d7b19176d97ba4907
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20191027 b/metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20191027
index 11d6d12c90e1..c6ee3a6a55cd 100644
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20191027
+++ b/metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20191027
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.4.0 >=net-misc/curl-7.36 || ( dev-libs/pugixml dev-libs/tinyxml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/rofafor/vdr-plugin-satip/archive/19e3057f34d9c097c8c6bad30188b14d80b7a242.tar.gz -> vdr-satip-2.4.0_p20191027.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e1e27408ff3fe765391963bd787a113
diff --git a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3 b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
index c30e0c9e231c..0ac371274218 100644
--- a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/scheduler/downloads/vdr-scheduler-0.1.3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=550e7c47a800e0aca1a28ff157368f57
diff --git a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6 b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
index 86b61540c9a0..684e35bcb3da 100644
--- a/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
+++ b/metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/scheduler/downloads/vdr-scheduler-0.1.6.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=95cd000862b37b6c2fa0c48a49f759b4
diff --git a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15 b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
index 1903117e2b4c..c6b0125cf825 100644
--- a/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
+++ b/metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/jowi24/vdr-screenshot/archive/0.0.15.tar.gz -> vdr-screenshot-0.0.15.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc2b01283de4950c3d15214c46119126
diff --git a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1 b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
index ad2c8fb7cee7..347a32bd7c42 100644
--- a/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
+++ b/metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.lf-klueber.de/vdr-serial-0.0.6a.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d599ef5d713936af752b472819e5f035
diff --git a/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0 b/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
index 7e2928521433..9dca8ccbceb6 100644
--- a/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
+++ b/metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-skincurses-2.2.0.tar.gz https://dev.gentoo.org/~hd_brummy/distfiles/vdr-skincurses-2.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5619cb19cb2eb9df3b02bb91067c05cc
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
index 62baf784b08b..c41c1c522df5 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.3.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=934f9d106676d70dd913da91ffb1a3d9
diff --git a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2 b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
index 4df09ed41e13..520e7f17f252 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/skinelchi/vdr-skinelchi-0.3.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=874e907af68b311802ba93e5c0d7b5a0
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
index bb35b2a5f501..cfc227da9cff 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.0.0.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4d5899362162c490c3f983524adafd9f
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
index c2f7d20ca1e7..57eec2ff9374 100644
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
+++ b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-2.4.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.4.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1d4a0ad513dbb4de7209b9a9a456c358
diff --git a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6 b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
index a58985b96d6e..c7684fa2b337 100644
--- a/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
+++ b/metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://linvdr.org/download/vdr-sleeptimer/sleeptimer-0.6.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=993d2e65d97fcaa636bf783482528fff
diff --git a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1 b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
index 110eacd20a9c..40f9a6b91f6f 100644
--- a/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.4.1 media-libs/alsa-lib >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-sndctl/vdr-sndctl-0.1.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=55c3ac7c4ee9265f5cbba150953967df
diff --git a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3 b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
index c7ef73c106e2..0638edb67e8c 100644
--- a/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
+++ b/metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://web.archive.org/web/20150928211126/http://www.djdagobert.com/vdr/solitaire/vdr-solitaire-0.0.3.tbz2
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dc07ffbd9d945180def7427aa33dda8e
diff --git a/metadata/md5-cache/media-plugins/vdr-span-0.0.7 b/metadata/md5-cache/media-plugins/vdr-span-0.0.7
index cc01b7681d37..e95a50d55774 100644
--- a/metadata/md5-cache/media-plugins/vdr-span-0.0.7
+++ b/metadata/md5-cache/media-plugins/vdr-span-0.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=sci-libs/fftw-3.0.1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lcr.vdr-developer.org/downloads/vdr-span-0.0.7.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c384c44b1a6671a0a6c8c920be18f49c
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
index b3643d374af5..9755b997f27e 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.7.25 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-esele
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1580/vdr-streamdev-0.6.1.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c660bc195bc4fcabe86923b44240396b
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
index 307d46d39532..2802bf101e7b 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-1.7.25 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-esele
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-674bb5b331240de3ba2a8beb63a1276003e64e3e.tar.bz2
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=000f2f826ed51c439aedee8ca7b4ff1e
diff --git a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930 b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
index 99dd90c46583..a19bc08cbd51 100644
--- a/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
+++ b/metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/vdr-2.3 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-e2a9b979d3fb92967c7a6a8221e674eb7e55c813.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b2f4e6a7829ea0c2b01e066e075b3758
diff --git a/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1 b/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
index 19d250be01b9..522aafe67ab8 100644
--- a/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-suspendoutput/vdr-suspendoutput-2.0.1.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d0a76258d68d6e92759d6ab23c921c6a
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0 b/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
index 24c7087cb88c..8f28f5cafee8 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/svdrpext/vdr-svdrposd-1.0.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=de14083fe23eb7fa879f850a0fb815af
diff --git a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0 b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
index 5942a99c965d..9572beb68e76 100644
--- a/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
+++ b/metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.schmirler.de/svdrpservice/vdr-svdrpservice-1.0.0.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=470c1b7e02b8fb15189d447035842db3
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
index d6abc686c6bf..00fd7d494a6a 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/lm-sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.4.tar.bz2
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8e703c7eaf59a5005ae19e42939ce8f7
diff --git a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0 b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
index 88fcd7cde0cc..fbe8736933cd 100644
--- a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
+++ b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-video/vdr-1.7.38[ttxtsubs] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1281/vdr-ttxtsubs-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=130af98d96a141f59eb87782afffb20c
diff --git a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2 b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
index d0dc5166fca3..77f8cabaac55 100644
--- a/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=media-video/vdr[ttxtsubs] >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1281/vdr-ttxtsubs-0.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=225ca271e18f6f3e7fe63708b9c3aa9a
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7 b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
index 27df9eac0cfe..3e4d6548b29d 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1060/vdr-undelete-0.0.7.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ea2479542b1bbce9bd1d4c582f80e665
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1 b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
index 36fe9d04a007..49681f2c697a 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1060/vdr-undelete-0.0.7.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=861f7aec85e45d052e2d42af388bbdd1
diff --git a/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1 b/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
index b1bc2ff53699..9aca2c9181ab 100644
--- a/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
+++ b/metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-2.3.1-pre1.tgz -> vdr-undelete-2.3.0_pre1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8ecc6d1a6f113c4ff2f85218b9b03eae
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3 b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
index 964df083a9aa..1ff2d9bc74ab 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-vcd/vdr-vcd-0.9.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b8aa6c7a7a03008104bf10adc7591760
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4 b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
index 3b2664befe98..f98a2ab711b6 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-vcd/vdr-vcd-0.9.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b44aba257c3df277951221da5c8dc2b
diff --git a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14 b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
index 63cdc829f34e..437829de807e 100644
--- a/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
+++ b/metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=stream? ( media-plugins/vdr-streamdev[server] ) zlib? ( sys-libs/zlib ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1971/vdr-vdrmanager-0.14.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	6ba9452db3e1108ce9b4a017a005fd79	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	6ba9452db3e1108ce9b4a017a005fd79	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=13570a47f3bec4db5f03df2ef6dc870e
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
index c59b948a2a7f..ea2d5a54a46a 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.36-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.4.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=25feac9640e4e9f7ac12714d18246ca6
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
index 27602a4bb66a..c3281b2d055e 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.36-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.4.1.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5c1c82cb2f04ab25955b2a6de3b6a61
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
index cc45d011217f..60445c882690 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.5.1.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d3f1f67b154a163d09539315db506ea
diff --git a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1 b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
index 26e3ab7dfde2..78f9f057540d 100644
--- a/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
+++ b/metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 stardock-images
 RDEPEND=media-libs/imlib2[jpeg,gif] >=media-video/vdr-1.3.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://vdr.websitec.de/download/vdr-weatherng/vdr-weatherng-0.0.8-pre3.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dfcaec1b0b2e3bd9ff5a9d4e8872417c
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1 b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
index 6c4719e5deaf..c48dd297075c 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-0.0.7.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0f1728497d2689b70cb66651897b64c2
diff --git a/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1 b/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
index 8ade9b2eecbb..2fbede79792f 100644
--- a/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
+++ b/metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=https://github.com/CvH/vdr-plugin-wirbelscan/archive/e1377b95312a138a41f93d7b06b3adb4ed4e7324.tar.gz -> vdr-wirbelscan-2018.11.04.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d115850927fa4b47d92b91d816ca1bc4
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r1 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r1
index 6efc6d4bed1c..0a053e371ad9 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.1.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cdb73fc0d25b98990c4e635b2c8eafbc
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r2 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r2
index 3cb914033c41..e6e6ce967ed4 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.1.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c9ea5f488f141c368a44abc9c01ca62f
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r1 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r1
index 84d6125fdd3c..5d7424dab8e7 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.2.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1cc47cf7dcc70063a1fac4cb7aedc922
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
index 9898531f261d..f88e0abe90e5 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=vdr? ( media-video/vdr libextractor? ( >=media-libs/libextractor-0.5.20
 REQUIRED_USE=|| ( vdr xine )
 SLOT=0
 SRC_URI=mirror://sourceforge/xineliboutput/vdr-xineliboutput-2.2.0.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0719b31306648c3a577289101d66d939
diff --git a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999 b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
index 14f17b5630d2..52537c6e91ff 100644
--- a/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
+++ b/metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=vdr? ( >=media-video/vdr-1.6.0 libextractor? ( >=media-libs/libextractor-0.5.20 ) caps? ( sys-libs/libcap ) ) xine? ( ( >=media-libs/xine-lib-1.2 media-video/ffmpeg ) fbcon? ( jpeg? ( virtual/jpeg:* ) ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) dbus? ( dev-libs/dbus-glib dev-libs/glib:2 ) vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 ) jpeg? ( virtual/jpeg:* ) bluray? ( media-libs/libbluray ) opengl? ( virtual/opengl ) ) ) cec? ( dev-libs/libcec ) vdr? ( >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2 )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a61962f6e46dfaa84a7189ce339d0ce3
diff --git a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5 b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
index 602b8f944753..05f384505156 100644
--- a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1318/vdr-zappilot-0.0.5.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3e7fb425f1507659c92adc9f87d0c4c2
diff --git a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1 b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
index ef48acdd32bf..0d88f87665fc 100644
--- a/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.34 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/1318/vdr-zappilot-0.0.5.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0699e36abfc518a52e16428ffa160c66
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 8e0f1a8735da..a32b88ba55e7 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/abcde-2.9.3-r1 b/metadata/md5-cache/media-sound/abcde-2.9.3-r1
index 37a4d7abf9a7..09226c9ea9b7 100644
--- a/metadata/md5-cache/media-sound/abcde-2.9.3-r1
+++ b/metadata/md5-cache/media-sound/abcde-2.9.3-r1
@@ -5,7 +5,7 @@ HOMEPAGE=https://abcde.einval.com/
 IUSE=aac aiff cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
-RDEPEND=media-sound/cd-discid net-misc/wget virtual/eject || ( dev-libs/libcdio-paranoia media-sound/cdparanoia media-sound/dagrab ) aac? ( media-libs/faac || ( media-video/atomicparsley media-video/atomicparsley-wez ) ) aiff? ( media-video/ffmpeg ) cdr? ( virtual/cdrtools ) flac? ( media-libs/flac ) id3tag? ( dev-python/eyeD3:0.7 >=media-sound/id3-0.12 media-sound/id3v2 ) lame? ( media-sound/lame ) mac? ( media-sound/apetag media-sound/mac ) musepack? ( media-sound/musepack-tools ) musicbrainz? ( dev-perl/MusicBrainz-DiscID >=dev-perl/WebService-MusicBrainz-1.0.4 virtual/perl-Digest-SHA virtual/perl-Getopt-Long ) normalize? ( >=media-sound/normalize-0.7.4 ) opus? ( media-sound/opus-tools ) replaygain? ( lame? ( media-sound/mp3gain ) vorbis? ( media-sound/vorbisgain ) ) speex? ( media-libs/speex ) vorbis? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack )
+RDEPEND=media-sound/cd-discid net-misc/wget virtual/eject || ( dev-libs/libcdio-paranoia media-sound/cdparanoia media-sound/dagrab ) aac? ( media-libs/faac || ( media-video/atomicparsley media-video/atomicparsley-wez ) ) aiff? ( media-video/ffmpeg ) cdr? ( app-cdr/cdrtools ) flac? ( media-libs/flac ) id3tag? ( dev-python/eyeD3:0.7 >=media-sound/id3-0.12 media-sound/id3v2 ) lame? ( media-sound/lame ) mac? ( media-sound/apetag media-sound/mac ) musepack? ( media-sound/musepack-tools ) musicbrainz? ( dev-perl/MusicBrainz-DiscID >=dev-perl/WebService-MusicBrainz-1.0.4 virtual/perl-Digest-SHA virtual/perl-Getopt-Long ) normalize? ( >=media-sound/normalize-0.7.4 ) opus? ( media-sound/opus-tools ) replaygain? ( lame? ( media-sound/mp3gain ) vorbis? ( media-sound/vorbisgain ) ) speex? ( media-libs/speex ) vorbis? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=https://abcde.einval.com/download/abcde-2.9.3.tar.gz
-_md5_=ea30d767ae3a3e540c4df6a82be10220
+_md5_=63c037edc3369f7eb5b4774125760124
diff --git a/metadata/md5-cache/media-sound/audiotools-3.1.1 b/metadata/md5-cache/media-sound/audiotools-3.1.1
index f5c3ab12d4b7..f764e7312bd9 100644
--- a/metadata/md5-cache/media-sound/audiotools-3.1.1
+++ b/metadata/md5-cache/media-sound/audiotools-3.1.1
@@ -7,10 +7,10 @@ HOMEPAGE=http://audiotools.sourceforge.net/
 IUSE=aac alsa cdda cdr cue dvda flac gui twolame mp3 opus pulseaudio vorbis wavpack python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia:0= ) dvda? ( media-libs/libdvd-audio ) twolame? ( media-sound/twolame ) mp3? ( || ( media-sound/mpg123 media-sound/lame ) ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) aac? ( media-libs/faad2 media-libs/faac ) cdr? ( virtual/cdrtools ) cue? ( app-cdr/cdrdao ) flac? ( media-libs/flac ) gui? ( python_targets_python3_6? ( dev-lang/python:3.6[tk(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk(+)] ) dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urwid[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[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(-)]
+RDEPEND=alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia:0= ) dvda? ( media-libs/libdvd-audio ) twolame? ( media-sound/twolame ) mp3? ( || ( media-sound/mpg123 media-sound/lame ) ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) aac? ( media-libs/faad2 media-libs/faac ) cdr? ( app-cdr/cdrtools ) cue? ( app-cdr/cdrdao ) flac? ( media-libs/flac ) gui? ( python_targets_python3_6? ( dev-lang/python:3.6[tk(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk(+)] ) dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urwid[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[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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/audiotools/audiotools-3.1.1.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e6f3df4d39d36b3f71bac04fbcaae5a8
+_md5_=177aa6176748d567886746f5ba132062
diff --git a/metadata/md5-cache/media-sound/din-49.1 b/metadata/md5-cache/media-sound/din-49.1
index abdcf45e5ecc..e70da645ef75 100644
--- a/metadata/md5-cache/media-sound/din-49.1
+++ b/metadata/md5-cache/media-sound/din-49.1
@@ -5,11 +5,11 @@ DESCRIPTION=a software musical instrument and audio synthesizer
 EAPI=7
 HOMEPAGE=https://dinisnoise.org/
 IUSE=+alsa jack
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
 REQUIRED_USE=|| ( alsa jack )
 SLOT=0
 SRC_URI=https://archive.org/download/dinisnoise_source_code/din-49.1.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c711451399b3fed1cb7b2ccf4ea8f85
+_md5_=3fc7a826ce056f4a59f07d04f757fe4b
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.36.7 b/metadata/md5-cache/media-sound/gnome-music-3.36.7
new file mode 100644
index 000000000000..8ec084a5713b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gnome-music-3.36.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2:2 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 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] ) >=dev-libs/glib-2.50:2 >=net-libs/gnome-online-accounts-3.35.90[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.24.7:3[introspection] >=dev-libs/libdazzle-3.28.0[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] net-libs/libsoup:2.4[introspection] >=app-misc/tracker-2.3.0:=[introspection(+)] python_single_target_python3_6? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_6(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_7(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_8(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_8(-)] ) >=media-libs/grilo-0.3.12:0.3[introspection] >=media-plugins/grilo-plugins-0.3.10:0.3 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Music management for Gnome
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Music
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm64 ~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/glib-2.50:2 >=net-libs/gnome-online-accounts-3.35.90[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.24.7:3[introspection] >=dev-libs/libdazzle-3.28.0[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] net-libs/libsoup:2.4[introspection] >=app-misc/tracker-2.3.0:=[introspection(+)] python_single_target_python3_6? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_6(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_7(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_8(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_8(-)] ) >=media-libs/grilo-0.3.12:0.3[introspection] >=media-plugins/grilo-plugins-0.3.10:0.3 || ( >=app-misc/tracker-miners-2.2.0[gstreamer] >=app-misc/tracker-miners-2.2.0[ffmpeg] ) x11-libs/libnotify[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.3[tracker] x11-misc/xdg-user-dirs
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-music/3.36/gnome-music-3.36.7.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0cdec2fc4706c984bb70b6da6ea6284a
diff --git a/metadata/md5-cache/media-sound/gnump3d-3.0-r2 b/metadata/md5-cache/media-sound/gnump3d-3.0-r2
index 3e404ed99066..057381f2237c 100644
--- a/metadata/md5-cache/media-sound/gnump3d-3.0-r2
+++ b/metadata/md5-cache/media-sound/gnump3d-3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=sox? ( media-sound/sox ) dev-lang/perl:=[-build(-)]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://savannah.gnu.org/download/gnump3d/gnump3d-3.0.tar.bz2
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5c543af272709e53096867e41f042a78
diff --git a/metadata/md5-cache/media-sound/mp3c-0.31-r1 b/metadata/md5-cache/media-sound/mp3c-0.31-r1
index 8ed563c9251e..3739a0527f3d 100644
--- a/metadata/md5-cache/media-sound/mp3c-0.31-r1
+++ b/metadata/md5-cache/media-sound/mp3c-0.31-r1
@@ -7,8 +7,8 @@ HOMEPAGE=http://wspse.de/WSPse/Linux-MP3c.php3
 IUSE=mp3 vorbis
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= virtual/cdrtools mp3? ( media-sound/lame media-sound/mp3info ) vorbis? ( media-sound/vorbis-tools )
+RDEPEND=sys-libs/ncurses:0= app-cdr/cdrtools mp3? ( media-sound/lame media-sound/mp3info ) vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=ftp://ftp.wspse.de/pub/linux/wspse/mp3c-0.31.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=831b37f5d5560c3926ac7ee8f9718eb7
+_md5_=0ef5b9a515f590e670f2d515cfd3490f
diff --git a/metadata/md5-cache/media-sound/mumble-1.3.3 b/metadata/md5-cache/media-sound/mumble-1.3.3
index b28b63604873..dc8b31ede591 100644
--- a/metadata/md5-cache/media-sound/mumble-1.3.3
+++ b/metadata/md5-cache/media-sound/mumble-1.3.3
@@ -5,10 +5,10 @@ DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat softw
 EAPI=7
 HOMEPAGE=https://wiki.mumble.info
 IUSE=+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=BSD MIT
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 SLOT=0
 SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.3/mumble-1.3.3.tar.gz https://dl.mumble.info/mumble-1.3.3.tar.gz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	estack	d780995dc525ff7e6a2c4c043ffec242	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1609c353bac2187f1364649c830d54c7
+_md5_=da312721e24787865fab14b06ac30c49
diff --git a/metadata/md5-cache/media-sound/murmur-1.3.3 b/metadata/md5-cache/media-sound/murmur-1.3.3
index 1941caeaaf3d..407870294232 100644
--- a/metadata/md5-cache/media-sound/murmur-1.3.3
+++ b/metadata/md5-cache/media-sound/murmur-1.3.3
@@ -5,10 +5,10 @@ DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat softw
 EAPI=7
 HOMEPAGE=https://wiki.mumble.info
 IUSE=+dbus debug +ice pch zeroconf
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=acct-group/murmur acct-user/murmur >=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 || ( dev-qt/qtsql:5[sqlite] dev-qt/qtsql:5[mysql] ) dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 dbus? ( dev-qt/qtdbus:5 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 SLOT=0
 SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.3/mumble-1.3.3.tar.gz https://dl.mumble.info/mumble-1.3.3.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=71a18b0bd349bbf39285124b5655b025
+_md5_=ff6ad876ac7fe6b20e43497c5f875e9e
diff --git a/metadata/md5-cache/media-sound/qjackctl-0.9.0 b/metadata/md5-cache/media-sound/qjackctl-0.9.0
new file mode 100644
index 000000000000..1d2a9c05b03f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qjackctl-0.9.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-arch/gzip dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 virtual/jack alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) portaudio? ( media-libs/portaudio ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections
+EAPI=7
+HOMEPAGE=https://qjackctl.sourceforge.io/
+IUSE=alsa dbus debug portaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/gzip dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 virtual/jack alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) portaudio? ( media-libs/portaudio )
+SLOT=0
+SRC_URI=mirror://sourceforge/qjackctl/qjackctl-0.9.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4007e198d5fd21cffb1cb348bd5d56ff
diff --git a/metadata/md5-cache/media-sound/qjackctl-9999 b/metadata/md5-cache/media-sound/qjackctl-9999
index dd2255c32fb2..143d32036a0a 100644
--- a/metadata/md5-cache/media-sound/qjackctl-9999
+++ b/metadata/md5-cache/media-sound/qjackctl-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=app-arch/gzip dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 virtual/jack alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) portaudio? ( media-libs/portaudio )
 SLOT=0
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5816dca5b9b9d3fd77f63d516f631f05
+_md5_=b465f159c7d651e72a913bdd874ea9b3
diff --git a/metadata/md5-cache/media-sound/qsampler-0.5.6 b/metadata/md5-cache/media-sound/qsampler-0.5.6
deleted file mode 100644
index 584721080615..000000000000
--- a/metadata/md5-cache/media-sound/qsampler-0.5.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib >=media-libs/liblscp-0.5.6:= x11-libs/libX11 libgig? ( >=media-libs/libgig-3.3.0:= ) dev-qt/linguist-tools:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Graphical frontend to the LinuxSampler engine
-EAPI=7
-HOMEPAGE=https://qsampler.sourceforge.io/ https://www.linuxsampler.org/
-IUSE=debug +libgig
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib >=media-libs/liblscp-0.5.6:= x11-libs/libX11 libgig? ( >=media-libs/libgig-3.3.0:= ) >=media-sound/linuxsampler-0.5
-SLOT=0
-SRC_URI=mirror://sourceforge/qsampler/0.5.6/qsampler-0.5.6.tar.gz
-_eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b628a1158f20396184de62ea86b4de0
diff --git a/metadata/md5-cache/media-sound/qsampler-0.6.3 b/metadata/md5-cache/media-sound/qsampler-0.6.3
index e02418c20ad1..60d2b6fdc3ec 100644
--- a/metadata/md5-cache/media-sound/qsampler-0.6.3
+++ b/metadata/md5-cache/media-sound/qsampler-0.6.3
@@ -5,10 +5,10 @@ DESCRIPTION=Graphical frontend to the LinuxSampler engine
 EAPI=7
 HOMEPAGE=https://qsampler.sourceforge.io/ https://www.linuxsampler.org/
 IUSE=debug +libgig
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib >=media-libs/liblscp-0.5.6:= x11-libs/libX11 libgig? ( >=media-libs/libgig-3.3.0:= ) >=media-sound/linuxsampler-0.5
 SLOT=0
 SRC_URI=mirror://sourceforge/qsampler/0.6.3/qsampler-0.6.3.tar.gz
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=98942825cb13e4733e5d32cd996de911
+_md5_=b0252cf89d3e7b404af823b2730c58ad
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.72-r1 b/metadata/md5-cache/media-sound/spotify-1.0.72-r1
index daf19bfafe2f..81d194b5b8e4 100644
--- a/metadata/md5-cache/media-sound/spotify-1.0.72-r1
+++ b/metadata/md5-cache/media-sound/spotify-1.0.72-r1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib med
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2263b15a6d32c35796b52b67449e2c1
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.10-r1 b/metadata/md5-cache/media-sound/spotify-1.1.10-r1
index d0dbe007dffd..65645df9fa4d 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.10-r1
+++ b/metadata/md5-cache/media-sound/spotify-1.1.10-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? (
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.10.546.ge08ef575-19_amd64.deb
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f1592ccde15615000bdc9d081e5b7a8
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.26-r1 b/metadata/md5-cache/media-sound/spotify-1.1.26-r1
index d019e689f122..d54984d6f3b5 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.26-r1
+++ b/metadata/md5-cache/media-sound/spotify-1.1.26-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? (
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6911dd4524940b9922fdd548675c13a0
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.26-r2 b/metadata/md5-cache/media-sound/spotify-1.1.26-r2
index 74be04b23b81..33c77936b0e7 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.26-r2
+++ b/metadata/md5-cache/media-sound/spotify-1.1.26-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? (
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=168357014aaef8826a67789ad7f7bcc1
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.42 b/metadata/md5-cache/media-sound/spotify-1.1.42
index 130af5c77993..5f613c481385 100644
--- a/metadata/md5-cache/media-sound/spotify-1.1.42
+++ b/metadata/md5-cache/media-sound/spotify-1.1.42
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? (
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.42.622.gbd112320-37_amd64.deb
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3884c75d33c5822fca3a6b3abed18685
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-3.5.3-r1 b/metadata/md5-cache/media-sound/teamspeak-client-3.5.3-r1
index d78a4a148c1c..ad0e0a7e0b8f 100644
--- a/metadata/md5-cache/media-sound/teamspeak-client-3.5.3-r1
+++ b/metadata/md5-cache/media-sound/teamspeak-client-3.5.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( alsa pulseaudio )
 RESTRICT=bindist mirror
 SLOT=3
 SRC_URI=amd64? ( https://files.teamspeak-services.com/releases/client/3.5.3/TeamSpeak3-Client-linux_amd64-3.5.3.run ) x86? ( https://files.teamspeak-services.com/releases/client/3.5.3/TeamSpeak3-Client-linux_x86-3.5.3.run )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c413e8c22096046e9bc8841515816d46
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-3.5.6-r1 b/metadata/md5-cache/media-sound/teamspeak-client-3.5.6-r1
index 867356d5a754..b8074e66d319 100644
--- a/metadata/md5-cache/media-sound/teamspeak-client-3.5.6-r1
+++ b/metadata/md5-cache/media-sound/teamspeak-client-3.5.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( alsa pulseaudio )
 RESTRICT=bindist mirror
 SLOT=3
 SRC_URI=amd64? ( https://files.teamspeak-services.com/releases/client/3.5.6/TeamSpeak3-Client-linux_amd64-3.5.6.run ) x86? ( https://files.teamspeak-services.com/releases/client/3.5.6/TeamSpeak3-Client-linux_x86-3.5.6.run )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c456213f70528f4be54eda6f0cb9ac3b
diff --git a/metadata/md5-cache/media-sound/teamspeak-server-3.13.2 b/metadata/md5-cache/media-sound/teamspeak-server-3.13.3
similarity index 79%
rename from metadata/md5-cache/media-sound/teamspeak-server-3.13.2
rename to metadata/md5-cache/media-sound/teamspeak-server-3.13.3
index 6425a3ef7d75..4a316c049b6b 100644
--- a/metadata/md5-cache/media-sound/teamspeak-server-3.13.2
+++ b/metadata/md5-cache/media-sound/teamspeak-server-3.13.3
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3
 RDEPEND=acct-group/teamspeak acct-user/teamspeak postgres? ( dev-db/postgresql )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://files.teamspeak-services.com/releases/server/3.13.2/teamspeak3-server_linux_amd64-3.13.2.tar.bz2 ) x86? ( https://files.teamspeak-services.com/releases/server/3.13.2/teamspeak3-server_linux_x86-3.13.2.tar.bz2 )
+SRC_URI=amd64? ( https://files.teamspeak-services.com/releases/server/3.13.3/teamspeak3-server_linux_amd64-3.13.3.tar.bz2 ) x86? ( https://files.teamspeak-services.com/releases/server/3.13.3/teamspeak3-server_linux_x86-3.13.3.tar.bz2 )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d60765d23a2f94ccb68af91b09752312
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 359939217131..3b6a38e9c2a0 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/acidrip-0.14-r4 b/metadata/md5-cache/media-video/acidrip-0.14-r4
index 8f82067ace60..5912484b7334 100644
--- a/metadata/md5-cache/media-video/acidrip-0.14-r4
+++ b/metadata/md5-cache/media-video/acidrip-0.14-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Gtk2 media-video/lsdvd media-video/mplayer[encode] encode? ( >=media-sound/lame-3.92 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/acidrip/files/acidrip/0.14%20-%20Your%20two-wheeled%20knife/acidrip-0.14.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=99ca20cedca67baaa8c275e19daa3940
diff --git a/metadata/md5-cache/media-video/clive-2.3.0.1 b/metadata/md5-cache/media-video/clive-2.3.0.1
index 0fc0d887f0fb..fe36874e8acd 100644
--- a/metadata/md5-cache/media-video/clive-2.3.0.1
+++ b/metadata/md5-cache/media-video/clive-2.3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/BerkeleyDB-0.34 >=dev-perl/Config-Tiny-2.12 >=virtual/perl-Di
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/clive/2.3/clive-2.3.0.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8aeee870341f23058d24e292645f078d
diff --git a/metadata/md5-cache/media-video/devedeng-4.16.0-r1 b/metadata/md5-cache/media-video/devedeng-4.16.0-r1
index 53aefe36ca0a..8e76d61a49c5 100644
--- a/metadata/md5-cache/media-video/devedeng-4.16.0-r1
+++ b/metadata/md5-cache/media-video/devedeng-4.16.0-r1
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.rastersoft.com/programas/devede.html
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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: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(-)] x11-libs/gtk+:3 || ( media-video/vlc media-video/mpv media-video/mplayer ) media-video/ffmpeg media-video/dvdauthor media-video/vcdimager virtual/cdrtools || ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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(-)]
+RDEPEND=app-cdr/cdrtools dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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: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(-)] x11-libs/gtk+:3 || ( media-video/vlc media-video/mpv media-video/mplayer ) media-video/ffmpeg media-video/dvdauthor media-video/vcdimager || ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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=https://gitlab.com/rastersoft/devedeng/-/archive/4.16.0/devedeng-4.16.0.tar.bz2
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ebf60a7fc282862df53d9af2eba2f40b
+_md5_=f504c9975b831752ae1105abee7c3ed9
diff --git a/metadata/md5-cache/media-video/dvdrip-0.98.11-r4 b/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
index 5bdd3c82811d..47ffd7ca0ab0 100644
--- a/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
+++ b/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/Gtk2 >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] virtual/imagemagick-tools >=virtual/perl-podlators-2.5.3 x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 ffmpeg? ( media-video/ffmpeg:0 ) fping? ( >=net-analyzer/fping-2.2 ) mplayer? ( media-video/mplayer ) ogg? ( media-sound/ogmtools ) subtitles? ( media-video/subtitleripper ) vcd? ( media-video/transcode[mjpeg] >=media-video/mjpegtools-1.6.0 ) vorbis? ( media-sound/vorbis-tools ) xine? ( media-video/xine-ui ) xvid? ( media-video/xvid4conf ) >=media-video/lsdvd-0.15 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://www.exit1.org/dvdrip/dist/dvdrip-0.98.11.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=07698aa07c5f754948afa62bea918e56
diff --git a/metadata/md5-cache/media-video/dvdstyler-3.0.4 b/metadata/md5-cache/media-video/dvdstyler-3.0.4
index 0a51920a77f0..42a90c82a418 100644
--- a/metadata/md5-cache/media-video/dvdstyler-3.0.4
+++ b/metadata/md5-cache/media-video/dvdstyler-3.0.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= >=media-libs/wxsvg-1.5.11:= >=media-video/dvdauthor-0.7.1 >=media-video/ffmpeg-2.6:0=[encode] >=media-video/xine-ui-0.99.7 virtual/cdrtools virtual/jpeg:0 x11-libs/wxGTK:3.0=[gstreamer,X] sys-apps/dbus udev? ( >=virtual/libudev-215:= ) app-arch/zip app-text/xmlto sys-devel/gettext virtual/yacc virtual/pkgconfig
+DEPEND=app-cdr/cdrtools >=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= >=media-libs/wxsvg-1.5.11:= >=media-video/dvdauthor-0.7.1 >=media-video/ffmpeg-2.6:0=[encode] >=media-video/xine-ui-0.99.7 virtual/jpeg:0 x11-libs/wxGTK:3.0=[gstreamer,X] sys-apps/dbus udev? ( >=virtual/libudev-215:= ) app-arch/zip app-text/xmlto sys-devel/gettext virtual/yacc virtual/pkgconfig
 DESCRIPTION=A cross-platform free DVD authoring application
 EAPI=5
 HOMEPAGE=http://www.dvdstyler.org/
 IUSE=debug +udev
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= >=media-libs/wxsvg-1.5.11:= >=media-video/dvdauthor-0.7.1 >=media-video/ffmpeg-2.6:0=[encode] >=media-video/xine-ui-0.99.7 virtual/cdrtools virtual/jpeg:0 x11-libs/wxGTK:3.0=[gstreamer,X] sys-apps/dbus udev? ( >=virtual/libudev-215:= ) >=app-cdr/dvdisaster-0.72.4 media-video/mjpegtools
+RDEPEND=app-cdr/cdrtools >=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= >=media-libs/wxsvg-1.5.11:= >=media-video/dvdauthor-0.7.1 >=media-video/ffmpeg-2.6:0=[encode] >=media-video/xine-ui-0.99.7 virtual/jpeg:0 x11-libs/wxGTK:3.0=[gstreamer,X] sys-apps/dbus udev? ( >=virtual/libudev-215:= ) >=app-cdr/dvdisaster-0.72.4 media-video/mjpegtools
 SLOT=0
 SRC_URI=mirror://sourceforge/dvdstyler/DVDStyler-3.0.4.tar.bz2
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=5cc69a478db5ec4534509db13d2a588a
+_md5_=8386328803e4d1ae391af94d6ac49033
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.3.1 b/metadata/md5-cache/media-video/ffmpeg-4.3.1
index d14122f154a9..8c59ee6cd761 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.3.1
+++ b/metadata/md5-cache/media-video/ffmpeg-4.3.1
@@ -5,7 +5,7 @@ DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes
 EAPI=7
 HOMEPAGE=https://ffmpeg.org/
 IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 rav1e snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 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_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( media-video/rav1e:=[capi] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=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_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=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_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=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_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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
 REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) vidstab? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl?
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.3.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0e975703d6206d78cd71327d92f5c7b6
+_md5_=4e639ebdb7a364c16ec6b683532844a4
diff --git a/metadata/md5-cache/media-video/kmplayer-0.12.0b-r4 b/metadata/md5-cache/media-video/kmplayer-0.12.0b-r4
deleted file mode 100644
index b9aa025d7764..000000000000
--- a/metadata/md5-cache/media-video/kmplayer-0.12.0b-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext 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/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kbookmarks-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/kdelibs4support-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/kmediaplayer-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 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libxcb cairo? ( x11-libs/cairo[X,xcb(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Video player plugin for Konqueror and basic MPlayer frontend
-EAPI=7
-HOMEPAGE=https://kmplayer.kde.org https://apps.kde.org/en/kmplayer
-IUSE=cairo debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 FDL-1.2 LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kbookmarks-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/kdelibs4support-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/kmediaplayer-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 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libxcb cairo? ( x11-libs/cairo[X,xcb(+)] ) media-video/mplayer || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kmplayer/0.12/kmplayer-0.12.0b.tar.bz2
-_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	ecm	1debe80a481e8d4ed5d2eefb52a27558	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	kde.org	8a81008797ecdb979e3100d782ab5513	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a11bbe406ee4cf38e9fa468b24c99da
diff --git a/metadata/md5-cache/media-video/rav1e-0.3.4 b/metadata/md5-cache/media-video/rav1e-0.3.4
index 4761089e3f39..7170bd3ad758 100644
--- a/metadata/md5-cache/media-video/rav1e-0.3.4
+++ b/metadata/md5-cache/media-video/rav1e-0.3.4
@@ -5,10 +5,10 @@ DESCRIPTION=The fastest and safest AV1 encoder
 EAPI=7
 HOMEPAGE=https://github.com/xiph/rav1e/
 IUSE=+capi debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=BSD-2 Apache-2.0 MIT Unlicense
 RDEPEND=capi? ( dev-util/cargo-c )
 SLOT=0
 SRC_URI=https://github.com/xiph/rav1e/archive/v0.3.4.tar.gz -> rav1e-0.3.4.tar.gz https://crates.io/api/v1/crates/addr2line/0.13.0/download -> addr2line-0.13.0.crate https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.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/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/aom-sys/0.2.1/download -> aom-sys-0.2.1.crate https://crates.io/api/v1/crates/arbitrary/0.2.0/download -> arbitrary-0.2.0.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/arg_enum_proc_macro/0.3.0/download -> arg_enum_proc_macro-0.3.0.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/assert_cmd/1.0.1/download -> assert_cmd-1.0.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.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.50/download -> backtrace-0.3.50.crate https://crates.io/api/v1/crates/bindgen/0.54.0/download -> bindgen-0.54.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitstream-io/0.8.5/download -> bitstream-io-0.8.5.crate https://crates.io/api/v1/crates/bstr/0.2.13/download -> bstr-0.2.13.crate https://crates.io/api/v1/crates/bumpalo/3.4.0/download -> bumpalo-3.4.0.crate https://crates.io/api/v1/crates/bytemuck/1.4.1/download -> bytemuck-1.4.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.59/download -> cc-1.0.59.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/chrono/0.4.15/download -> chrono-0.4.15.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.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cmake/0.1.44/download -> cmake-0.1.44.crate https://crates.io/api/v1/crates/console/0.11.3/download -> console-0.11.3.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/criterion/0.3.3/download -> criterion-0.3.3.crate https://crates.io/api/v1/crates/criterion-plot/0.4.3/download -> criterion-plot-0.4.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.4/download -> crossbeam-channel-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.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/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.15/download -> ctor-0.1.15.crate https://crates.io/api/v1/crates/dav1d-sys/0.3.2/download -> dav1d-sys-0.3.2.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.0/download -> either-1.6.0.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.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/error-chain/0.10.0/download -> error-chain-0.10.0.crate https://crates.io/api/v1/crates/fern/0.6.0/download -> fern-0.6.0.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gimli/0.22.0/download -> gimli-0.22.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/half/1.6.0/download -> half-1.6.0.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/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/image/0.23.9/download -> image-0.23.9.crate https://crates.io/api/v1/crates/interpolate_name/0.2.3/download -> interpolate_name-0.2.3.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/js-sys/0.3.45/download -> js-sys-0.3.45.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.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/libc/0.2.76/download -> libc-0.2.76.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.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/memoffset/0.5.5/download -> memoffset-0.5.5.crate https://crates.io/api/v1/crates/metadeps/1.1.2/download -> metadeps-1.1.2.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.1/download -> miniz_oxide-0.4.1.crate https://crates.io/api/v1/crates/nasm-rs/0.2.0/download -> nasm-rs-0.2.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/noop_proc_macro/0.2.1/download -> noop_proc_macro-0.2.1.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/num-derive/0.3.2/download -> num-derive-0.3.2.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/object/0.20.0/download -> object-0.20.0.crate https://crates.io/api/v1/crates/oorandom/11.1.2/download -> oorandom-11.1.2.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.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/pkg-config/0.3.18/download -> pkg-config-0.3.18.crate https://crates.io/api/v1/crates/plotters/0.2.15/download -> plotters-0.2.15.crate https://crates.io/api/v1/crates/png/0.16.7/download -> png-0.16.7.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.9/download -> ppv-lite86-0.2.9.crate https://crates.io/api/v1/crates/predicates/1.0.5/download -> predicates-1.0.5.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.20/download -> proc-macro2-1.0.20.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.18/download -> proc-macro-hack-0.5.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/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/rayon/1.4.0/download -> rayon-1.4.0.crate https://crates.io/api/v1/crates/rayon-core/1.8.0/download -> rayon-core-1.8.0.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/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.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_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rust_hawktracer/0.7.0/download -> rust_hawktracer-0.7.0.crate https://crates.io/api/v1/crates/rust_hawktracer_normal_macro/0.4.1/download -> rust_hawktracer_normal_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_proc_macro/0.4.1/download -> rust_hawktracer_proc_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_sys/0.4.2/download -> rust_hawktracer_sys-0.4.2.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/scan_fmt/0.2.5/download -> scan_fmt-0.2.5.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.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.115/download -> serde-1.0.115.crate https://crates.io/api/v1/crates/serde_cbor/0.11.1/download -> serde_cbor-0.11.1.crate https://crates.io/api/v1/crates/serde_derive/1.0.115/download -> serde_derive-1.0.115.crate https://crates.io/api/v1/crates/serde_json/1.0.57/download -> serde_json-1.0.57.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.1/download -> signal-hook-registry-1.2.1.crate https://crates.io/api/v1/crates/simd_helpers/0.1.0/download -> simd_helpers-0.1.0.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.40/download -> syn-1.0.40.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/terminal_size/0.1.13/download -> terminal_size-0.1.13.crate https://crates.io/api/v1/crates/termios/0.3.2/download -> termios-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.20/download -> thiserror-1.0.20.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.20/download -> thiserror-impl-1.0.20.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.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinytemplate/1.1.0/download -> tinytemplate-1.1.0.crate https://crates.io/api/v1/crates/toml/0.2.1/download -> toml-0.2.1.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.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.2.1/download -> unicode-xid-0.2.1.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/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.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.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.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/wasm-bindgen/0.2.68/download -> wasm-bindgen-0.2.68.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.68/download -> wasm-bindgen-backend-0.2.68.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.68/download -> wasm-bindgen-macro-0.2.68.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.68/download -> wasm-bindgen-macro-support-0.2.68.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.68/download -> wasm-bindgen-shared-0.2.68.crate https://crates.io/api/v1/crates/web-sys/0.3.45/download -> web-sys-0.3.45.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.3.9/download -> winapi-0.3.9.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/y4m/0.5.3/download -> y4m-0.5.3.crate
 _eclasses_=cargo	bd8499d18174b7d9e84e56a022ccd236	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fa7dbff79f5db7e0cd63ccf88cd24acb
+_md5_=bed76365edf7430cc65b5bdd668b2285
diff --git a/metadata/md5-cache/media-video/streamdvd-0.4-r2 b/metadata/md5-cache/media-video/streamdvd-0.4-r2
index 56b3ca1fd2ea..0ae908c51921 100644
--- a/metadata/md5-cache/media-video/streamdvd-0.4-r2
+++ b/metadata/md5-cache/media-video/streamdvd-0.4-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libdvdread media-video/lsdvd X? ( dev-perl/Tk dev-perl/Tk-JPEG-Lite virtual/cdrtools >=media-video/dvdauthor-0.6.5 >=app-cdr/dvd+rw-tools-5.13.4.7.4 )
+DEPEND=app-cdr/cdrtools media-libs/libdvdread media-video/lsdvd X? ( dev-perl/Tk dev-perl/Tk-JPEG-Lite >=media-video/dvdauthor-0.6.5 >=app-cdr/dvd+rw-tools-5.13.4.7.4 )
 DESCRIPTION=fast tool to backup Video DVDs 'on the fly'
 EAPI=7
 HOMEPAGE=http://www.badabum.de/streamdvd.html
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.badabum.de/down/streamdvd-0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d46083b0f6799840effcf65dd53d6151
+_md5_=e2a9d8d1967d184515f4b2ff42c339b7
diff --git a/metadata/md5-cache/media-video/xine-ui-0.99.10 b/metadata/md5-cache/media-video/xine-ui-0.99.10
deleted file mode 100644
index 526f3e22991a..000000000000
--- a/metadata/md5-cache/media-video/xine-ui-0.99.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=|| ( app-arch/tar app-arch/libarchive ) media-libs/libpng:0= >=media-libs/xine-lib-1.2:=[aalib?,libcaca?] virtual/jpeg:0 aalib? ( media-libs/aalib:= ) curl? ( >=net-misc/curl-7.10.2:= ) libcaca? ( media-libs/libcaca:= ) lirc? ( app-misc/lirc:= ) nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2:= ) X? ( x11-libs/libICE:= x11-libs/libSM:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXft:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/libXv:= x11-libs/libXxf86vm:= xinerama? ( x11-libs/libXinerama:= ) ) virtual/pkgconfig nls? ( >=sys-devel/gettext-0.18.3 ) X? ( x11-base/xorg-proto x11-libs/libXt ) >=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=Xine movie player
-EAPI=6
-HOMEPAGE=https://xine-project.org/home
-IUSE=aalib curl debug libcaca lirc nls readline vdr X xinerama
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=|| ( app-arch/tar app-arch/libarchive ) media-libs/libpng:0= >=media-libs/xine-lib-1.2:=[aalib?,libcaca?] virtual/jpeg:0 aalib? ( media-libs/aalib:= ) curl? ( >=net-misc/curl-7.10.2:= ) libcaca? ( media-libs/libcaca:= ) lirc? ( app-misc/lirc:= ) nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2:= ) X? ( x11-libs/libICE:= x11-libs/libSM:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXft:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/libXv:= x11-libs/libXxf86vm:= xinerama? ( x11-libs/libXinerama:= ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/xine/xine-ui-0.99.10.tar.xz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5acad66d0da3d5b95ad2159136957346
diff --git a/metadata/md5-cache/media-video/xine-ui-0.99.12 b/metadata/md5-cache/media-video/xine-ui-0.99.12
index 8bb5eaba266e..fa3710ea823d 100644
--- a/metadata/md5-cache/media-video/xine-ui-0.99.12
+++ b/metadata/md5-cache/media-video/xine-ui-0.99.12
@@ -4,10 +4,10 @@ DESCRIPTION=Xine movie player
 EAPI=6
 HOMEPAGE=https://xine-project.org/home
 IUSE=aalib curl debug libcaca lirc nls readline vdr X xinerama
-KEYWORDS=amd64 ~hppa ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=|| ( app-arch/tar app-arch/libarchive ) media-libs/libpng:0= >=media-libs/xine-lib-1.2:=[aalib?,libcaca?] virtual/jpeg:0 aalib? ( media-libs/aalib:= ) curl? ( >=net-misc/curl-7.10.2:= ) libcaca? ( media-libs/libcaca:= ) lirc? ( app-misc/lirc:= ) nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2:= ) X? ( x11-libs/libICE:= x11-libs/libSM:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXft:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/libXv:= x11-libs/libXxf86vm:= xinerama? ( x11-libs/libXinerama:= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/xine/xine-ui-0.99.12.tar.xz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6829b23acc8d8ce3737516b5160a1c02
+_md5_=ff81d86dd9e15d37dc8edb3a2ddfee32
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 6a734864e2ee..4ee241b4c3eb 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/cacti-1.2.14 b/metadata/md5-cache/net-analyzer/cacti-1.2.14
index ac54482a5ca3..b2f1f5a16f22 100644
--- a/metadata/md5-cache/net-analyzer/cacti-1.2.14
+++ b/metadata/md5-cache/net-analyzer/cacti-1.2.14
@@ -4,10 +4,10 @@ DESCRIPTION=Cacti is a complete frontend to rrdtool
 EAPI=7
 HOMEPAGE=https://www.cacti.net/
 IUSE=snmp doc vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[cli,mysql,pdo,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
 SLOT=1.2.14
 SRC_URI=https://www.cacti.net/downloads/cacti-1.2.14.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=14c32a0c877e1ecda3b3e585d02ac6fe
+_md5_=4a69706c31200836d661ac69cbd2480b
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.12.0 b/metadata/md5-cache/net-analyzer/icinga2-2.12.0
deleted file mode 100644
index e8791f3a1691..000000000000
--- a/metadata/md5-cache/net-analyzer/icinga2-2.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.66.0:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl sys-devel/bison >=sys-devel/flex-2.5.35 apache2? ( =www-servers/apache-2* ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=Distributed, general purpose, network monitoring engine
-EAPI=6
-HOMEPAGE=http://icinga.org/icinga2
-IUSE=console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax apache2
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.66.0:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) acct-user/icinga acct-group/icinga acct-group/icingacmd acct-group/nagios apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
-SLOT=0
-SRC_URI=https://github.com/Icinga/icinga2/archive/v2.12.0.tar.gz -> icinga2-2.12.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	depend.apache	69ed723e2331f996dc7510598673359e	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25d110506e687b5d05862cd7dd898596
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.87 b/metadata/md5-cache/net-analyzer/mtr-0.87
deleted file mode 100644
index 780d5b100112..000000000000
--- a/metadata/md5-cache/net-analyzer/mtr-0.87
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst prepare
-DEPEND=sys-libs/ncurses:0= gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) sys-devel/autoconf 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=My TraceRoute, an Excellent network diagnostic tool
-EAPI=6
-HOMEPAGE=https://www.bitwizard.nl/mtr/
-IUSE=gtk ipv6 +filecaps
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) filecaps? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=https://www.bitwizard.nl/mtr/files/mtr-0.87.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	fcaps	1e1121450b09cb38037babb4aba88d0f	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7d98764cee8a46687e1cf166cadcb79b
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.93-r2 b/metadata/md5-cache/net-analyzer/mtr-0.93-r2
deleted file mode 100644
index 9d5883d8a4ab..000000000000
--- a/metadata/md5-cache/net-analyzer/mtr-0.93-r2
+++ /dev/null
@@ -1,14 +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 filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=configure postinst prepare test
-DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= )
-DESCRIPTION=My TraceRoute, an Excellent network diagnostic tool
-EAPI=7
-HOMEPAGE=https://www.bitwizard.nl/mtr/
-IUSE=gtk ipv6 ncurses +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) filecaps? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=https://www.bitwizard.nl/mtr/files/mtr-0.93.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	fcaps	1e1121450b09cb38037babb4aba88d0f	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1aa441f433dc5a80bf74f6f54d679dff
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.27.0 b/metadata/md5-cache/net-analyzer/netdata-1.28.0
similarity index 98%
rename from metadata/md5-cache/net-analyzer/netdata-1.27.0
rename to metadata/md5-cache/net-analyzer/netdata-1.28.0
index 38d26b610e90..da9a2c6bf2b4 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.27.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.28.0
@@ -10,6 +10,6 @@ LICENSE=GPL-3+ MIT BSD
 RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) 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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) mysql? ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) tor? ( python )
 SLOT=0
-SRC_URI=https://github.com/netdata/netdata/archive/v1.27.0.tar.gz -> netdata-1.27.0.tar.gz
+SRC_URI=https://github.com/netdata/netdata/archive/v1.28.0.tar.gz -> netdata-1.28.0.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	fcaps	1e1121450b09cb38037babb4aba88d0f	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=20fffb14ab25b7079011631858da1a52
diff --git a/metadata/md5-cache/net-analyzer/ngrep-1.47 b/metadata/md5-cache/net-analyzer/ngrep-1.47
index ceb4b2cd8b6a..ba01e5e45c52 100644
--- a/metadata/md5-cache/net-analyzer/ngrep-1.47
+++ b/metadata/md5-cache/net-analyzer/ngrep-1.47
@@ -5,10 +5,10 @@ DESCRIPTION=A grep for network layers
 EAPI=7
 HOMEPAGE=https://github.com/jpr5/ngrep
 IUSE=ipv6
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=ngrep
 RDEPEND=dev-libs/libpcre net-libs/libpcap
 SLOT=0
 SRC_URI=https://github.com/jpr5/ngrep/archive/V1_47.tar.gz -> ngrep-1.47.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=a9b6b0eb3d5328a7f7b838c055aa28c8
+_md5_=a8898b38cb50cb2f217464bbc9725afb
diff --git a/metadata/md5-cache/net-analyzer/scapy-2.4.3 b/metadata/md5-cache/net-analyzer/scapy-2.4.3
deleted file mode 100644
index b6f4d2782ed5..000000000000
--- a/metadata/md5-cache/net-analyzer/scapy-2.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-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=A Python interactive packet manipulation program for mastering the network
-EAPI=7
-HOMEPAGE=https://scapy.net/ https://github.com/secdev/scapy
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=net-analyzer/tcpdump 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/secdev/scapy/archive/v2.4.3.tar.gz -> scapy-2.4.3.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f360f1ac84a4d5d8dc601448dde957ee
diff --git a/metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r3 b/metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r3
index f711543b1d96..cfdf840be567 100644
--- a/metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r3
+++ b/metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r3
@@ -4,11 +4,11 @@ DEPEND=net-libs/libnet:1.1 net-libs/libpcap
 DESCRIPTION=tcptraceroute is a traceroute implementation using TCP packets
 EAPI=7
 HOMEPAGE=https://github.com/mct/tcptraceroute
-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=net-libs/libnet:1.1 net-libs/libpcap
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mct/tcptraceroute/archive/tcptraceroute-1.5beta7.tar.gz -> tcptraceroute-1.5_beta7.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ea58d546f8c9bf99ddafd982ca802c2d
+_md5_=746c38cd118035251a9d5de31d7c79cd
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.1 b/metadata/md5-cache/net-analyzer/wireshark-3.4.1
index 7cf76837f048..8cff7c717c92 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.4.1
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.1
@@ -5,7 +5,7 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=7
 HOMEPAGE=https://www.wireshark.org/
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:0= ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=plugin-ifdemo? ( plugins )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/3.4.1
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.1.tar.xz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	fcaps	1e1121450b09cb38037babb4aba88d0f	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5bf197dc170099b369c1b06d475c0aa3
+_md5_=f232ed65c08d9eb2abd5ed48c7e2bfb1
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.2 b/metadata/md5-cache/net-analyzer/wireshark-3.4.2
new file mode 100644
index 000000000000..b1988bf9cda2
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:0= ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
+DESCRIPTION=A network protocol analyzer formerly known as ethereal
+EAPI=7
+HOMEPAGE=https://www.wireshark.org/
+IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:0= ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=plugin-ifdemo? ( plugins )
+RESTRICT=test
+SLOT=0/3.4.2
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.2.tar.xz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	fcaps	1e1121450b09cb38037babb4aba88d0f	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ccff57d2bfb84247d1b1374ded200642
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.2-r100 b/metadata/md5-cache/net-analyzer/wireshark-3.4.2-r100
new file mode 100644
index 000000000000..9d921f7a0058
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.2-r100
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
+DESCRIPTION=A network protocol analyzer formerly known as ethereal
+EAPI=7
+HOMEPAGE=https://www.wireshark.org/
+IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps lua_single_target_lua5-1 lua_single_target_lua5-2
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) plugin-ifdemo? ( plugins )
+RESTRICT=test
+SLOT=0/3.4.2
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.2.tar.xz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	fcaps	1e1121450b09cb38037babb4aba88d0f	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06d8c309b4d096f0ac8be8c1d9923a14
diff --git a/metadata/md5-cache/net-analyzer/wireshark-99999999 b/metadata/md5-cache/net-analyzer/wireshark-99999999
index b1b78cb7b703..766411536872 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-99999999
+++ b/metadata/md5-cache/net-analyzer/wireshark-99999999
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:0= ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
+DEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=7
 HOMEPAGE=https://www.wireshark.org/
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps
+IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps lua_single_target_lua5-1 lua_single_target_lua5-2
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:0= ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=plugin-ifdemo? ( plugins )
+RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) plugin-ifdemo? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0/99999999
-_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	fcaps	1e1121450b09cb38037babb4aba88d0f	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0f45a22f5531462e56e88d1cc35511c
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	fcaps	1e1121450b09cb38037babb4aba88d0f	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7b3cb831874432e1c24c03a28d49f592
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 5828e15cb778..d8f366fb042e 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/fpdns-0.10.0_pre20130404-r1 b/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
index 775be619a25d..85129328178b 100644
--- a/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
+++ b/metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-perl/Net-DNS-0.74 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/kirei/fpdns/archive/20130404.tar.gz -> fpdns-0.10.0_pre20130404.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c6ca7dbadc32c65ad49d8baddf6be294
diff --git a/metadata/md5-cache/net-dns/ldns-utils-1.7.1 b/metadata/md5-cache/net-dns/ldns-utils-1.7.1
index d14e7199bac9..9d00529ad511 100644
--- a/metadata/md5-cache/net-dns/ldns-utils-1.7.1
+++ b/metadata/md5-cache/net-dns/ldns-utils-1.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Set of utilities to simplify various dns(sec) tasks
 EAPI=6
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
 IUSE=+dane ecdsa ed25519 ed448 examples gost ssl
-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
 LICENSE=BSD
 RDEPEND=>=net-libs/ldns-1.7.1[dane?,ecdsa?,ed25519?,ed448?,gost?] examples? ( net-libs/libpcap )
 REQUIRED_USE=ecdsa? ( ssl ) ed25519? ( ssl ) ed448? ( ssl ) dane? ( ssl ) gost? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz
-_md5_=f0713b985d9150c11b1916e510c862d3
+_md5_=b3a2f74755827bf91c552e3eced350be
diff --git a/metadata/md5-cache/net-dns/pdns-4.4.0 b/metadata/md5-cache/net-dns/pdns-4.4.0
new file mode 100644
index 000000000000..e35fc7a2733b
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-4.4.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst
+DEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:= ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
+DESCRIPTION=The PowerDNS Daemon
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+IUSE=debug doc geoip ldap libressl luajit lua-records mydns mysql postgres protobuf remote sodium sqlite systemd tools tinydns test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:= ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf ) acct-user/pdns acct-group/pdns
+REQUIRED_USE=mydns? ( mysql )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-4.4.0.tar.bz2
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a500279ade0b5b4592baaa0f7fdee560
diff --git a/metadata/md5-cache/net-dns/unbound-1.13.0 b/metadata/md5-cache/net-dns/unbound-1.13.0
index 4b3d4dddbfa1..f44366b8ec49 100644
--- a/metadata/md5-cache/net-dns/unbound-1.13.0
+++ b/metadata/md5-cache/net-dns/unbound-1.13.0
@@ -1,16 +1,16 @@
 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 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) http2? ( net-libs/nghttp2 ) 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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) redis? ( dev-libs/hiredis:= ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) systemd? ( sys-apps/systemd )
+DEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) redis? ( dev-libs/hiredis:= ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) systemd? ( sys-apps/systemd )
 DESCRIPTION=A validating, recursive and caching DNS resolver
 EAPI=7
 HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
 IUSE=debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ~ppc64 x86
 LICENSE=BSD GPL-2
-RDEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) http2? ( net-libs/nghttp2 ) 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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+RDEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.13.0.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=25b4c1afcf38eddf7dc5005f41672cc9
+_md5_=a7b86f646c4fc7e9220a702c5e085d62
diff --git a/metadata/md5-cache/net-dns/unbound-1.13.0-r1 b/metadata/md5-cache/net-dns/unbound-1.13.0-r1
index fc2af4be00cf..14e49dcf9e61 100644
--- a/metadata/md5-cache/net-dns/unbound-1.13.0-r1
+++ b/metadata/md5-cache/net-dns/unbound-1.13.0-r1
@@ -1,16 +1,16 @@
 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 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) http2? ( net-libs/nghttp2 ) 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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) redis? ( dev-libs/hiredis:= ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) systemd? ( sys-apps/systemd )
+DEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) redis? ( dev-libs/hiredis:= ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) systemd? ( sys-apps/systemd )
 DESCRIPTION=A validating, recursive and caching DNS resolver
 EAPI=7
 HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
 IUSE=debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
 LICENSE=BSD GPL-2
-RDEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) http2? ( net-libs/nghttp2 ) 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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+RDEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.13.0.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5e914d5fd80b9d668bb03a0fdc7803b9
+_md5_=ab0888dddbf66c519ee64dd74d0984b7
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 42abb0790af0..d915c48e8a3e 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/wdfs-1.4.2-r1 b/metadata/md5-cache/net-fs/wdfs-1.4.2-r1
deleted file mode 100644
index 3686943fb354..000000000000
--- a/metadata/md5-cache/net-fs/wdfs-1.4.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=net-libs/neon-0.24.7 >=sys-fs/fuse-2.5 dev-libs/glib:2
-DESCRIPTION=WebDAV filesystem with special features for accessing subversion repositories
-EAPI=5
-HOMEPAGE=http://noedler.de/projekte/wdfs/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/neon-0.24.7 >=sys-fs/fuse-2.5 dev-libs/glib:2
-SLOT=0
-SRC_URI=http://noedler.de/projekte/wdfs/wdfs-1.4.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a705c407b2dccd2a88cda1d8b5170e6e
diff --git a/metadata/md5-cache/net-fs/wdfs-1.4.2-r2 b/metadata/md5-cache/net-fs/wdfs-1.4.2-r2
new file mode 100644
index 000000000000..b161d1ed3400
--- /dev/null
+++ b/metadata/md5-cache/net-fs/wdfs-1.4.2-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=>=net-libs/neon-0.24.7 >=sys-fs/fuse-2.5:0 dev-libs/glib:2
+DESCRIPTION=WebDAV filesystem with special features for accessing subversion repositories
+EAPI=7
+HOMEPAGE=http://noedler.de/projekte/wdfs/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/neon-0.24.7 >=sys-fs/fuse-2.5:0 dev-libs/glib:2
+SLOT=0
+SRC_URI=http://noedler.de/projekte/wdfs/wdfs-1.4.2.tar.gz
+_md5_=e289b3c35104e0d11579198ccc65bf66
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index b09a74fbb0f8..f2ab3a0dcb8a 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.51.0 b/metadata/md5-cache/net-ftp/filezilla-3.51.0
index 735e22530400..ff47598b9a5d 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.51.0
+++ b/metadata/md5-cache/net-ftp/filezilla-3.51.0
@@ -4,11 +4,11 @@ DESCRIPTION=FTP client with lots of useful features and an intuitive interface
 EAPI=6
 HOMEPAGE=https://filezilla-project.org/
 IUSE=dbus nls test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.25.0:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.51.0_src.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=acab761d1056eb6f61b251538e71641a
+_md5_=6f2cf6e961cd308a8b67dadca6848006
diff --git a/metadata/md5-cache/net-ftp/ncftp-3.2.6-r2 b/metadata/md5-cache/net-ftp/ncftp-3.2.6-r2
index fe5d26e5da4d..a3586253444b 100644
--- a/metadata/md5-cache/net-ftp/ncftp-3.2.6-r2
+++ b/metadata/md5-cache/net-ftp/ncftp-3.2.6-r2
@@ -5,10 +5,10 @@ DESCRIPTION=An extremely configurable ftp client
 EAPI=7
 HOMEPAGE=https://www.ncftp.com/
 IUSE=pch
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
 LICENSE=Clarified-Artistic
 RDEPEND=sys-libs/ncurses:*
 SLOT=0
 SRC_URI=https://ftp.mirrorservice.org/sites/ftp.ncftp.com/ncftp/ncftp-3.2.6-src.tar.xz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=14d354e9baf4838065ab2d4810e8818e
+_md5_=ec01c9c9e3e476097d36b8d23d22aa99
diff --git a/metadata/md5-cache/net-ftp/profxp-3_pre2-r2 b/metadata/md5-cache/net-ftp/profxp-3_pre2-r2
index 33e154fc651a..48f95eda6392 100644
--- a/metadata/md5-cache/net-ftp/profxp-3_pre2-r2
+++ b/metadata/md5-cache/net-ftp/profxp-3_pre2-r2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://duncanthrax.net/profxp/profxp-v3-pre2-src.tar.gz http://search.cpan.org/src/CLINTDW/SOCKS-0.03/lib/Net/SOCKS.pm
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d76ae7a5af190c8e82dd2da6151c30e1
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index e50c0959b06f..f5786f27b727 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/discord-bin-0.0.13 b/metadata/md5-cache/net-im/discord-bin-0.0.13
index 839c518fba17..fc8a1f3230ca 100644
--- a/metadata/md5-cache/net-im/discord-bin-0.0.13
+++ b/metadata/md5-cache/net-im/discord-bin-0.0.13
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://dl.discordapp.net/apps/linux/0.0.13/discord-0.0.13.deb
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=752203a1a495b430d0ccccca42e2b9cf
diff --git a/metadata/md5-cache/net-im/element-desktop-bin-1.7.15 b/metadata/md5-cache/net-im/element-desktop-bin-1.7.15
index b87d41d022bd..c9da9d30b49d 100644
--- a/metadata/md5-cache/net-im/element-desktop-bin-1.7.15
+++ b/metadata/md5-cache/net-im/element-desktop-bin-1.7.15
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-accessibility/at-spi2-atk:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango emoji? ( media-fonts/noto-emoji )
 SLOT=0
 SRC_URI=https://packages.riot.im/debian/pool/main/e/element-desktop/element-desktop_1.7.15_amd64.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a29792e33c256da17c80908e634f618
diff --git a/metadata/md5-cache/net-im/gitter-bin-3.1.0 b/metadata/md5-cache/net-im/gitter-bin-3.1.0
index 3d088f833de2..ae7671c243ad 100644
--- a/metadata/md5-cache/net-im/gitter-bin-3.1.0
+++ b/metadata/md5-cache/net-im/gitter-bin-3.1.0
@@ -8,5 +8,5 @@ RDEPEND=dev-libs/expat:0 dev-libs/glib:2 dev-libs/nspr:0 dev-libs/nss:0 gnome-ba
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://update.gitter.im/linux64/gitter_3.1.0_amd64.deb ) x86? ( https://update.gitter.im/linux32/gitter_3.1.0_i386.deb )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=301b73723c403db303261cf05003b4c8
diff --git a/metadata/md5-cache/net-im/gitter-bin-4.1.0 b/metadata/md5-cache/net-im/gitter-bin-4.1.0
index cbd336ac4b04..442ea74c9b43 100644
--- a/metadata/md5-cache/net-im/gitter-bin-4.1.0
+++ b/metadata/md5-cache/net-im/gitter-bin-4.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://update.gitter.im/linux64/gitter_4.1.0_amd64.deb ) x86? ( https://update.gitter.im/linux32/gitter_4.1.0_i386.deb )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e09d0ec46f61899e5a33340f317f5a3
diff --git a/metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.1 b/metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.1
new file mode 100644
index 000000000000..47d238c5c86f
--- /dev/null
+++ b/metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Mattermost Desktop application
+EAPI=7
+HOMEPAGE=https://about.mattermost.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 GPL-2+ LGPL-2.1+ MIT
+RDEPEND=gnome-base/gconf:2 dev-libs/atk:0 dev-libs/expat:0 dev-libs/glib:2 dev-libs/nspr:0 dev-libs/nss:0 gnome-base/gconf:2 media-libs/alsa-lib:0 media-libs/fontconfig:1.0 media-libs/freetype:2 net-print/cups:0 sys-apps/dbus:0 sys-devel/gcc sys-libs/glibc:2.2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11:0 x11-libs/libxcb:0/1.12 x11-libs/libXcomposite:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXi:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXScrnSaver:0 x11-libs/libXtst:0 x11-libs/pango:0
+SLOT=0
+SRC_URI=https://github.com/mattermost/desktop/archive/v4.6.1.tar.gz -> mattermost-desktop-bin-4.6.1.tar.gz amd64? ( https://releases.mattermost.com/desktop/4.6.1/mattermost-desktop-4.6.1-linux-x64.tar.gz ) x86? ( https://releases.mattermost.com/desktop/4.6.1/mattermost-desktop-4.6.1-linux-ia32.tar.gz )
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a54761a804a26cc6c3ba5e565fb7a1f0
diff --git a/metadata/md5-cache/net-im/sendxmpp-1.24 b/metadata/md5-cache/net-im/sendxmpp-1.24
index 07d2f64b9552..abd75b8766d3 100644
--- a/metadata/md5-cache/net-im/sendxmpp-1.24
+++ b/metadata/md5-cache/net-im/sendxmpp-1.24
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Net-XMPP dev-perl/Authen-SASL virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/lhost/sendxmpp/archive/v1.24.tar.gz -> sendxmpp-1.24.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=48cf605642bfffc919334688800cd652
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.39.2 b/metadata/md5-cache/net-im/signal-desktop-bin-1.39.2
index 29fb855c03a8..ce8ba5977ceb 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.39.2
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.39.2
@@ -11,5 +11,5 @@ RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/at
 RESTRICT=splitdebug
 SLOT=0
 SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.39.2_amd64.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6c9aa35fc16df43d7142ef2660e00e25	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6c9aa35fc16df43d7142ef2660e00e25	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb9b7b8ab70089ef7961d271cc3f27a2
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.66.0.74 b/metadata/md5-cache/net-im/skypeforlinux-8.67.0.96
similarity index 96%
rename from metadata/md5-cache/net-im/skypeforlinux-8.66.0.74
rename to metadata/md5-cache/net-im/skypeforlinux-8.67.0.96
index b0dd6658940d..e5fb54ab6eda 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.66.0.74
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.67.0.96
@@ -11,6 +11,6 @@ RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-lib
 REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
-SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.66.0.74-1.x86_64.rpm
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.67.0.96-1.x86_64.rpm
 _eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a8f802f06f1c6ed7df1bf48f2d3302f
diff --git a/metadata/md5-cache/net-im/slack-4.11.3 b/metadata/md5-cache/net-im/slack-4.11.3
index c967c3bb737e..96e72638b1c0 100644
--- a/metadata/md5-cache/net-im/slack-4.11.3
+++ b/metadata/md5-cache/net-im/slack-4.11.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.11.3-amd64.deb
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	optfeature	6c9aa35fc16df43d7142ef2660e00e25	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	optfeature	6c9aa35fc16df43d7142ef2660e00e25	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f7ee9c34528bad703b8bb23c5ad55e0
diff --git a/metadata/md5-cache/net-im/slack-4.4.2 b/metadata/md5-cache/net-im/slack-4.4.2
index fd8743429b2a..c73d45027d78 100644
--- a/metadata/md5-cache/net-im/slack-4.4.2
+++ b/metadata/md5-cache/net-im/slack-4.4.2
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.4.2-amd64.deb
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	optfeature	6c9aa35fc16df43d7142ef2660e00e25	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	optfeature	6c9aa35fc16df43d7142ef2660e00e25	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f9bda73b6526fead15ed8103de20ea9
diff --git a/metadata/md5-cache/net-im/slack-4.4.3 b/metadata/md5-cache/net-im/slack-4.4.3
index 58b1b810cf6d..cffac02e2332 100644
--- a/metadata/md5-cache/net-im/slack-4.4.3
+++ b/metadata/md5-cache/net-im/slack-4.4.3
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.4.3-amd64.deb
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	optfeature	6c9aa35fc16df43d7142ef2660e00e25	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	optfeature	6c9aa35fc16df43d7142ef2660e00e25	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cde919bc777768a9e2b74ee0d86f204a
diff --git a/metadata/md5-cache/net-im/swift-4.0.2-r100 b/metadata/md5-cache/net-im/swift-4.0.2-r100
deleted file mode 100644
index c20b9adb4e19..000000000000
--- a/metadata/md5-cache/net-im/swift-4.0.2-r100
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.9 dev-util/scons[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-util/scons[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/openssl:0= net-libs/libnatpmp net-libs/miniupnpc:= sys-libs/zlib client? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 net-dns/avahi ) expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gconf? ( gnome-base/gconf:2 ) icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) spell? ( app-text/hunspell:= ) >=dev-util/scons-3.0.1-r3 client? ( dev-qt/linguist-tools:5 ) test? ( net-dns/avahi )
-DESCRIPTION=An elegant, secure, adaptable and intuitive XMPP Client
-EAPI=7
-HOMEPAGE=https://www.swift.im/
-IUSE=+client expat gconf +icu +idn lua spell test zeroconf lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2
-KEYWORDS=~amd64
-LICENSE=BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1
-RDEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/openssl:0= net-libs/libnatpmp net-libs/miniupnpc:= sys-libs/zlib client? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 net-dns/avahi ) expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) gconf? ( gnome-base/gconf:2 ) icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) spell? ( app-text/hunspell:= )
-REQUIRED_USE=|| ( icu idn ) gconf? ( client ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) spell? ( client )
-RESTRICT=test
-SLOT=4/0
-SRC_URI=https://swift.im/downloads/releases/swift-4.0.2/swift-4.0.2.tar.gz https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0fe7fd393285abcdfa3cf508262316f8
diff --git a/metadata/md5-cache/net-im/swift-4.0.2-r101 b/metadata/md5-cache/net-im/swift-4.0.2-r101
new file mode 100644
index 000000000000..b712ce68df88
--- /dev/null
+++ b/metadata/md5-cache/net-im/swift-4.0.2-r101
@@ -0,0 +1,16 @@
+BDEPEND=|| ( ( dev-lang/python:3.9 dev-util/scons[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-util/scons[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/openssl:0= net-libs/libnatpmp net-libs/miniupnpc:= sys-libs/zlib expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) >=dev-util/scons-3.0.1-r3 test? ( net-dns/avahi )
+DESCRIPTION=An elegant, secure, adaptable and intuitive XMPP Client
+EAPI=7
+HOMEPAGE=https://www.swift.im/
+IUSE=expat +icu +idn lua test zeroconf lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2
+KEYWORDS=~amd64
+LICENSE=BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1
+RDEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/openssl:0= net-libs/libnatpmp net-libs/miniupnpc:= sys-libs/zlib expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) )
+REQUIRED_USE=|| ( icu idn ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 ) )
+RESTRICT=test
+SLOT=4/0
+SRC_URI=https://swift.im/downloads/releases/swift-4.0.2/swift-4.0.2.tar.gz https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=24662ad41e773f3589f194d5d40903d7
diff --git a/metadata/md5-cache/net-im/teams-1.3.00.25560 b/metadata/md5-cache/net-im/teams-1.3.00.25560
index d18f528af87c..3205dff5b07d 100644
--- a/metadata/md5-cache/net-im/teams-1.3.00.25560
+++ b/metadata/md5-cache/net-im/teams-1.3.00.25560
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret dev-libs/atk dev-libs/
 RESTRICT=bindist mirror splitdebug test
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.3.00.25560_amd64.deb
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2b04a36dc7df7c8af34278ae9c8903f
diff --git a/metadata/md5-cache/net-im/teams-1.3.00.30857 b/metadata/md5-cache/net-im/teams-1.3.00.30857
new file mode 100644
index 000000000000..fadd694828fe
--- /dev/null
+++ b/metadata/md5-cache/net-im/teams-1.3.00.30857
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm unpack
+DESCRIPTION=Microsoft Teams, an Office 365 multimedia collaboration client, pre-release
+EAPI=7
+HOMEPAGE=https://products.office.com/en-us/microsoft-teams/group-chat-software/
+IUSE=system-ffmpeg system-mesa
+KEYWORDS=-* ~amd64
+LICENSE=ms-teams-pre
+RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbfile x11-libs/pango system-mesa? ( media-libs/mesa ) system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
+RESTRICT=bindist mirror splitdebug test
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.3.00.30857_amd64.deb
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2b04a36dc7df7c8af34278ae9c8903f
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 42a0fa47c325..88e079596992 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/anope-2.0.7 b/metadata/md5-cache/net-irc/anope-2.0.7
deleted file mode 100644
index 79cb7d2cdc6c..000000000000
--- a/metadata/md5-cache/net-irc/anope-2.0.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=acct-group/anope acct-user/anope mysql? ( dev-db/mysql-connector-c:0= ) ssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) sqlite? ( dev-db/sqlite:3 ) tre? ( dev-libs/tre ) virtual/libintl
-DESCRIPTION=Anope IRC Services
-EAPI=7
-HOMEPAGE=https://anope.org/ https://github.com/anope/anope/
-IUSE=gnutls ldap mysql pcre sql sqlite ssl tre
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=acct-group/anope acct-user/anope mysql? ( dev-db/mysql-connector-c:0= ) ssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) sqlite? ( dev-db/sqlite:3 ) tre? ( dev-libs/tre ) virtual/libintl
-REQUIRED_USE=sql? ( || ( mysql sqlite ) )
-SLOT=0
-SRC_URI=https://github.com/anope/anope/releases/download/2.0.7/anope-2.0.7-source.tar.gz
-_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22d84d8b4633a268f13f9863e2376c6c
diff --git a/metadata/md5-cache/net-irc/hexchat-2.14.3-r100 b/metadata/md5-cache/net-irc/hexchat-2.14.3-r100
new file mode 100644
index 000000000000..9f3499aba8e2
--- /dev/null
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.3-r100
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils app-arch/xz-utils app-text/iso-codes sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) 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] ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Graphical IRC client based on XChat
+EAPI=7
+HOMEPAGE=https://hexchat.github.io/
+IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2 plugin-fishlim? ( MIT )
+RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) 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] ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+SLOT=0
+SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.14.3.tar.xz
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	meson	71d293a701d6362387e1214da368c848	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c751929b9d44025725afe8e7da287c32
diff --git a/metadata/md5-cache/net-irc/hexchat-9999 b/metadata/md5-cache/net-irc/hexchat-9999
index 87b5de0e922f..f3dd635bf9a5 100644
--- a/metadata/md5-cache/net-irc/hexchat-9999
+++ b/metadata/md5-cache/net-irc/hexchat-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/glib-utils app-arch/xz-utils app-text/iso-codes sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) 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] ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) 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] ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Graphical IRC client based on XChat
 EAPI=7
 HOMEPAGE=https://hexchat.github.io/
-IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-2 plugin-fishlim? ( MIT )
 PROPERTIES=live
-RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) 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] ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) 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] ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	71d293a701d6362387e1214da368c848	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=096296e0d81ec4c02bdefce4d70339f8
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	meson	71d293a701d6362387e1214da368c848	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c751929b9d44025725afe8e7da287c32
diff --git a/metadata/md5-cache/net-irc/irccloud-desktop-bin-0.15.0 b/metadata/md5-cache/net-irc/irccloud-desktop-bin-0.15.0
index 63f837e48844..9396b342bdbe 100644
--- a/metadata/md5-cache/net-irc/irccloud-desktop-bin-0.15.0
+++ b/metadata/md5-cache/net-irc/irccloud-desktop-bin-0.15.0
@@ -9,5 +9,5 @@ RDEPEND=>=x11-libs/gtk+-3.0 x11-libs/libnotify >=dev-libs/nss-3 x11-libs/libXScr
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=https://github.com/irccloud/irccloud-desktop/releases/download/v0.15.0/irccloud-desktop_0.15.0_linux_amd64.deb
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff1d8a26400a95a39732306394cf545f
diff --git a/metadata/md5-cache/net-irc/pisg-0.73-r1 b/metadata/md5-cache/net-irc/pisg-0.73-r1
index 5baa2a6e8ee1..53e9310645cb 100644
--- a/metadata/md5-cache/net-irc/pisg-0.73-r1
+++ b/metadata/md5-cache/net-irc/pisg-0.73-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Text-Iconv dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/pisg/pisg-0.73.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3a3a8759ade36e7bc24235391741bcfd
diff --git a/metadata/md5-cache/net-irc/weechat-3.0-r100 b/metadata/md5-cache/net-irc/weechat-3.0-r100
new file mode 100644
index 000000000000..8b9b2843f346
--- /dev/null
+++ b/metadata/md5-cache/net-irc/weechat-3.0-r100
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( 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] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
+DESCRIPTION=Portable and multi-interface IRC client
+EAPI=7
+HOMEPAGE=https://weechat.org/
+IUSE=doc man nls test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( 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] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) test? ( nls )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://weechat.org/files/src/weechat-3.0.tar.xz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7808e92aeb95ec33a7cc27c7818a1cf7
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index 62f41dd029cb..06233bf44970 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0 ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( 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] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
+DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( 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] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=7
 HOMEPAGE=https://weechat.org/
-IUSE=doc man nls test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=doc man nls test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0 ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( 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] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) test? ( nls )
+RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( 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] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) test? ( nls )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50e67f7f3642665692fb2ced20ab3de3
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7808e92aeb95ec33a7cc27c7818a1cf7
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 1fc9151ede80..c39e1d6838d6 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/axtls-2.1.5-r100 b/metadata/md5-cache/net-libs/axtls-2.1.5-r100
new file mode 100644
index 000000000000..1b7387c9a9bf
--- /dev/null
+++ b/metadata/md5-cache/net-libs/axtls-2.1.5-r100
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=doc? ( app-doc/doxygen )
+DESCRIPTION=Embedded client/server TLSv1 SSL library and small HTTP(S) server
+EAPI=7
+HOMEPAGE=http://axtls.sourceforge.net/
+IUSE=httpd cgi-lua cgi-php static static-libs doc lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 savedconfig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=httpd? ( cgi-lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) cgi-php? ( dev-lang/php[cgi] ) )
+REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) cgi-php? ( httpd )
+SLOT=0/1
+SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.5.tar.gz
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=fd75fccf62af095eaa8b2fa41ad8f16c
diff --git a/metadata/md5-cache/net-libs/gnutls-3.6.15 b/metadata/md5-cache/net-libs/gnutls-3.6.15
index e4635adceb80..37a635f255de 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.6.15
+++ b/metadata/md5-cache/net-libs/gnutls-3.6.15
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.6/gnutls-3.6.15.tar.xz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8e8a47defeb4e51f5612becf7dd7780f
+_md5_=b74350dccd79acb3d10f0fb9891dbec8
diff --git a/metadata/md5-cache/net-libs/libgsasl-1.8.1 b/metadata/md5-cache/net-libs/libgsasl-1.8.1
index 007ea4da31ae..fea308290dd4 100644
--- a/metadata/md5-cache/net-libs/libgsasl-1.8.1
+++ b/metadata/md5-cache/net-libs/libgsasl-1.8.1
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU SASL library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gsasl/
 IUSE=idn gcrypt kerberos nls ntlm static-libs
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-3 LGPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm ) !net-misc/gsasl
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/libgsasl-1.8.1.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=36e6f54ddc849bd4a868a04447c65dc9
+_md5_=7d6accf5de70b8febea91ecfa5569d4d
diff --git a/metadata/md5-cache/net-libs/libmrss-0.19.2 b/metadata/md5-cache/net-libs/libmrss-0.19.2
deleted file mode 100644
index 78779fcf1c9c..000000000000
--- a/metadata/md5-cache/net-libs/libmrss-0.19.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install
-DEPEND=net-libs/libnxml net-misc/curl
-DESCRIPTION=A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or streams
-EAPI=7
-HOMEPAGE=https://www.autistici.org/bakunin/libmrss/doc/
-IUSE=doc examples
-KEYWORDS=amd64 ~arm ~mips ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=net-libs/libnxml net-misc/curl
-SLOT=0
-SRC_URI=https://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz
-_md5_=f1a04a82128132346151b6aa26ac8166
diff --git a/metadata/md5-cache/net-libs/libmrss-0.19.2-r1 b/metadata/md5-cache/net-libs/libmrss-0.19.2-r1
index f3c52d57c405..17ba6914cc1b 100644
--- a/metadata/md5-cache/net-libs/libmrss-0.19.2-r1
+++ b/metadata/md5-cache/net-libs/libmrss-0.19.2-r1
@@ -5,9 +5,9 @@ DESCRIPTION=A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or s
 EAPI=7
 HOMEPAGE=https://www.autistici.org/bakunin/libmrss/doc/
 IUSE=doc examples
-KEYWORDS=amd64 ~arm ~mips ppc ~x86
+KEYWORDS=amd64 ~arm ~mips ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=net-libs/libnxml net-misc/curl
 SLOT=0
 SRC_URI=https://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz
-_md5_=51fc85ce0bc9f3f7144ba76db0518fae
+_md5_=90e0da52b9423779738d8c93624ad441
diff --git a/metadata/md5-cache/net-libs/libnxml-0.18.3 b/metadata/md5-cache/net-libs/libnxml-0.18.3
deleted file mode 100644
index 038164360bb9..000000000000
--- a/metadata/md5-cache/net-libs/libnxml-0.18.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install
-DEPEND=net-misc/curl
-DESCRIPTION=A C-library for parsing and writing XML 1.0/1.1 files or streams
-EAPI=7
-HOMEPAGE=https://www.autistici.org/bakunin/libnxml/doc/
-IUSE=doc examples
-KEYWORDS=amd64 ~arm ~mips ppc ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=net-misc/curl
-SLOT=0
-SRC_URI=https://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz
-_md5_=1f0e2885e015aefb1ea80f62e0273582
diff --git a/metadata/md5-cache/net-libs/libnxml-0.18.3-r1 b/metadata/md5-cache/net-libs/libnxml-0.18.3-r1
index 56f00a244a90..75b98b686fe9 100644
--- a/metadata/md5-cache/net-libs/libnxml-0.18.3-r1
+++ b/metadata/md5-cache/net-libs/libnxml-0.18.3-r1
@@ -5,9 +5,9 @@ DESCRIPTION=A C-library for parsing and writing XML 1.0/1.1 files or streams
 EAPI=7
 HOMEPAGE=https://www.autistici.org/bakunin/libnxml/doc/
 IUSE=doc examples
-KEYWORDS=amd64 ~arm ~mips ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~mips ppc ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=https://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz
-_md5_=be6b1b38727ace9866c5a069a9a2ab32
+_md5_=c345fc67a041a39884a61e6715c24191
diff --git a/metadata/md5-cache/net-libs/libproxy-0.4.16 b/metadata/md5-cache/net-libs/libproxy-0.4.16
index 78b9a319cd70..21282b917a8f 100644
--- a/metadata/md5-cache/net-libs/libproxy-0.4.16
+++ b/metadata/md5-cache/net-libs/libproxy-0.4.16
@@ -5,7 +5,7 @@ DESCRIPTION=Library for automatic proxy configuration management
 EAPI=7
 HOMEPAGE=https://github.com/libproxy/libproxy
 IUSE=gnome kde mono networkmanager spidermonkey test webkit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 PDEPEND=networkmanager? ( net-misc/networkmanager )
 RDEPEND=gnome? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mono? ( dev-lang/mono ) networkmanager? ( sys-apps/dbus:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) spidermonkey? ( >=dev-lang/spidermonkey-52.0.0:= ) webkit? ( net-libs/webkit-gtk:4 ) kde? ( kde-frameworks/kconfig:5 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libproxy/libproxy/archive/0.4.16.tar.gz -> libproxy-0.4.16.tar.gz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=17b72b792be1c2dd5f13a916e6d331f7
+_md5_=e83e147541db34435f8834ecc4466851
diff --git a/metadata/md5-cache/net-libs/libslirp-4.3.1 b/metadata/md5-cache/net-libs/libslirp-4.3.1
deleted file mode 100644
index f17bbe8bccd0..000000000000
--- a/metadata/md5-cache/net-libs/libslirp-4.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:=
-DESCRIPTION=A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services.
-EAPI=7
-HOMEPAGE=https://gitlab.freedesktop.org/slirp/libslirp
-IUSE=static-libs
-KEYWORDS=amd64 arm64 ~ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/glib:=
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v4.3.1/libslirp-v4.3.1.tar.gz -> libslirp-4.3.1.tar.gz
-_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=28697809c4e2f17ec780557c396c30a9
diff --git a/metadata/md5-cache/net-libs/libslirp-4.3.1-r1 b/metadata/md5-cache/net-libs/libslirp-4.3.1-r1
index 83018e7fc70f..61bb38310443 100644
--- a/metadata/md5-cache/net-libs/libslirp-4.3.1-r1
+++ b/metadata/md5-cache/net-libs/libslirp-4.3.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A general purpose TCP-IP emulator used by virtual machine hypervisor
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/slirp/libslirp
 IUSE=static-libs
-KEYWORDS=amd64 arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib:=
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v4.3.1/libslirp-v4.3.1.tar.gz -> libslirp-4.3.1.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=18f7dd6a0700ecd5a5d0210303cf4694
+_md5_=e8051c97580cb4c61a919f64f73e89a5
diff --git a/metadata/md5-cache/net-libs/libsmi-0.5.0-r1 b/metadata/md5-cache/net-libs/libsmi-0.5.0-r1
index fa444acf49de..79de8af775d0 100644
--- a/metadata/md5-cache/net-libs/libsmi-0.5.0-r1
+++ b/metadata/md5-cache/net-libs/libsmi-0.5.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=A Library to Access SMI MIB Information
 EAPI=7
 HOMEPAGE=https://www.ibr.cs.tu-bs.de/projects/libsmi/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.ibr.cs.tu-bs.de/projects/libsmi/download/libsmi-0.5.0.tar.gz
-_md5_=898ad76d4f95920f56b748a91d5b8c9e
+_md5_=fe36959f005555aeda0777173cdf7f4c
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.2.0 b/metadata/md5-cache/net-libs/miniupnpc-2.2.0
index 18c074fa4f16..78e668be0aba 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.2.0
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.2.0
@@ -4,9 +4,9 @@ DESCRIPTION=UPnP client library and a simple UPnP client
 EAPI=7
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=ipv6 kernel_linux static-libs verify-sig
-KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86
 LICENSE=BSD
 SLOT=0/17
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.0.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.0.tar.gz.sig )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=18fc8c7de5edfcc0b72a99311c72ecfd
+_md5_=a1fc4975eeacc04e35a34cc29daafaa1
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.1.20201016 b/metadata/md5-cache/net-libs/miniupnpc-2.2.1
similarity index 68%
rename from metadata/md5-cache/net-libs/miniupnpc-2.1.20201016
rename to metadata/md5-cache/net-libs/miniupnpc-2.2.1
index a33e1d9017ff..e2ed3647cc81 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.1.20201016
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.2.1
@@ -4,9 +4,9 @@ DESCRIPTION=UPnP client library and a simple UPnP client
 EAPI=7
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=ipv6 kernel_linux static-libs verify-sig
-KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 SLOT=0/17
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20201016.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.1.20201016.tar.gz.sig )
+SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.1.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.1.tar.gz.sig )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=a1fc4975eeacc04e35a34cc29daafaa1
+_md5_=5cf53b1655935b30da95ff2973814b8d
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.42.0 b/metadata/md5-cache/net-libs/nghttp2-1.42.0
index d46e6d337396..3940a7e8a87d 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.42.0
+++ b/metadata/md5-cache/net-libs/nghttp2-1.42.0
@@ -5,11 +5,11 @@ DESCRIPTION=HTTP/2 C Library
 EAPI=7
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.14
 SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.42.0/nghttp2-1.42.0.tar.xz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5627d9652aab131a36aef13b865da9e4
+_md5_=2b14297ad43d9533cd1f1ec4580c9e61
diff --git a/metadata/md5-cache/net-libs/nghttp2-9999 b/metadata/md5-cache/net-libs/nghttp2-9999
index faa85d162186..260587a3d9af 100644
--- a/metadata/md5-cache/net-libs/nghttp2-9999
+++ b/metadata/md5-cache/net-libs/nghttp2-9999
@@ -11,4 +11,4 @@ RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,
 RESTRICT=!test? ( test )
 SLOT=0/1.14
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a6befda0bafa867f9464b37abddd6fb3
+_md5_=a79745b7c39dd0fa02fdbbbcb6963009
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.30.4 b/metadata/md5-cache/net-libs/webkit-gtk-2.30.4
new file mode 100644
index 000000000000..ebc1a385b659
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.30.4
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.32 ) geolocation? ( dev-util/gdbus-codegen ) >=dev-util/cmake-3.10 dev-util/ninja dev-util/cmake >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Open source web browser engine
+EAPI=7
+HOMEPAGE=https://www.webkitgtk.org
+IUSE=aqua +egl gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.30.4.tar.xz
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd1e904052bf3dc097474a605e3b7f46
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 2220b7b24173..f3c6180493dc 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/cyrus-imapd-3.0.14 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.14
index 46c2845b3c24..e7dc6baf1648 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.14
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.14
@@ -5,7 +5,7 @@ DESCRIPTION=The Cyrus IMAP Server
 EAPI=7
 HOMEPAGE=https://www.cyrusimap.org/
 IUSE=afs backup calalarm caps clamav http kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sqlite ssl static-libs tcpd test xapian ssl
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=BSD-with-attribution GPL-2
 RDEPEND=sys-libs/zlib:0= dev-libs/libpcre:3 >=dev-libs/cyrus-sasl-2.1.13:2 dev-libs/jansson dev-libs/icu:0= sys-libs/e2fsprogs-libs afs? ( net-fs/openafs ) calalarm? ( dev-libs/libical:0= ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb:0= ) mysql? ( dev-db/mysql-connector-c:0= ) nntp? ( !net-nntp/leafnode ) pam? ( sys-libs/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= ) ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp:0=[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0:0= ) acct-group/mail acct-user/cyrus !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !app-arch/dump
 REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.14/cyrus-imapd-3.0.14.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	ssl-cert	6ba9452db3e1108ce9b4a017a005fd79	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e99b5e0171697e7a065c512d056bb1e5
+_md5_=9083e904dadf640a69e378fd75a4bfad
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.11.3-r100 b/metadata/md5-cache/net-mail/dovecot-2.3.11.3-r100
new file mode 100644
index 000000000000..90604a45e5e3
--- /dev/null
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.11.3-r100
@@ -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 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) virtual/libiconv dev-libs/icu:=
+DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
+EAPI=7
+HOMEPAGE=https://www.dovecot.org/
+IUSE=kerberos ldap lua mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib zstd argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1 MIT
+RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) virtual/libiconv dev-libs/icu:= acct-group/dovecot acct-group/dovenull acct-user/dovecot acct-user/dovenull net-mail/mailbase
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
+SLOT=0
+SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.11.3.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.11.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.11.tar.gz )
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	6ba9452db3e1108ce9b4a017a005fd79	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=74ff8d502c045893f87e80a95a41ebea
diff --git a/metadata/md5-cache/net-mail/lbdb-0.41 b/metadata/md5-cache/net-mail/lbdb-0.41
deleted file mode 100644
index 1277fdf0128d..000000000000
--- a/metadata/md5-cache/net-mail/lbdb-0.41
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/libvformat evo? ( mail-client/evolution ) finger? ( net-misc/netkit-fingerd ) abook? ( app-misc/abook ) crypt? ( app-crypt/gnupg )
-DESCRIPTION=Little Brother database
-EAPI=6
-HOMEPAGE=http://www.spinnaker.de/lbdb/
-IUSE=pda ldap finger abook crypt evo
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libvformat evo? ( mail-client/evolution ) finger? ( net-misc/netkit-fingerd ) abook? ( app-misc/abook ) crypt? ( app-crypt/gnupg ) pda? ( dev-perl/Palm ) ldap? ( dev-perl/perl-ldap )
-SLOT=0
-SRC_URI=http://www.spinnaker.de/debian/lbdb_0.41.tar.gz
-_eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=5a6fa49c9b8238cdaa3fa398441cb31e
diff --git a/metadata/md5-cache/net-mail/lbdb-0.47 b/metadata/md5-cache/net-mail/lbdb-0.47
index 313c161b6033..8ee2af100875 100644
--- a/metadata/md5-cache/net-mail/lbdb-0.47
+++ b/metadata/md5-cache/net-mail/lbdb-0.47
@@ -4,10 +4,10 @@ DESCRIPTION=Little Brother database
 EAPI=7
 HOMEPAGE=https://www.spinnaker.de/lbdb/
 IUSE=abook bbdb crypt evo finger ldap pda test
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libvformat evo? ( mail-client/evolution ) finger? ( net-misc/netkit-fingerd ) abook? ( app-misc/abook ) crypt? ( app-crypt/gnupg ) bbdb? ( app-emacs/bbdb ) pda? ( dev-perl/Palm ) ldap? ( dev-perl/perl-ldap )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.spinnaker.de/lbdb/download/lbdb_0.47.tar.gz
-_md5_=59fd3477d2a464f39b1306febc3b212f
+_md5_=b974bbd4f225dad980b0ed01aeeb8574
diff --git a/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2 b/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2
index e70ba63959b9..c1b4b15b1de4 100644
--- a/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2
+++ b/metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/list-remote-forwards-0.0.1/list-remote-forwards-0.0.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0154ce122affc82dfa34d38553709621
diff --git a/metadata/md5-cache/net-mail/mailbox-count-0.0.5 b/metadata/md5-cache/net-mail/mailbox-count-0.0.5
index 6298e674368a..cb7b5c4934d4 100644
--- a/metadata/md5-cache/net-mail/mailbox-count-0.0.5
+++ b/metadata/md5-cache/net-mail/mailbox-count-0.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cmdargs-0.10 >=dev-haskell/configurator-0.2 >=dev-haskell/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/mailbox-count-0.0.5/mailbox-count-0.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8e61758c374edd0cc6c2f0bc37ae38af
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 9ada8136bc7d..407de046aafd 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/asterisk-16.14.0-r100 b/metadata/md5-cache/net-misc/asterisk-16.14.0-r100
new file mode 100644
index 000000000000..f7c9c2bef68e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-16.14.0-r100
@@ -0,0 +1,15 @@
+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 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9 ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=7
+HOMEPAGE=https://www.asterisk.org/
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9 ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
+SLOT=0
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.14.0.tar.gz https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e021138250170a0d9b47d44fa3f2816a
diff --git a/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2 b/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
index 2bb4ea871db4..780f25ea22db 100644
--- a/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
+++ b/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://whois.bw.org/dist/whois-5.5.2.tgz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=66bf8264cc9a03fdb60d3614b6e71e04
diff --git a/metadata/md5-cache/net-misc/chrony-3.5.1-r1 b/metadata/md5-cache/net-misc/chrony-3.5.1-r1
deleted file mode 100644
index 5b725d9ffa21..000000000000
--- a/metadata/md5-cache/net-misc/chrony-3.5.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nettle? ( virtual/pkgconfig ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) readline? ( >=sys-libs/readline-4.1-r4:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools )
-DESCRIPTION=NTP client and server programs
-EAPI=7
-HOMEPAGE=https://chrony.tuxfamily.org/
-IUSE=+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc samba +seccomp +sechash selinux
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) readline? ( >=sys-libs/readline-4.1-r4:= ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
-REQUIRED_USE=?? ( libedit readline ) sechash? ( nettle )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.tuxfamily.org/chrony/chrony-3.5.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5a57936f3cc457d692e678183b87115b
diff --git a/metadata/md5-cache/net-misc/clusterssh-4.03.03 b/metadata/md5-cache/net-misc/clusterssh-4.03.03
index e287786c4867..063f1664c477 100644
--- a/metadata/md5-cache/net-misc/clusterssh-4.03.03
+++ b/metadata/md5-cache/net-misc/clusterssh-4.03.03
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Exception-Class dev-perl/Readonly dev-perl/Test-Pod dev-perl/Te
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.01_05.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=87d6e1e9b0e68258ecaa302c8da55906
diff --git a/metadata/md5-cache/net-misc/clusterssh-4.30.600 b/metadata/md5-cache/net-misc/clusterssh-4.30.600
index 46e4fd513f3c..372454cb6e03 100644
--- a/metadata/md5-cache/net-misc/clusterssh-4.30.600
+++ b/metadata/md5-cache/net-misc/clusterssh-4.30.600
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Config-Simple dev-perl/Exception-Class dev-perl/Tk dev-perl/Rea
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.03_06.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ecec2ec5d220c26856d100fc90f12ca0
diff --git a/metadata/md5-cache/net-misc/clusterssh-9999 b/metadata/md5-cache/net-misc/clusterssh-9999
index b74fce90f873..28c27f24ef14 100644
--- a/metadata/md5-cache/net-misc/clusterssh-9999
+++ b/metadata/md5-cache/net-misc/clusterssh-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-perl/Exception-Class dev-perl/Readonly dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Trap dev-perl/Test-DistManifest dev-perl/Try-Tiny dev-perl/Tk dev-perl/Config-Simple dev-perl/X11-Protocol dev-perl/XML-Simple x11-apps/xlsfonts x11-terms/xterm dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f565b188ba09f5d746def31a2e2cca70
diff --git a/metadata/md5-cache/net-misc/dropbox-112.4.321 b/metadata/md5-cache/net-misc/dropbox-112.4.321
index 542ede72dacb..76842ed209b6 100644
--- a/metadata/md5-cache/net-misc/dropbox-112.4.321
+++ b/metadata/md5-cache/net-misc/dropbox-112.4.321
@@ -5,11 +5,11 @@ DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
 EAPI=7
 HOMEPAGE=https://www.dropbox.com/
 IUSE=selinux X
-KEYWORDS=~amd64 ~x86 ~x86-linux
+KEYWORDS=amd64 x86 ~x86-linux
 LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
 RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-112.4.321.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-112.4.321.tar.gz )
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6988e1d99f9bf049b53feb57c7e6e90e
+_md5_=bf7d611bab280bf05e4aa9a1eff8d32b
diff --git a/metadata/md5-cache/net-misc/electrum-4.0.9 b/metadata/md5-cache/net-misc/electrum-4.0.9
new file mode 100644
index 000000000000..5224c5b3393e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-4.0.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pyaes[python_targets_python3_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/pycryptodome[python_targets_python3_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? ( 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?] ) >=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/libsecp256k1 >=dev-python/aiohttp-socks-0.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(-)] =dev-python/aiorpcX-0.18*[python_targets_python3_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/attrs-19.2.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/bitstring[python_targets_python3_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[python_targets_python3_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/dnspython-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/pbkdf2[python_targets_python3_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/PySocks[python_targets_python3_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/qrcode[python_targets_python3_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/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(-)] 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/protobuf-python-3.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,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(-)] ) 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] ) ) >=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[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) >=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 postinst postrm prepare test
+DESCRIPTION=User friendly Bitcoin client
+EAPI=7
+HOMEPAGE=https://electrum.org/
+IUSE=cli ncurses qrcode +qt5 test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+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?] ) >=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/libsecp256k1 >=dev-python/aiohttp-socks-0.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(-)] =dev-python/aiorpcX-0.18*[python_targets_python3_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/attrs-19.2.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/bitstring[python_targets_python3_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[python_targets_python3_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/dnspython-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/pbkdf2[python_targets_python3_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/PySocks[python_targets_python3_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/qrcode[python_targets_python3_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/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(-)] 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/protobuf-python-3.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,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(-)] ) 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_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?] ) >=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=|| ( cli ncurses qt5 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spesmilo/electrum/archive/4.0.9.tar.gz -> electrum-4.0.9.gh.tar.gz
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=133bf837c6acb62c74820f245892c0a7
diff --git a/metadata/md5-cache/net-misc/gcap-0.1.1-r1 b/metadata/md5-cache/net-misc/gcap-0.1.1-r1
index 9e3692ca0a4e..b4d79fc3ead6 100644
--- a/metadata/md5-cache/net-misc/gcap-0.1.1-r1
+++ b/metadata/md5-cache/net-misc/gcap-0.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-perl/Getopt-ArgvFile dev-perl/XML-DOM virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/gcap/gcap_0.1.1.orig.tar.gz -> gcap-0.1.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a22e22b0c654a34570ec94e8e3384006
diff --git a/metadata/md5-cache/net-misc/gnome-remote-desktop-0.1.9 b/metadata/md5-cache/net-misc/gnome-remote-desktop-0.1.9
new file mode 100644
index 000000000000..9f38a14e97eb
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gnome-remote-desktop-0.1.9
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/glib:2 media-video/pipewire:0/0.3 sys-apps/systemd net-libs/libvncserver app-crypt/libsecret x11-libs/libnotify dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Remote desktop daemon for GNOME using pipewire
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/jadahl/gnome-remote-desktop
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 media-video/pipewire:0/0.3 sys-apps/systemd net-libs/libvncserver app-crypt/libsecret x11-libs/libnotify x11-wm/mutter[screencast]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-remote-desktop/0.1/gnome-remote-desktop-0.1.9.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dbc4ddee10b8edb044060fcd58f7be70
diff --git a/metadata/md5-cache/net-misc/gsasl-1.8.1 b/metadata/md5-cache/net-misc/gsasl-1.8.1
index 2e5fec9ce366..06d7c6d63c74 100644
--- a/metadata/md5-cache/net-misc/gsasl-1.8.1
+++ b/metadata/md5-cache/net-misc/gsasl-1.8.1
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU SASL client, server, and library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gsasl/
 IUSE=doc gcrypt idn kerberos nls ntlm static-libs +threads
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/gsasl-1.8.1.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e3c98acb7c3b9343229e6303c23abce4
+_md5_=158d5b3179da89734057dd9eec6c93b4
diff --git a/metadata/md5-cache/net-misc/haeredes-0.5.2 b/metadata/md5-cache/net-misc/haeredes-0.5.2
index 33a63e966787..e8e17f9ae6f6 100644
--- a/metadata/md5-cache/net-misc/haeredes-0.5.2
+++ b/metadata/md5-cache/net-misc/haeredes-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cmdargs-0.10:= >=dev-haskell/dns-1.4:= >=dev-haskell/iprou
 RESTRICT=test
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/haeredes-0.5.2/haeredes-0.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3601a0e721432a14430f5c760c90ac40
diff --git a/metadata/md5-cache/net-misc/hath-0.5.0 b/metadata/md5-cache/net-misc/hath-0.5.0
index 8b8d5049ae57..4a5e5e194687 100644
--- a/metadata/md5-cache/net-misc/hath-0.5.0
+++ b/metadata/md5-cache/net-misc/hath-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-haskell/cmdargs-0.10:= >=dev-haskell/split-0.2:= >=dev-haskell/tas
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hackage.haskell.org/package/hath-0.5.0/hath-0.5.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=49593706f6174cdbdd2639a4c21f20b6
diff --git a/metadata/md5-cache/net-misc/htpdate-1.0.7 b/metadata/md5-cache/net-misc/htpdate-1.0.7
index 80b1a1c814ad..ef29a6466337 100644
--- a/metadata/md5-cache/net-misc/htpdate-1.0.7
+++ b/metadata/md5-cache/net-misc/htpdate-1.0.7
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ~ppc64 s390 x86 ~amd64-linux ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.vervest.org/htp/archive/c/htpdate-1.0.7.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7cd5b842ca0c69161112c013576e2cb3
diff --git a/metadata/md5-cache/net-misc/httpie-2.1.0 b/metadata/md5-cache/net-misc/httpie-2.1.0
deleted file mode 100644
index 2e4c2eeff980..000000000000
--- a/metadata/md5-cache/net-misc/httpie-2.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_python3_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-2.22.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/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[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) >=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/pygments[python_targets_python3_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-2.22.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/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/pyopenssl[python_targets_python3_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-httpbin[python_targets_python3_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[python_targets_python3_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=Modern command line HTTP client
-EAPI=7
-HOMEPAGE=https://httpie.org/ https://pypi.org/project/httpie/
-IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/pygments[python_targets_python3_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-2.22.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[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) >=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 ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jakubroztocil/httpie/archive/2.1.0.tar.gz -> httpie-2.1.0.tar.gz
-_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=60962ddaac5b3c2208c4bb9d91919648
diff --git a/metadata/md5-cache/net-misc/httpie-2.3.0 b/metadata/md5-cache/net-misc/httpie-2.3.0
new file mode 100644
index 000000000000..86000f510074
--- /dev/null
+++ b/metadata/md5-cache/net-misc/httpie-2.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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-2.22.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/requests-toolbelt-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/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/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/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/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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-2.22.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/requests-toolbelt-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/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[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=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=Modern command line HTTP client
+EAPI=7
+HOMEPAGE=https://httpie.org/ https://pypi.org/project/httpie/
+IUSE=test 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/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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-2.22.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/requests-toolbelt-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(-)] python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=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? ( test )
+SLOT=0
+SRC_URI=https://github.com/jakubroztocil/httpie/archive/2.3.0.tar.gz -> httpie-2.3.0.tar.gz
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f406374d0feda0c16ca9e5d5c9424b2f
diff --git a/metadata/md5-cache/net-misc/kea-1.8.2 b/metadata/md5-cache/net-misc/kea-1.8.2
new file mode 100644
index 000000000000..ccf0425f7ddf
--- /dev/null
+++ b/metadata/md5-cache/net-misc/kea-1.8.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* )
+DESCRIPTION=High-performance production grade DHCPv4 & DHCPv6 server
+EAPI=7
+HOMEPAGE=http://www.isc.org/kea/
+IUSE=mysql +openssl postgres samples
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC BSD SSLeay GPL-2
+RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* ) acct-group/dhcp acct-user/dhcp
+SLOT=0
+SRC_URI=ftp://ftp.isc.org/isc/kea/kea-1.8.2.tar.gz ftp://ftp.isc.org/isc/kea/1.8.2/kea-1.8.2.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=901663e0e867297107bb3371afe881aa
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.1.20200510 b/metadata/md5-cache/net-misc/miniupnpd-2.1.20200510
deleted file mode 100644
index 97094aa65b29..000000000000
--- a/metadata/md5-cache/net-misc/miniupnpd-2.1.20200510
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst
-DEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= ) sys-apps/lsb-release
-DESCRIPTION=MiniUPnP IGD Daemon
-EAPI=7
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.1.20200510.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c2b48103e8a113312b4849e39e77efa4
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc3 b/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc3
deleted file mode 100644
index dfb9fb2f90d6..000000000000
--- a/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/lsb-release verify-sig? ( app-crypt/openpgp-keys-miniupnp ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst unpack
-DEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
-DESCRIPTION=MiniUPnP IGD Daemon
-EAPI=7
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict verify-sig
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.2.0-RC3.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpd-2.2.0-RC3.tar.gz.sig )
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=f6d96e5020680ff508f9d28051bcfc51
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2 b/metadata/md5-cache/net-misc/miniupnpd-2.2.1
similarity index 87%
rename from metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2
rename to metadata/md5-cache/net-misc/miniupnpd-2.2.1
index f60c3435b31e..1ea95dda64cc 100644
--- a/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.2.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
 SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.2.0-RC2.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpd-2.2.0-RC2.tar.gz.sig )
+SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.2.1.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpd-2.2.1.tar.gz.sig )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=f6d96e5020680ff508f9d28051bcfc51
diff --git a/metadata/md5-cache/net-misc/ofono-1.31 b/metadata/md5-cache/net-misc/ofono-1.31
index af7a798515c3..0bdeafcd947a 100644
--- a/metadata/md5-cache/net-misc/ofono-1.31
+++ b/metadata/md5-cache/net-misc/ofono-1.31
@@ -5,11 +5,11 @@ DESCRIPTION=Open Source mobile telephony (GSM/UMTS) daemon
 EAPI=7
 HOMEPAGE=https://01.org/ofono
 IUSE=+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86
+KEYWORDS=amd64 arm arm64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/dbus-1.4 >=dev-libs/glib-2.32 net-misc/mobile-broadband-provider-info bluetooth? ( >=net-wireless/bluez-4.99 ) udev? ( virtual/udev ) examples? ( dev-python/dbus-python ) tools? ( virtual/libusb:1 )
 REQUIRED_USE=dundee? ( bluetooth )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/ofono/ofono-1.31.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0a200937115f53cd22d03082c32c65fd
+_md5_=e6e563034254e82567b0d46a21547da9
diff --git a/metadata/md5-cache/net-misc/websocat-1.6.0 b/metadata/md5-cache/net-misc/websocat-1.6.0
new file mode 100644
index 000000000000..8bdb5d96cb04
--- /dev/null
+++ b/metadata/md5-cache/net-misc/websocat-1.6.0
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=virtual/rust-1.37.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+DESCRIPTION=Command-line client for WebSockets, like netcat, with socat-like functions
+EAPI=7
+HOMEPAGE=https://github.com/vi/websocat
+IUSE=libressl ssl debug
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 ISC Unlicense
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/anymap/0.12.1/download -> anymap-0.12.1.crate https://crates.io/api/v1/crates/arc-swap/0.4.3/download -> arc-swap-0.4.3.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/c2-chacha/0.2.3/download -> c2-chacha-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.41/download -> cc-1.0.41.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.2/download -> crossbeam-deque-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.0/download -> crossbeam-epoch-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.0/download -> crossbeam-utils-0.7.0.crate https://crates.io/api/v1/crates/derivative/1.0.3/download -> derivative-1.0.3.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/env_logger/0.6.2/download -> env_logger-0.6.2.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.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-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.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/futures/0.1.29/download -> futures-0.1.29.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getrandom/0.1.13/download -> getrandom-0.1.13.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.3/download -> hermit-abi-0.1.3.crate https://crates.io/api/v1/crates/http/0.1.19/download -> http-0.1.19.crate https://crates.io/api/v1/crates/http-bytes/0.1.0/download -> http-bytes-0.1.0.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/hyper/0.10.16/download -> hyper-0.10.16.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.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.4/download -> itoa-0.4.4.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/language-tags/0.2.2/download -> language-tags-0.2.2.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.65/download -> libc-0.2.65.crate https://crates.io/api/v1/crates/lock_api/0.1.5/download -> lock_api-0.1.5.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.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/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/mime/0.2.6/download -> mime-0.2.6.crate https://crates.io/api/v1/crates/mio/0.6.19/download -> mio-0.6.19.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.7/download -> mio-uds-0.6.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.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/native-tls/0.2.3/download -> native-tls-0.2.3.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/num_cpus/1.11.0/download -> num_cpus-1.11.0.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/openssl/0.10.25/download -> openssl-0.10.25.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.52/download -> openssl-sys-0.9.52.crate https://crates.io/api/v1/crates/owning_ref/0.4.0/download -> owning_ref-0.4.0.crate https://crates.io/api/v1/crates/parking_lot/0.7.1/download -> parking_lot-0.7.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.4.0/download -> parking_lot_core-0.4.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.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/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.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/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand/0.7.2/download -> rand-0.7.2.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_chacha/0.2.1/download -> rand_chacha-0.2.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.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.1.0/download -> rand_hc-0.1.0.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_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/readwrite/0.1.1/download -> readwrite-0.1.1.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/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/schannel/0.1.16/download -> schannel-0.1.16.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.crate https://crates.io/api/v1/crates/security-framework/0.3.3/download -> security-framework-0.3.3.crate https://crates.io/api/v1/crates/security-framework-sys/0.3.3/download -> security-framework-sys-0.3.3.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/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/signal-hook/0.1.11/download -> signal-hook-0.1.11.crate https://crates.io/api/v1/crates/signal-hook-registry/1.1.1/download -> signal-hook-registry-1.1.1.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/slab_typesafe/0.1.3/download -> slab_typesafe-0.1.3.crate https://crates.io/api/v1/crates/smallvec/0.6.13/download -> smallvec-0.6.13.crate https://crates.io/api/v1/crates/smart-default/0.3.0/download -> smart-default-0.3.0.crate https://crates.io/api/v1/crates/socket2/0.3.11/download -> socket2-0.3.11.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.crate https://crates.io/api/v1/crates/structopt/0.2.16/download -> structopt-0.2.16.crate https://crates.io/api/v1/crates/structopt-derive/0.2.16/download -> structopt-derive-0.2.16.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/tk-listen/0.2.1/download -> tk-listen-0.2.1.crate https://crates.io/api/v1/crates/tokio/0.1.22/download -> tokio-0.1.22.crate https://crates.io/api/v1/crates/tokio-codec/0.1.1/download -> tokio-codec-0.1.1.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.6/download -> tokio-current-thread-0.1.6.crate https://crates.io/api/v1/crates/tokio-executor/0.1.8/download -> tokio-executor-0.1.8.crate https://crates.io/api/v1/crates/tokio-file-unix/0.5.1/download -> tokio-file-unix-0.5.1.crate https://crates.io/api/v1/crates/tokio-fs/0.1.6/download -> tokio-fs-0.1.6.crate https://crates.io/api/v1/crates/tokio-io/0.1.12/download -> tokio-io-0.1.12.crate https://crates.io/api/v1/crates/tokio-process/0.2.4/download -> tokio-process-0.2.4.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.9/download -> tokio-reactor-0.1.9.crate https://crates.io/api/v1/crates/tokio-signal/0.2.7/download -> tokio-signal-0.2.7.crate https://crates.io/api/v1/crates/tokio-stdin-stdout/0.1.5/download -> tokio-stdin-stdout-0.1.5.crate https://crates.io/api/v1/crates/tokio-sync/0.1.7/download -> tokio-sync-0.1.7.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.3/download -> tokio-tcp-0.1.3.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.16/download -> tokio-threadpool-0.1.16.crate https://crates.io/api/v1/crates/tokio-timer/0.2.11/download -> tokio-timer-0.2.11.crate https://crates.io/api/v1/crates/tokio-tls/0.2.1/download -> tokio-tls-0.2.1.crate https://crates.io/api/v1/crates/tokio-udp/0.1.5/download -> tokio-udp-0.1.5.crate https://crates.io/api/v1/crates/tokio-uds/0.2.5/download -> tokio-uds-0.2.5.crate https://crates.io/api/v1/crates/traitobject/0.1.0/download -> traitobject-0.1.0.crate https://crates.io/api/v1/crates/typeable/0.1.2/download -> typeable-0.1.2.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.9/download -> unicode-normalization-0.1.9.crate https://crates.io/api/v1/crates/unicode-segmentation/1.5.0/download -> unicode-segmentation-1.5.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.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/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.7/download -> vcpkg-0.2.7.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/websocat/1.6.0/download -> websocat-1.6.0.crate https://crates.io/api/v1/crates/websocket/0.26.2/download -> websocket-0.26.2.crate https://crates.io/api/v1/crates/websocket-base/0.26.2/download -> websocket-base-0.26.2.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.8/download -> winapi-0.3.8.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-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/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
+_eclasses_=cargo	bd8499d18174b7d9e84e56a022ccd236	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=06e01bf969f570d8f718a71eeacd8b77
diff --git a/metadata/md5-cache/net-misc/websocat-1.6.0-r1 b/metadata/md5-cache/net-misc/websocat-1.6.0-r1
new file mode 100644
index 000000000000..29160e5645e2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/websocat-1.6.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=virtual/rust-1.37.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+DESCRIPTION=Command-line client for WebSockets, like netcat, with socat-like functions
+EAPI=7
+HOMEPAGE=https://github.com/vi/websocat
+IUSE=libressl ssl debug
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 ISC Unlicense
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/anymap/0.12.1/download -> anymap-0.12.1.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.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/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.3/download -> crossbeam-queue-0.2.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.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/derivative/1.0.4/download -> derivative-1.0.4.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/env_logger/0.6.2/download -> env_logger-0.6.2.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.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-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.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/futures/0.1.30/download -> futures-0.1.30.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.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.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/http/0.1.21/download -> http-0.1.21.crate https://crates.io/api/v1/crates/http-bytes/0.1.0/download -> http-bytes-0.1.0.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/hyper/0.10.16/download -> hyper-0.10.16.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.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/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.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.81/download -> libc-0.2.81.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.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.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/memoffset/0.5.6/download -> memoffset-0.5.6.crate https://crates.io/api/v1/crates/mime/0.2.6/download -> mime-0.2.6.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.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/mio-uds/0.6.8/download -> mio-uds-0.6.8.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.6/download -> miow-0.3.6.crate https://crates.io/api/v1/crates/native-tls/0.2.6/download -> native-tls-0.2.6.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/openssl/0.10.31/download -> openssl-0.10.31.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.59/download -> openssl-sys-0.9.59.crate https://crates.io/api/v1/crates/parking_lot/0.9.0/download -> parking_lot-0.9.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.6.2/download -> parking_lot_core-0.6.2.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.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/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.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.1.1/download -> rand_chacha-0.1.1.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.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.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.1.0/download -> rand_hc-0.1.0.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_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/readwrite/0.1.2/download -> readwrite-0.1.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.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/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.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/2.0.0/download -> security-framework-2.0.0.crate https://crates.io/api/v1/crates/security-framework-sys/2.0.0/download -> security-framework-sys-2.0.0.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/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.2/download -> signal-hook-registry-1.2.2.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/slab_typesafe/0.1.3/download -> slab_typesafe-0.1.3.crate https://crates.io/api/v1/crates/smallvec/0.6.13/download -> smallvec-0.6.13.crate https://crates.io/api/v1/crates/smart-default/0.3.0/download -> smart-default-0.3.0.crate https://crates.io/api/v1/crates/socket2/0.3.18/download -> socket2-0.3.18.crate https://crates.io/api/v1/crates/structopt/0.2.16/download -> structopt-0.2.16.crate https://crates.io/api/v1/crates/structopt-derive/0.2.16/download -> structopt-derive-0.2.16.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinyvec/1.1.0/download -> tinyvec-1.1.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tk-listen/0.2.1/download -> tk-listen-0.2.1.crate https://crates.io/api/v1/crates/tokio/0.1.22/download -> tokio-0.1.22.crate https://crates.io/api/v1/crates/tokio-codec/0.1.2/download -> tokio-codec-0.1.2.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.7/download -> tokio-current-thread-0.1.7.crate https://crates.io/api/v1/crates/tokio-executor/0.1.10/download -> tokio-executor-0.1.10.crate https://crates.io/api/v1/crates/tokio-file-unix/0.5.1/download -> tokio-file-unix-0.5.1.crate https://crates.io/api/v1/crates/tokio-fs/0.1.7/download -> tokio-fs-0.1.7.crate https://crates.io/api/v1/crates/tokio-io/0.1.13/download -> tokio-io-0.1.13.crate https://crates.io/api/v1/crates/tokio-process/0.2.5/download -> tokio-process-0.2.5.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.12/download -> tokio-reactor-0.1.12.crate https://crates.io/api/v1/crates/tokio-signal/0.2.9/download -> tokio-signal-0.2.9.crate https://crates.io/api/v1/crates/tokio-stdin-stdout/0.1.5/download -> tokio-stdin-stdout-0.1.5.crate https://crates.io/api/v1/crates/tokio-sync/0.1.8/download -> tokio-sync-0.1.8.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.4/download -> tokio-tcp-0.1.4.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.18/download -> tokio-threadpool-0.1.18.crate https://crates.io/api/v1/crates/tokio-timer/0.2.13/download -> tokio-timer-0.2.13.crate https://crates.io/api/v1/crates/tokio-tls/0.2.1/download -> tokio-tls-0.2.1.crate https://crates.io/api/v1/crates/tokio-udp/0.1.6/download -> tokio-udp-0.1.6.crate https://crates.io/api/v1/crates/tokio-uds/0.2.7/download -> tokio-uds-0.2.7.crate https://crates.io/api/v1/crates/traitobject/0.1.0/download -> traitobject-0.1.0.crate https://crates.io/api/v1/crates/typeable/0.1.2/download -> typeable-0.1.2.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.16/download -> unicode-normalization-0.1.16.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.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/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.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/websocat/1.6.0/download -> websocat-1.6.0.crate https://crates.io/api/v1/crates/websocket/0.26.2/download -> websocket-0.26.2.crate https://crates.io/api/v1/crates/websocket-base/0.26.2/download -> websocket-base-0.26.2.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-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/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://dev.gentoo.org/~zmedico/dist/websocat-1.6.0-libressl-3.3.patch.xz
+_eclasses_=cargo	bd8499d18174b7d9e84e56a022ccd236	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=835978ab9824be36c6eccdba6b5c6712
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.09.20 b/metadata/md5-cache/net-misc/youtube-dl-2020.09.20
deleted file mode 100644
index 809564d13a90..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.09.20
+++ /dev/null
@@ -1,16 +0,0 @@
-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 postinst prepare test
-DEPEND=dev-python/pycryptodome[python_targets_python3_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(-)] test? ( 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/flake8[python_targets_python3_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=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://github.com/ytdl-org/youtube-dl/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/pycryptodome[python_targets_python3_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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2020.09.20/youtube-dl-2020.09.20.tar.gz
-_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=918ead4df120b59067b3d7087ea5d91b
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.11.26 b/metadata/md5-cache/net-misc/youtube-dl-2020.11.26
deleted file mode 100644
index be36069c36fb..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.11.26
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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 postinst prepare test
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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://youtube-dl.org/downloads/2020.11.26/youtube-dl-2020.11.26.tar.gz
-_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a733008947a32c28c88213c8b2479606
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.11.29 b/metadata/md5-cache/net-misc/youtube-dl-2020.11.29
deleted file mode 100644
index 9b2a5846c085..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.11.29
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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 postinst prepare test
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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://youtube-dl.org/downloads/2020.11.29/youtube-dl-2020.11.29.tar.gz
-_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3a0aa2499aa88ddd233026cea1daf26a
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.12.02 b/metadata/md5-cache/net-misc/youtube-dl-2020.12.02
deleted file mode 100644
index 674aa13ac301..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.12.02
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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 postinst prepare test
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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://youtube-dl.org/downloads/2020.12.02/youtube-dl-2020.12.02.tar.gz
-_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3a0aa2499aa88ddd233026cea1daf26a
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.12.05 b/metadata/md5-cache/net-misc/youtube-dl-2020.12.05
deleted file mode 100644
index 9718f273488c..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.12.05
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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 postinst prepare test
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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://youtube-dl.org/downloads/2020.12.05/youtube-dl-2020.12.05.tar.gz
-_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3a0aa2499aa88ddd233026cea1daf26a
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.12.12 b/metadata/md5-cache/net-misc/youtube-dl-2020.12.12
deleted file mode 100644
index cf7da34aa1b2..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.12.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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 postinst prepare test
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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://youtube-dl.org/downloads/2020.12.12/youtube-dl-2020.12.12.tar.gz
-_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a13d68caf7e2e2bd56bdc302c71d8493
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.12.14 b/metadata/md5-cache/net-misc/youtube-dl-2020.12.14
index dcfb4b1222ab..941660856098 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.12.14
+++ b/metadata/md5-cache/net-misc/youtube-dl-2020.12.14
@@ -4,7 +4,7 @@ DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=7
 HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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=https://youtube-dl.org/downloads/2020.12.14/youtube-dl-2020.12.14.tar.gz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a13d68caf7e2e2bd56bdc302c71d8493
+_md5_=cf5201bdb2065049cab4c8e04aaf35d5
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index e3ece6e7af24..ad0328ce1415 100644
Binary files a/metadata/md5-cache/net-nds/Manifest.gz and b/metadata/md5-cache/net-nds/Manifest.gz differ
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.53-r1 b/metadata/md5-cache/net-nds/openldap-2.4.53-r1
deleted file mode 100644
index 150b858d60a9..000000000000
--- a/metadata/md5-cache/net-nds/openldap-2.4.53-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=!minimal? ( acct-group/ldap acct-user/ldap ) >=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 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( <sys-libs/db-6.0:= || ( 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 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) sys-apps/groff
-DESCRIPTION=LDAP suite of application and development tools
-EAPI=7
-HOMEPAGE=https://www.OpenLDAP.org/
-IUSE=crypt samba tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test smbkrb5passwd kerberos kinit pbkdf2 sha2 -cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 ssl
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=OPENLDAP GPL-2
-RDEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( <sys-libs/db-6.0:= || ( 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 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) selinux? ( sec-policy/selinux-ldap )
-REQUIRED_USE=cxx? ( sasl ) pbkdf2? ( ssl ) test? ( berkdb ) ?? ( test minimal )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.53.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.4.53.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.4.53.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.53.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	db-use	d0a68876efc79f37b39ecf3f48c48e7e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	6ba9452db3e1108ce9b4a017a005fd79	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=80a3d6360048b2897b1ce26803aafc98
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.54 b/metadata/md5-cache/net-nds/openldap-2.4.54
deleted file mode 100644
index a54a50b94a9e..000000000000
--- a/metadata/md5-cache/net-nds/openldap-2.4.54
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=!minimal? ( acct-group/ldap acct-user/ldap ) >=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 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( <sys-libs/db-6.0:= || ( 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 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) sys-apps/groff
-DESCRIPTION=LDAP suite of application and development tools
-EAPI=7
-HOMEPAGE=https://www.OpenLDAP.org/
-IUSE=crypt samba tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test smbkrb5passwd kerberos kinit pbkdf2 sha2 -cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=OPENLDAP GPL-2
-RDEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( <sys-libs/db-6.0:= || ( 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 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) selinux? ( sec-policy/selinux-ldap )
-REQUIRED_USE=cxx? ( sasl ) pbkdf2? ( ssl ) test? ( berkdb ) ?? ( test minimal )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.54.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.4.54.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.4.54.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.54.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	db-use	d0a68876efc79f37b39ecf3f48c48e7e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	6ba9452db3e1108ce9b4a017a005fd79	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4c5f34af206bc8243ad477ea34992784
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.56 b/metadata/md5-cache/net-nds/openldap-2.4.56
index 658a2f2cc95d..021726951c1a 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.56
+++ b/metadata/md5-cache/net-nds/openldap-2.4.56
@@ -5,7 +5,7 @@ DESCRIPTION=LDAP suite of application and development tools
 EAPI=7
 HOMEPAGE=https://www.OpenLDAP.org/
 IUSE=crypt samba tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test smbkrb5passwd kerberos kinit pbkdf2 sha2 -cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=OPENLDAP GPL-2
 RDEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( <sys-libs/db-6.0:= || ( 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 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) selinux? ( sec-policy/selinux-ldap )
 REQUIRED_USE=cxx? ( sasl ) pbkdf2? ( ssl ) test? ( berkdb ) ?? ( test minimal )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.56.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.4.56.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.4.56.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.56.tgz mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	db-use	d0a68876efc79f37b39ecf3f48c48e7e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	6ba9452db3e1108ce9b4a017a005fd79	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4c5f34af206bc8243ad477ea34992784
+_md5_=b1ddd23f984f78272fdb356982b642bf
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index b54cd7ef0161..acddbf0ab354 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/nicotine+-2.2.0 b/metadata/md5-cache/net-p2p/nicotine+-2.2.0
index 7d347f189291..307dbb6d480c 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-2.2.0
+++ b/metadata/md5-cache/net-p2p/nicotine+-2.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=A fork of nicotine, a Soulseek client in Python
 EAPI=7
 HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-python/pygobject: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(-)] dev-python/pytaglib[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(-)] media-libs/mutagen[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(-)] x11-libs/gtk+:3[introspection] python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_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 ) python_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_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 )
 SLOT=0
 SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/2.2.0.tar.gz -> nicotine+-2.2.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25e26f7e6c2de1760ce6d2d33c0afe4a
+_md5_=5c4770eb4c8f0c17aa23d0f15e129108
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.6.1 b/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
index fddf2e566d51..9c3221214b8e 100644
--- a/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/tmpfiles
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.6.1-1_amd64.deb ) x86? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.6.1-1_i386.deb )
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c83c801efb884bbf6beec0f7c1b81713
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.6.3 b/metadata/md5-cache/net-p2p/resilio-sync-2.6.3
index 41b368caaab6..003b99a883a3 100644
--- a/metadata/md5-cache/net-p2p/resilio-sync-2.6.3
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.6.3
@@ -9,5 +9,5 @@ RDEPEND=virtual/tmpfiles
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( http://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_amd64.deb ) x86? ( http://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_i386.deb )
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=26a92518853c70500f7a8b4f650beae9
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index e6609e3a0308..e53f3fa3e568 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/cups-filters-1.28.3 b/metadata/md5-cache/net-print/cups-filters-1.28.3
index 8e77b6f266eb..a2507f13112d 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.28.3
+++ b/metadata/md5-cache/net-print/cups-filters-1.28.3
@@ -5,11 +5,11 @@ DESCRIPTION=Cups filters
 EAPI=7
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 IUSE=dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~m68k-mint
 LICENSE=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.28.3.tar.xz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=81061621cd45bcd00708d34f65171c58
+_md5_=c4ca1b4b3befa319ae23437f0d7cf692
diff --git a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12 b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
index 73bf9e144d3d..264b0fe091e0 100644
--- a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
+++ b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
@@ -9,5 +9,5 @@ PDEPEND=net-print/foomatic-db
 RDEPEND=dev-libs/libxml2 >=net-print/cups-filters-1.0.43-r1[foomatic] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-engine-4.0.12.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3739330a3a8a1d3d0ae60bbdbb355e3d
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.20.11 b/metadata/md5-cache/net-print/hplip-plugin-3.20.11
index d2a86197294b..34438fdd3e8e 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.20.11
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.20.11
@@ -9,5 +9,5 @@ RDEPEND=~net-print/hplip-3.20.11 virtual/udev orblite? ( media-gfx/sane-backends
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.20.11-plugin.run
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=1ac3d05ef99560d4393d68ee6f946c23
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.20.9 b/metadata/md5-cache/net-print/hplip-plugin-3.20.9
index 1188227d8928..1f3340105889 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.20.9
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.20.9
@@ -9,5 +9,5 @@ RDEPEND=~net-print/hplip-3.20.9 virtual/udev orblite? ( media-gfx/sane-backends
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.20.9-plugin.run
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=1ac3d05ef99560d4393d68ee6f946c23
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 6ba495895d3b..0ab7ecf3506a 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/tailscale-1.2.10-r1 b/metadata/md5-cache/net-vpn/tailscale-1.2.10-r1
index d86d1c3aafce..2c3bbcd7c450 100644
--- a/metadata/md5-cache/net-vpn/tailscale-1.2.10-r1
+++ b/metadata/md5-cache/net-vpn/tailscale-1.2.10-r1
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Tailscale vpn client
 EAPI=7
 HOMEPAGE=https://tailscale.com
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=net-firewall/iptables virtual/tmpfiles
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/tailscale/tailscale/archive/v1.2.10.tar.gz -> tailscale-1.2.10.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.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/!masterminds/semver/v3/@v/v3.0.3.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//github.com/alecthomas/kingpin/@v/v2.2.6+incompatible.mod -> github.com%2Falecthomas%2Fkingpin%2F@v%2Fv2.2.6+incompatible.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-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.zip -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.zip mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.mod -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.zip -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.zip mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/apenwarr/fixconsole/@v/v0.0.0-20191012055117-5a9f6489cc29.zip -> github.com%2Fapenwarr%2Ffixconsole%2F@v%2Fv0.0.0-20191012055117-5a9f6489cc29.zip mirror://goproxy//github.com/apenwarr/fixconsole/@v/v0.0.0-20191012055117-5a9f6489cc29.mod -> github.com%2Fapenwarr%2Ffixconsole%2F@v%2Fv0.0.0-20191012055117-5a9f6489cc29.mod mirror://goproxy//github.com/apenwarr/w32/@v/v0.0.0-20190407065021-aa00fece76ab.zip -> github.com%2Fapenwarr%2Fw32%2F@v%2Fv0.0.0-20190407065021-aa00fece76ab.zip mirror://goproxy//github.com/apenwarr/w32/@v/v0.0.0-20190407065021-aa00fece76ab.mod -> github.com%2Fapenwarr%2Fw32%2F@v%2Fv0.0.0-20190407065021-aa00fece76ab.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.mod mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.zip -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.zip mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.mod -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.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/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.zip -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.zip -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.mod -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 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/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.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/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.zip -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.zip mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.mod -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.mod mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.zip -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.mod -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.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/klauspost/compress/@v/v1.10.10.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.10.10.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 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/pty/@v/v1.1.1.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.zip 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/lxn/walk/@v/v0.0.0-20191128110447-55ccb3a9f5c1.mod -> github.com%2Flxn%2Fwalk%2F@v%2Fv0.0.0-20191128110447-55ccb3a9f5c1.mod mirror://goproxy//github.com/lxn/win/@v/v0.0.0-20191128105842-2da648fda5b4.mod -> github.com%2Flxn%2Fwin%2F@v%2Fv0.0.0-20191128105842-2da648fda5b4.mod mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.zip -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.zip mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.zip -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.zip mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.mod -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.6.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.zip -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.mod -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.zip -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.zip mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.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/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/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.zip -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.zip mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.mod -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.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/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/tailscale/depaware/@v/v0.0.0-20201003033024-5d95aab075be.zip -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201003033024-5d95aab075be.zip mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201003033024-5d95aab075be.mod -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201003033024-5d95aab075be.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20200921221757-11a958a67bdd.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20200921221757-11a958a67bdd.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20200921221757-11a958a67bdd.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20200921221757-11a958a67bdd.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20201008164108-2c83f43a9859.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201008164108-2c83f43a9859.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20201008164108-2c83f43a9859.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201008164108-2c83f43a9859.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20201021041318-a6168fd06b3f.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201021041318-a6168fd06b3f.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20201021041318-a6168fd06b3f.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201021041318-a6168fd06b3f.mod mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.zip -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.mod -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.zip -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.mod -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.zip -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go4.org/mem/@v/v0.0.0-20200706164138-185c595c3ecc.zip -> go4.org%2Fmem%2F@v%2Fv0.0.0-20200706164138-185c595c3ecc.zip mirror://goproxy//go4.org/mem/@v/v0.0.0-20200706164138-185c595c3ecc.mod -> go4.org%2Fmem%2F@v%2Fv0.0.0-20200706164138-185c595c3ecc.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-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200429183012-4b2356b1ed79.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200429183012-4b2356b1ed79.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.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-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-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-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-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.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-20191003171128-d98b1b443823.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191003171128-d98b1b443823.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.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-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-20200625203802-6e8e738ad208.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.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-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190411185658-b44545bcd369.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.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-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.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-20191003212358-c178f38b412c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191003212358-c178f38b412c.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-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501145240-bc7a7d42d5c3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501145240-bc7a7d42d5c3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200812155832-6a926be9bd1d.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200812155832-6a926be9bd1d.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200812155832-6a926be9bd1d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200812155832-6a926be9bd1d.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.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.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-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201001230009-b5b87423c93b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201001230009-b5b87423c93b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201002184944-ecd9fd270d5d.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201002184944-ecd9fd270d5d.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201002184944-ecd9fd270d5d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201002184944-ecd9fd270d5d.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-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 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//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20200715051853-507f148e1c42.zip -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20200715051853-507f148e1c42.zip mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20200715051853-507f148e1c42.mod -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20200715051853-507f148e1c42.mod mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201004085714-dd60d0447f81.zip -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201004085714-dd60d0447f81.zip mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201004085714-dd60d0447f81.mod -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201004085714-dd60d0447f81.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.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/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.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.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20200810144936-56928fe48a98.zip -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200810144936-56928fe48a98.zip mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20200810144936-56928fe48a98.mod -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200810144936-56928fe48a98.mod mirror://goproxy//rsc.io/goversion/@v/v1.2.0.zip -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.zip mirror://goproxy//rsc.io/goversion/@v/v1.2.0.mod -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.mod
 _eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ce443afff1f61b3e20ba1a265f87ed1a
+_md5_=4f95f5ec3571a6f660b0ab1889917734
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 78ebbf90f0aa..6034cf0449f1 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.8.2.0 b/metadata/md5-cache/net-wireless/gnuradio-3.8.2.0
deleted file mode 100644
index b44d628e8737..000000000000
--- a/metadata/md5-cache/net-wireless/gnuradio-3.8.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( 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 dev-python/scipy ) filter? ( dev-python/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? ( dev-python/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 dev-python/scipy ) filter? ( dev-python/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? ( dev-python/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.2.0
-SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.8.2.0/gnuradio-3.8.2.0.tar.xz
-_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3bb2e4027d455f29e0032a17f658121e
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.8.2.0-r1 b/metadata/md5-cache/net-wireless/gnuradio-3.8.2.0-r1
new file mode 100644
index 000000000000..f9364cf0d986
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.8.2.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( 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:= ) ctrlport? ( python_single_target_python3_6? ( dev-python/thrift[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/thrift[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) ) fec? ( sci-libs/gsl dev-python/scipy ) filter? ( dev-python/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? ( dev-python/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 ctrlport 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:= ) ctrlport? ( python_single_target_python3_6? ( dev-python/thrift[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/thrift[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) ) fec? ( sci-libs/gsl dev-python/scipy ) filter? ( dev-python/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? ( dev-python/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.2.0
+SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.8.2.0/gnuradio-3.8.2.0.tar.xz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=df4dd1eab637f1662e347ff237fa5a3c
diff --git a/metadata/md5-cache/net-wireless/gqrx-2.14.3 b/metadata/md5-cache/net-wireless/gqrx-2.14.3-r1
similarity index 84%
rename from metadata/md5-cache/net-wireless/gqrx-2.14.3
rename to metadata/md5-cache/net-wireless/gqrx-2.14.3-r1
index 47933d49e9c6..5ca7e5a387aa 100644
--- a/metadata/md5-cache/net-wireless/gqrx-2.14.3
+++ b/metadata/md5-cache/net-wireless/gqrx-2.14.3-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sci-libs/volk pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
+DEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sci-libs/volk:= pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
 DESCRIPTION=Software defined radio receiver powered by GNU Radio and Qt
 EAPI=7
 HOMEPAGE=https://gqrx.dk/
 IUSE=gr-audio portaudio pulseaudio
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sci-libs/volk pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
+RDEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sci-libs/volk:= pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
 REQUIRED_USE=^^ ( pulseaudio portaudio gr-audio )
 SLOT=0
 SRC_URI=https://github.com/csete/gqrx/archive/v2.14.3.tar.gz -> gqrx-2.14.3.tar.gz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=911c6f7688d74da14c1c0fe19eca1727
+_md5_=9b3a38b09bbedda3e749f21ab9ff7de0
diff --git a/metadata/md5-cache/net-wireless/gqrx-9999 b/metadata/md5-cache/net-wireless/gqrx-9999
index 432b50d60c25..3ea192cc9e32 100644
--- a/metadata/md5-cache/net-wireless/gqrx-9999
+++ b/metadata/md5-cache/net-wireless/gqrx-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sci-libs/volk pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
+DEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sci-libs/volk:= pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
 DESCRIPTION=Software defined radio receiver powered by GNU Radio and Qt
 EAPI=7
 HOMEPAGE=https://gqrx.dk/
 IUSE=gr-audio portaudio pulseaudio
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sci-libs/volk pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
+RDEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sci-libs/volk:= pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
 REQUIRED_USE=^^ ( pulseaudio portaudio gr-audio )
 SLOT=0
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f869ec143779f0a0d7cce1a0f5045e05
+_md5_=2c679f6f38913925bc4ab079c5c730c2
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20191006 b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20191006
deleted file mode 100644
index 9a148ffba7d9..000000000000
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20191006
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk 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-lang/swig:0
-DESCRIPTION=IEEE 802.15.4 ZigBee Transceiver
-EAPI=7
-HOMEPAGE=https://github.com/bastibl/gr-ieee802-15-4
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk 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 )
-SLOT=0/0.0_p20191006
-SRC_URI=https://github.com/bastibl/gr-ieee802-15-4/archive/a3c79af96e18de3eb3a76659e1669a370efccf17.tar.gz -> gr-ieee802154-0.0_p20191006.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82dcf549a1ed02694ff53fafafae2b7f
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20191006-r1 b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20191006-r1
new file mode 100644
index 000000000000..f027a66d453d
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20191006-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk:= 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-lang/swig:0
+DESCRIPTION=IEEE 802.15.4 ZigBee Transceiver
+EAPI=7
+HOMEPAGE=https://github.com/bastibl/gr-ieee802-15-4
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk:= 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 )
+SLOT=0/0.0_p20191006
+SRC_URI=https://github.com/bastibl/gr-ieee802-15-4/archive/a3c79af96e18de3eb3a76659e1669a370efccf17.tar.gz -> gr-ieee802154-0.0_p20191006.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b212451de1e86ad4cc79e949885b7515
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-9999 b/metadata/md5-cache/net-wireless/gr-ieee802154-9999
index 861625f7b68f..fc8ba109811e 100644
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-9999
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-9999
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk 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-lang/swig:0
+DEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk:= 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-lang/swig:0
 DESCRIPTION=IEEE 802.15.4 ZigBee Transceiver
 EAPI=7
 HOMEPAGE=https://github.com/bastibl/gr-ieee802-15-4
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk 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] )
+RDEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk:= 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 )
 SLOT=0/9999
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82dcf549a1ed02694ff53fafafae2b7f
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b212451de1e86ad4cc79e949885b7515
diff --git a/metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r1 b/metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r2
similarity index 88%
rename from metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r1
rename to metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r2
index 88747a69be36..722d055d7f62 100644
--- a/metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r1
+++ b/metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r2
@@ -1,15 +1,15 @@
 BDEPEND=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] ) =net-wireless/gnuradio-3.8*:= dev-libs/boost:= net-libs/libiio:= dev-libs/gmp sci-libs/volk net-libs/libad9361-iio:= sys-devel/flex:= sys-devel/bison:= dev-util/cppunit:= dev-lang/swig:0
+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] ) =net-wireless/gnuradio-3.8*:= dev-libs/boost:= net-libs/libiio:= dev-libs/gmp sci-libs/volk:= net-libs/libad9361-iio:= sys-devel/flex:= sys-devel/bison:= dev-util/cppunit:= dev-lang/swig:0
 DESCRIPTION=GNU Radio IIO Blocks
 EAPI=7
 HOMEPAGE=https://github.com/analogdevicesinc/gr-iio
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~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] ) =net-wireless/gnuradio-3.8*:= dev-libs/boost:= net-libs/libiio:= dev-libs/gmp sci-libs/volk net-libs/libad9361-iio:=
+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] ) =net-wireless/gnuradio-3.8*:= dev-libs/boost:= net-libs/libiio:= dev-libs/gmp sci-libs/volk:= net-libs/libad9361-iio:=
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/analogdevicesinc/gr-iio/archive/733c8a05e74b7d10fbaef502cc82d025ae35a1fb.tar.gz -> gr-iio-0.3_p20191219.tar.gz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53422a7754bf981a8136f0e33aba472b
+_md5_=da5388a93cb5380e9e00db1c28789185
diff --git a/metadata/md5-cache/net-wireless/gr-iio-9999 b/metadata/md5-cache/net-wireless/gr-iio-9999
index 2ec75fda7d6c..042ac0d942aa 100644
--- a/metadata/md5-cache/net-wireless/gr-iio-9999
+++ b/metadata/md5-cache/net-wireless/gr-iio-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-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] ) =net-wireless/gnuradio-3.8*:= dev-libs/boost:= net-libs/libiio:= dev-libs/gmp sci-libs/volk net-libs/libad9361-iio:= sys-devel/flex:= sys-devel/bison:= dev-util/cppunit:= dev-lang/swig:0
+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] ) =net-wireless/gnuradio-3.8*:= dev-libs/boost:= net-libs/libiio:= dev-libs/gmp sci-libs/volk:= net-libs/libad9361-iio:= sys-devel/flex:= sys-devel/bison:= dev-util/cppunit:= dev-lang/swig:0
 DESCRIPTION=GNU Radio IIO Blocks
 EAPI=7
 HOMEPAGE=https://github.com/analogdevicesinc/gr-iio
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3+
 PROPERTIES=live
-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] ) =net-wireless/gnuradio-3.8*:= dev-libs/boost:= net-libs/libiio:= dev-libs/gmp sci-libs/volk net-libs/libad9361-iio:=
+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] ) =net-wireless/gnuradio-3.8*:= dev-libs/boost:= net-libs/libiio:= dev-libs/gmp sci-libs/volk:= net-libs/libad9361-iio:=
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53422a7754bf981a8136f0e33aba472b
+_md5_=da5388a93cb5380e9e00db1c28789185
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.2.2 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.2.3
similarity index 55%
rename from metadata/md5-cache/net-wireless/gr-osmosdr-0.2.2
rename to metadata/md5-cache/net-wireless/gr-osmosdr-0.2.3
index 7220b45d9c85..15a77cf15308 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-0.2.2
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-0.2.3
@@ -1,15 +1,15 @@
 BDEPEND=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] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/volk airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+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] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/volk:= airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) xtrx? ( net-wireless/libxtrx )
 DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
 EAPI=7
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
-IUSE=airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=airspy bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 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] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/volk airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[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] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/volk:= airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) xtrx? ( net-wireless/libxtrx )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0/0.2.2
-SRC_URI=https://github.com/osmocom/gr-osmosdr/archive/v0.2.2.tar.gz -> gr-osmosdr-0.2.2.tar.gz
+SLOT=0/0.2.3
+SRC_URI=https://github.com/osmocom/gr-osmosdr/archive/v0.2.3.tar.gz -> gr-osmosdr-0.2.3.tar.gz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=637b3fb57e0b5732fddfbedcf8095de9
+_md5_=60eb062794bafe19ab571982a5e373be
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-9999 b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
index 5b1aa10467bf..3e1cf22b4a54 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-9999
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-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] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/volk airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+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] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/volk:= airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
 EAPI=7
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
 IUSE=airspy bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3
 PROPERTIES=live
-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/boost:= =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/volk airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[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] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/volk:= airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0/9999
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b942f9b3a49e92d078939ba4a6b8fc65
+_md5_=d42cd72716b560ff7f59076a7b2f981e
diff --git a/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517 b/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517-r1
similarity index 85%
rename from metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517
rename to metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517-r1
index 0cdb28ef955d..6d9a21227601 100644
--- a/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517
+++ b/metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-lang/swig dev-util/cppunit virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.9.6
 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] ) python_single_target_python3_6? ( dev-libs/boost:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk =net-wireless/gnuradio-3.8*:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
+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:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk:= =net-wireless/gnuradio-3.8*:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Paints monochrome images into the waterfall of a receiver
 EAPI=7
 HOMEPAGE=https://github.com/drmpeg/gr-paint
 IUSE=doc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64
 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:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk =net-wireless/gnuradio-3.8*:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-gfx/imagemagick
+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:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk:= =net-wireless/gnuradio-3.8*:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-gfx/imagemagick
 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/drmpeg/gr-paint38/archive/9cb4eabe3b570ccd1f53837681607d73501b5c1e.tar.gz -> gr-paint-0.0_p20200517.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c7d00c8a500bee54022dc2bfdbc70b2
+_md5_=228745be4fb12b122459419ea9e9d71a
diff --git a/metadata/md5-cache/net-wireless/gr-paint-9999 b/metadata/md5-cache/net-wireless/gr-paint-9999
index 2fc4d194776f..6bdcb75f914d 100644
--- a/metadata/md5-cache/net-wireless/gr-paint-9999
+++ b/metadata/md5-cache/net-wireless/gr-paint-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/swig dev-util/cppunit virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-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:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk =net-wireless/gnuradio-3.8*:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
+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:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk:= =net-wireless/gnuradio-3.8*:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 DESCRIPTION=Paints monochrome images into the waterfall of a receiver
 EAPI=7
 HOMEPAGE=https://github.com/drmpeg/gr-paint
 IUSE=doc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3+
 PROPERTIES=live
-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:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk =net-wireless/gnuradio-3.8*:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-gfx/imagemagick
+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:=[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) dev-libs/gmp sci-libs/volk:= =net-wireless/gnuradio-3.8*:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] media-gfx/imagemagick
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c7d00c8a500bee54022dc2bfdbc70b2
+_md5_=228745be4fb12b122459419ea9e9d71a
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.9-r1 b/metadata/md5-cache/net-wireless/hostapd-2.9-r1
deleted file mode 100644
index c42214caf020..000000000000
--- a/metadata/md5-cache/net-wireless/hostapd-2.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend unpack
-DEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 ) virtual/pkgconfig
-DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon
-EAPI=6
-HOMEPAGE=http://w1.fi
-IUSE=internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda savedconfig
-KEYWORDS=amd64 arm arm64 ~mips ppc x86
-LICENSE=BSD
-RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.7-r2_extras.tar.xz https://w1.fi/releases/hostapd-2.9.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=550c3970093e6409f36955dcb82c47cf
diff --git a/metadata/md5-cache/net-wireless/kismet-2020.12.2 b/metadata/md5-cache/net-wireless/kismet-2020.12.2
index 5f8486ddaed5..61ad19d2ac5f 100644
--- a/metadata/md5-cache/net-wireless/kismet-2020.12.2
+++ b/metadata/md5-cache/net-wireless/kismet-2020.12.2
@@ -5,7 +5,7 @@ DESCRIPTION=IEEE 802.11 wireless LAN sniffer
 EAPI=7
 HOMEPAGE=https://www.kismetwireless.net
 IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
 PDEPEND=rtlsdr? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) net-wireless/rtl-sdr )
 RDEPEND=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] ) acct-user/kismet acct-group/kismet networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd:= net-libs/libwebsockets:=[client] kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_7? ( dev-python/protobuf-python[python_targets_python3_7(-)] dev-python/websockets[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/protobuf-python[python_targets_python3_8(-)] dev-python/websockets[python_targets_python3_8(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) selinux? ( sec-policy/selinux-kismet )
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 SLOT=0/2020.12.2
 SRC_URI=https://www.kismetwireless.net/code/kismet-2020-12-R2.tar.xz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d3d5006ad1d36d42ed556b3bd180ea65
+_md5_=084edb05ca0181d34171f2d4419afe14
diff --git a/metadata/md5-cache/net-wireless/liblms7002m-0.0_p20200518 b/metadata/md5-cache/net-wireless/liblms7002m-0.0_p20200518
new file mode 100644
index 000000000000..df1e2cdde715
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/liblms7002m-0.0_p20200518
@@ -0,0 +1,14 @@
+BDEPEND=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] ) python_single_target_python3_6? ( dev-python/cheetah3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cheetah3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cheetah3[python_targets_python3_8(-)] )
+DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
+EAPI=7
+HOMEPAGE=https://www.gnuradio.org/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~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-python/cheetah3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cheetah3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cheetah3[python_targets_python3_8(-)] )
+SLOT=0/0.0_p20200518
+SRC_URI=https://github.com/xtrx-sdr/liblms7002m/archive/b07761b7386181f0e6a35158456b75bce14f2aca.tar.gz -> liblms7002m-0.0_p20200518.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d5aec9add00535e4a798119a098a2afe
diff --git a/metadata/md5-cache/net-wireless/liblms7002m-9999 b/metadata/md5-cache/net-wireless/liblms7002m-9999
new file mode 100644
index 000000000000..471c7e3408bd
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/liblms7002m-9999
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+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-python/cheetah3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cheetah3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cheetah3[python_targets_python3_8(-)] )
+DESCRIPTION=Compact LMS7002M library suitable for resource-limited MCUs
+EAPI=7
+HOMEPAGE=https://github.com/xtrx-sdr/liblms7002m
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+LICENSE=LGPL-2.1
+PROPERTIES=live
+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-python/cheetah3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cheetah3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cheetah3[python_targets_python3_8(-)] )
+SLOT=0/9999
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f6e8374cb6fd1888b460e767989ba7ef
diff --git a/metadata/md5-cache/net-wireless/libusb3380-0.0_p20190125 b/metadata/md5-cache/net-wireless/libusb3380-0.0_p20190125
new file mode 100644
index 000000000000..5680ac844794
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/libusb3380-0.0_p20190125
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libusb:1
+DESCRIPTION=USB3380 abstraction layer for libusb
+EAPI=7
+HOMEPAGE=https://github.com/xtrx-sdr/libusb3380
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=virtual/libusb:1
+SLOT=0
+SRC_URI=https://github.com/xtrx-sdr/libusb3380/archive/c83d1e93eb3a5b8b6a9db41c2613b206f344f825.tar.gz -> libusb3380-0.0_p20190125.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d5c59bc80dd34e80e060f002824dc352
diff --git a/metadata/md5-cache/net-wireless/libusb3380-9999 b/metadata/md5-cache/net-wireless/libusb3380-9999
new file mode 100644
index 000000000000..a00a559f873e
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/libusb3380-9999
@@ -0,0 +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=virtual/libusb:1
+DESCRIPTION=USB3380 abstraction layer for libusb
+EAPI=7
+HOMEPAGE=https://github.com/xtrx-sdr/libusb3380
+LICENSE=LGPL-2.1
+PROPERTIES=live
+RDEPEND=virtual/libusb:1
+SLOT=0
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d5c59bc80dd34e80e060f002824dc352
diff --git a/metadata/md5-cache/net-wireless/libxtrx-0.0_p20201202 b/metadata/md5-cache/net-wireless/libxtrx-0.0_p20201202
new file mode 100644
index 000000000000..d64bbd74d09f
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/libxtrx-0.0_p20201202
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-wireless/libxtrxll:= net-wireless/libxtrxdsp:= net-wireless/liblms7002m:=
+DESCRIPTION=High-level XTRX API library
+EAPI=7
+HOMEPAGE=https://github.com/xtrx-sdr/libxtrx
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=net-wireless/libxtrxll:= net-wireless/libxtrxdsp:= net-wireless/liblms7002m:=
+SLOT=0/0.0_p20201202
+SRC_URI=https://github.com/xtrx-sdr/libxtrx/archive/acb0b1cf7ab92744034767a04c1d4b4c281b840f.tar.gz -> libxtrx-0.0_p20201202.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=39b641a34502b01fda1824ba663288d0
diff --git a/metadata/md5-cache/net-wireless/libxtrx-9999 b/metadata/md5-cache/net-wireless/libxtrx-9999
new file mode 100644
index 000000000000..edc6adf9fe50
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/libxtrx-9999
@@ -0,0 +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=net-wireless/libxtrxll:= net-wireless/libxtrxdsp:= net-wireless/liblms7002m:=
+DESCRIPTION=High-level XTRX API library
+EAPI=7
+HOMEPAGE=https://github.com/xtrx-sdr/libxtrx
+LICENSE=LGPL-2.1
+PROPERTIES=live
+RDEPEND=net-wireless/libxtrxll:= net-wireless/libxtrxdsp:= net-wireless/liblms7002m:=
+SLOT=0/9999
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=39b641a34502b01fda1824ba663288d0
diff --git a/metadata/md5-cache/net-wireless/libxtrxdsp-0.0_p20200830 b/metadata/md5-cache/net-wireless/libxtrxdsp-0.0_p20200830
new file mode 100644
index 000000000000..7dd1f696f4b6
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/libxtrxdsp-0.0_p20200830
@@ -0,0 +1,11 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=DSP specific function for SDR in general and XTRX in specific
+EAPI=7
+HOMEPAGE=https://github.com/xtrx-sdr/libxtrxdsp
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://github.com/xtrx-sdr/libxtrxdsp/archive/eec28640c0ebd5639b642f07b310a0a0d02d9834.tar.gz -> libxtrxdsp-0.0_p20200830.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa067587194229fee7dd495196a402e2
diff --git a/metadata/md5-cache/net-wireless/libxtrxdsp-9999 b/metadata/md5-cache/net-wireless/libxtrxdsp-9999
new file mode 100644
index 000000000000..872b20d0bc6e
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/libxtrxdsp-9999
@@ -0,0 +1,10 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=DSP specific function for SDR in general and XTRX in specific
+EAPI=7
+HOMEPAGE=https://github.com/xtrx-sdr/libxtrxdsp
+LICENSE=LGPL-2.1
+PROPERTIES=live
+SLOT=0
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa067587194229fee7dd495196a402e2
diff --git a/metadata/md5-cache/net-wireless/libxtrxll-0.0_p20201202 b/metadata/md5-cache/net-wireless/libxtrxll-0.0_p20201202
new file mode 100644
index 000000000000..ee2bda189923
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/libxtrxll-0.0_p20201202
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=usb3380? ( net-wireless/libusb3380 )
+DESCRIPTION=Low-level XTRX hardware abstraction library
+EAPI=7
+HOMEPAGE=https://github.com/xtrx-sdr/libxtrxll
+IUSE=usb3380
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=usb3380? ( net-wireless/libusb3380 )
+SLOT=0/0.0_p20201202
+SRC_URI=https://github.com/xtrx-sdr/libxtrxll/archive/1b6eddfbedc700efb6f7e3c3594e43ac6ff29ea4.tar.gz -> libxtrxll-0.0_p20201202.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c3143534ad2c2f5297d255101951383c
diff --git a/metadata/md5-cache/net-wireless/libxtrxll-9999 b/metadata/md5-cache/net-wireless/libxtrxll-9999
new file mode 100644
index 000000000000..5ad06b38536d
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/libxtrxll-9999
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=usb3380? ( net-wireless/libusb3380 )
+DESCRIPTION=Low-level XTRX hardware abstraction library
+EAPI=7
+HOMEPAGE=https://github.com/xtrx-sdr/libxtrxll
+IUSE=usb3380
+LICENSE=LGPL-2.1
+PROPERTIES=live
+RDEPEND=usb3380? ( net-wireless/libusb3380 )
+SLOT=0/9999
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c3143534ad2c2f5297d255101951383c
diff --git a/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1 b/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
index d25b174e7df2..fd3fc3e164ff 100644
--- a/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
+++ b/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 virtual/udev
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=http://www.sdrplay.com/software/SDRplay_RSP_API-Linux-2.13.1.run
-_eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=d039fa2929056ba9469f001cdbc9bcbb
diff --git a/metadata/md5-cache/net-wireless/unifi-6.0.43 b/metadata/md5-cache/net-wireless/unifi-6.0.43
index f1b668aaa6d4..d4d631a73c60 100644
--- a/metadata/md5-cache/net-wireless/unifi-6.0.43
+++ b/metadata/md5-cache/net-wireless/unifi-6.0.43
@@ -5,11 +5,11 @@ DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
 EAPI=7
 HOMEPAGE=https://www.ubnt.com
 IUSE=systemd
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
 RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
 RESTRICT=bindist mirror
 SLOT=0/6.0
 SRC_URI=https://dl.ui.com/unifi/6.0.43-a8e04a273f/UniFi.unix.zip -> unifi-6.0.43.zip
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=96d77b6a77d60ecfa376502506ac70d8
+_md5_=151c3b28b6e4346f2476884f351306ac
diff --git a/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1 b/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
index e742766721de..a859cc31bb79 100644
--- a/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
+++ b/metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils >=virtual/perl-version-0.77 !<perl-core/CPAN-Meta-2.120.920 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.125.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=af6588dbe547af2059a999fc9bd7b594
diff --git a/metadata/md5-cache/perl-core/Data-Dumper-2.154.0 b/metadata/md5-cache/perl-core/Data-Dumper-2.154.0
index fa3c6a873488..3cbdbdce3fc4 100644
--- a/metadata/md5-cache/perl-core/Data-Dumper-2.154.0
+++ b/metadata/md5-cache/perl-core/Data-Dumper-2.154.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Data-Dumper-2.154.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1a11b47061c044be19143c30ef915ff6
diff --git a/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0 b/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
index 62fa5e50db4d..5f8318bd310e 100644
--- a/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
+++ b/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WO/WOLFSAGE/Devel-PPPort-3.31.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=161840910429112ddab666e3a9470647
diff --git a/metadata/md5-cache/perl-core/Digest-1.170.0-r1 b/metadata/md5-cache/perl-core/Digest-1.170.0-r1
index 58296c3c5830..a20ddb7ffe0b 100644
--- a/metadata/md5-cache/perl-core/Digest-1.170.0-r1
+++ b/metadata/md5-cache/perl-core/Digest-1.170.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-1.17.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5e07b18bdefc6387c83697a504cb1ad0
diff --git a/metadata/md5-cache/perl-core/Digest-MD5-2.530.0 b/metadata/md5-cache/perl-core/Digest-MD5-2.530.0
index 49b8b9a185e0..bbba1824d0dc 100644
--- a/metadata/md5-cache/perl-core/Digest-MD5-2.530.0
+++ b/metadata/md5-cache/perl-core/Digest-MD5-2.530.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Digest-MD5-2.53.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1d882be9a1e5386fb7099422947e8ddf
diff --git a/metadata/md5-cache/perl-core/Digest-SHA-5.880.0 b/metadata/md5-cache/perl-core/Digest-SHA-5.880.0
index a137899c87de..7c4df796dc0c 100644
--- a/metadata/md5-cache/perl-core/Digest-SHA-5.880.0
+++ b/metadata/md5-cache/perl-core/Digest-SHA-5.880.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSHELOR/Digest-SHA-5.88.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5e0ccce3440ddd474ba9b90c7100c0fb
diff --git a/metadata/md5-cache/perl-core/Dumpvalue-1.170.0 b/metadata/md5-cache/perl-core/Dumpvalue-1.170.0
index 23a665ffb26a..1fc6dbe51651 100644
--- a/metadata/md5-cache/perl-core/Dumpvalue-1.170.0
+++ b/metadata/md5-cache/perl-core/Dumpvalue-1.170.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/Dumpvalue-1.17.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d9bfad902c981b8be5abbf5582ae0271
diff --git a/metadata/md5-cache/perl-core/Encode-2.730.0 b/metadata/md5-cache/perl-core/Encode-2.730.0
index b4a870515f01..c1245f91cc56 100644
--- a/metadata/md5-cache/perl-core/Encode-2.730.0
+++ b/metadata/md5-cache/perl-core/Encode-2.730.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.73.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=41f8814ca07f7dd75095fdfa7b361766
diff --git a/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1 b/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1
index 21172a5d04a7..f243297893eb 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1
+++ b/metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.23.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9bce866d12c6548304a792d5b983a30f
diff --git a/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0 b/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0
index 5b78c8f43b2d..88aa87dc5817 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0
+++ b/metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!=perl-core/ExtUtils-MakeMaker-7.40.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.70.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d23e27531672094963eea033c27b973d
diff --git a/metadata/md5-cache/perl-core/Getopt-Long-2.420.0 b/metadata/md5-cache/perl-core/Getopt-Long-2.420.0
index 17cf7dbd21d6..14869ddecdcf 100644
--- a/metadata/md5-cache/perl-core/Getopt-Long-2.420.0
+++ b/metadata/md5-cache/perl-core/Getopt-Long-2.420.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Pod-Parser dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.42.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b9576305c2e8db3af75f0278aa59e9a6
diff --git a/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0 b/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
index 158aa82e47f9..a286675c41a3 100644
--- a/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
+++ b/metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
@@ -9,5 +9,5 @@ RDEPEND=virtual/perl-IO virtual/perl-Time-Local dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-Tiny-0.043.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=18c81db43d12d56a7e4060ce98791656
diff --git a/metadata/md5-cache/perl-core/IO-Zlib-1.100.0 b/metadata/md5-cache/perl-core/IO-Zlib-1.100.0
index a4d6f1083284..9cce3ab2f165 100644
--- a/metadata/md5-cache/perl-core/IO-Zlib-1.100.0
+++ b/metadata/md5-cache/perl-core/IO-Zlib-1.100.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO-Compress dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOMHUGHES/IO-Zlib-1.10.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=93e536c64a4eb126079427fbde3b3ad0
diff --git a/metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1 b/metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1
index 2adfb0b01e6d..bee742169620 100644
--- a/metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1
+++ b/metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Locale-Maketext-Simple-0.21.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1ca829d41c95a354777341174cdd2921
diff --git a/metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1 b/metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1
index be64dd1ee43f..6eb44e3cea70 100644
--- a/metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1
+++ b/metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/MIME-Base64-3.14.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7120014832f2cf56e37353b654c422a3
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index 68991c712f93..0be8527ab52d 100644
Binary files a/metadata/md5-cache/perl-core/Manifest.gz and b/metadata/md5-cache/perl-core/Manifest.gz differ
diff --git a/metadata/md5-cache/perl-core/Math-Complex-1.590.0 b/metadata/md5-cache/perl-core/Math-Complex-1.590.0
index f93f90432f5a..5c81e8b9dda1 100644
--- a/metadata/md5-cache/perl-core/Math-Complex-1.590.0
+++ b/metadata/md5-cache/perl-core/Math-Complex-1.590.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Math-Complex-1.59.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0ccff8feaca13d105e6425fb20c65a67
diff --git a/metadata/md5-cache/perl-core/Memoize-1.30.0-r1 b/metadata/md5-cache/perl-core/Memoize-1.30.0-r1
index a99727282f75..af6512300cda 100644
--- a/metadata/md5-cache/perl-core/Memoize-1.30.0-r1
+++ b/metadata/md5-cache/perl-core/Memoize-1.30.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MJ/MJD/Memoize-1.03.tgz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8aedd9da39c49171398338899531667a
diff --git a/metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1 b/metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1
index 48d1b4c4358c..2313d5b95ebf 100644
--- a/metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1
+++ b/metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Module-Loaded-0.08.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fef5c17d234157582c52980b3aea755a
diff --git a/metadata/md5-cache/perl-core/Module-Metadata-1.0.26 b/metadata/md5-cache/perl-core/Module-Metadata-1.0.26
index 8a4201da7bea..7bd03872b865 100644
--- a/metadata/md5-cache/perl-core/Module-Metadata-1.0.26
+++ b/metadata/md5-cache/perl-core/Module-Metadata-1.0.26
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-version-0.870 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Module-Metadata-1.000026.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e2dd8db4608d14537d80b958442a399f
diff --git a/metadata/md5-cache/perl-core/Params-Check-0.380.0-r1 b/metadata/md5-cache/perl-core/Params-Check-0.380.0-r1
index a37a398fd26f..ca11674cafad 100644
--- a/metadata/md5-cache/perl-core/Params-Check-0.380.0-r1
+++ b/metadata/md5-cache/perl-core/Params-Check-0.380.0-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Locale-Maketext-Simple dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Params-Check-0.38.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=42236c7f43ae19f5d075e8e47a225cf2
diff --git a/metadata/md5-cache/perl-core/Pod-Simple-3.280.0 b/metadata/md5-cache/perl-core/Pod-Simple-3.280.0
index 7ff120d8c763..f10f482c1672 100644
--- a/metadata/md5-cache/perl-core/Pod-Simple-3.280.0
+++ b/metadata/md5-cache/perl-core/Pod-Simple-3.280.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Pod-Escapes-1.04 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/Pod-Simple-3.28.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b68581178dc25f95e8f7babc5b4385e2
diff --git a/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1 b/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
index 8c302ba6ab4b..7a2c2a7f01c6 100644
--- a/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
+++ b/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Sys-Syslog-0.33.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e3d4194f75c364d6fbdd176f575fb625
diff --git a/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0 b/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
index 2379a00bd2a4..7f30346c3037 100644
--- a/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
+++ b/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRA/Term-ANSIColor-4.02.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4b8eb6b4da22fd254f266b9abe6dcdd9
diff --git a/metadata/md5-cache/perl-core/Test-1.260.0 b/metadata/md5-cache/perl-core/Test-1.260.0
index 89bbfa959cba..010eac0401e9 100644
--- a/metadata/md5-cache/perl-core/Test-1.260.0
+++ b/metadata/md5-cache/perl-core/Test-1.260.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Test-1.26.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f7730dd1c045dbed8fab79b4a0e62e6c
diff --git a/metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1 b/metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1
index 9dbb4ed990c1..96cb674282d7 100644
--- a/metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1
+++ b/metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Text-Balanced-2.02.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a76277c69562e3a0a3c90f0f0600129f
diff --git a/metadata/md5-cache/perl-core/Text-ParseWords-3.290.0 b/metadata/md5-cache/perl-core/Text-ParseWords-3.290.0
index 8f519da04644..e8618ec31822 100644
--- a/metadata/md5-cache/perl-core/Text-ParseWords-3.290.0
+++ b/metadata/md5-cache/perl-core/Text-ParseWords-3.290.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Text-ParseWords-3.29.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2f7d80e3e125275772b55cdc93dff2ca
diff --git a/metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1 b/metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1
index a1b8d1fe7689..a7eb4436e341 100644
--- a/metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1
+++ b/metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Text-Tabs+Wrap-2013.0523.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5aab14f51acca5399043f76782aa60f0
diff --git a/metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1 b/metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1
index 651de446ab32..e8c4e994bfbc 100644
--- a/metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1
+++ b/metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-threads-shared virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Semaphore-2.12.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9414eebebcbfac5616ffb89fdc55ab91
diff --git a/metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1 b/metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1
index ef1fb3b9fe5b..92a290a68f6b 100644
--- a/metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1
+++ b/metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Time-HiRes-1.9726.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bf81bbb2fd9f67f915cffce452307bce
diff --git a/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1 b/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
index b937bc680376..658d2bb6d75c 100644
--- a/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
+++ b/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.2300.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3a98021e861849d6b060a81471e9d57b
diff --git a/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0 b/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
index 8184c22c750e..ffd98f6a8d57 100644
--- a/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
+++ b/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KH/KHW/Unicode-Normalize-1.25.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4e47c61518b80af4a8f6ac8af82b86f4
diff --git a/metadata/md5-cache/perl-core/libnet-1.270.0 b/metadata/md5-cache/perl-core/libnet-1.270.0
index 9fdb40a2b418..6b24bae29c23 100644
--- a/metadata/md5-cache/perl-core/libnet-1.270.0
+++ b/metadata/md5-cache/perl-core/libnet-1.270.0
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sasl? ( dev-perl/Authen-SASL ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/libnet-1.27.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4e843ad61d232318b8df76dabb92c6e1
diff --git a/metadata/md5-cache/perl-core/parent-0.228-r1 b/metadata/md5-cache/perl-core/parent-0.228-r1
index d22a57df894d..dd1805010f54 100644
--- a/metadata/md5-cache/perl-core/parent-0.228-r1
+++ b/metadata/md5-cache/perl-core/parent-0.228-r1
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORION/parent-0.228.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8de14c26dd105ad5343a1ab16bf7c673
diff --git a/metadata/md5-cache/perl-core/podlators-2.5.3 b/metadata/md5-cache/perl-core/podlators-2.5.3
index 0399c75f130a..90a9601b1612 100644
--- a/metadata/md5-cache/perl-core/podlators-2.5.3
+++ b/metadata/md5-cache/perl-core/podlators-2.5.3
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-lang/perl-5.8.8-r8 >=virtual/perl-Pod-Simple-3.06 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRA/podlators-2.5.3.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7c668a0b06fdc02d1ea8ac54bbad0a3
diff --git a/metadata/md5-cache/perl-core/version-0.990.800 b/metadata/md5-cache/perl-core/version-0.990.800
index 6623d737b1e2..e1785d4c12d5 100644
--- a/metadata/md5-cache/perl-core/version-0.990.800
+++ b/metadata/md5-cache/perl-core/version-0.990.800
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9908.tar.gz
-_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=alternatives	4fcd064c96f75850fe45465cf4788e11	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=54f778cb860e363f97d2ca973071c386
diff --git a/metadata/md5-cache/sci-biology/GBrowse-2.48-r1 b/metadata/md5-cache/sci-biology/GBrowse-2.48-r1
index cf2b27b2a89b..68113524b7b2 100644
--- a/metadata/md5-cache/sci-biology/GBrowse-2.48-r1
+++ b/metadata/md5-cache/sci-biology/GBrowse-2.48-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<sci-biology/GBrowse-2.44-r1 >=sci-biology/bioperl-1.6.9 >=dev-perl/Bio-Graphics-2.09 >=dev-perl/GD-2.07 >=dev-perl/CGI-Session-4.02 dev-perl/IO-String dev-perl/JSON dev-perl/libwww-perl dev-perl/Statistics-Descriptive !minimal? ( dev-perl/Bio-Das >=dev-perl/Bio-SamTools-1.20 dev-perl/Crypt-SSLeay dev-perl/DB_File-Lock dev-perl/DBI mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) dev-perl/FCGI dev-perl/File-NFSLock dev-perl/GD-SVG dev-perl/Net-OpenID-Consumer dev-perl/Net-SMTP-SSL ) dev-lang/perl:=[-build(-)] >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/GBrowse-2.48.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bccaeef3292f6df307fc14fb5a2a74b2
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 4909c978a642..0c2a7ce86b4a 100644
Binary files a/metadata/md5-cache/sci-biology/Manifest.gz and b/metadata/md5-cache/sci-biology/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-biology/bioperl-1.6.9 b/metadata/md5-cache/sci-biology/bioperl-1.6.9
index f91c34c99880..0e4905c67b5c 100644
--- a/metadata/md5-cache/sci-biology/bioperl-1.6.9
+++ b/metadata/md5-cache/sci-biology/bioperl-1.6.9
@@ -11,5 +11,5 @@ RDEPEND=dev-perl/libwww-perl !minimal? ( dev-perl/Algorithm-Munkres dev-perl/Arr
 REQUIRED_USE=minimal? ( !graphviz )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-1.6.901.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=be22a76392a6e5c121e4b6d388045faa
diff --git a/metadata/md5-cache/sci-biology/bioperl-db-1.6.9 b/metadata/md5-cache/sci-biology/bioperl-db-1.6.9
index c24cd153b85b..cfc51f727d98 100644
--- a/metadata/md5-cache/sci-biology/bioperl-db-1.6.9
+++ b/metadata/md5-cache/sci-biology/bioperl-db-1.6.9
@@ -10,5 +10,5 @@ RDEPEND=>=sci-biology/bioperl-1.6.9 dev-perl/DBD-mysql dev-perl/DBI sci-biology/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-DB-1.006900.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2470d7ecf1b6ff1902a8d74057748480
diff --git a/metadata/md5-cache/sci-biology/bioperl-network-1.6.9 b/metadata/md5-cache/sci-biology/bioperl-network-1.6.9
index 0b0f729ad145..902cbdcbccab 100644
--- a/metadata/md5-cache/sci-biology/bioperl-network-1.6.9
+++ b/metadata/md5-cache/sci-biology/bioperl-network-1.6.9
@@ -10,5 +10,5 @@ RDEPEND=>=sci-biology/bioperl-1.6.9 >=dev-perl/Graph-0.86 dev-lang/perl:=[-build
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-Network-1.006900.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8f7c4053ffbec76cfad29cca2d99847b
diff --git a/metadata/md5-cache/sci-biology/bioperl-run-1.6.9 b/metadata/md5-cache/sci-biology/bioperl-run-1.6.9
index 7b8983d26d45..e1764c3fe5e3 100644
--- a/metadata/md5-cache/sci-biology/bioperl-run-1.6.9
+++ b/metadata/md5-cache/sci-biology/bioperl-run-1.6.9
@@ -10,5 +10,5 @@ RDEPEND=>=sci-biology/bioperl-1.6.9 !minimal? ( dev-perl/Algorithm-Diff dev-perl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-Run-1.006900.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9caec4e5b47cbf306a1689903f2a018a
diff --git a/metadata/md5-cache/sci-biology/diya-1.0_rc4 b/metadata/md5-cache/sci-biology/diya-1.0_rc4
index d88f0ae289b8..34179e149f45 100644
--- a/metadata/md5-cache/sci-biology/diya-1.0_rc4
+++ b/metadata/md5-cache/sci-biology/diya-1.0_rc4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sci-biology/bioperl dev-perl/Data-Utilities dev-perl/XML-Simple !minimal? ( sci-biology/mummer sci-biology/glimmer sci-biology/trnascan-se sci-biology/infernal ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/diyg/files/diya/diya-1.0/diya-1.0-rc4.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5d4639d7c08c43e2c2208492508fd56c
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index c3e106ffe822..daaa3f2255f8 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-2.4.1-r1 b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
index 3d3024e446c7..b32fce3ab07e 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Interconverts file formats used in molecular modeling
 EAPI=7
 HOMEPAGE=http://openbabel.org/wiki/Main_Page
 IUSE=doc openmp test wxwidgets
-KEYWORDS=~amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sci-libs/inchi sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:3.0[X] )
 RESTRICT=!test? ( test )
 SLOT=0/5.0.0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.4.1.tar.gz https://openbabel.org/docs/dev/_static/babel130.png -> openbabel.png
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a754f45bd0c575119ad466190e62eb3b
+_md5_=cb30029ea1d45388cf4bdde7fb713e8e
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 5b1392f3588e..bed8bbb804b5 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0 b/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0
new file mode 100644
index 000000000000..224f9ff9d736
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat sci-libs/proj:= sys-libs/zlib lua? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:= ) dev-libs/boost
+DESCRIPTION=Converts OSM planet.osm data to a PostgreSQL/PostGIS database
+EAPI=7
+HOMEPAGE=https://osm2pgsql.org/
+IUSE=+lua luajit
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat sci-libs/proj:= sys-libs/zlib lua? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:= ) dev-db/postgis
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/openstreetmap/osm2pgsql/archive/1.4.0.tar.gz -> osm2pgsql-1.4.0.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=938edf069a4ff4d6bb5665b735624198
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index a8c932ac149e..0c20d4f0a99e 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/cartopy-0.18.0 b/metadata/md5-cache/sci-libs/cartopy-0.18.0
index e2751a5690a2..bee11e154954 100644
--- a/metadata/md5-cache/sci-libs/cartopy-0.18.0
+++ b/metadata/md5-cache/sci-libs/cartopy-0.18.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_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/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(-)] sci-libs/pyshp[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/shapely[python_targets_python3_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(-)] 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(-)] dev-python/scipy[python_targets_python3_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/pillow[jpeg,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/gdal[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(-)] >=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? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_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[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(-)] sci-libs/pyshp[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(-)] sci-libs/shapely[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/six[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/scipy[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/pillow[jpeg,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(-)] sci-libs/gdal[python,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/pytest-4.5.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(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_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? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 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-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(-)] sci-libs/pyshp[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/shapely[python_targets_python3_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(-)] 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(-)] dev-python/scipy[python_targets_python3_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/pillow[jpeg,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/gdal[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(-)] 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(-)] 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(-)] sci-libs/geos sci-libs/proj test? ( dev-python/filelock[python_targets_python3_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/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(-)] )
+DEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_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[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(-)] sci-libs/pyshp[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(-)] sci-libs/shapely[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/six[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/scipy[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/pillow[jpeg,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(-)] sci-libs/gdal[python,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(-)] dev-python/cython[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(-)] sci-libs/geos sci-libs/proj test? ( dev-python/filelock[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/mock[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/pytest[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=Python package for geospatial data processing and analysis
 EAPI=7
 HOMEPAGE=https://scitools.org.uk/cartopy
-IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
+IUSE=test test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-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(-)] 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(-)] sci-libs/pyshp[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/shapely[python_targets_python3_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(-)] 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(-)] dev-python/scipy[python_targets_python3_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/pillow[jpeg,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/gdal[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 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_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[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(-)] sci-libs/pyshp[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(-)] sci-libs/shapely[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/six[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/scipy[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/pillow[jpeg,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(-)] sci-libs/gdal[python,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 ) python_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_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 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SciTools/cartopy/archive/v0.18.0.tar.gz -> cartopy-0.18.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=0ffab59e74ad2b5ebe7b9ff5d0e3e3e0
+_md5_=b4eb7db5024b53e92ffce239d123c478
diff --git a/metadata/md5-cache/sci-libs/geos-3.9.0 b/metadata/md5-cache/sci-libs/geos-3.9.0-r2
similarity index 50%
rename from metadata/md5-cache/sci-libs/geos-3.9.0
rename to metadata/md5-cache/sci-libs/geos-3.9.0-r2
index 7d381c3983ea..abb8dc55d0cf 100644
--- a/metadata/md5-cache/sci-libs/geos-3.9.0
+++ b/metadata/md5-cache/sci-libs/geos-3.9.0-r2
@@ -1,14 +1,12 @@
-BDEPEND=doc? ( app-doc/doxygen ) ruby? ( dev-lang/swig:0 )
-DEFINED_PHASES=compile configure install prepare
-DEPEND=ruby? ( dev-lang/ruby:* )
+BDEPEND=doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install
 DESCRIPTION=Geometry engine library for Geographic Information Systems
 EAPI=7
 HOMEPAGE=https://trac.osgeo.org/geos/
-IUSE=doc ruby static-libs
+IUSE=doc static-libs
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=LGPL-2.1
-RDEPEND=ruby? ( dev-lang/ruby:* )
 RESTRICT=test
 SLOT=0
-SRC_URI=http://download.osgeo.org/geos/geos-3.9.0.tar.bz2
-_md5_=f7f2416a9a1298873c6f67b7e85dc923
+SRC_URI=https://download.osgeo.org/geos/geos-3.9.0.tar.bz2 -> geos-3.9.0-r1.tar.bz2
+_md5_=d09fa4f11eaad0c805e19b6c1ae66655
diff --git a/metadata/md5-cache/sci-libs/gmsh-4.6.0 b/metadata/md5-cache/sci-libs/gmsh-4.6.0
index ca487056d9e1..bfe96ce3062c 100644
--- a/metadata/md5-cache/sci-libs/gmsh-4.6.0
+++ b/metadata/md5-cache/sci-libs/gmsh-4.6.0
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/fortran X? ( x11-libs/fltk:1 ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib ) jpeg? ( virtual/jpeg:0 ) lua? ( dev-lang/lua:0 ) med? ( sci-libs/med[mpi] ) opencascade? ( sci-libs/opencascade:* ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc ) zlib? ( sys-libs/zlib ) mpi? ( virtual/mpi[cxx] ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig python? ( dev-lang/swig:0 ) virtual/fortran
+DEPEND=virtual/fortran X? ( x11-libs/fltk:1 ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib ) jpeg? ( virtual/jpeg:0 ) med? ( sci-libs/med[mpi] ) opencascade? ( sci-libs/opencascade:* ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc ) zlib? ( sys-libs/zlib ) mpi? ( virtual/mpi[cxx] ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig python? ( dev-lang/swig:0 ) virtual/fortran
 DESCRIPTION=A three-dimensional finite element mesh generator
 EAPI=7
 HOMEPAGE=http://www.geuz.org/gmsh/
-IUSE=blas cgns examples jpeg lua med metis mpi netgen opencascade petsc png python X zlib
+IUSE=blas cgns examples jpeg med metis mpi netgen opencascade petsc png python X zlib
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 free-noncomm
-RDEPEND=virtual/fortran X? ( x11-libs/fltk:1 ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib ) jpeg? ( virtual/jpeg:0 ) lua? ( dev-lang/lua:0 ) med? ( sci-libs/med[mpi] ) opencascade? ( sci-libs/opencascade:* ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc ) zlib? ( sys-libs/zlib ) mpi? ( virtual/mpi[cxx] ) virtual/fortran
+RDEPEND=virtual/fortran X? ( x11-libs/fltk:1 ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib ) jpeg? ( virtual/jpeg:0 ) med? ( sci-libs/med[mpi] ) opencascade? ( sci-libs/opencascade:* ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc ) zlib? ( sys-libs/zlib ) mpi? ( virtual/mpi[cxx] ) virtual/fortran
 REQUIRED_USE=med? ( mpi )
 SLOT=0
 SRC_URI=http://www.geuz.org/gmsh/src/gmsh-4.6.0-source.tgz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	fortran-2	621cee8c59438af36bd78dc3289cc729	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bf89ae8a96ca70befff0844b492ed0f9
+_md5_=00d4ef259fda04cddcdae3798e4f21e9
diff --git a/metadata/md5-cache/sci-libs/libsc-2.0 b/metadata/md5-cache/sci-libs/libsc-2.0
index 6a17065b82ae..218b75eb462e 100644
--- a/metadata/md5-cache/sci-libs/libsc-2.0
+++ b/metadata/md5-cache/sci-libs/libsc-2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare pretend
-DEPEND=dev-lang/lua:* sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] ) 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=dev-lang/lua:0= sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] ) 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=Support for parallel scientific applications
 EAPI=6
 HOMEPAGE=http://www.p4est.org/
 IUSE=debug examples mpi openmp romio static-libs threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=dev-lang/lua:* sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
+RDEPEND=dev-lang/lua:0= sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
 REQUIRED_USE=romio? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/cburstedde/libsc/archive/v2.0.tar.gz -> libsc-2.0.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4372458b9a4dfd4521520d595f8559f1
+_md5_=774b6120645d0dba5f151800144a2405
diff --git a/metadata/md5-cache/sci-libs/libsc-2.2 b/metadata/md5-cache/sci-libs/libsc-2.2
index 492bc5399b2b..bafa37c11c55 100644
--- a/metadata/md5-cache/sci-libs/libsc-2.2
+++ b/metadata/md5-cache/sci-libs/libsc-2.2
@@ -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 prepare pretend
-DEPEND=dev-lang/lua:* sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] ) virtual/pkgconfig
+DEPEND=dev-lang/lua:0= sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] ) virtual/pkgconfig
 DESCRIPTION=Support for parallel scientific applications
 EAPI=7
 HOMEPAGE=http://www.p4est.org/
 IUSE=debug examples mpi openmp romio static-libs threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=dev-lang/lua:* sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
+RDEPEND=dev-lang/lua:0= sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
 REQUIRED_USE=romio? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/cburstedde/libsc/archive/v2.2.tar.gz -> libsc-2.2.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6e63e465a932099c376debd720d462b7
+_md5_=442d95311b2c68877ae06fc3251b0aa0
diff --git a/metadata/md5-cache/sci-libs/libsc-2.2-r100 b/metadata/md5-cache/sci-libs/libsc-2.2-r100
new file mode 100644
index 000000000000..9e8dc30cc404
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libsc-2.2-r100
@@ -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=configure install prepare pretend setup
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] ) virtual/pkgconfig
+DESCRIPTION=Support for parallel scientific applications
+EAPI=7
+HOMEPAGE=http://www.p4est.org/
+IUSE=debug examples mpi openmp romio static-libs threads lua_single_target_lua5-1 lua_single_target_lua5-2
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) romio? ( mpi )
+SLOT=0
+SRC_URI=https://github.com/cburstedde/libsc/archive/v2.2.tar.gz -> libsc-2.2.tar.gz
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=942f3c069ee92499e32479a6059afc02
diff --git a/metadata/md5-cache/sci-libs/libsc-9999 b/metadata/md5-cache/sci-libs/libsc-9999
index e264caba0133..5cc57decd766 100644
--- a/metadata/md5-cache/sci-libs/libsc-9999
+++ b/metadata/md5-cache/sci-libs/libsc-9999
@@ -1,13 +1,14 @@
-DEFINED_PHASES=configure install prepare pretend unpack
-DEPEND=dev-lang/lua:* sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] ) 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 >=dev-vcs/git-1.8.2.1[curl]
+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=configure install prepare pretend setup unpack
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] ) virtual/pkgconfig
 DESCRIPTION=Support for parallel scientific applications
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.p4est.org/
-IUSE=debug examples mpi openmp romio static-libs threads
+IUSE=debug examples mpi openmp romio static-libs threads lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
 LICENSE=LGPL-2.1+
 PROPERTIES=live
-RDEPEND=dev-lang/lua:* sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
-REQUIRED_USE=romio? ( mpi )
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
 SLOT=0
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4372458b9a4dfd4521520d595f8559f1
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0970064e9ad49f75cfe961eda3a63c06
diff --git a/metadata/md5-cache/sci-libs/p4est-2.2-r100 b/metadata/md5-cache/sci-libs/p4est-2.2-r100
new file mode 100644
index 000000000000..597a00a591d4
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/p4est-2.2-r100
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare pretend setup
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ~sci-libs/libsc-2.2[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] ) sys-devel/automake:1.11 virtual/pkgconfig
+DESCRIPTION=Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees
+EAPI=7
+HOMEPAGE=http://www.p4est.org/
+IUSE=debug doc examples mpi openmp romio static-libs threads +vtk-binary lua_single_target_lua5-1 lua_single_target_lua5-2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ~sci-libs/libsc-2.2[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) romio? ( mpi )
+SLOT=0
+SRC_URI=https://github.com/cburstedde/p4est/archive/v2.2.tar.gz -> p4est-2.2.tar.gz https://github.com/cburstedde/libsc/archive/v2.2.tar.gz -> libsc-2.2.tar.gz
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=39a0da183408f57cca7b89dcda4522ab
diff --git a/metadata/md5-cache/sci-libs/p4est-9999 b/metadata/md5-cache/sci-libs/p4est-9999
index 2d8071279331..02501be88686 100644
--- a/metadata/md5-cache/sci-libs/p4est-9999
+++ b/metadata/md5-cache/sci-libs/p4est-9999
@@ -1,13 +1,14 @@
-DEFINED_PHASES=configure install prepare pretend unpack
-DEPEND=~sci-libs/libsc-9999[mpi=,openmp=,romio=,static-libs=,threads=] dev-lang/lua:0= sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] ) sys-devel/automake:1.11 virtual/pkgconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=app-portage/elt-patches-20170815 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install prepare pretend setup unpack
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ~sci-libs/libsc-9999[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,lua_single_target_lua5-3(-)?,mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] ) sys-devel/automake:1.11 virtual/pkgconfig
 DESCRIPTION=Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.p4est.org/
-IUSE=debug doc examples mpi openmp romio static-libs threads +vtk-binary
+IUSE=debug doc examples mpi openmp romio static-libs threads +vtk-binary lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=~sci-libs/libsc-9999[mpi=,openmp=,romio=,static-libs=,threads=] dev-lang/lua:0= sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
-REQUIRED_USE=romio? ( mpi )
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ~sci-libs/libsc-9999[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,lua_single_target_lua5-3(-)?,mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
 SLOT=0
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f2498fe4672c84c6a79766279131e038
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1186690a2594bb45b0214891f1341b91
diff --git a/metadata/md5-cache/sci-libs/pyshp-2.1.0 b/metadata/md5-cache/sci-libs/pyshp-2.1.0
deleted file mode 100644
index 4c4b8ca92acc..000000000000
--- a/metadata/md5-cache/sci-libs/pyshp-2.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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_python3_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=Pure Python read/write support for ESRI Shapefile format
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pyshp/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-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=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyshp/pyshp-2.1.0.tar.gz
-_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d16fe4442447835bf8f97069d01272bc
diff --git a/metadata/md5-cache/sci-libs/trilinos-12.14.1 b/metadata/md5-cache/sci-libs/trilinos-12.14.1
deleted file mode 100644
index 753ae1bb68ce..000000000000
--- a/metadata/md5-cache/sci-libs/trilinos-12.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/binutils-libs virtual/blas virtual/lapack virtual/mpi adolc? ( sci-libs/adolc ) arprec? ( sci-libs/arprec ) boost? ( dev-libs/boost ) clp? ( sci-libs/coinor-clp ) cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) eigen? ( dev-cpp/eigen:3 ) glpk? ( sci-mathematics/glpk ) gtest? ( dev-cpp/gtest ) hdf5? ( sci-libs/hdf5[mpi] ) hypre? ( sci-libs/hypre ) hwloc? ( sys-apps/hwloc ) matio? ( sci-libs/matio ) mkl? ( sci-libs/mkl ) metis? ( || ( sci-libs/parmetis sci-libs/metis ) ) mumps? ( sci-libs/mumps ) netcdf? ( sci-libs/netcdf ) petsc? ( sci-mathematics/petsc ) qd? ( sci-libs/qd ) scalapack? ( sci-libs/scalapack ) scotch? ( sci-libs/scotch ) sparse? ( sci-libs/cxsparse sci-libs/umfpack ) superlu? ( sci-libs/superlu ) taucs? ( sci-libs/taucs ) tbb? ( dev-cpp/tbb ) tvmet? ( dev-libs/tvmet ) yaml? ( dev-cpp/yaml-cpp ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 ) virtual/pkgconfig
-DESCRIPTION=Scientific library collection for large scale problems
-EAPI=7
-HOMEPAGE=http://trilinos.sandia.gov/
-IUSE=adolc arprec boost clp cuda eigen glpk gtest hdf5 hwloc hypre matio metis mkl mumps netcdf petsc qd scalapack scotch sparse superlu taucs tbb test threads tvmet yaml zlib X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD LGPL-2.1
-RDEPEND=sys-libs/binutils-libs virtual/blas virtual/lapack virtual/mpi adolc? ( sci-libs/adolc ) arprec? ( sci-libs/arprec ) boost? ( dev-libs/boost ) clp? ( sci-libs/coinor-clp ) cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) eigen? ( dev-cpp/eigen:3 ) glpk? ( sci-mathematics/glpk ) gtest? ( dev-cpp/gtest ) hdf5? ( sci-libs/hdf5[mpi] ) hypre? ( sci-libs/hypre ) hwloc? ( sys-apps/hwloc ) matio? ( sci-libs/matio ) mkl? ( sci-libs/mkl ) metis? ( || ( sci-libs/parmetis sci-libs/metis ) ) mumps? ( sci-libs/mumps ) netcdf? ( sci-libs/netcdf ) petsc? ( sci-mathematics/petsc ) qd? ( sci-libs/qd ) scalapack? ( sci-libs/scalapack ) scotch? ( sci-libs/scotch ) sparse? ( sci-libs/cxsparse sci-libs/umfpack ) superlu? ( sci-libs/superlu ) taucs? ( sci-libs/taucs ) tbb? ( dev-cpp/tbb ) tvmet? ( dev-libs/tvmet ) yaml? ( dev-cpp/yaml-cpp ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/trilinos/Trilinos/archive/trilinos-release-12-14-1.tar.gz -> trilinos-12.14.1.tar.gz https://dev.gentoo.org/~tamiko/distfiles/trilinos-12.14.1-patches-r0.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e60862233eeaea32716531880a4f4a7
diff --git a/metadata/md5-cache/sci-libs/trilinos-12.18.1 b/metadata/md5-cache/sci-libs/trilinos-13.0.1
similarity index 94%
rename from metadata/md5-cache/sci-libs/trilinos-12.18.1
rename to metadata/md5-cache/sci-libs/trilinos-13.0.1
index 4c83ab05facc..22219e38ac37 100644
--- a/metadata/md5-cache/sci-libs/trilinos-12.18.1
+++ b/metadata/md5-cache/sci-libs/trilinos-13.0.1
@@ -10,6 +10,6 @@ LICENSE=BSD LGPL-2.1
 RDEPEND=sys-libs/binutils-libs virtual/blas virtual/lapack virtual/mpi adolc? ( sci-libs/adolc ) arprec? ( sci-libs/arprec ) boost? ( dev-libs/boost ) clp? ( sci-libs/coinor-clp ) cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) eigen? ( dev-cpp/eigen:3 ) glpk? ( sci-mathematics/glpk ) gtest? ( dev-cpp/gtest ) hdf5? ( sci-libs/hdf5[mpi] ) hypre? ( sci-libs/hypre ) hwloc? ( sys-apps/hwloc ) matio? ( sci-libs/matio ) mkl? ( sci-libs/mkl ) metis? ( || ( sci-libs/parmetis sci-libs/metis ) ) mumps? ( sci-libs/mumps ) netcdf? ( sci-libs/netcdf ) petsc? ( sci-mathematics/petsc ) qd? ( sci-libs/qd ) scalapack? ( sci-libs/scalapack ) scotch? ( sci-libs/scotch ) sparse? ( sci-libs/cxsparse sci-libs/umfpack ) superlu? ( sci-libs/superlu ) taucs? ( sci-libs/taucs ) tbb? ( dev-cpp/tbb ) tvmet? ( dev-libs/tvmet ) yaml? ( dev-cpp/yaml-cpp ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/trilinos/Trilinos/archive/trilinos-release-12-18-1.tar.gz -> trilinos-12.18.1.tar.gz https://dev.gentoo.org/~tamiko/distfiles/trilinos-12.18.1-patches-r0.tar.xz
+SRC_URI=https://github.com/trilinos/Trilinos/archive/trilinos-release-13-0-1.tar.gz -> trilinos-13.0.1.tar.gz https://dev.gentoo.org/~tamiko/distfiles/trilinos-13.0.0-patches-r0.tar.xz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8cc3773b73c1f19d2944f64e5d7d90a1
+_md5_=61d7a1e23a08613c124bbfcaa6be9c3a
diff --git a/metadata/md5-cache/sci-libs/volk-2.3.0-r2 b/metadata/md5-cache/sci-libs/volk-2.4.1
similarity index 93%
rename from metadata/md5-cache/sci-libs/volk-2.3.0-r2
rename to metadata/md5-cache/sci-libs/volk-2.4.1
index d7b9b7007142..784b9a522c52 100644
--- a/metadata/md5-cache/sci-libs/volk-2.3.0-r2
+++ b/metadata/md5-cache/sci-libs/volk-2.4.1
@@ -10,7 +10,7 @@ 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] ) !<net-wireless/gnuradio-3.8 dev-libs/boost:= orc? ( dev-lang/orc )
 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/gnuradio/volk/archive/v2.3.0.tar.gz -> volk-2.3.0.tar.gz
+SLOT=0/2.4
+SRC_URI=https://github.com/gnuradio/volk/releases/download/v2.4.1/volk-2.4.1.tar.xz -> volk-2.4.1.tar.xz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2019bf6980eb0d43dd97bc54ca2884d5
+_md5_=3b62192effcc1b7db9250d84fa66b5f6
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 6ebee2b23839..ab1b76ae335b 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/agda-2.6.1.2 b/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
index 7aca9c7ae691..b30b8ff3d589 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
+++ b/metadata/md5-cache/sci-mathematics/agda-2.6.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/blaze-html-0.8:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?] >=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?] >=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?] >=dev-haskell/equivalence-0.3.2:=[profile?] <dev-haskell/equivalence-0.4:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] <dev-haskell/gitrev-2.0:=[profile?] >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/hashtables-1.2.0.2:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] >=dev-haskell/haskeline-0.7.2.3:=[profile?] <dev-haskell/haskeline-0.9:=[profile?] >=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.9:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?] >=dev-haskell/regex-tdfa-1.3.1.0:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?] >=dev-haskell/split-0.2.0.0:=[profile?] <dev-haskell/split-0.2.4:=[profile?] >=dev-haskell/stm-2.4.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.5:=[profile?] >=dev-haskell/text-1.2.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uri-encode-1.5.0.4:=[profile?] <dev-haskell/uri-encode-1.6:=[profile?] >=dev-haskell/zlib-0.6:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.2:= enable-cluster-counting? ( >=dev-haskell/text-icu-0.7:=[profile?] <dev-haskell/text-icu-0.8:=[profile?] ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/haskell-mode ) dev-haskell/alex >=dev-haskell/cabal-1.24.2.0 <dev-haskell/cabal-3.3 dev-haskell/happy cpphs? ( >=dev-haskell/cpphs-1.20.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/blaze-html-0.8:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?] >=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?] >=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?] >=dev-haskell/equivalence-0.3.2:=[profile?] <dev-haskell/equivalence-0.4:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] <dev-haskell/gitrev-2.0:=[profile?] >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/hashtables-1.2.0.2:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] >=dev-haskell/haskeline-0.7.2.3:=[profile?] <dev-haskell/haskeline-0.9:=[profile?] >=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.9:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?] >=dev-haskell/regex-tdfa-1.3.1.0:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?] >=dev-haskell/split-0.2.0.0:=[profile?] <dev-haskell/split-0.2.4:=[profile?] >=dev-haskell/stm-2.4.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.5:=[profile?] >=dev-haskell/text-1.2.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uri-encode-1.5.0.4:=[profile?] <dev-haskell/uri-encode-1.6:=[profile?] >=dev-haskell/zlib-0.6:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.2:= enable-cluster-counting? ( >=dev-haskell/text-icu-0.7:=[profile?] <dev-haskell/text-icu-0.8:=[profile?] ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/haskell-mode ) dev-haskell/alex >=dev-haskell/cabal-1.24.2.0 <dev-haskell/cabal-3.3 dev-haskell/happy cpphs? ( >=dev-haskell/cpphs-1.20.9 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A dependently typed functional programming language and proof assistant
 EAPI=7
 HOMEPAGE=https://wiki.portal.chalmers.se/agda/
@@ -10,5 +10,5 @@ PDEPEND=stdlib? ( ~sci-mathematics/agda-stdlib-2.6.1.2.1.4 )
 RDEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/blaze-html-0.8:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?] >=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?] >=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?] >=dev-haskell/equivalence-0.3.2:=[profile?] <dev-haskell/equivalence-0.4:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] <dev-haskell/gitrev-2.0:=[profile?] >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/hashtables-1.2.0.2:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] >=dev-haskell/haskeline-0.7.2.3:=[profile?] <dev-haskell/haskeline-0.9:=[profile?] >=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.9:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?] >=dev-haskell/regex-tdfa-1.3.1.0:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?] >=dev-haskell/split-0.2.0.0:=[profile?] <dev-haskell/split-0.2.4:=[profile?] >=dev-haskell/stm-2.4.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.5:=[profile?] >=dev-haskell/text-1.2.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uri-encode-1.5.0.4:=[profile?] <dev-haskell/uri-encode-1.6:=[profile?] >=dev-haskell/zlib-0.6:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.2:= enable-cluster-counting? ( >=dev-haskell/text-icu-0.7:=[profile?] <dev-haskell/text-icu-0.8:=[profile?] ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/haskell-mode )
 SLOT=0/2.6.1.2
 SRC_URI=https://hackage.haskell.org/package/Agda-2.6.1.2/Agda-2.6.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	b9df8d576b8e3d10e3da1c292b027912	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	b9df8d576b8e3d10e3da1c292b027912	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9aebbc3c48645cd439a1102b29130d2e
diff --git a/metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2 b/metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2
index e69644cfed49..25638342faea 100644
--- a/metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2
+++ b/metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.2
 SRC_URI=https://www.cse.chalmers.se/~nad/software/lib-0.7.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=690e01a2b63423cb80b8c6062a386cc0
diff --git a/metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2-r2 b/metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2-r2
index d311a76e61c5..97c56fe321c8 100644
--- a/metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2-r2
+++ b/metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2-r2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.0.2
 SRC_URI=https://github.com/agda/agda-stdlib/archive/2.4.2.3.tar.gz -> agda-stdlib-2.4.2.3.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=40c6fa6c8ad00c7dee40c9a08bbc70dc
diff --git a/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4 b/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
index ff57a846342a..9e22cea7ebbf 100644
--- a/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
+++ b/metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sci-mathematics/agda-2.6.1.2:=[profile?]
 SLOT=0
 SRC_URI=https://github.com/agda/agda-stdlib/archive/v1.4.tar.gz -> agda-stdlib-2.6.1.2.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	b9df8d576b8e3d10e3da1c292b027912	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	b9df8d576b8e3d10e3da1c292b027912	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=592624cf25722d12d36034a11cf539f8
diff --git a/metadata/md5-cache/sci-mathematics/flint-2.7.0 b/metadata/md5-cache/sci-mathematics/flint-2.7.0
new file mode 100644
index 000000000000..0e23018173c1
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/flint-2.7.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx app-text/texlive-core dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= )
+DESCRIPTION=Fast Library for Number Theory
+EAPI=7
+HOMEPAGE=http://www.flintlib.org/
+IUSE=doc ntl test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= )
+RESTRICT=!test? ( test )
+SLOT=0/15
+SRC_URI=http://www.flintlib.org/flint-2.7.0.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=371bff8fe797cd80f8b7b34df2876918
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index da13b5b98155..319d5668f9bb 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.2.8-r1 b/metadata/md5-cache/sci-visualization/gnuplot-5.2.8-r1
index d5925f3a3213..b4e179a605c5 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.2.8-r1
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.2.8-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Command-line driven interactive plotting program
 EAPI=7
 HOMEPAGE=http://www.gnuplot.info/
 IUSE=aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis svga wxwidgets X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gnuplot
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.2.8.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=a8c3ccc8b86528d73aa873d07a7f96d4
+_md5_=106d0ff60c4e5d4e22bd3b0507d1f38e
diff --git a/metadata/md5-cache/sci-visualization/pythonprop-0.29 b/metadata/md5-cache/sci-visualization/pythonprop-0.29
deleted file mode 100644
index ee2d8d7b3f18..000000000000
--- a/metadata/md5-cache/sci-visualization/pythonprop-0.29
+++ /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
-DEFINED_PHASES=install prepare 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_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/pygobject:3[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] sci-libs/cartopy[python_targets_python3_6(-)] dev-python/scipy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] sci-libs/cartopy[python_targets_python3_7(-)] dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] sci-libs/cartopy[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] ) dev-python/cairocffi sci-electronics/voacapl app-text/gnome-doc-utils app-text/rarian
-DESCRIPTION=Scripts to prepare and plot VOACAP propagation predictions
-EAPI=7
-HOMEPAGE=https://www.qsl.net/h/hz1jw/pythonprop
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~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-python/pygobject:3[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] sci-libs/cartopy[python_targets_python3_6(-)] dev-python/scipy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] sci-libs/cartopy[python_targets_python3_7(-)] dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] sci-libs/cartopy[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] ) dev-python/cairocffi sci-electronics/voacapl
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/jawatson/pythonprop/archive/v0.29.tar.gz -> pythonprop-0.29.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=074691c66a83b81d17dabdc8e4ef8a1e
diff --git a/metadata/md5-cache/sci-visualization/pythonprop-0.30 b/metadata/md5-cache/sci-visualization/pythonprop-0.30
index 9892f9aae1b6..0b7f172724d6 100644
--- a/metadata/md5-cache/sci-visualization/pythonprop-0.30
+++ b/metadata/md5-cache/sci-visualization/pythonprop-0.30
@@ -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=install prepare 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_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/pygobject:3[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] sci-libs/cartopy[python_targets_python3_6(-)] dev-python/scipy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] sci-libs/cartopy[python_targets_python3_7(-)] dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] sci-libs/cartopy[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] ) dev-python/cairocffi sci-electronics/voacapl app-text/yelp-tools app-text/rarian
+DEPEND=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] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] sci-libs/cartopy[python_targets_python3_7(-)] dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] sci-libs/cartopy[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] sci-libs/cartopy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) dev-python/cairocffi sci-electronics/voacapl app-text/yelp-tools app-text/rarian
 DESCRIPTION=Scripts to prepare and plot VOACAP propagation predictions
 EAPI=7
 HOMEPAGE=https://www.qsl.net/h/hz1jw/pythonprop
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~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-python/pygobject:3[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] sci-libs/cartopy[python_targets_python3_6(-)] dev-python/scipy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] sci-libs/cartopy[python_targets_python3_7(-)] dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] sci-libs/cartopy[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] ) dev-python/cairocffi sci-electronics/voacapl
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=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] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] sci-libs/cartopy[python_targets_python3_7(-)] dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] sci-libs/cartopy[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] sci-libs/cartopy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) dev-python/cairocffi sci-electronics/voacapl
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jawatson/pythonprop/archive/v0.30.tar.gz -> pythonprop-0.30.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ea4a7df51d0781d0fb81e12505cd4133
+_md5_=64cfac7fac1505a533e4704ccb3a5bd1
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 6bd1e62ce5f8..597ce395015e 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/ack-3.4.0 b/metadata/md5-cache/sys-apps/ack-3.4.0
index 2c75c4e29948..2c095e61ebb0 100644
--- a/metadata/md5-cache/sys-apps/ack-3.4.0
+++ b/metadata/md5-cache/sys-apps/ack-3.4.0
@@ -5,11 +5,11 @@ DESCRIPTION=ack is a tool like grep, optimized for programmers
 EAPI=7
 HOMEPAGE=https://beyondgrep.com
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/File-Next-1.180.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.4.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=681b29ae048c6311748ac77d8f94f3a7
+_md5_=3e766d64f5a1621e65885478213e1675
diff --git a/metadata/md5-cache/sys-apps/attr-2.4.48-r3 b/metadata/md5-cache/sys-apps/attr-2.4.48-r3
deleted file mode 100644
index 6bdf19b10585..000000000000
--- a/metadata/md5-cache/sys-apps/attr-2.4.48-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DESCRIPTION=Extended attributes tools
-EAPI=6
-HOMEPAGE=https://savannah.nongnu.org/projects/attr
-IUSE=debug nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://nongnu/attr/attr-2.4.48.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b48ea34ae97fea2d89c97d54032516fd
diff --git a/metadata/md5-cache/sys-apps/attr-2.4.48-r5 b/metadata/md5-cache/sys-apps/attr-2.4.48-r5
new file mode 100644
index 000000000000..130ac35379eb
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/attr-2.4.48-r5
@@ -0,0 +1,12 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extended attributes tools
+EAPI=7
+HOMEPAGE=https://savannah.nongnu.org/projects/attr
+IUSE=debug nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://nongnu/attr/attr-2.4.48.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=effd42a5a69d811f0bbab945801cbaac
diff --git a/metadata/md5-cache/sys-apps/attr-9999 b/metadata/md5-cache/sys-apps/attr-9999
index 673601984eef..b313533cd97e 100644
--- a/metadata/md5-cache/sys-apps/attr-9999
+++ b/metadata/md5-cache/sys-apps/attr-9999
@@ -1,5 +1,5 @@
 BDEPEND=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 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare setup test unpack
+DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Extended attributes tools
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/attr
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6c68800ddeef26afacc7a1e7a866b588
+_md5_=533a58f2fd38c82929288e86d53c88af
diff --git a/metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1 b/metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1
index 4835afa23a10..5d4852973ad4 100644
--- a/metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1
+++ b/metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1
@@ -9,4 +9,4 @@ RDEPEND=app-crypt/p11-kit[trust] app-misc/ca-certificates !<dev-java/java-config
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~gyakovlev/distfiles/baselayout-java-0.1.0.tar.gz
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef06a25800261b1d1ab533bb3d393c29
+_md5_=4c50a7282ba205555f98c56f32d2d81e
diff --git a/metadata/md5-cache/sys-apps/fd-8.2.1 b/metadata/md5-cache/sys-apps/fd-8.2.1
new file mode 100644
index 000000000000..fe694c793ff7
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fd-8.2.1
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )
+DESCRIPTION=Alternative to find that provides sensible defaults for 80% of the use cases
+EAPI=7
+HOMEPAGE=https://github.com/sharkdp/fd
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 BSD-2 ISC MIT Unlicense
+RDEPEND=!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )
+SLOT=0
+SRC_URI=https://github.com/sharkdp/fd/archive/v8.2.1.tar.gz -> fd-8.2.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.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/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.35/download -> anyhow-1.0.35.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.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.14/download -> bstr-0.2.14.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.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/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/ctrlc/3.1.7/download -> ctrlc-3.1.7.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.1/download -> dirs-sys-next-0.1.1.crate https://crates.io/api/v1/crates/filetime/0.2.13/download -> filetime-0.2.13.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fs_extra/1.2.0/download -> fs_extra-1.2.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/globset/0.4.6/download -> globset-0.4.6.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/humantime/2.0.1/download -> humantime-2.0.1.crate https://crates.io/api/v1/crates/ignore/0.4.17/download -> ignore-0.4.17.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.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.80/download -> libc-0.2.80.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/lscolors/0.7.1/download -> lscolors-0.7.1.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/nix/0.18.0/download -> nix-0.18.0.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.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/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.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/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.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/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/winapi/0.3.9/download -> winapi-0.3.9.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
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	cargo	bd8499d18174b7d9e84e56a022ccd236	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=044e09fe77b53de74b08efbb7087eca3
diff --git a/metadata/md5-cache/sys-apps/hwdata-gentoo-0.4 b/metadata/md5-cache/sys-apps/hwdata-gentoo-0.4
deleted file mode 100644
index 31d357dafca5..000000000000
--- a/metadata/md5-cache/sys-apps/hwdata-gentoo-0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!sys-apps/hwdata-redhat
-DESCRIPTION=Data for the hwsetup program
-EAPI=5
-HOMEPAGE=http://wolf31o2.org
-IUSE=opengl binary-drivers
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=!sys-apps/hwdata-redhat
-SLOT=0
-SRC_URI=mirror://gentoo/hwdata-gentoo-0.4.tar.bz2 http://wolf31o2.org/sources/hwdata/hwdata-gentoo-0.4.tar.bz2
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2ea0dd1bb7610b6d58794a88c0dcaee3
diff --git a/metadata/md5-cache/sys-apps/hwsetup-1.2-r3 b/metadata/md5-cache/sys-apps/hwsetup-1.2-r3
deleted file mode 100644
index 50074db58edc..000000000000
--- a/metadata/md5-cache/sys-apps/hwsetup-1.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils[zlib?] zlib? ( sys-libs/zlib ) sys-libs/libkudzu
-DESCRIPTION=Hardware setup program from Knoppix - used only on LiveCD
-EAPI=5
-HOMEPAGE=http://www.knopper.net/
-IUSE=zlib
-KEYWORDS=~alpha amd64 hppa ~ia64 -mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils[zlib?] zlib? ( sys-libs/zlib ) sys-apps/hwdata-gentoo
-SLOT=0
-SRC_URI=http://debian-knoppix.alioth.debian.org/sources/hwsetup_1.2-7.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c6406f6831bcaf9deeaf660048e9478f
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.2 b/metadata/md5-cache/sys-apps/i2c-tools-4.2
index 5aea090d48e4..a13954a9badf 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.2
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=python? ( python_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(-)] )
+DEPEND=python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_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=I2C tools for bus probing, chip dumping, EEPROM decoding, and more
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/software/utils/i2c-tools
-IUSE=perl python python_targets_python3_7 python_targets_python3_8
+IUSE=perl python python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=python? ( python_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(-)] ) perl? ( dev-lang/perl )
-REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
+RDEPEND=python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) perl? ( dev-lang/perl )
+REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.2.tar.xz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e75f4f4071ed1e94f29cd62456a803f9
+_md5_=6a82d2afbfce3baa41c5874995640540
diff --git a/metadata/md5-cache/sys-apps/kbd-2.3.0-r1 b/metadata/md5-cache/sys-apps/kbd-2.3.0-r1
index 82de268e31da..27f164603387 100644
--- a/metadata/md5-cache/sys-apps/kbd-2.3.0-r1
+++ b/metadata/md5-cache/sys-apps/kbd-2.3.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Keyboard and console utilities
 EAPI=7
 HOMEPAGE=http://kbd-project.org/
 IUSE=nls pam 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-2
 RDEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.3.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c52c90ddd4d70ae35490ca2561ff6cee
+_md5_=0d36f7737a692373c89b87dad1da75bf
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-2.0.21 b/metadata/md5-cache/sys-apps/kexec-tools-2.0.21
new file mode 100644
index 000000000000..678897b71889
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/kexec-tools-2.0.21
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Load another kernel from the currently executing Linux kernel
+EAPI=7
+HOMEPAGE=https://kernel.org/pub/linux/utils/kernel/kexec/
+IUSE=booke lzma xen zlib kernel_linux
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=lzma? ( zlib )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.21.tar.xz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=02f5c6da678de1f1e2823a81ee7ef582
diff --git a/metadata/md5-cache/sys-apps/logwatch-7.5.4 b/metadata/md5-cache/sys-apps/logwatch-7.5.4
index fa7b6632a2d4..eb0a031092bc 100644
--- a/metadata/md5-cache/sys-apps/logwatch-7.5.4
+++ b/metadata/md5-cache/sys-apps/logwatch-7.5.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Analyzes and Reports on system logs
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/logwatch/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://sourceforge/logwatch/logwatch-7.5.4/logwatch-7.5.4.tar.gz
 _eclasses_=tmpfiles	6170dc7770585fb3f16efdee789a3218
-_md5_=0b84577dc742b59219d820dead9d66ec
+_md5_=bdaa70c5f778acdf5e26f1ddce7f97d1
diff --git a/metadata/md5-cache/sys-apps/lsd-0.17.0 b/metadata/md5-cache/sys-apps/lsd-0.17.0
deleted file mode 100644
index 989e8df198ad..000000000000
--- a/metadata/md5-cache/sys-apps/lsd-0.17.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=A modern ls with a lot of pretty colors and awesome icons
-EAPI=7
-HOMEPAGE=https://github.com/Peltoche/lsd
-IUSE=debug
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0 BSD-2 ISC MIT
-SLOT=0
-SRC_URI=https://github.com/Peltoche/lsd/archive/0.17.0.tar.gz -> lsd-0.17.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.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/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/assert_cmd/0.11.1/download -> assert_cmd-0.11.1.crate https://crates.io/api/v1/crates/assert_fs/0.11.3/download -> assert_fs-0.11.3.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/c2-chacha/0.2.3/download -> c2-chacha-0.2.3.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/chrono/0.4.9/download -> chrono-0.4.9.crate https://crates.io/api/v1/crates/chrono-humanize/0.0.11/download -> chrono-humanize-0.0.11.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.3.9/download -> crossbeam-channel-0.3.9.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/escargot/0.4.0/download -> escargot-0.4.0.crate https://crates.io/api/v1/crates/float-cmp/0.4.0/download -> float-cmp-0.4.0.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/getrandom/0.1.12/download -> getrandom-0.1.12.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.4/download -> globset-0.4.4.crate https://crates.io/api/v1/crates/globwalk/0.5.0/download -> globwalk-0.5.0.crate https://crates.io/api/v1/crates/ignore/0.4.10/download -> ignore-0.4.10.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.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/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.65/download -> libc-0.2.65.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lscolors/0.6.0/download -> lscolors-0.6.0.crate https://crates.io/api/v1/crates/lsd/0.17.0/download -> lsd-0.17.0.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.2.2/download -> normalize-line-endings-0.2.2.crate https://crates.io/api/v1/crates/num-integer/0.1.41/download -> num-integer-0.1.41.crate https://crates.io/api/v1/crates/num-traits/0.2.8/download -> num-traits-0.2.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/predicates/1.0.1/download -> predicates-1.0.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.6/download -> proc-macro2-1.0.6.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand/0.7.2/download -> rand-0.7.2.crate https://crates.io/api/v1/crates/rand_chacha/0.2.1/download -> rand_chacha-0.2.1.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/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.101/download -> serde-1.0.101.crate https://crates.io/api/v1/crates/serde_derive/1.0.101/download -> serde_derive-1.0.101.crate https://crates.io/api/v1/crates/serde_json/1.0.41/download -> serde_json-1.0.41.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.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.8/download -> terminal_size-0.1.8.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/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.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/users/0.9.1/download -> users-0.9.1.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/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/wild/2.0.2/download -> wild-2.0.2.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.8/download -> winapi-0.3.8.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.2/download -> winapi-util-0.1.2.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	bd8499d18174b7d9e84e56a022ccd236	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5161828779db264fd3cf8295226fc6c7
diff --git a/metadata/md5-cache/sys-apps/lsd-0.18.0 b/metadata/md5-cache/sys-apps/lsd-0.18.0
deleted file mode 100644
index fe00985849fe..000000000000
--- a/metadata/md5-cache/sys-apps/lsd-0.18.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=A modern ls with a lot of pretty colors and awesome icons
-EAPI=7
-HOMEPAGE=https://github.com/Peltoche/lsd
-IUSE=debug
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0 BSD-2 ISC MIT
-SLOT=0
-SRC_URI=https://github.com/Peltoche/lsd/archive/0.18.0.tar.gz -> lsd-0.18.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.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/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/assert_cmd/1.0.1/download -> assert_cmd-1.0.1.crate https://crates.io/api/v1/crates/assert_fs/1.0.0/download -> assert_fs-1.0.0.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/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.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/chrono/0.4.11/download -> chrono-0.4.11.crate https://crates.io/api/v1/crates/chrono-humanize/0.0.11/download -> chrono-humanize-0.0.11.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.2.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/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/float-cmp/0.6.0/download -> float-cmp-0.6.0.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/globwalk/0.7.3/download -> globwalk-0.7.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.10/download -> hermit-abi-0.1.10.crate https://crates.io/api/v1/crates/ignore/0.4.14/download -> ignore-0.4.14.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/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.68/download -> libc-0.2.68.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lscolors/0.7.0/download -> lscolors-0.7.0.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/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/predicates/1.0.4/download -> predicates-1.0.4.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.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/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.6/download -> regex-1.3.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.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/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.12/download -> terminal_size-0.1.12.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.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.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/users/0.10.0/download -> users-0.10.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/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.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/wild/2.0.2/download -> wild-2.0.2.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.8/download -> winapi-0.3.8.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.4/download -> winapi-util-0.1.4.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	bd8499d18174b7d9e84e56a022ccd236	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=179e6e8f8c9f6250ab196c591d5e8641
diff --git a/metadata/md5-cache/sys-apps/lsd-0.19.0 b/metadata/md5-cache/sys-apps/lsd-0.19.0
new file mode 100644
index 000000000000..92e7bd36c869
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/lsd-0.19.0
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=A modern ls with a lot of pretty colors and awesome icons
+EAPI=7
+HOMEPAGE=https://github.com/Peltoche/lsd
+IUSE=debug
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Apache-2.0 BSD-2 ISC MIT
+SLOT=0
+SRC_URI=https://github.com/Peltoche/lsd/archive/0.19.0.tar.gz -> lsd-0.19.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.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/ansi_term/0.12.1/download -> ansi_term-0.12.1.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/assert_cmd/1.0.1/download -> assert_cmd-1.0.1.crate https://crates.io/api/v1/crates/assert_fs/1.0.0/download -> assert_fs-1.0.0.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.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.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/bstr/0.2.13/download -> bstr-0.2.13.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/chrono/0.4.15/download -> chrono-0.4.15.crate https://crates.io/api/v1/crates/chrono-humanize/0.0.11/download -> chrono-humanize-0.0.11.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.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/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/3.0.1/download -> dirs-3.0.1.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/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.6/download -> dtoa-0.4.6.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/globwalk/0.7.3/download -> globwalk-0.7.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.16/download -> hermit-abi-0.1.16.crate https://crates.io/api/v1/crates/human-sort/0.2.2/download -> human-sort-0.2.2.crate https://crates.io/api/v1/crates/ignore/0.4.16/download -> ignore-0.4.16.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.77/download -> libc-0.2.77.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/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/lscolors/0.7.1/download -> lscolors-0.7.1.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.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-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.9/download -> ppv-lite86-0.2.9.crate https://crates.io/api/v1/crates/predicates/1.0.5/download -> predicates-1.0.5.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.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/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.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.8.2/download -> rust-argon2-0.8.2.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/serde/1.0.117/download -> serde-1.0.117.crate https://crates.io/api/v1/crates/serde_derive/1.0.117/download -> serde_derive-1.0.117.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/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.48/download -> syn-1.0.48.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.13/download -> terminal_size-0.1.13.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.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.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.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.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/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.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.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.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/wild/2.0.4/download -> wild-2.0.4.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.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/xdg/2.1.0/download -> xdg-2.1.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.4/download -> yaml-rust-0.4.4.crate
+_eclasses_=cargo	bd8499d18174b7d9e84e56a022ccd236	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=40cd282a0e665f06afe1e4826f69995d
diff --git a/metadata/md5-cache/sys-apps/lsvpd-1.7.11 b/metadata/md5-cache/sys-apps/lsvpd-1.7.11
index d7899989b27e..459f9e183faf 100644
--- a/metadata/md5-cache/sys-apps/lsvpd-1.7.11
+++ b/metadata/md5-cache/sys-apps/lsvpd-1.7.11
@@ -4,10 +4,10 @@ DEPEND=dev-db/sqlite:3 sys-apps/sg3_utils sys-libs/librtas sys-libs/libvpd sys-l
 DESCRIPTION=Utility to List Device Vital Product Data (VPD)
 EAPI=7
 HOMEPAGE=https://github.com/power-ras/lsvpd
-KEYWORDS=~ppc64
+KEYWORDS=ppc64
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-db/sqlite:3 sys-apps/sg3_utils sys-libs/librtas sys-libs/libvpd sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/power-ras/lsvpd/archive/v1.7.11.tar.gz -> lsvpd-1.7.11.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6750505092ef8dd1d598e64fbc8f2b1f
+_md5_=0556cbdc49f8df4ae3d9c68b06fe8ccd
diff --git a/metadata/md5-cache/sys-apps/moreutils-0.63 b/metadata/md5-cache/sys-apps/moreutils-0.63
deleted file mode 100644
index 46bd3cf328d3..000000000000
--- a/metadata/md5-cache/sys-apps/moreutils-0.63
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=app-admin/eselect doc? ( dev-lang/perl >=app-text/docbook2X-0.8.8-r2 app-text/docbook-xml-dtd:4.4 )
-DESCRIPTION=a collection of tools that nobody thought to write when Unix was young
-EAPI=7
-HOMEPAGE=https://joeyh.name/code/moreutils/
-IUSE=+doc +perl
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ppc ~ppc64 x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=perl? ( dev-lang/perl dev-perl/IPC-Run dev-perl/Time-Duration dev-perl/TimeDate )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/m/moreutils/moreutils_0.63.orig.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=de830690aec847f5d4d237d38e723888
diff --git a/metadata/md5-cache/sys-apps/mouseemu-0.12 b/metadata/md5-cache/sys-apps/mouseemu-0.12
deleted file mode 100644
index f8de2e029c97..000000000000
--- a/metadata/md5-cache/sys-apps/mouseemu-0.12
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Emulates scrollwheel, right- & left-click for one-button mice/touchpads
-EAPI=6
-HOMEPAGE=http://geekounet.org/powerbook/
-KEYWORDS=-* ppc
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/mouseemu-0.12.tar.gz
-_md5_=560f71f9d7dfe8bf0d36b37bfb833e7b
diff --git a/metadata/md5-cache/sys-apps/opal-utils-6.5.2 b/metadata/md5-cache/sys-apps/opal-utils-6.5.2
deleted file mode 100644
index 27e6f0abc3c4..000000000000
--- a/metadata/md5-cache/sys-apps/opal-utils-6.5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[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/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst setup
-DESCRIPTION=OPAL firmware utilities
-EAPI=7
-HOMEPAGE=https://github.com/open-power/skiboot
-IUSE=doc kernel_linux
-KEYWORDS=ppc64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/open-power/skiboot/archive/v6.5.2.tar.gz -> opal-utils-6.5.2.tar.gz
-_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8ec1cc089199815af68aeb19cd508e33
diff --git a/metadata/md5-cache/sys-apps/opal-utils-6.7 b/metadata/md5-cache/sys-apps/opal-utils-6.7
index ba4457b002b7..e9afa1325ccd 100644
--- a/metadata/md5-cache/sys-apps/opal-utils-6.7
+++ b/metadata/md5-cache/sys-apps/opal-utils-6.7
@@ -4,9 +4,9 @@ DESCRIPTION=OPAL firmware utilities
 EAPI=7
 HOMEPAGE=https://github.com/open-power/skiboot
 IUSE=doc kernel_linux
-KEYWORDS=~ppc64
+KEYWORDS=ppc64
 LICENSE=Apache-2.0 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/open-power/skiboot/archive/v6.7.tar.gz -> opal-utils-6.7.tar.gz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f9b372c075409bcf095c73082267633
+_md5_=2c5283161735afd1e785808c0baf337a
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.9 b/metadata/md5-cache/sys-apps/portage-3.0.9
index b97211b98167..e29c18f69bf0 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.9
+++ b/metadata/md5-cache/sys-apps/portage-3.0.9
@@ -5,7 +5,7 @@ DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux
-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
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.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(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=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(-)] virtual/tmpfiles
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-3.0.9.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.9.tar.bz2
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=edf3d6eb9a02926006915b3135815dcc
+_md5_=b59d4883f16ad6c36d0b627cf052ec4a
diff --git a/metadata/md5-cache/sys-apps/servicelog-1.1.14 b/metadata/md5-cache/sys-apps/servicelog-1.1.14
deleted file mode 100644
index 42653e9bc342..000000000000
--- a/metadata/md5-cache/sys-apps/servicelog-1.1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=sys-libs/libservicelog
-DESCRIPTION=Provides utilities for logging service-related events
-EAPI=6
-HOMEPAGE=http://linux-diag.sourceforge.net/servicelog/
-KEYWORDS=ppc ppc64
-LICENSE=GPL-2+
-RDEPEND=sys-libs/libservicelog virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-diag/servicelog-1.1.14.tar.gz
-_md5_=014e8d70cc9c22962eafdb39876db6a1
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 3ea62fc83ffa..c4e9009f7d02 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/keystone-18.0.0 b/metadata/md5-cache/sys-auth/keystone-18.0.0
index f746a21b705a..feb83e1140fe 100644
--- a/metadata/md5-cache/sys-auth/keystone-18.0.0
+++ b/metadata/md5-cache/sys-auth/keystone-18.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=The Openstack authentication, authorization, and service catalog
 EAPI=7
 HOMEPAGE=https://launchpad.net/keystone
 IUSE=+sqlite ldap memcached mongo mysql postgres test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0 >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-1.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-restful-0.3.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sqlite? ( >=dev-python/sqlalchemy-1.3.0[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/sqlalchemy-migrate-0.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/passlib-1.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystonemiddleware-7.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/bcrypt-3.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/scrypt-0.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.22.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-db-6.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.44.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-policy-3.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oauthlib-0.6.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pysaml2-5.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyjwt-1.6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/dogpile-cache-1.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pycadf-1.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pycadf-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/msgpack-0.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytz-2013.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pymongo-3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ldap? ( >=dev-python/python-ldap-3.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ldappool-2.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) || ( www-servers/uwsgi[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] www-apache/mod_wsgi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] www-servers/gunicorn[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) acct-user/keystone acct-group/keystone python_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=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/victoria/keystone.conf.sample -> keystone.conf.sample-18.0.0 https://tarballs.openstack.org/keystone/keystone-18.0.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d16b70b732d994b16071cc4d3b17154e
+_md5_=a5acd3bac08e6791a5145752c91a502c
diff --git a/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2 b/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2
index 2067bde9e510..0fc75631eae7 100644
--- a/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2
+++ b/metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst
 DEPEND=sys-libs/pam >=dev-db/postgresql-8.0:= >=dev-libs/libgcrypt-1.2.0:0=
 DESCRIPTION=pam module to authenticate users via PostgreSQL
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/pam-pgsql/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/pam >=dev-db/postgresql-8.0:= >=dev-libs/libgcrypt-1.2.0:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-pgsql/pam-pgsql-0.7.3.2.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=85cadf4cf21c668d334b00fb4d148de5
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=76de58c420a509a4e6b2753161b519f0
diff --git a/metadata/md5-cache/sys-auth/pam_ldap-186-r1 b/metadata/md5-cache/sys-auth/pam_ldap-186-r1
index 4ef07fe07812..41d20de4ec2c 100644
--- a/metadata/md5-cache/sys-auth/pam_ldap-186-r1
+++ b/metadata/md5-cache/sys-auth/pam_ldap-186-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=>=sys-libs/glibc-2.1.3 sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=PAM LDAP Module
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.padl.com/OSS/pam_ldap.html
 IUSE=ssl sasl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=|| ( GPL-2 LGPL-2 )
-RDEPEND=>=sys-libs/glibc-2.1.3 sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://www.padl.com/download/pam_ldap-186.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	226d8d2ff588bdfd7d188512dbdb189d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3b129fe19d551b38dc3ff9d5188b974f
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	226d8d2ff588bdfd7d188512dbdb189d	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6a81b0b5078c47ad520320d71266970a
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 7dcb2b0adcd5..44220733d404 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/storcli-7.1410 b/metadata/md5-cache/sys-block/storcli-7.1410
index cad7d4f3fe9f..04befa878cce 100644
--- a/metadata/md5-cache/sys-block/storcli-7.1410
+++ b/metadata/md5-cache/sys-block/storcli-7.1410
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=MegaRAID StorCLI (successor of the MegaCLI)
 EAPI=7
 HOMEPAGE=https://www.broadcom.com/support/download-search?dk=storcli
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Avago LSI BSD
 SLOT=0/7.14
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.1410.0000.0000_Unified_StorCLI.zip -> storcli-7.1410.zip
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=23e02fc4bc04fd09c8d6fd07eacefe9d
+_md5_=7d8b4d9fcb44637351f20853883a8102
diff --git a/metadata/md5-cache/sys-block/storcli-7.1508 b/metadata/md5-cache/sys-block/storcli-7.1508
new file mode 100644
index 000000000000..5ee19931e1f2
--- /dev/null
+++ b/metadata/md5-cache/sys-block/storcli-7.1508
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=MegaRAID StorCLI (successor of the MegaCLI)
+EAPI=7
+HOMEPAGE=https://www.broadcom.com/support/download-search?dk=storcli
+KEYWORDS=-* ~amd64
+LICENSE=Avago LSI BSD
+SLOT=0/7.15
+SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.1508.0000.0000_Unified_StorCLI-PUL.zip -> storcli-7.1508.zip
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9b9b1261bd9645c09ac0ec8c68fad951
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 409cc06ff854..ed5c39e64a0a 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/bootcreator-1.1 b/metadata/md5-cache/sys-boot/bootcreator-1.1
deleted file mode 100644
index db477688e7ba..000000000000
--- a/metadata/md5-cache/sys-boot/bootcreator-1.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Simple generator for Forth based BootMenu scripts for Pegasos machines
-EAPI=6
-HOMEPAGE=http://tbs-software.com/morgoth/projects.html
-KEYWORDS=-* ppc
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://tbs-software.com/morgoth/files/bootcreator-src.tar.gz
-_md5_=a4b0c37a1dcb7677dee7310202439a09
diff --git a/metadata/md5-cache/sys-boot/palo-2.13 b/metadata/md5-cache/sys-boot/palo-2.13
deleted file mode 100644
index c36c66b73507..000000000000
--- a/metadata/md5-cache/sys-boot/palo-2.13
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=PALO : PArisc Linux Loader
-EAPI=7
-HOMEPAGE=http://parisc-linux.org/ https://parisc.wiki.kernel.org/
-KEYWORDS=-* ~hppa
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/deller/palo.git/snapshot/palo-2.13.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=852a8a610d97d6073643b4ad62bac32e
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20190925 b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20190925
deleted file mode 100644
index a481dbf65abc..000000000000
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20190925
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prerm pretend
-DESCRIPTION=Raspberry Pi (all versions) bootloader and GPU firmware
-EAPI=7
-HOMEPAGE=https://github.com/raspberrypi/firmware
-KEYWORDS=-* ~arm ~arm64
-LICENSE=GPL-2 raspberrypi-videocore-bin
-RDEPEND=!<=sys-kernel/raspberrypi-image-4.19.57_p20190709
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/raspberrypi/firmware/archive/1.20190925.tar.gz -> raspberrypi-firmware-1.20190925.tar.gz
-_eclasses_=mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=939e8e1432b9d3b9add7b42279335c53
diff --git a/metadata/md5-cache/sys-boot/silo-1.4.14_p20120819-r1 b/metadata/md5-cache/sys-boot/silo-1.4.14_p20120819-r1
deleted file mode 100644
index a0744772d3fb..000000000000
--- a/metadata/md5-cache/sys-boot/silo-1.4.14_p20120819-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend
-DEPEND=sys-fs/e2fsprogs sys-apps/sparc-utils
-DESCRIPTION=SPARC/UltraSPARC Improved Loader, a boot loader for sparc
-EAPI=6
-HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary
-KEYWORDS=-* sparc
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/s/silo/silo_1.4.14+git20120819.orig.tar.gz mirror://debian/pool/main/s/silo/silo_1.4.14+git20120819-1.diff.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=65b2deb49eff41aa41ac5686387c8bbf
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 91c7c3c78335..28f4f97000cf 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/cinder-17.0.1 b/metadata/md5-cache/sys-cluster/cinder-17.0.1
index 2ecf44b31894..b64edb3d114a 100644
--- a/metadata/md5-cache/sys-cluster/cinder-17.0.1
+++ b/metadata/md5-cache/sys-cluster/cinder-17.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-vo
 EAPI=7
 HOMEPAGE=https://launchpad.net/cinder
 IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python3_7 python_targets_python3_8 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-5.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/decorator-4.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/eventlet-0.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/greenlet-0.4.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/importlib_metadata-1.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/iso8601-0.1.12[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.14.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystonemiddleware-4.21.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/lxml-4.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-6.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-db-6.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.44.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-messaging-6.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-policy-1.44.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-privsep-2.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-2.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-service-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.40.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/packaging-20.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/paramiko-2.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-2.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-barbicanclient-4.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-glanceclient-2.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-keystoneclient-3.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytz-2015.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/requests-2.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/taskflow-3.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/rtslib-fb-2.1.65[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sqlite? ( >=dev-python/sqlalchemy-1.3.0[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/sqlalchemy-migrate-0.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tabulate-0.8.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tenacity-6.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.24.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-vmware-2.35.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-brick-4.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-win-4.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/castellan-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cursive-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zstd-1.4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils acct-user/cinder acct-group/cinder python_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=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/victoria/cinder.conf.sample -> cinder.conf.sample-17.0.1 https://tarballs.openstack.org/cinder/cinder-17.0.1.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d6538078aca568125e9db40730e099f4
+_md5_=e642ccf8bf4dc310776d1d1c50d8df50
diff --git a/metadata/md5-cache/sys-cluster/heat-15.0.0 b/metadata/md5-cache/sys-cluster/heat-15.0.0
index 361bdf1303ce..c5e9b06a5e31 100644
--- a/metadata/md5-cache/sys-cluster/heat-15.0.0
+++ b/metadata/md5-cache/sys-cluster/heat-15.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration eng
 EAPI=7
 HOMEPAGE=https://launchpad.net/heat
 IUSE=+mysql +memcached postgres sqlite python_targets_python3_7 python_targets_python3_8 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-5.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/Babel-2.3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/Babel-2.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/croniter-0.3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-1.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/debtcollector-1.19.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/eventlet-0.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/eventlet-0.21.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/lxml-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/neutron-lib-1.14.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/openstacksdk-0.11.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-db-6.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.37.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/aodhclient-0.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-blazarclient-1.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-heatclient-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-ironicclient-2.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-magnumclient-2.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-manilaclient-1.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-mistralclient-3.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/python-mistralclient-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-monascaclient-1.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-neutronclient-6.14.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-octaviaclient-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-openstackclient-3.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-saharaclient-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-vitrageclient-2.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-zaqarclient-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-zunclient-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytz-2013.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tenacity-6.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/sqlalchemy-migrate-0.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-3.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/yaql-1.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] acct-user/heat acct-group/heat python_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=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.victoria -> heat.conf.sample-15.0.0 https://tarballs.openstack.org/heat/openstack-heat-15.0.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d986d1896dcd1a2601d0cd4b839a5ac8
+_md5_=7abaf2e9984c18ea7793b6ae320dfa70
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.17.13 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.17.13
deleted file mode 100644
index 16d69d091025..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.17.13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
-DESCRIPTION=Kubernetes API server
-EAPI=7
-HOMEPAGE=https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.13.tar.gz -> kubernetes-1.17.13.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=d03642c35c0ac90786983ff0bbe876a6
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.17.14 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.17.14
index 76495c24eb68..2f278f89d3e9 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.17.14
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.17.14
@@ -5,11 +5,11 @@ DESCRIPTION=Kubernetes API server
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.14.tar.gz -> kubernetes-1.17.14.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=f3e0ae07c2be55b5012a33aa8012930c
+_md5_=d03642c35c0ac90786983ff0bbe876a6
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.12 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.12
index c284c721e487..80973ae3626b 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.12
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.12
@@ -5,11 +5,11 @@ DESCRIPTION=Kubernetes API server
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.12.tar.gz -> kubernetes-1.18.12.tar.gz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=95cd427489474ade75953a9ec73344e9
+_md5_=31999d154f0e60f1fe02f7717920305e
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.14 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.14
new file mode 100644
index 000000000000..325bb32addd3
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.18.14
@@ -0,0 +1,15 @@
+BDEPEND==dev-lang/go-1.14* >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.14.tar.gz -> kubernetes-1.18.14.tar.gz
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=95cd427489474ade75953a9ec73344e9
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.4 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.4
index 8305d428fa19..de090587335d 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.4
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.4
@@ -5,11 +5,11 @@ DESCRIPTION=Kubernetes API server
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.4.tar.gz -> kubernetes-1.19.4.tar.gz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e16a9a5ddf1116c30f809d05134d7148
+_md5_=d20e7c72886afc0fbc34d3261d0981eb
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.6 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.6
new file mode 100644
index 000000000000..73ddb1724952
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.19.6
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.6.tar.gz -> kubernetes-1.19.6.tar.gz
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e16a9a5ddf1116c30f809d05134d7148
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.1 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.1
new file mode 100644
index 000000000000..9f7fc300a120
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.20.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.1.tar.gz -> kubernetes-1.20.1.tar.gz
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e16a9a5ddf1116c30f809d05134d7148
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.17.14 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.17.14
index ffbbf9438ac8..2a93d825bb42 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.17.14
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.17.14
@@ -5,11 +5,11 @@ DESCRIPTION=Kubernetes Controller Manager
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.14.tar.gz -> kubernetes-1.17.14.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=07144b8fea08d67cdca6ba268a87abd9
+_md5_=49a48df614ccf2693a4a17db0600794a
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.12 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.12
index 40c0e9baddd2..9a130f92f596 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.12
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.12
@@ -5,11 +5,11 @@ DESCRIPTION=Kubernetes Controller Manager
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.12.tar.gz -> kubernetes-1.18.12.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=ec949de752def5bce1314bd484071457
+_md5_=8fa6510dcd0623fd2d995fb498a7e319
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.17.13 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.14
similarity index 75%
rename from metadata/md5-cache/sys-cluster/kube-controller-manager-1.17.13
rename to metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.14
index a97b4dc81a77..8c48cd2c34dd 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.17.13
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.14
@@ -5,11 +5,11 @@ DESCRIPTION=Kubernetes Controller Manager
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.13.tar.gz -> kubernetes-1.17.13.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.14.tar.gz -> kubernetes-1.18.14.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=49a48df614ccf2693a4a17db0600794a
+_md5_=ec949de752def5bce1314bd484071457
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.4 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.4
index aae2ae069a19..9b2f8812951d 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.4
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.4
@@ -5,11 +5,11 @@ DESCRIPTION=Kubernetes Controller Manager
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.4.tar.gz -> kubernetes-1.19.4.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=e139ccc1e65e258bd411b84b4f9dc75f
+_md5_=8b6c0d4d904f5f14c3d433f98c7cd7d6
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.6 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.6
new file mode 100644
index 000000000000..b44e4bc7ef25
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.6
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.6.tar.gz -> kubernetes-1.19.6.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=e139ccc1e65e258bd411b84b4f9dc75f
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.1 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.1
new file mode 100644
index 000000000000..f51190a0a232
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.1.tar.gz -> kubernetes-1.20.1.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=e139ccc1e65e258bd411b84b4f9dc75f
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.17.14 b/metadata/md5-cache/sys-cluster/kube-proxy-1.17.14
index 846aa355bd97..e1db7c43d467 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.17.14
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.17.14
@@ -4,11 +4,11 @@ DESCRIPTION=Kubernetes Proxy service
 EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.14.tar.gz -> kubernetes-1.17.14.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=bf859e4431f13751f272245771552672
+_md5_=3d53f61a1e26b18f452584760fbc296f
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.18.12 b/metadata/md5-cache/sys-cluster/kube-proxy-1.18.12
index 53f499a96b57..31b84252bf35 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.18.12
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.18.12
@@ -4,11 +4,11 @@ DESCRIPTION=Kubernetes Proxy service
 EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.12.tar.gz -> kubernetes-1.18.12.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=bf859e4431f13751f272245771552672
+_md5_=3d53f61a1e26b18f452584760fbc296f
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.17.13 b/metadata/md5-cache/sys-cluster/kube-proxy-1.18.14
similarity index 71%
rename from metadata/md5-cache/sys-cluster/kube-proxy-1.17.13
rename to metadata/md5-cache/sys-cluster/kube-proxy-1.18.14
index 2220da49f946..5cf6de8869bf 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.17.13
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.18.14
@@ -4,11 +4,11 @@ DESCRIPTION=Kubernetes Proxy service
 EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 IUSE=hardened
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.13.tar.gz -> kubernetes-1.17.13.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.14.tar.gz -> kubernetes-1.18.14.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=3d53f61a1e26b18f452584760fbc296f
+_md5_=bf859e4431f13751f272245771552672
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.19.4 b/metadata/md5-cache/sys-cluster/kube-proxy-1.19.4
index df1af974b64e..71ee0b9ea193 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.19.4
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.19.4
@@ -4,11 +4,11 @@ DESCRIPTION=Kubernetes Proxy service
 EAPI=7
 HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.4.tar.gz -> kubernetes-1.19.4.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=0fe281a765d94ad243504314573ecafe
+_md5_=1295262c21a756305484af75a8f0c840
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.19.6 b/metadata/md5-cache/sys-cluster/kube-proxy-1.19.6
new file mode 100644
index 000000000000..b9fdfd3455b9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.19.6
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.6.tar.gz -> kubernetes-1.19.6.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=0fe281a765d94ad243504314573ecafe
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.20.1 b/metadata/md5-cache/sys-cluster/kube-proxy-1.20.1
new file mode 100644
index 000000000000..273bcd730903
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.20.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.1.tar.gz -> kubernetes-1.20.1.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=0fe281a765d94ad243504314573ecafe
diff --git a/metadata/md5-cache/sys-cluster/kube-router-1.1.1 b/metadata/md5-cache/sys-cluster/kube-router-1.1.1
new file mode 100644
index 000000000000..ad3006a4eadd
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-router-1.1.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst test unpack
+DESCRIPTION=A turnkey solution for Kubernetes networking
+EAPI=7
+HOMEPAGE=https://kube-router.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception
+RDEPEND=net-firewall/iptables[conntrack] net-firewall/ipset sys-cluster/ipvsadm
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/cloudnativelabs/kube-router/archive/v1.1.1.tar.gz -> kube-router-1.1.1.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=ee9a9161273a32686bbba69d3ec651f6
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.17.14 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.17.14
index d25198e33df7..762f5fed5ac1 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.17.14
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.17.14
@@ -5,11 +5,11 @@ DESCRIPTION=Kubernetes Scheduler
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.14.tar.gz -> kubernetes-1.17.14.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=b8df199743df95a7888d9f7883f115b2
+_md5_=1e7995bf695dfc52b28a6be423a39610
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.12 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.12
index d444346ef480..55ac9db28769 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.12
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.12
@@ -5,11 +5,11 @@ DESCRIPTION=Kubernetes Scheduler
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.12.tar.gz -> kubernetes-1.18.12.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=448852f3b4bc02b9cbe9a877aa0c11b7
+_md5_=a4b200a1100acc05e9da4a904b223ba9
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.17.13 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.14
similarity index 73%
rename from metadata/md5-cache/sys-cluster/kube-scheduler-1.17.13
rename to metadata/md5-cache/sys-cluster/kube-scheduler-1.18.14
index b7085b1c3f79..d0b46bc6be72 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.17.13
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.18.14
@@ -5,11 +5,11 @@ DESCRIPTION=Kubernetes Scheduler
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.13.tar.gz -> kubernetes-1.17.13.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.14.tar.gz -> kubernetes-1.18.14.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=1e7995bf695dfc52b28a6be423a39610
+_md5_=448852f3b4bc02b9cbe9a877aa0c11b7
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.4 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.4
index 5ff9be279b67..6a37c4b763f8 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.4
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.4
@@ -5,11 +5,11 @@ DESCRIPTION=Kubernetes Scheduler
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.4.tar.gz -> kubernetes-1.19.4.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=7a24b85a26f70a47d21e46c2836b12c7
+_md5_=1a2ec21fc573554b1facd2a40a9826be
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.6 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.6
new file mode 100644
index 000000000000..bc9e4cfce2e1
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.19.6
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.6.tar.gz -> kubernetes-1.19.6.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=7a24b85a26f70a47d21e46c2836b12c7
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.20.1 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.20.1
new file mode 100644
index 000000000000..6b87d5e0e666
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.20.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.1.tar.gz -> kubernetes-1.20.1.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=7a24b85a26f70a47d21e46c2836b12c7
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.17.14 b/metadata/md5-cache/sys-cluster/kubeadm-1.17.14
index 74c6ee2b10c2..fb5940be69d6 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.17.14
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.17.14
@@ -4,11 +4,11 @@ DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.14.tar.gz -> kubernetes-1.17.14.tar.gz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1b160c86a80a430d8b764e766d7a986f
+_md5_=b5d59ff3e88aba1c1b0daf7872d96930
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.18.12 b/metadata/md5-cache/sys-cluster/kubeadm-1.18.12
index 5e063837f9e7..2ca7ee67b2f4 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.18.12
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.18.12
@@ -4,11 +4,11 @@ DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.12.tar.gz -> kubernetes-1.18.12.tar.gz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1b160c86a80a430d8b764e766d7a986f
+_md5_=b5d59ff3e88aba1c1b0daf7872d96930
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.17.13 b/metadata/md5-cache/sys-cluster/kubeadm-1.18.14
similarity index 76%
rename from metadata/md5-cache/sys-cluster/kubeadm-1.17.13
rename to metadata/md5-cache/sys-cluster/kubeadm-1.18.14
index bfc28b464622..d353037fa315 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.17.13
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.18.14
@@ -4,11 +4,11 @@ DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.13.tar.gz -> kubernetes-1.17.13.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.14.tar.gz -> kubernetes-1.18.14.tar.gz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b5d59ff3e88aba1c1b0daf7872d96930
+_md5_=1b160c86a80a430d8b764e766d7a986f
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.19.4 b/metadata/md5-cache/sys-cluster/kubeadm-1.19.4
index f26d4f6e1876..c09f43ac1df4 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.19.4
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.19.4
@@ -4,11 +4,11 @@ DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.4.tar.gz -> kubernetes-1.19.4.tar.gz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=afb44926372eb98e7d0694239613278d
+_md5_=ad2e7fd861a99cdf6069afee5aa882df
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.19.6 b/metadata/md5-cache/sys-cluster/kubeadm-1.19.6
new file mode 100644
index 000000000000..3f3b7647e778
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.19.6
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.6.tar.gz -> kubernetes-1.19.6.tar.gz
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=afb44926372eb98e7d0694239613278d
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.20.1 b/metadata/md5-cache/sys-cluster/kubeadm-1.20.1
new file mode 100644
index 000000000000..c8cd948bd5c8
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.20.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.1.tar.gz -> kubernetes-1.20.1.tar.gz
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=afb44926372eb98e7d0694239613278d
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.17.14 b/metadata/md5-cache/sys-cluster/kubectl-1.17.14
index cb93305dae74..45f0fb7d1f9e 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.17.14
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.17.14
@@ -4,11 +4,11 @@ DESCRIPTION=CLI to run commands against Kubernetes clusters
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.14.tar.gz -> kubernetes-1.17.14.tar.gz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b41ff374552a7589ea9f8344bf505694
+_md5_=132422d6ddcd5ea70aa1684d6adad311
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.18.12 b/metadata/md5-cache/sys-cluster/kubectl-1.18.12
index 05343126a04d..c389e019f59f 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.18.12
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.18.12
@@ -4,11 +4,11 @@ DESCRIPTION=CLI to run commands against Kubernetes clusters
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.12.tar.gz -> kubernetes-1.18.12.tar.gz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b41ff374552a7589ea9f8344bf505694
+_md5_=132422d6ddcd5ea70aa1684d6adad311
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.17.13 b/metadata/md5-cache/sys-cluster/kubectl-1.18.14
similarity index 75%
rename from metadata/md5-cache/sys-cluster/kubectl-1.17.13
rename to metadata/md5-cache/sys-cluster/kubectl-1.18.14
index 3f996c63bcce..d459dcbfb047 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.17.13
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.18.14
@@ -4,11 +4,11 @@ DESCRIPTION=CLI to run commands against Kubernetes clusters
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.13.tar.gz -> kubernetes-1.17.13.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.14.tar.gz -> kubernetes-1.18.14.tar.gz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=132422d6ddcd5ea70aa1684d6adad311
+_md5_=b41ff374552a7589ea9f8344bf505694
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.19.4 b/metadata/md5-cache/sys-cluster/kubectl-1.19.4
index cfe7e04337cf..dcb932e1f81c 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.19.4
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.19.4
@@ -5,10 +5,10 @@ DESCRIPTION=CLI to run commands against Kubernetes clusters
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.4.tar.gz -> kubernetes-1.19.4.tar.gz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1d975c88b26246d225ac030a58cb6c2d
+_md5_=8d88b13f3403939ad60382363793ff22
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.19.6 b/metadata/md5-cache/sys-cluster/kubectl-1.19.6
new file mode 100644
index 000000000000..420345a499c9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.19.6
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=!sys-cluster/kubernetes
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.6.tar.gz -> kubernetes-1.19.6.tar.gz
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1d975c88b26246d225ac030a58cb6c2d
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.20.1 b/metadata/md5-cache/sys-cluster/kubectl-1.20.1
new file mode 100644
index 000000000000..3f8b3342b825
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.20.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=!sys-cluster/kubernetes
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.1.tar.gz -> kubernetes-1.20.1.tar.gz
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1d975c88b26246d225ac030a58cb6c2d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.17.14 b/metadata/md5-cache/sys-cluster/kubelet-1.17.14
index beff21ef431a..4dc1cd686f2e 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.17.14
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.17.14
@@ -4,11 +4,11 @@ DESCRIPTION=Kubernetes Node Agent
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.14.tar.gz -> kubernetes-1.17.14.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fcdf054918c3d7b7c311e99ca88ec1b8
+_md5_=16cc2136286582be3b8d9fa348f7a62f
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.18.12 b/metadata/md5-cache/sys-cluster/kubelet-1.18.12
index bd89ee4d83d4..f494ccdf3fdd 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.18.12
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.18.12
@@ -4,11 +4,11 @@ DESCRIPTION=Kubernetes Node Agent
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.12.tar.gz -> kubernetes-1.18.12.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fcdf054918c3d7b7c311e99ca88ec1b8
+_md5_=16cc2136286582be3b8d9fa348f7a62f
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.17.13 b/metadata/md5-cache/sys-cluster/kubelet-1.18.14
similarity index 75%
rename from metadata/md5-cache/sys-cluster/kubelet-1.17.13
rename to metadata/md5-cache/sys-cluster/kubelet-1.18.14
index 32749d9d520a..dd550e318f6d 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.17.13
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.18.14
@@ -4,11 +4,11 @@ DESCRIPTION=Kubernetes Node Agent
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.17.13.tar.gz -> kubernetes-1.17.13.tar.gz
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.18.14.tar.gz -> kubernetes-1.18.14.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=16cc2136286582be3b8d9fa348f7a62f
+_md5_=fcdf054918c3d7b7c311e99ca88ec1b8
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.19.4 b/metadata/md5-cache/sys-cluster/kubelet-1.19.4
index d9a7728f72f6..98835e9b067e 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.19.4
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.19.4
@@ -4,11 +4,11 @@ DESCRIPTION=Kubernetes Node Agent
 EAPI=7
 HOMEPAGE=https://kubernetes.io
 IUSE=hardened
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=!sys-cluster/kubernetes
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.4.tar.gz -> kubernetes-1.19.4.tar.gz
 _eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=155188854e512cd660297f5916e7ee83
+_md5_=f759e8214a664601ddbcf321044bfe23
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.19.6 b/metadata/md5-cache/sys-cluster/kubelet-1.19.6
new file mode 100644
index 000000000000..4a4e358e547e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.19.6
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.19.6.tar.gz -> kubernetes-1.19.6.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=155188854e512cd660297f5916e7ee83
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.20.1 b/metadata/md5-cache/sys-cluster/kubelet-1.20.1
new file mode 100644
index 000000000000..961735b00e73
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.20.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.15 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.20.1.tar.gz -> kubernetes-1.20.1.tar.gz
+_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=155188854e512cd660297f5916e7ee83
diff --git a/metadata/md5-cache/sys-cluster/neutron-17.0.0 b/metadata/md5-cache/sys-cluster/neutron-17.0.0
index c10062847006..8d586f9529a3 100644
--- a/metadata/md5-cache/sys-cluster/neutron-17.0.0
+++ b/metadata/md5-cache/sys-cluster/neutron-17.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=A virtual network service for Openstack
 EAPI=7
 HOMEPAGE=https://launchpad.net/neutron
 IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres python_targets_python3_7 python_targets_python3_8 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/debtcollector-1.19.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/eventlet-0.21.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pecan-1.3.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/neutron-lib-2.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tenacity-6.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.0[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.14.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/alembic-0.8.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-db-4.44.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-4.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-messaging-7.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-privsep-2.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-2.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-4.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-versionedobjects-1.35.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/osprofiler-2.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-ken-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ovs-2.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ovsdbapp-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyroute2-0.5.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/openstacksdk-0.31.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-vif-1.15.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/futurist-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyudev[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( net-misc/openvswitch ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) acct-group/neutron acct-user/neutron python_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=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz -> neutron-configs-17.0.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz -> neutron-ml2-plugins-17.0.0.tar.gz https://tarballs.openstack.org/neutron/neutron-17.0.0.tar.gz
 _eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7cb6f23467793b6f029406b16a5834c6
+_md5_=785f26a95ad551f4f6aa5a03ae852092
diff --git a/metadata/md5-cache/sys-cluster/sanlock-3.8.2 b/metadata/md5-cache/sys-cluster/sanlock-3.8.2
index 06be52f48a7d..c40a983fdd8d 100644
--- a/metadata/md5-cache/sys-cluster/sanlock-3.8.2
+++ b/metadata/md5-cache/sys-cluster/sanlock-3.8.2
@@ -4,11 +4,11 @@ DESCRIPTION=shared storage lock manager
 EAPI=6
 HOMEPAGE=https://pagure.io/sanlock
 IUSE=python kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-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=LGPL-2+ GPL-2 GPL-2+
 RDEPEND=acct-user/sanlock acct-group/sanlock dev-libs/libaio sys-apps/util-linux 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 ) )
 SLOT=0
 SRC_URI=https://releases.pagure.org/sanlock/sanlock-3.8.2.tar.gz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7b4acb23e566a90fb4f0283a8e97182d
+_md5_=e2abe69e65e79363f079087452a231cc
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index b03f4b1eed03..113bcdd3d288 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-apple-11.3.1 b/metadata/md5-cache/sys-devel/binutils-apple-11.3.1-r1
similarity index 96%
rename from metadata/md5-cache/sys-devel/binutils-apple-11.3.1
rename to metadata/md5-cache/sys-devel/binutils-apple-11.3.1-r1
index a9fdbb495505..53d3aa57f8e4 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-11.3.1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-11.3.1-r1
@@ -9,6 +9,6 @@ LICENSE=APSL-2
 RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-libs/tapi sys-devel/llvm:* sys-libs/libcxx
 RESTRICT=!test? ( test )
 SLOT=11
-SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-530.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-949.0.1.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-551.4.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-8.2-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-11.3.tar.bz2
+SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-530.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-949.0.1.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-551.4.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-8.2-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-11.3-r1.tar.bz2
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8875d517673fd84b10fe0c89399a989f
+_md5_=776f8703646a581895f5a8b23004cec0
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r100 b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r100
new file mode 100644
index 000000000000..092b9b3f6a3f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r100
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/make dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-devel/binutils-config app-arch/xar tapi? ( sys-libs/tapi )
+DESCRIPTION=Darwin Xtools matching Xcode Tools binutils-apple
+EAPI=7
+HOMEPAGE=https://github.com/iains/darwin-xtools
+IUSE=tapi
+KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
+LICENSE=APSL-2
+RDEPEND=sys-devel/binutils-config app-arch/xar tapi? ( sys-libs/tapi )
+SLOT=8
+SRC_URI=https://github.com/grobian/darwin-xtools/archive/gentoo-8.2.1-r100.tar.gz -> darwin-xtools-8.2.1-r100.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8a65ec1b65c90e0b3310ccc75a8fdd7b
diff --git a/metadata/md5-cache/sys-devel/bison-3.7.3 b/metadata/md5-cache/sys-devel/bison-3.7.3
index 5071f601fa51..a90216c1322a 100644
--- a/metadata/md5-cache/sys-devel/bison-3.7.3
+++ b/metadata/md5-cache/sys-devel/bison-3.7.3
@@ -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 >=sys-devel/gettext-0.21
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.7.3.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.7.3-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.7.3-patches-01.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=067e0528402082973a2a9588ef46866e
+_md5_=01411224e0cad26d5bb5f63601b7b39a
diff --git a/metadata/md5-cache/sys-devel/clang-11.0.1_rc2 b/metadata/md5-cache/sys-devel/clang-11.0.1_rc2
new file mode 100644
index 000000000000..825a6955cba8
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-11.0.1_rc2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/cmake-3.16 doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) 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] ) dev-python/sphinx dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-11.0.1_rc2:11=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) llvm_targets_AArch64? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_ARC] ) llvm_targets_VE? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_VE] ) test? ( sys-libs/compiler-rt ) !!sys-devel/llvm:0
+DESCRIPTION=C language family frontend for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug default-compiler-rt default-libcxx default-lld doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR 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_VE test doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-11.0.1_rc2 default-compiler-rt? ( =sys-libs/compiler-rt-11.0.1* ) default-libcxx? ( >=sys-libs/libcxx-11.0.1_rc2 ) default-lld? ( sys-devel/lld )
+RDEPEND=~sys-devel/llvm-11.0.1_rc2:11=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) llvm_targets_AArch64? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_ARC] ) llvm_targets_VE? ( ~sys-devel/llvm-11.0.1_rc2:11[llvm_targets_VE] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR 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_VE )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=11
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.1-rc2.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=844ddb97496d4178ea531386c80851bf
diff --git a/metadata/md5-cache/sys-devel/clang-common-11.0.1_rc2 b/metadata/md5-cache/sys-devel/clang-common-11.0.1_rc2
new file mode 100644
index 000000000000..f7f683195d50
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-11.0.1_rc2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+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-11.0.1-rc2.tar.gz
+_eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ba7e9332ae485bb187dc503176e97a45
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-11.0.1_rc2 b/metadata/md5-cache/sys-devel/clang-runtime-11.0.1_rc2
new file mode 100644
index 000000000000..37e1b8c82219
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-11.0.1_rc2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+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_s390_32 abi_s390_64
+LICENSE=metapackage
+PROPERTIES=live
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-11.0.1_rc2:11.0.1 sanitize? ( ~sys-libs/compiler-rt-sanitizers-11.0.1_rc2:11.0.1 ) ) libcxx? ( >=sys-libs/libcxx-11.0.1_rc2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-11.0.1_rc2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sanitize? ( compiler-rt )
+SLOT=11.0.1
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=227477f42947a65af543cd73da80bf66
diff --git a/metadata/md5-cache/sys-devel/gcc-10.2.0-r4 b/metadata/md5-cache/sys-devel/gcc-10.2.0-r4
new file mode 100644
index 000000000000..539520df87ac
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-10.2.0-r4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/binutils >=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=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= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit +pie +ssp +pch systemtap d lto zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+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= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+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-5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.2.0-patches-5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.2.0-patches-5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.2.0-patches-5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.2.0-patches-5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.2.0-patches-5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-5.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	gnuconfig	19d349b47d87bd42d6f8c1f5a4d67460	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	c20246536ba49efcca50ef4502a1bf97	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=396e6ed4935103a6290eed2e0ebf1c8c
diff --git a/metadata/md5-cache/sys-devel/gcc-8.4.0-r2 b/metadata/md5-cache/sys-devel/gcc-8.4.0-r2
new file mode 100644
index 000000000000..ab0c2823dd48
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-8.4.0-r2
@@ -0,0 +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.13 ) >=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= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) systemtap? ( dev-util/systemtap )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit mpx +pie +ssp +pch systemtap
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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.13 ) >=sys-devel/gcc-config-2.3
+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= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+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-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.4.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.4.0-patches-3.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	gnuconfig	19d349b47d87bd42d6f8c1f5a4d67460	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	c20246536ba49efcca50ef4502a1bf97	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=54be3776338de366dbab3e51d991968c
diff --git a/metadata/md5-cache/sys-devel/gcc-9.3.0-r2 b/metadata/md5-cache/sys-devel/gcc-9.3.0-r2
index 3f1170930400..82eeba121c45 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.3.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-9.3.0-r2
@@ -5,7 +5,7 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit +pie +ssp +pch systemtap d lto
-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+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
 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= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
@@ -13,4 +13,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-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-4.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	gnuconfig	19d349b47d87bd42d6f8c1f5a4d67460	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	c20246536ba49efcca50ef4502a1bf97	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=00421ae91df7c107a978cde293ed6fa9
+_md5_=e8f75a9862e64c340bee6f087350082f
diff --git a/metadata/md5-cache/sys-devel/lld-11.0.1_rc2 b/metadata/md5-cache/sys-devel/lld-11.0.1_rc2
new file mode 100644
index 000000000000..51a32000577c
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-11.0.1_rc2
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.9 ~dev-python/lit-11.0.1_rc2[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 ~dev-python/lit-11.0.1_rc2[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 ~dev-python/lit-11.0.1_rc2[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 ~dev-python/lit-11.0.1_rc2[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-11.0.1_rc2 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test test
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=~sys-devel/llvm-11.0.1_rc2
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.1-rc2.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0e21661235a318dc67e16d10d16d2d7
diff --git a/metadata/md5-cache/sys-devel/llvm-11.0.1_rc2 b/metadata/md5-cache/sys-devel/llvm-11.0.1_rc2
new file mode 100644
index 000000000000..eb005374e565
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-11.0.1_rc2
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-11.0.1.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.9 dev-python/recommonmark[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/recommonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-python/sphinx dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) gold? ( sys-libs/binutils-libs )
+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_AVR 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_VE doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-11 )
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR 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_VE )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.1-rc2.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01e45c262a265bd5af00acdc3fbe7303
diff --git a/metadata/md5-cache/sys-devel/llvm-common-11.0.1_rc2 b/metadata/md5-cache/sys-devel/llvm-common-11.0.1_rc2
new file mode 100644
index 000000000000..2a2224099bcc
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-11.0.1_rc2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+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-11.0.1-rc2.tar.gz
+_eclasses_=llvm.org	f9a86faa44b9076b1603ff7c37564776	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=69b5382e6a4c27c13e4114449b987724
diff --git a/metadata/md5-cache/sys-devel/make-4.3 b/metadata/md5-cache/sys-devel/make-4.3
index 27c2c0ce9108..6cb57bf09cfa 100644
--- a/metadata/md5-cache/sys-devel/make-4.3
+++ b/metadata/md5-cache/sys-devel/make-4.3
@@ -5,10 +5,10 @@ DESCRIPTION=Standard tool to compile source trees
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/make/make.html
 IUSE=guile nls static
-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=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-4.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=505882a8781aec3da75d52434487735a
+_md5_=a99c1e5cba6f0d3d4ad9f60052fd35cf
diff --git a/metadata/md5-cache/sys-devel/sparse-0.6.1 b/metadata/md5-cache/sys-devel/sparse-0.6.1
deleted file mode 100644
index 851b61356f67..000000000000
--- a/metadata/md5-cache/sys-devel/sparse-0.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( sys-devel/llvm:9= ) xml? ( dev-libs/libxml2 ) gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
-DESCRIPTION=C semantic parser
-EAPI=7
-HOMEPAGE=https://sparse.wiki.kernel.org/index.php/Main_Page
-IUSE=gtk llvm test xml
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( sys-devel/llvm:9= ) xml? ( dev-libs/libxml2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/devel/sparse/dist/sparse-0.6.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5df62efd3b7f7cb43bc875b6fc007754
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 39f6484d19b9..2edd02a5e8c6 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
index 4fe023a42854..e7016853346c 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst
-DEPEND=!binary? ( amd64? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) ) x86? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) ) )
+DEPEND=!binary? ( amd64? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( app-cdr/cdrtools sys-boot/syslinux ) ) x86? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( app-cdr/cdrtools sys-boot/syslinux ) ) )
 DESCRIPTION=Open source network boot (PXE) firmware
 EAPI=6
 HOMEPAGE=https://ipxe.org/
@@ -10,4 +10,4 @@ REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/546dd51de8459d4d09958891f426fa2c73ff090d.tar.bz2 -> ipxe-1.0.0_p20180211-546dd51.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20180211-546dd51-bin.tar.xz )
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f9697a2bec469ddeac8db39fe6a26628
+_md5_=d3cef17b0437a954e35c3dcb9244f591
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
index 0f9dcb1cf689..16c614ebda1f 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst
-DEPEND=!binary? ( amd64? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) ) x86? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) ) )
+DEPEND=!binary? ( amd64? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( app-cdr/cdrtools sys-boot/syslinux ) ) x86? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( app-cdr/cdrtools sys-boot/syslinux ) ) )
 DESCRIPTION=Open source network boot (PXE) firmware
 EAPI=6
 HOMEPAGE=https://ipxe.org/
@@ -10,4 +10,4 @@ REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3.tar.bz2 -> ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz )
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c6e0f5ff772fac70eba37ccd3ec4bcee
+_md5_=6f5d681071922bab077c6709d5b1a5ce
diff --git a/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32-r1 b/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32-r1
index 4cab15c8a736..3ed3954373b9 100644
--- a/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32-r1
+++ b/metadata/md5-cache/sys-firmware/nvidia-firmware-340.32-r1
@@ -8,5 +8,5 @@ LICENSE=MIT NVIDIA-r2
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://us.download.nvidia.com/XFree86/Linux-x86/340.32/NVIDIA-Linux-x86-340.32.run https://raw.githubusercontent.com/envytools/firmware/a0b9f9be0efad90cc84b8b2eaf587c3d7d350ea9/extract_firmware.py -> nvidia_extract_firmware-a0b9f9be0efad90cc84b8b2eaf587c3d7d350ea9.py
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=089307d421ea46d0204e0286d8862d58
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index b097cf2bf844..d8fcafc3c139 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.24 b/metadata/md5-cache/sys-fs/ddrescue-1.24
index b5f8bd04414e..f1d8608a02e5 100644
--- a/metadata/md5-cache/sys-fs/ddrescue-1.24
+++ b/metadata/md5-cache/sys-fs/ddrescue-1.24
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/ddrescue/ddrescue-1.24.tar.lz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50b7c5038f339c055841a06543065a59
diff --git a/metadata/md5-cache/sys-fs/ddrescue-1.25 b/metadata/md5-cache/sys-fs/ddrescue-1.25
index f04ebeefd02d..ceeaf4e08e4b 100644
--- a/metadata/md5-cache/sys-fs/ddrescue-1.25
+++ b/metadata/md5-cache/sys-fs/ddrescue-1.25
@@ -8,5 +8,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dd5b6154ba59190eb4d51575c1005d4a
diff --git a/metadata/md5-cache/sys-fs/duperemove-0.11.1 b/metadata/md5-cache/sys-fs/duperemove-0.11.1
deleted file mode 100644
index ca5c45674f66..000000000000
--- a/metadata/md5-cache/sys-fs/duperemove-0.11.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2
-DESCRIPTION=Btrfs and xfs deduplication utility
-EAPI=7
-HOMEPAGE=https://github.com/markfasheh/duperemove
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 dev-libs/glib:2
-SLOT=0
-SRC_URI=https://github.com/markfasheh/duperemove/archive/v0.11.1.tar.gz -> duperemove-0.11.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=47497294605a7a66d4f4261248180c85
diff --git a/metadata/md5-cache/sys-fs/duperemove-0.11.2 b/metadata/md5-cache/sys-fs/duperemove-0.11.2
index 045fc9e2fb2f..0578fa3fee13 100644
--- a/metadata/md5-cache/sys-fs/duperemove-0.11.2
+++ b/metadata/md5-cache/sys-fs/duperemove-0.11.2
@@ -3,10 +3,10 @@ DEPEND=dev-db/sqlite:3 dev-libs/glib:2
 DESCRIPTION=Btrfs and xfs deduplication utility
 EAPI=7
 HOMEPAGE=https://github.com/markfasheh/duperemove
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2
 SLOT=0
 SRC_URI=https://github.com/markfasheh/duperemove/archive/v0.11.2.tar.gz -> duperemove-0.11.2.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e32ccc83058d41e8d5ce04e6f8a48ba9
+_md5_=bae120e665aa2cd76b90999f0d8af75e
diff --git a/metadata/md5-cache/sys-fs/iprutils-2.4.17.1 b/metadata/md5-cache/sys-fs/iprutils-2.4.17.1
deleted file mode 100644
index 487345716633..000000000000
--- a/metadata/md5-cache/sys-fs/iprutils-2.4.17.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.4-r5:= >=sys-apps/pciutils-2.1.11-r1 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=IBM's tools for support of the ipr SCSI controller
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/iprdd/
-IUSE=static-libs
-KEYWORDS=~ppc ~ppc64
-LICENSE=IBM
-RDEPEND=>=sys-libs/ncurses-5.4-r5:= >=sys-apps/pciutils-2.1.11-r1 virtual/logger virtual/udev
-SLOT=0
-SRC_URI=mirror://sourceforge/iprdd/iprutils-2.4.17.1.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a1a07af1a8519946db39a378cafa0753
diff --git a/metadata/md5-cache/sys-fs/iprutils-2.4.7 b/metadata/md5-cache/sys-fs/iprutils-2.4.7
deleted file mode 100644
index 575814de5c9e..000000000000
--- a/metadata/md5-cache/sys-fs/iprutils-2.4.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.4-r5 >=sys-apps/pciutils-2.1.11-r1 virtual/udev >=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=IBM's tools for support of the ipr SCSI controller
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/iprdd/
-IUSE=static-libs
-KEYWORDS=ppc ppc64
-LICENSE=IBM
-RDEPEND=>=sys-libs/ncurses-5.4-r5 >=sys-apps/pciutils-2.1.11-r1 virtual/udev virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/iprdd/iprutils-2.4.7.tar.gz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=becdbb746ba995b9fbf41a243d2abc88
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5 b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5-r1
similarity index 66%
rename from metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5
rename to metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5-r1
index 5d8dd26ae2ac..e9e83d032b3e 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install setup
 DEPEND=sys-apps/util-linux:0= ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) sys-apps/attr
 DESCRIPTION=Open source read-write NTFS driver that runs under FUSE
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux:0= ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 )
 SLOT=0/885
 SRC_URI=https://jp-andre.pagesperso-orange.fr/ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=51ba764c1913250673ad0414133ea2f6
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=29334ce512cf6ee78af4ab00df219605
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-4.4 b/metadata/md5-cache/sys-fs/squashfs-tools-4.4
deleted file mode 100644
index fd318abdd61d..000000000000
--- a/metadata/md5-cache/sys-fs/squashfs-tools-4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=!static? ( sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) zstd? ( app-arch/zstd ) ) static? ( sys-libs/zlib[static-libs(+)] !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) lz4? ( app-arch/lz4[static-libs(+)] ) lzma? ( app-arch/xz-utils[static-libs(+)] ) lzo? ( dev-libs/lzo[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xz? ( app-arch/xz-utils[static-libs(+)] ) zstd? ( app-arch/zstd[static-libs(+)] ) )
-DESCRIPTION=tools to create and extract Squashfs filesystems
-EAPI=7
-HOMEPAGE=https://github.com/plougher/squashfs-tools
-IUSE=debug lz4 lzma lzo static xattr +xz zstd
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=!static? ( sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) zstd? ( app-arch/zstd ) )
-SLOT=0
-SRC_URI=https://github.com/plougher/squashfs-tools/archive/4.4.tar.gz -> squashfs-tools-4.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fa7b379e4bc632e315a1a9e59917daff
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-4.4-r1 b/metadata/md5-cache/sys-fs/squashfs-tools-4.4-r1
deleted file mode 100644
index d38652fd8c5b..000000000000
--- a/metadata/md5-cache/sys-fs/squashfs-tools-4.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=sys-libs/zlib lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) zstd? ( app-arch/zstd )
-DESCRIPTION=tools to create and extract Squashfs filesystems
-EAPI=7
-HOMEPAGE=https://github.com/plougher/squashfs-tools
-IUSE=debug lz4 lzma lzo xattr zstd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) zstd? ( app-arch/zstd )
-SLOT=0
-SRC_URI=https://github.com/plougher/squashfs-tools/archive/4.4.tar.gz -> squashfs-tools-4.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ecbe2e490fa8f7db816efa1a44d8799c
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-4.4_p1 b/metadata/md5-cache/sys-fs/squashfs-tools-4.4_p1
index d6ca107ab296..56fd649ada11 100644
--- a/metadata/md5-cache/sys-fs/squashfs-tools-4.4_p1
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-4.4_p1
@@ -4,10 +4,10 @@ DESCRIPTION=tools to create and extract Squashfs filesystems
 EAPI=7
 HOMEPAGE=https://github.com/plougher/squashfs-tools/
 IUSE=debug lz4 lzma lzo xattr zstd
-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-libs/zlib lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) zstd? ( app-arch/zstd )
 SLOT=0
 SRC_URI=https://github.com/plougher/squashfs-tools/archive/4.4-git.1.tar.gz -> squashfs-tools-4.4-git.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=14aa69cc40f39d4fe78f78caf8962782
+_md5_=7b3a460716963867cc36c4b1e5e81a16
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-5.10.0 b/metadata/md5-cache/sys-fs/xfsprogs-5.10.0
index be3b3b67a765..4b75c0d4afa2 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-5.10.0
+++ b/metadata/md5-cache/sys-fs/xfsprogs-5.10.0
@@ -11,4 +11,4 @@ RDEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) libedit? ( dev-libs
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.10.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a6cf039be9c076a6bf38c869f813afac
+_md5_=31dc643859888c83f0ccc9dba0a0cd36
diff --git a/metadata/md5-cache/sys-fs/zerofree-1.1.1 b/metadata/md5-cache/sys-fs/zerofree-1.1.1
index 76f3da853e1d..229a8fa78217 100644
--- a/metadata/md5-cache/sys-fs/zerofree-1.1.1
+++ b/metadata/md5-cache/sys-fs/zerofree-1.1.1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/e2fsprogs-libs
 DESCRIPTION=Zeroes out all free space on a filesystem
 EAPI=7
 HOMEPAGE=http://frippery.org/uml/index.html
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/e2fsprogs-libs
 SLOT=0
 SRC_URI=http://frippery.org/uml/zerofree-1.1.1.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4c76c2bb902f555f6dddafe2f0dc01c4
+_md5_=39d9ac3ad71cf73b8c41b83432d2889d
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.8.6 b/metadata/md5-cache/sys-fs/zfs-kmod-0.8.6
index 959bc9832f32..30c4a0e0e9e1 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.8.6
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.8.6
@@ -12,4 +12,4 @@ RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-0.8.6/zfs-0.8.6.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c599f7670fe3ed1ffd7d730f5c18ec06
+_md5_=c08279695e9ea434d7920bee7c37e5ae
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 4360b0466fd6..ee6cc71ce83f 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/dracut-051 b/metadata/md5-cache/sys-kernel/dracut-051-r1
similarity index 96%
rename from metadata/md5-cache/sys-kernel/dracut-051
rename to metadata/md5-cache/sys-kernel/dracut-051-r1
index cb12b1d490e6..f5785a72ab0e 100644
--- a/metadata/md5-cache/sys-kernel/dracut-051
+++ b/metadata/md5-cache/sys-kernel/dracut-051-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-051.tar.xz
 _eclasses_=bash-completion-r1	20058ccf29bb27d8da5ebf2fd48c60c2	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6c9aa35fc16df43d7142ef2660e00e25	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=60b7ae76d18fd508a595b477080927db
+_md5_=7e70e6c795e7630f2f236cc72e91a5ca
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.1-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.1-r1
new file mode 100644
index 000000000000..cbb0f71643d7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) 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 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.10.1 !sys-kernel/vanilla-kernel-bin:5.10.1 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.1
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-3.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.9.8-r1.tar.gz -> gentoo-kernel-config-5.9.8-r1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/12700e38e8ba0a7be437a4c5804ba0e6417fdc24/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.0 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/12700e38e8ba0a7be437a4c5804ba0e6417fdc24/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.0 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/12700e38e8ba0a7be437a4c5804ba0e6417fdc24/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.0 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/12700e38e8ba0a7be437a4c5804ba0e6417fdc24/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.0 )
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=498935699dd2d26431706a424a062738
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.84 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.84
new file mode 100644
index 000000000000..6aad347654cf
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.84
@@ -0,0 +1,14 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) 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 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.4.84 !sys-kernel/vanilla-kernel-bin:5.4.84 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.84
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-86.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-86.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.77-r1.tar.gz -> gentoo-kernel-config-5.4.77-r1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.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	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=96d050f286a796b5e6ef65d7632e4e02
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.15 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.15
new file mode 100644
index 000000000000..5758ab9bc777
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.15
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) 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 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.9.15 !sys-kernel/vanilla-kernel-bin:5.9.15 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.9.15
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-15.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.9.8-r1.tar.gz -> gentoo-kernel-config-5.9.8-r1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.13 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.13 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.13 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.13 )
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=67e14e777fa9f216bead2199d9c779d5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.1-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.1-r1
new file mode 100644
index 000000000000..7153c79d2a76
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) 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.10.1 !sys-kernel/vanilla-kernel:5.10.1 !sys-kernel/vanilla-kernel-bin:5.10.1 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.1
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.1-r1-1.xpak -> gentoo-kernel-5.10.1-r1-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.1-r1-1.xpak -> gentoo-kernel-5.10.1-r1-1.x86.xpak )
+_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=957bf50fab09d11983c8260cdf99f7f2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.84 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.84
new file mode 100644
index 000000000000..761bf90c3108
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.84
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) 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.84 !sys-kernel/vanilla-kernel:5.4.84 !sys-kernel/vanilla-kernel-bin:5.4.84 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.84
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.84-1.xpak -> gentoo-kernel-5.4.84-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.84-1.xpak -> gentoo-kernel-5.4.84-1.x86.xpak )
+_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.84-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.84-r1
new file mode 100644
index 000000000000..19cf8f9328b1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.84-r1
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) 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=~arm64
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.84 !sys-kernel/vanilla-kernel:5.4.84 !sys-kernel/vanilla-kernel-bin:5.4.84 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.84
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.84-1.xpak -> gentoo-kernel-5.4.84-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.84-1.xpak -> gentoo-kernel-5.4.84-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.84-1.xpak -> gentoo-kernel-5.4.84-1.x86.xpak )
+_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a233ac0f8da53036540d5f704213ef4e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.15 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.15
new file mode 100644
index 000000000000..c3ea88140342
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.15
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) 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.9.15 !sys-kernel/vanilla-kernel:5.9.15 !sys-kernel/vanilla-kernel-bin:5.9.15 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.9.15
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.15-1.xpak -> gentoo-kernel-5.9.15-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.15-1.xpak -> gentoo-kernel-5.9.15-1.x86.xpak )
+_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.1-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.1-r1
new file mode 100644
index 000000000000..812cde2802c4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.1-r1
@@ -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.10 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.10.1-r1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-3.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-3.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-3.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-3.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-3.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-3.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-3.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-3.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	d780995dc525ff7e6a2c4c043ffec242	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e5741d6ea2432ea49231eb084f3dbace
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.10_p1 b/metadata/md5-cache/sys-kernel/pf-sources-5.10_p1-r1
similarity index 85%
rename from metadata/md5-cache/sys-kernel/pf-sources-5.10_p1
rename to metadata/md5-cache/sys-kernel/pf-sources-5.10_p1-r1
index ceea387f5c97..f0245fdd9612 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.10_p1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.10_p1-r1
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~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.10_p1
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.10...v5.10-pf1.diff -> pf-sources-5.10_p1.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.10-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.10-1.extras.tar.xz
+SLOT=5.10_p1-r1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.10...v5.10-pf1.diff -> pf-sources-5.10_p1.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.10-3.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.10-3.extras.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	d780995dc525ff7e6a2c4c043ffec242	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=81b8cc000b97905db21c170c3891e759
+_md5_=0eca0e5abd4614e1cb213eee424548b6
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.1 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.1
index 274f4ccd6134..0a9be7610b74 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.1
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.1
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.1.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.9.8-r1.tar.gz -> gentoo-kernel-config-5.9.8-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.1.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/12700e38e8ba0a7be437a4c5804ba0e6417fdc24/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.0 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/12700e38e8ba0a7be437a4c5804ba0e6417fdc24/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.0 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/12700e38e8ba0a7be437a4c5804ba0e6417fdc24/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.0 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/12700e38e8ba0a7be437a4c5804ba0e6417fdc24/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.0 )
 _eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=ea253f252da7e88588b051806e735c01
+_md5_=aae5c978834831647db4eeb84748e1b1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.78 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.78
index 6c9784235c98..ad38c9b04e3c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.78
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.78
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.78
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.78.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.77-r1.tar.gz -> gentoo-kernel-config-5.4.77-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.78.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.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	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=270127bc525d061891eea08f7b769945
+_md5_=1a8d810b7da3d187362601d4a0739f26
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.79 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.79
index 56354a52e8da..8d22af438bae 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.79
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.79
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.79
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.79.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.77-r1.tar.gz -> gentoo-kernel-config-5.4.77-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.79.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.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	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=270127bc525d061891eea08f7b769945
+_md5_=1a8d810b7da3d187362601d4a0739f26
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.80 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.80
index 5bc19bc44e03..5efcdc7c8f9a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.80
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.80
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.80
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.80.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.77-r1.tar.gz -> gentoo-kernel-config-5.4.77-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.80.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.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	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=270127bc525d061891eea08f7b769945
+_md5_=1a8d810b7da3d187362601d4a0739f26
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.81 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.81
index ab1d587b5377..5cb1d29c9d92 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.81
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.81
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.81
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.81.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.77-r1.tar.gz -> gentoo-kernel-config-5.4.77-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.81.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.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	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=270127bc525d061891eea08f7b769945
+_md5_=1a8d810b7da3d187362601d4a0739f26
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.82 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.82
index aa8acff4ee69..81e5995d8708 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.82
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.82
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.82
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.82.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.77-r1.tar.gz -> gentoo-kernel-config-5.4.77-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.82.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.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	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=270127bc525d061891eea08f7b769945
+_md5_=1a8d810b7da3d187362601d4a0739f26
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.83 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.83
index 2a61eec86cff..4756e4a4f97b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.83
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.83
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.83
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.83.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.77-r1.tar.gz -> gentoo-kernel-config-5.4.77-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.83.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.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	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=270127bc525d061891eea08f7b769945
+_md5_=1a8d810b7da3d187362601d4a0739f26
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.84 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.84
new file mode 100644
index 000000000000..897b6f6a9ca0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.84
@@ -0,0 +1,14 @@
+BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.84 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.84
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.84.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.77-r1.tar.gz -> gentoo-kernel-config-5.4.77-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.84.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.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	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=1a8d810b7da3d187362601d4a0739f26
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.10 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.10
index e2d7a5025a7e..4a038b335e43 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.10
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.10
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.9.10
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.10.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.9.8-r1.tar.gz -> gentoo-kernel-config-5.9.8-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.10.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
 _eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=ab05edaa61e2c7b33ec81d910edd2658
+_md5_=efaa2b8b9fad3a4b3f5d7241202d12ab
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.11 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.11
index ab8a3ec9a85c..91801430eccb 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.11
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.11
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.9.11
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.11.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.9.8-r1.tar.gz -> gentoo-kernel-config-5.9.8-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.11.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
 _eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=ab05edaa61e2c7b33ec81d910edd2658
+_md5_=efaa2b8b9fad3a4b3f5d7241202d12ab
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.12 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.12
index ac50e2ac4835..8b20693eb0ad 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.12
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.12
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.9.12
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.12.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.9.8-r1.tar.gz -> gentoo-kernel-config-5.9.8-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.12.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
 _eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=ab05edaa61e2c7b33ec81d910edd2658
+_md5_=efaa2b8b9fad3a4b3f5d7241202d12ab
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.13 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.13
index 63bfc38428a9..9e6fe679d97c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.13
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.13
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.9.13
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.13.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.9.8-r1.tar.gz -> gentoo-kernel-config-5.9.8-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.13.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.13 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.13 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.13 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.13 )
 _eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=582852c9d3397173a25b4ff5d09ac6c7
+_md5_=20efdb8e9f5a8eaade328bad646ce456
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.14 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.14
index 355d29ee0e30..db524946afaf 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.14
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.14
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.9.14
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.14.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.9.8-r1.tar.gz -> gentoo-kernel-config-5.9.8-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.14.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.13 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.13 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.13 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.13 )
 _eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=582852c9d3397173a25b4ff5d09ac6c7
+_md5_=20efdb8e9f5a8eaade328bad646ce456
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.15 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.15
new file mode 100644
index 000000000000..34b58e3823d5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.15
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.9.15 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.9.15
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.15.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.9.8-r1.tar.gz -> gentoo-kernel-config-5.9.8-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.15.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.13 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.13 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.13 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/b57160e20ddbe02624d2652e6836b0cb73044a4e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.13 )
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=20efdb8e9f5a8eaade328bad646ce456
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.9 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.9
index 20df13882a43..e5bcee5ff939 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.9
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.9
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.9.9
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.9.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.9.8-r1.tar.gz -> gentoo-kernel-config-5.9.8-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.9.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
 _eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	1142b2ccb57f0bb5ae58b806089e08f0	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=ab05edaa61e2c7b33ec81d910edd2658
+_md5_=efaa2b8b9fad3a4b3f5d7241202d12ab
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 0cd32c58a63b..7afa4089df47 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/compiler-rt-11.0.1_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-11.0.1_rc2
new file mode 100644
index 000000000000..bccbb5f60c94
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-11.0.1_rc2
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.9 >=dev-python/lit-9.0.1[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 >=dev-python/lit-9.0.1[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-11.0.1*:11 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=11.0.1
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.1-rc2.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe6769fd950f9592149b8d337b822717
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.1_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.1_rc2
new file mode 100644
index 000000000000..79407063796a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.1_rc2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.9 >=dev-python/lit-5[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 >=dev-python/lit-5[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/lit-5[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-5[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-11.0.1*:11 sys-libs/compiler-rt:11.0.1 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc test
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
+RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
+SLOT=11.0.1
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.1-rc2.tar.gz
+_eclasses_=check-reqs	38804be59703af0fbf462b3710024074	cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3c35d617e3e0e9461f5a9dfb13624942
diff --git a/metadata/md5-cache/sys-libs/cygwin-crypt-1.4 b/metadata/md5-cache/sys-libs/cygwin-crypt-1.4
index 1c1f68aab1ac..f43185449751 100644
--- a/metadata/md5-cache/sys-libs/cygwin-crypt-1.4
+++ b/metadata/md5-cache/sys-libs/cygwin-crypt-1.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Cygwin Encryption/Decryption utility and library
 EAPI=5
 HOMEPAGE=https://sourceware.org/cygwin-apps/
-KEYWORDS=~x64-cygwin ~x86-cygwin
+KEYWORDS=~x64-cygwin
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gentoo/cygwin-crypt-1.4.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e1952015c48c3e7c4da10f394b45fe20
+_md5_=35a1769b94240cf62585b43f89298b7e
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r11 b/metadata/md5-cache/sys-libs/glibc-2.25-r11
index ec0b5f5d628f..f5a85007c06a 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r11
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r11
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-15.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	gnuconfig	19d349b47d87bd42d6f8c1f5a4d67460	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	toolchain-glibc	15d87aa39f413c53abf65d756d9c6a36	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	gnuconfig	19d349b47d87bd42d6f8c1f5a4d67460	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	toolchain-glibc	15d87aa39f413c53abf65d756d9c6a36	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=feb6af49c3d2465247be90f123a4bf25
diff --git a/metadata/md5-cache/sys-libs/libcxx-11.0.1_rc2 b/metadata/md5-cache/sys-libs/libcxx-11.0.1_rc2
new file mode 100644
index 000000000000..e5a2f8bf6df5
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-11.0.1_rc2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-11.0.1_rc2[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+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_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-11.0.1_rc2[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=libunwind? ( libcxxabi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.1-rc2.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=83571f434b77398a6a5b810d04043fa9
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-11.0.1_rc2 b/metadata/md5-cache/sys-libs/libcxxabi-11.0.1_rc2
new file mode 100644
index 000000000000..ae1ab3af347e
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-11.0.1_rc2
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_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_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=7
+HOMEPAGE=https://libcxxabi.llvm.org/
+IUSE=+libunwind +static-libs test elibc_musl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+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_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_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.1-rc2.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=99a58284d2818fe272894ca9ef785bad
diff --git a/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1 b/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
deleted file mode 100644
index d5d112f2dba0..000000000000
--- a/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/popt >=sys-apps/pciutils-2.2.4[zlib?] zlib? ( sys-libs/zlib )
-DESCRIPTION=Red Hat Hardware detection tools
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=zlib kernel_linux
-KEYWORDS=~alpha amd64 hppa ~ia64 -mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/popt >=sys-apps/pciutils-2.2.4[zlib?] zlib? ( sys-libs/zlib ) sys-apps/hwdata-gentoo !sys-apps/kudzu
-SLOT=0
-SRC_URI=mirror://gentoo/kudzu-1.2.57.1.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=052705a2c2aa8ba8b4edd6ae9e193270
diff --git a/metadata/md5-cache/sys-libs/libomp-11.0.1_rc2 b/metadata/md5-cache/sys-libs/libomp-11.0.1_rc2
new file mode 100644
index 000000000000..d2ac91346b9b
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-11.0.1_rc2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig ) test? ( || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+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_s390_32 abi_s390_64 kernel_linux
+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_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_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_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.1-rc2.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fd02b832218f4dcc433eeda7cb7721b9
diff --git a/metadata/md5-cache/sys-libs/libvpd-2.2.6 b/metadata/md5-cache/sys-libs/libvpd-2.2.6
deleted file mode 100644
index 8e4cc0dfc367..000000000000
--- a/metadata/md5-cache/sys-libs/libvpd-2.2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=>=dev-db/sqlite-3.7.8 sys-libs/zlib
-DESCRIPTION=Library implementation for listing vpds
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/linux-diag/
-IUSE=static-libs
-KEYWORDS=ppc ppc64
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-db/sqlite-3.7.8 sys-libs/zlib
-SLOT=0
-SRC_URI=https://sourceforge.net/projects/linux-diag/files/libvpd/2.2.6/libvpd-2.2.6.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=935d5c5816ab3ea0f916c6996cd41ab7
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.1_rc2 b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.1_rc2
new file mode 100644
index 000000000000..a2443e424f41
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.1_rc2
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=7
+HOMEPAGE=https://github.com/llvm-mirror/libunwind
+IUSE=debug +static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.1-rc2.tar.gz
+_eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0a56ba55f87b43835462bb5f98f7cab6
diff --git a/metadata/md5-cache/sys-libs/readline-6.3_p8-r3 b/metadata/md5-cache/sys-libs/readline-6.3_p8-r3
deleted file mode 100644
index be9bbe7637b6..000000000000
--- a/metadata/md5-cache/sys-libs/readline-6.3_p8-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=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_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-DESCRIPTION=Another cute console display library
-EAPI=5
-HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
-IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-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_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=mirror://gnu/readline/readline-6.3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-001 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-002 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-003 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-004 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-005 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-006 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-007 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-008 mirror://gnu/readline/readline-6.3-patches/readline63-001 mirror://gnu/readline/readline-6.3-patches/readline63-002 mirror://gnu/readline/readline-6.3-patches/readline63-003 mirror://gnu/readline/readline-6.3-patches/readline63-004 mirror://gnu/readline/readline-6.3-patches/readline63-005 mirror://gnu/readline/readline-6.3-patches/readline63-006 mirror://gnu/readline/readline-6.3-patches/readline63-007 mirror://gnu/readline/readline-6.3-patches/readline63-008
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9e43196753d918c3227999ea9c614ff9
diff --git a/metadata/md5-cache/sys-libs/readline-7.0_p5-r1 b/metadata/md5-cache/sys-libs/readline-7.0_p5-r1
deleted file mode 100644
index 4b1d303ebc9c..000000000000
--- a/metadata/md5-cache/sys-libs/readline-7.0_p5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-DESCRIPTION=Another cute console display library
-EAPI=6
-HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
-IUSE=static-libs +unicode utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/7
-SRC_URI=mirror://gnu/readline/readline-7.0.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-001 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-002 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-003 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-004 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-005 mirror://gnu/readline/readline-7.0-patches/readline70-001 mirror://gnu/readline/readline-7.0-patches/readline70-002 mirror://gnu/readline/readline-7.0-patches/readline70-003 mirror://gnu/readline/readline-7.0-patches/readline70-004 mirror://gnu/readline/readline-7.0-patches/readline70-005
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1e19f36b13b9ffc3b7eeb014c40a4497
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2020a b/metadata/md5-cache/sys-libs/timezone-data-2020a
deleted file mode 100644
index befbaf1fd832..000000000000
--- a/metadata/md5-cache/sys-libs/timezone-data-2020a
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare test
-DEPEND=nls? ( virtual/libintl )
-DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
-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 ~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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2db2a8e3780daf4088e680f0ea1e4b64
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index e4f3531377d3..2f8732102d26 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/htop-3.0.2 b/metadata/md5-cache/sys-process/htop-3.0.2
index 2992ae25c053..4bc1ea4f9474 100644
--- a/metadata/md5-cache/sys-process/htop-3.0.2
+++ b/metadata/md5-cache/sys-process/htop-3.0.2
@@ -5,10 +5,10 @@ DESCRIPTION=interactive process viewer
 EAPI=7
 HOMEPAGE=https://htop.dev/ https://github.com/htop-dev/htop
 IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?]
 SLOT=0
 SRC_URI=https://github.com/htop-dev/htop/archive/3.0.2.tar.gz -> htop-3.0.2.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c03a77bf69121c3641d6ae757cf3f7ce
+_md5_=03fa71882546c1e6902a0dd845275299
diff --git a/metadata/md5-cache/sys-process/parallel-20200922 b/metadata/md5-cache/sys-process/parallel-20200922
deleted file mode 100644
index 9d6bac4eeda0..000000000000
--- a/metadata/md5-cache/sys-process/parallel-20200922
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git
-KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-SLOT=0
-SRC_URI=mirror://gnu/parallel/parallel-20200922.tar.bz2
-_md5_=e6f3aa96f32a294b1d551a5cec55c6bd
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 0f68988b65c5..179d4d3cad60 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/acl-0 b/metadata/md5-cache/virtual/acl-0
index a760203bfcc4..fae7493647ad 100644
--- a/metadata/md5-cache/virtual/acl-0
+++ b/metadata/md5-cache/virtual/acl-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for acl support (sys/acl.h)
 EAPI=5
-KEYWORDS=~alpha amd64 arm ~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
 RDEPEND=kernel_linux? ( sys-apps/acl )
 SLOT=0
-_md5_=b77a939eda436f770df698d48e5757bd
+_md5_=84dd6ea5cbd8323bd66f0333795456ca
diff --git a/metadata/md5-cache/virtual/acl-0-r2 b/metadata/md5-cache/virtual/acl-0-r2
index 8ae3622f4827..53cbd1fac266 100644
--- a/metadata/md5-cache/virtual/acl-0-r2
+++ b/metadata/md5-cache/virtual/acl-0-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for acl support (sys/acl.h)
 EAPI=5
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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
 RDEPEND=kernel_linux? ( >=sys-apps/acl-2.2.52-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dbeba72fef0fc09de886b6cb300243b0
+_md5_=12b5d467c80517fbeb82fc040672efe5
diff --git a/metadata/md5-cache/virtual/awk-1 b/metadata/md5-cache/virtual/awk-1
index 483831bfdadc..24787dd5b5ba 100644
--- a/metadata/md5-cache/virtual/awk-1
+++ b/metadata/md5-cache/virtual/awk-1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for awk implementation
 EAPI=5
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
+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=|| ( >=sys-apps/gawk-4.0.1-r1 sys-apps/mawk sys-apps/nawk sys-apps/busybox ) !<sys-apps/gawk-4.0.1-r1
 SLOT=0
-_md5_=ca7f3f5b398f6626c2e52684d7d0dc7e
+_md5_=a40668df0e1f3472767931ae5ecf4397
diff --git a/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2 b/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
index b58ffc4519df..7d9329e3c5c0 100644
--- a/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
+++ b/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for LevelDB versions known to be compatible with Bitcoin Core 0.9+
 EAPI=5
-KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=|| ( =dev-libs/leveldb-1.20 =dev-libs/leveldb-1.18-r2 =dev-libs/leveldb-1.18 =dev-libs/leveldb-1.17 =dev-libs/leveldb-1.15.0-r1 )
 SLOT=0
-_md5_=8b028bf466217fe944ca7c4b44ccb637
+_md5_=8e12c2826a8ba19f4f71a4722cd88fbc
diff --git a/metadata/md5-cache/virtual/cdrtools-0 b/metadata/md5-cache/virtual/cdrtools-0
deleted file mode 100644
index 7ef7eae82395..000000000000
--- a/metadata/md5-cache/virtual/cdrtools-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for command-line recorders cdrtools and cdrkit
-EAPI=5
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-RDEPEND=|| ( app-cdr/cdrtools app-cdr/cdrkit )
-SLOT=0
-_md5_=b2fc61f59533f030317dff4d1bfad1ae
diff --git a/metadata/md5-cache/virtual/commonlisp-0 b/metadata/md5-cache/virtual/commonlisp-0
index ec3f109e59ad..07130b32933a 100644
--- a/metadata/md5-cache/virtual/commonlisp-0
+++ b/metadata/md5-cache/virtual/commonlisp-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Common Lisp
 EAPI=6
-KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
 RDEPEND=|| ( dev-lisp/sbcl dev-lisp/clisp dev-lisp/clozurecl dev-lisp/cmucl dev-lisp/ecls dev-lisp/gcl dev-lisp/abcl )
 SLOT=0
-_md5_=cb75af783069b9b5fe599b76ea61bfb2
+_md5_=c9f0443cbfa01756f605b99d25e6f095
diff --git a/metadata/md5-cache/virtual/eject-0-r1 b/metadata/md5-cache/virtual/eject-0-r1
index 2e1eefd8497e..48605ccf44f6 100644
--- a/metadata/md5-cache/virtual/eject-0-r1
+++ b/metadata/md5-cache/virtual/eject-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the eject command
 EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 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
 RDEPEND=|| ( >=sys-apps/util-linux-2.22 sys-block/eject-bsd )
 SLOT=0
-_md5_=50cc2aa2855c9616576bc56a9fbf726a
+_md5_=2fa72c963e6c99e42c100fda7ecf1c44
diff --git a/metadata/md5-cache/virtual/fortran-0 b/metadata/md5-cache/virtual/fortran-0
index eeaa2e213d6d..258dc384806f 100644
--- a/metadata/md5-cache/virtual/fortran-0
+++ b/metadata/md5-cache/virtual/fortran-0
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Fortran Compiler
 EAPI=6
 IUSE=openmp
-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
+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 ~sparc-solaris
 RDEPEND=|| ( sys-devel/gcc[fortran,openmp?] sys-devel/gcc-apple[fortran,openmp?] dev-lang/ekopath dev-lang/ifc )
 SLOT=0
-_md5_=0dff872196365db618c384952c559ade
+_md5_=72d5f4f4e5fc138e711c62cd5d1b31c3
diff --git a/metadata/md5-cache/virtual/gsasl-2 b/metadata/md5-cache/virtual/gsasl-2
index 8232968fa446..248cac646583 100644
--- a/metadata/md5-cache/virtual/gsasl-2
+++ b/metadata/md5-cache/virtual/gsasl-2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU SASL library
 EAPI=5
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( net-libs/libgsasl net-misc/gsasl )
 SLOT=0
-_md5_=b92ade940681f8a5ef0cebe40e4508b6
+_md5_=4b3bf18fd2fd75aae0dac6dc2461485c
diff --git a/metadata/md5-cache/virtual/httpd-basic-0-r2 b/metadata/md5-cache/virtual/httpd-basic-0-r2
index 6545807b6092..d09c5a109803 100644
--- a/metadata/md5-cache/virtual/httpd-basic-0-r2
+++ b/metadata/md5-cache/virtual/httpd-basic-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for static HTML-enabled webservers
 EAPI=5
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/bozohttpd www-servers/cherokee www-servers/fnord www-servers/hiawatha www-servers/monkeyd www-servers/nginx www-servers/resin www-servers/thttpd www-servers/tomcat )
 SLOT=0
-_md5_=553482a0e0ba64129bd82f3507eb374a
+_md5_=5b916d92df6ed70be08c26cd889279b1
diff --git a/metadata/md5-cache/virtual/httpd-cgi-0-r1 b/metadata/md5-cache/virtual/httpd-cgi-0-r1
index b9d1e07ebf07..37863c495055 100644
--- a/metadata/md5-cache/virtual/httpd-cgi-0-r1
+++ b/metadata/md5-cache/virtual/httpd-cgi-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CGI-enabled webservers
 EAPI=5
-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 ~m68k-mint ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/bozohttpd www-servers/cherokee www-servers/fnord www-servers/monkeyd www-servers/nginx www-servers/resin www-servers/thttpd www-servers/tomcat )
 SLOT=0
-_md5_=3585210a15e37875cbe2b92fd2102c07
+_md5_=5e28025b610de1482b4bbe942ff7b281
diff --git a/metadata/md5-cache/virtual/httpd-cgi-0-r2 b/metadata/md5-cache/virtual/httpd-cgi-0-r2
index 2ec87d2d26ef..9643d448f647 100644
--- a/metadata/md5-cache/virtual/httpd-cgi-0-r2
+++ b/metadata/md5-cache/virtual/httpd-cgi-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CGI-enabled webservers
 EAPI=5
-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 ~m68k-mint ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( www-servers/apache www-servers/lighttpd www-servers/boa www-servers/bozohttpd www-servers/cherokee www-servers/fnord www-servers/hiawatha www-servers/monkeyd www-servers/nginx www-servers/resin www-servers/thttpd www-servers/tomcat )
 SLOT=0
-_md5_=20b27a1fd181ded86196fbb46f15504d
+_md5_=4556b5074198daecd03ef8e0d58bb4d5
diff --git a/metadata/md5-cache/virtual/httpd-fastcgi-0-r1 b/metadata/md5-cache/virtual/httpd-fastcgi-0-r1
index b7a6a07ab934..94f50a64e709 100644
--- a/metadata/md5-cache/virtual/httpd-fastcgi-0-r1
+++ b/metadata/md5-cache/virtual/httpd-fastcgi-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for FastCGI-enabled webservers
 EAPI=5
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=|| ( www-apache/mod_fcgid www-servers/lighttpd www-servers/bozohttpd www-servers/nginx www-servers/resin www-servers/cherokee )
 SLOT=0
-_md5_=a4975e2016b0fdbfc8c3a02824c99139
+_md5_=ab6d28ac9734f507b4247fb39ba1a194
diff --git a/metadata/md5-cache/virtual/imap-c-client-1 b/metadata/md5-cache/virtual/imap-c-client-1
index 0c9308f8e672..0b76f6f5adb8 100644
--- a/metadata/md5-cache/virtual/imap-c-client-1
+++ b/metadata/md5-cache/virtual/imap-c-client-1
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for IMAP c-client
 EAPI=5
 IUSE=ssl
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 RDEPEND=|| ( net-libs/c-client[ssl=] net-mail/uw-imap[ssl=] )
 SLOT=0
-_md5_=f691607d195d81aec3edcc801d0516e3
+_md5_=575fbf2c25ba922beebaaf504a643acb
diff --git a/metadata/md5-cache/virtual/imap-c-client-2 b/metadata/md5-cache/virtual/imap-c-client-2
index ea5f301ca29f..36a674223516 100644
--- a/metadata/md5-cache/virtual/imap-c-client-2
+++ b/metadata/md5-cache/virtual/imap-c-client-2
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for IMAP c-client
 EAPI=6
 IUSE=kerberos ssl
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 RDEPEND=|| ( net-libs/c-client[kerberos=,ssl=] net-mail/uw-imap[kerberos=,ssl=] )
 SLOT=0
-_md5_=700e6c1307cece4fcb1191fff4cf322c
+_md5_=959e2b79bb247e55a9fb4b00ca6c63ac
diff --git a/metadata/md5-cache/virtual/jpeg-compat-62 b/metadata/md5-cache/virtual/jpeg-compat-62
index 75cd17b6c98a..9ffcc811f4bb 100644
--- a/metadata/md5-cache/virtual/jpeg-compat-62
+++ b/metadata/md5-cache/virtual/jpeg-compat-62
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for the libjpeg.so.62 ABI for binary-only programs
 EAPI=7
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 RDEPEND=|| ( >=media-libs/libjpeg-turbo-1.3.0-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/jpeg-6b-r12:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=62
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0e9c647c0a55f32c686a41ba42745d52
+_md5_=9777c016fe0f347fd0ddd099cdc406cf
diff --git a/metadata/md5-cache/virtual/libcrypt-1-r1 b/metadata/md5-cache/virtual/libcrypt-1-r1
index 384bf7c28fa0..7a1f1ee24eea 100644
--- a/metadata/md5-cache/virtual/libcrypt-1-r1
+++ b/metadata/md5-cache/virtual/libcrypt-1-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libcrypt.so
 EAPI=7
 IUSE=+static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-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
 RDEPEND=!prefix-guest? ( elibc_glibc? ( sys-libs/glibc[crypt(+),static-libs(+)?] ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( sys-libs/uclibc-ng ) ) elibc_Cygwin? ( sys-libs/cygwin-crypt )
 SLOT=0/1
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f6431b9ad210be311654ff3e80453871
+_md5_=e16ff149ec023fcc295def6e117ce6d8
diff --git a/metadata/md5-cache/virtual/libcrypt-2 b/metadata/md5-cache/virtual/libcrypt-2
index bedd9befe0e8..a8014e5cd923 100644
--- a/metadata/md5-cache/virtual/libcrypt-2
+++ b/metadata/md5-cache/virtual/libcrypt-2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libcrypt.so
 EAPI=7
 IUSE=+static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-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
 RDEPEND=!prefix-guest? ( elibc_glibc? ( sys-libs/libxcrypt[system(-),static-libs(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( sys-libs/uclibc-ng ) ) elibc_Cygwin? ( sys-libs/cygwin-crypt )
 SLOT=0/2
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=451cc20502bc0700cc2f09581ea6bf25
+_md5_=2e1efd1a1dca9506b3a3aee1498d1595
diff --git a/metadata/md5-cache/virtual/libgudev-230 b/metadata/md5-cache/virtual/libgudev-230
index db3282d89115..d0f71968f745 100644
--- a/metadata/md5-cache/virtual/libgudev-230
+++ b/metadata/md5-cache/virtual/libgudev-230
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libgudev providers
 EAPI=5
 IUSE=introspection static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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
 RDEPEND=dev-libs/libgudev:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?,static-libs?]
 SLOT=0/0
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3a6073583a43a923c5b02b7619489ba1
+_md5_=ffe2d0b27bef1792d61b2a977fdf9bdc
diff --git a/metadata/md5-cache/virtual/libgudev-232 b/metadata/md5-cache/virtual/libgudev-232
index 46acce4ffccc..407dd834a996 100644
--- a/metadata/md5-cache/virtual/libgudev-232
+++ b/metadata/md5-cache/virtual/libgudev-232
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libgudev providers
 EAPI=6
 IUSE=introspection static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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
 RDEPEND=>=dev-libs/libgudev-232:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?,static-libs?]
 SLOT=0/0
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8966e7ec1f764900403e5511b0c8cd1d
+_md5_=d2259aff73bdceb75ce16e2867266a8a
diff --git a/metadata/md5-cache/virtual/libiconv-0 b/metadata/md5-cache/virtual/libiconv-0
index d9aef79ae211..e343ebc9d657 100644
--- a/metadata/md5-cache/virtual/libiconv-0
+++ b/metadata/md5-cache/virtual/libiconv-0
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU conversion library
 EAPI=5
 IUSE=elibc_glibc elibc_uclibc elibc_musl
-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 ~x86-winnt
+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 ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libiconv ) ) )
 SLOT=0
-_md5_=5d68f88cbbdadfb72cd2eb14c2527740
+_md5_=be0ea8657cc429227c9a4bb73f88a43a
diff --git a/metadata/md5-cache/virtual/libiconv-0-r1 b/metadata/md5-cache/virtual/libiconv-0-r1
index 335a19353e56..4604f85ce1d7 100644
--- a/metadata/md5-cache/virtual/libiconv-0-r1
+++ b/metadata/md5-cache/virtual/libiconv-0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU conversion library
 EAPI=5
 IUSE=elibc_glibc elibc_uclibc elibc_musl elibc_mintlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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 ~x86-winnt
+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 ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_mintlib? ( >=dev-libs/libiconv-1.14-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) )
 SLOT=0
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=849f3448d8d9c3f15846dc461ad71d35
+_md5_=91b79f196c82d5b3325eee9f407054c8
diff --git a/metadata/md5-cache/virtual/libintl-0 b/metadata/md5-cache/virtual/libintl-0
index 18b80eee9c5a..eb0c6f946145 100644
--- a/metadata/md5-cache/virtual/libintl-0
+++ b/metadata/md5-cache/virtual/libintl-0
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU Internationalization Library
 EAPI=5
 IUSE=elibc_glibc elibc_uclibc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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 ~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 ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( sys-devel/gettext ) ) )
 SLOT=0
-_md5_=a15c3ffe1479778d23f7b2278d2003d3
+_md5_=0ccf01b8765ff922883af39e81ac6fcc
diff --git a/metadata/md5-cache/virtual/libintl-0-r1 b/metadata/md5-cache/virtual/libintl-0-r1
index f442609cb43b..d7bd895c0f85 100644
--- a/metadata/md5-cache/virtual/libintl-0-r1
+++ b/metadata/md5-cache/virtual/libintl-0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU Internationalization Library
 EAPI=5
 IUSE=elibc_glibc elibc_uclibc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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 ~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 ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
 SLOT=0
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=26b21b97cab501f7abd2b4aed8e99914
+_md5_=dd9d37e425213868d448b24d62300b7d
diff --git a/metadata/md5-cache/virtual/libintl-0-r2 b/metadata/md5-cache/virtual/libintl-0-r2
index 83c89d22f727..e5a9b4835d99 100644
--- a/metadata/md5-cache/virtual/libintl-0-r2
+++ b/metadata/md5-cache/virtual/libintl-0-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for the GNU Internationalization Library
 EAPI=5
 IUSE=elibc_glibc elibc_musl elibc_uclibc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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 ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
 SLOT=0
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=743a6e9812fcd82fb5ecb8c63bc2362e
+_md5_=8ced530a024f64e9395c31d3293d86dc
diff --git a/metadata/md5-cache/virtual/libusb-1-r1 b/metadata/md5-cache/virtual/libusb-1-r1
index 65e8b4abeeb9..8d4aafd8df39 100644
--- a/metadata/md5-cache/virtual/libusb-1-r1
+++ b/metadata/md5-cache/virtual/libusb-1-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libusb
 EAPI=5
 IUSE=udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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
+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
 RDEPEND=>=dev-libs/libusb-1.0.9-r2:1[udev(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=1
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=41631128b273ac03bd5107494a17b303
+_md5_=b704b1b1ca6716c94afe4b1659c20b67
diff --git a/metadata/md5-cache/virtual/libusb-1-r2 b/metadata/md5-cache/virtual/libusb-1-r2
index 0fb9f502b4de..7ac281f90fdb 100644
--- a/metadata/md5-cache/virtual/libusb-1-r2
+++ b/metadata/md5-cache/virtual/libusb-1-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libusb
 EAPI=5
 IUSE=udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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 ~ppc-macos ~x64-macos ~x86-macos
+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
 RDEPEND=>=dev-libs/libusb-1.0.19:1[udev(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=1
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=603e28b5421d68d7900466e07d611977
+_md5_=de9b56aae14528bf5984673770f12f2d
diff --git a/metadata/md5-cache/virtual/logger-0-r1 b/metadata/md5-cache/virtual/logger-0-r1
index 167308368478..bd563e2340ab 100644
--- a/metadata/md5-cache/virtual/logger-0-r1
+++ b/metadata/md5-cache/virtual/logger-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for system loggers
 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
+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/metalog app-admin/rsyslog app-admin/socklog app-admin/sysklogd app-admin/syslog-ng sys-apps/busybox[syslog] >=sys-apps/systemd-38 )
 SLOT=0
-_md5_=f02d2789f684270d43dadf5d0fd44c9b
+_md5_=86b1c4b628db974eaf4f223045a87118
diff --git a/metadata/md5-cache/virtual/mda-0 b/metadata/md5-cache/virtual/mda-0
index 23c105dfaf75..6bb5b830ddc3 100644
--- a/metadata/md5-cache/virtual/mda-0
+++ b/metadata/md5-cache/virtual/mda-0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Message Delivery Agents
 EAPI=5
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 RDEPEND=|| ( mail-filter/procmail mail-filter/maildrop mail-mta/postfix mail-mta/courier mail-mta/mini-qmail mail-mta/netqmail mail-mta/qmail-ldap mail-mta/citadel )
 SLOT=0
-_md5_=0fa1ff90fdfdaa08b2d628a19e95aff0
+_md5_=c1e38560b9e97028e23542a5c5f13c37
diff --git a/metadata/md5-cache/virtual/python-cffi-1 b/metadata/md5-cache/virtual/python-cffi-1
index 175b9bfc6ece..6a5b52d4b7f8 100644
--- a/metadata/md5-cache/virtual/python-cffi-1
+++ b/metadata/md5-cache/virtual/python-cffi-1
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for the Python cffi package
 EAPI=7
 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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(-)] python_targets_python3_6? ( dev-python/cffi[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/cffi[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/cffi[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/cffi[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(-)] )
 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	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bbbf562b0b622c4e4c42019da6f33230
+_md5_=633de6c1014e6445143fe8877281f166
diff --git a/metadata/md5-cache/virtual/python-greenlet-1.0-r2 b/metadata/md5-cache/virtual/python-greenlet-1.0-r2
index b789d4d954d1..99df7b5a1282 100644
--- a/metadata/md5-cache/virtual/python-greenlet-1.0-r2
+++ b/metadata/md5-cache/virtual/python-greenlet-1.0-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for Python greenlet module
 EAPI=7
 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 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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(-)] python_targets_python3_6? ( dev-python/greenlet[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/greenlet[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/greenlet[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/greenlet[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(-)] )
 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	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c01283877d5c6717a28a1e8229a5bd30
+_md5_=a50d02a2c388eafb4edc4874ba740f9c
diff --git a/metadata/md5-cache/virtual/resolvconf-1 b/metadata/md5-cache/virtual/resolvconf-1
index b4b22748018a..61f9953ffcab 100644
--- a/metadata/md5-cache/virtual/resolvconf-1
+++ b/metadata/md5-cache/virtual/resolvconf-1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to select between different resolvconf providers
 EAPI=7
-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 ~riscv ~s390 sparc x86
 RDEPEND=|| ( net-dns/openresolv >=sys-apps/systemd-239-r1[resolvconf] )
 SLOT=0
-_md5_=a5a88fb4338f774aae812293039907de
+_md5_=c84308821d5a45391bd3ed67f54beb28
diff --git a/metadata/md5-cache/virtual/ruby-ssl-11 b/metadata/md5-cache/virtual/ruby-ssl-11
index 1021f9bad464..f17617b51fee 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-11
+++ b/metadata/md5-cache/virtual/ruby-ssl-11
@@ -3,9 +3,9 @@ DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lan
 DESCRIPTION=Virtual ebuild for the Ruby OpenSSL bindings
 EAPI=6
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~alpha amd64 arm arm64 hppa ~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 ~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
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5[ssl] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6[ssl] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7[ssl] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 SLOT=0
 _eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=baa52d9d16fbaee19291c6b30f0709c0
+_md5_=89652c4f30de4ee211bd0ccc0bbd0d40
diff --git a/metadata/md5-cache/virtual/texi2dvi-0-r2 b/metadata/md5-cache/virtual/texi2dvi-0-r2
index 461795c0ebc0..9d7e7811a498 100644
--- a/metadata/md5-cache/virtual/texi2dvi-0-r2
+++ b/metadata/md5-cache/virtual/texi2dvi-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for texi2dvi (and texi2pdf)
 EAPI=5
-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 ~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
 RDEPEND=sys-apps/texinfo virtual/latex-base dev-texlive/texlive-plaingeneric
 SLOT=0
-_md5_=220f640d90b7b5494fb3bcbc6a576218
+_md5_=88a96d4e0b4a3beed696eaad63fa5822
diff --git a/metadata/md5-cache/virtual/ttf-fonts-1-r1 b/metadata/md5-cache/virtual/ttf-fonts-1-r1
index f8ec7f148d85..dd4ac2d919a9 100644
--- a/metadata/md5-cache/virtual/ttf-fonts-1-r1
+++ b/metadata/md5-cache/virtual/ttf-fonts-1-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Serif/Sans/Monospace font packages
 EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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 ~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 ~x86-winnt
 RDEPEND=|| ( media-fonts/liberation-fonts media-fonts/source-pro media-fonts/dejavu media-fonts/croscorefonts media-fonts/droid media-fonts/freefont media-fonts/corefonts )
 SLOT=0
-_md5_=7138e89ed91852419d87e34a07505952
+_md5_=c03ff46d41570be23944e429eb18187b
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 41995f47b27a..de3f6f5e1eaf 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/libapreq2-2.13-r1 b/metadata/md5-cache/www-apache/libapreq2-2.13-r1
index 3fd50f93bbfd..5a6eab524f32 100644
--- a/metadata/md5-cache/www-apache/libapreq2-2.13-r1
+++ b/metadata/md5-cache/www-apache/libapreq2-2.13-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=perl? ( >=dev-perl/ExtUtils-XSBuilder-0.23 virtual/perl-version >=www-apache/mod_perl-2 ) =www-servers/apache-2* dev-lang/perl:=[-build(-)]
 SLOT=2
 SRC_URI=mirror://apache/httpd/libapreq/libapreq2-2.13.tar.gz
-_eclasses_=apache-module	ed1310f166e54de484f5d4b39d0279c9	depend.apache	69ed723e2331f996dc7510598673359e	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=apache-module	ed1310f166e54de484f5d4b39d0279c9	depend.apache	69ed723e2331f996dc7510598673359e	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=30bf1d6ae5e8d435290aafc0b7cffaaf
diff --git a/metadata/md5-cache/www-apache/mod_perl-2.0.11 b/metadata/md5-cache/www-apache/mod_perl-2.0.11
index 77fc39d7d43b..dbd4c4490ad9 100644
--- a/metadata/md5-cache/www-apache/mod_perl-2.0.11
+++ b/metadata/md5-cache/www-apache/mod_perl-2.0.11
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl[ithreads=] >=dev-perl/Apache-Test-1.420.0 >=www-servers/ap
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://apache/perl/mod_perl-2.0.11.tar.gz
-_eclasses_=apache-module	ed1310f166e54de484f5d4b39d0279c9	depend.apache	69ed723e2331f996dc7510598673359e	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=apache-module	ed1310f166e54de484f5d4b39d0279c9	depend.apache	69ed723e2331f996dc7510598673359e	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22bc3c0d639cee6e6aa2f765069ef098
diff --git a/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1 b/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
index 80963682b46f..c2b5cae80c4d 100644
--- a/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
+++ b/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND==www-servers/apache-2* dev-lang/perl:=[-build(-)] >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=http://apachegallery.dk/download/Apache-Gallery-1.0RC3.tar.gz
-_eclasses_=depend.apache	69ed723e2331f996dc7510598673359e	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=depend.apache	69ed723e2331f996dc7510598673359e	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=515d15d87102abe27871d4f16b37f452
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 676b90c0338b..5f07f61115ac 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/gitit-0.13.0.0 b/metadata/md5-cache/www-apps/gitit-0.13.0.0
index 3c0a2a6b62a7..6d0dd6112c8f 100644
--- a/metadata/md5-cache/www-apps/gitit-0.13.0.0
+++ b/metadata/md5-cache/www-apps/gitit-0.13.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=app-text/pandoc-2.9:=[profile?] <app-text/pandoc-2.10:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/configfile-1:=[profile?] >=dev-haskell/doctemplates-0.7.1:=[profile?] >=dev-haskell/feed-1.0:=[profile?] <dev-haskell/feed-1.4:=[profile?] >=dev-haskell/filestore-0.6.4:=[profile?] <dev-haskell/filestore-0.7:=[profile?] >=dev-haskell/happstack-server-7.5:=[profile?] <dev-haskell/happstack-server-7.7:=[profile?] >=dev-haskell/hoauth2-1.3.0:=[profile?] <dev-haskell/hoauth2-1.12:=[profile?] >=dev-haskell/hslogger-1:=[profile?] >=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?] >=dev-haskell/http-4000.0:=[profile?] >=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.1.6:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.11:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.21:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/recaptcha-0.1:=[profile?] dev-haskell/safe:=[profile?] >dev-haskell/sha-1:=[profile?] >=dev-haskell/skylighting-0.8.2.3:=[profile?] <dev-haskell/skylighting-0.9:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/uri-bytestring-0.2.3.3:=[profile?] >=dev-haskell/url-2.1:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?] dev-haskell/xhtml:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] >=dev-haskell/xml-conduit-1.5:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.1:= plugins? ( dev-haskell/ghc-paths:=[profile?] >=dev-lang/ghc-8.0.1:=[profile?] ) >=dev-haskell/cabal-2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=app-text/pandoc-2.9:=[profile?] <app-text/pandoc-2.10:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/configfile-1:=[profile?] >=dev-haskell/doctemplates-0.7.1:=[profile?] >=dev-haskell/feed-1.0:=[profile?] <dev-haskell/feed-1.4:=[profile?] >=dev-haskell/filestore-0.6.4:=[profile?] <dev-haskell/filestore-0.7:=[profile?] >=dev-haskell/happstack-server-7.5:=[profile?] <dev-haskell/happstack-server-7.7:=[profile?] >=dev-haskell/hoauth2-1.3.0:=[profile?] <dev-haskell/hoauth2-1.12:=[profile?] >=dev-haskell/hslogger-1:=[profile?] >=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?] >=dev-haskell/http-4000.0:=[profile?] >=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.1.6:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.11:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.21:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/recaptcha-0.1:=[profile?] dev-haskell/safe:=[profile?] >dev-haskell/sha-1:=[profile?] >=dev-haskell/skylighting-0.8.2.3:=[profile?] <dev-haskell/skylighting-0.9:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/uri-bytestring-0.2.3.3:=[profile?] >=dev-haskell/url-2.1:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?] dev-haskell/xhtml:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] >=dev-haskell/xml-conduit-1.5:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.1:= plugins? ( dev-haskell/ghc-paths:=[profile?] >=dev-lang/ghc-8.0.1:=[profile?] ) >=dev-haskell/cabal-2.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Wiki using happstack, git or darcs, and pandoc
 EAPI=7
 HOMEPAGE=https://hackage.haskell.org/package/gitit
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/pandoc-2.9:=[profile?] <app-text/pandoc-2.10:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] >=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/configfile-1:=[profile?] >=dev-haskell/doctemplates-0.7.1:=[profile?] >=dev-haskell/feed-1.0:=[profile?] <dev-haskell/feed-1.4:=[profile?] >=dev-haskell/filestore-0.6.4:=[profile?] <dev-haskell/filestore-0.7:=[profile?] >=dev-haskell/happstack-server-7.5:=[profile?] <dev-haskell/happstack-server-7.7:=[profile?] >=dev-haskell/hoauth2-1.3.0:=[profile?] <dev-haskell/hoauth2-1.12:=[profile?] >=dev-haskell/hslogger-1:=[profile?] >=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?] >=dev-haskell/http-4000.0:=[profile?] >=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.1.6:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.11:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.21:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/recaptcha-0.1:=[profile?] dev-haskell/safe:=[profile?] >dev-haskell/sha-1:=[profile?] >=dev-haskell/skylighting-0.8.2.3:=[profile?] <dev-haskell/skylighting-0.9:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/uri-bytestring-0.2.3.3:=[profile?] >=dev-haskell/url-2.1:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?] dev-haskell/xhtml:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] >=dev-haskell/xml-conduit-1.5:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.1:= plugins? ( dev-haskell/ghc-paths:=[profile?] >=dev-lang/ghc-8.0.1:=[profile?] )
 SLOT=0/0.13.0.0
 SRC_URI=https://hackage.haskell.org/package/gitit-0.13.0.0/gitit-0.13.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27ddedc461d9d345c1f88aaec06d4b4a
diff --git a/metadata/md5-cache/www-apps/ikiwiki-3.20190228 b/metadata/md5-cache/www-apps/ikiwiki-3.20190228
index 143e192e480a..ebf2f6203b5e 100644
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20190228
+++ b/metadata/md5-cache/www-apps/ikiwiki-3.20190228
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Sc
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ikiwiki/ikiwiki_3.20190228.orig.tar.xz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f85fe9b2c322445d899cf3dd42707f1a
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.35.1 b/metadata/md5-cache/www-apps/mediawiki-1.35.1
new file mode 100644
index 000000000000..bc1d925bf0e6
--- /dev/null
+++ b/metadata/md5-cache/www-apps/mediawiki-1.35.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prerm setup unpack
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=The MediaWiki wiki web application (as used on wikipedia.org)
+EAPI=7
+HOMEPAGE=http://www.mediawiki.org
+IUSE=imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/php-7.3.19[ctype,fileinfo,iconv,json(+),postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) mysql? ( dev-lang/php[mysql,mysqli] ) sqlite? ( dev-db/sqlite[fts3(+)] dev-lang/php[pdo,sqlite] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+RESTRICT=test
+SLOT=1.35.1
+SRC_URI=http://releases.wikimedia.org/mediawiki/1.35/mediawiki-1.35.1.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=5b20556999d03d097ec3516814721bfc
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 18cbdb05096d..8d29b2a57811 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-88.0.4324.41 b/metadata/md5-cache/www-client/chromium-88.0.4324.50
similarity index 97%
rename from metadata/md5-cache/www-client/chromium-88.0.4324.41
rename to metadata/md5-cache/www-client/chromium-88.0.4324.50
index 72b6f29a8094..ed41d6db16a1 100644
--- a/metadata/md5-cache/www-client/chromium-88.0.4324.41
+++ b/metadata/md5-cache/www-client/chromium-88.0.4324.50
@@ -1,15 +1,15 @@
 BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=7
 HOMEPAGE=https://chromium.org/
 IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
 REQUIRED_USE=component-build? ( !suid )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-88.0.4324.41.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-88-patchset-3/chromium-88-patchset-3.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-88.0.4324.50.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-88-patchset-3/chromium-88-patchset-3.tar.xz
 _eclasses_=check-reqs	38804be59703af0fbf462b3710024074	chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	1142b2ccb57f0bb5ae58b806089e08f0	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0b3fb2f63b96b3b9554c1d0141f523a
+_md5_=8fcde05367bd3f39489e3fcb4529a8ab
diff --git a/metadata/md5-cache/www-client/chromium-89.0.4350.4 b/metadata/md5-cache/www-client/chromium-89.0.4356.6
similarity index 73%
rename from metadata/md5-cache/www-client/chromium-89.0.4350.4
rename to metadata/md5-cache/www-client/chromium-89.0.4356.6
index a2ea5fe0474f..a1e8b41ea24e 100644
--- a/metadata/md5-cache/www-client/chromium-89.0.4350.4
+++ b/metadata/md5-cache/www-client/chromium-89.0.4356.6
@@ -1,15 +1,15 @@
 BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=7
 HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
-REQUIRED_USE=component-build? ( !suid )
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
+REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-89.0.4350.4.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-89-patchset-2/chromium-89-patchset-2.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-89.0.4356.6.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-89-patchset-3/chromium-89-patchset-3.tar.xz
 _eclasses_=check-reqs	38804be59703af0fbf462b3710024074	chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	1142b2ccb57f0bb5ae58b806089e08f0	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69df85c513b0d2b98e539d12b4fb9a54
+_md5_=3cf2820aa306218872031abf599a8ea9
diff --git a/metadata/md5-cache/www-client/google-chrome-87.0.4280.88 b/metadata/md5-cache/www-client/google-chrome-87.0.4280.88
index adf50a2b35a1..2133f6117986 100644
--- a/metadata/md5-cache/www-client/google-chrome-87.0.4280.88
+++ b/metadata/md5-cache/www-client/google-chrome-87.0.4280.88
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-arc
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_87.0.4280.88-1_amd64.deb
-_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=903fcd0fc686d87f9cfee7f611b80e74
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-88.0.4324.50 b/metadata/md5-cache/www-client/google-chrome-beta-88.0.4324.50
index dce0af6dcfc1..c172c2de0cd6 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-88.0.4324.50
+++ b/metadata/md5-cache/www-client/google-chrome-beta-88.0.4324.50
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-arc
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_88.0.4324.50-1_amd64.deb
-_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=903fcd0fc686d87f9cfee7f611b80e74
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-89.0.4350.4 b/metadata/md5-cache/www-client/google-chrome-unstable-89.0.4356.6
similarity index 92%
rename from metadata/md5-cache/www-client/google-chrome-unstable-89.0.4350.4
rename to metadata/md5-cache/www-client/google-chrome-unstable-89.0.4356.6
index d898e97ef467..d5e49b757d04 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-89.0.4350.4
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-89.0.4356.6
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 media-libs/mesa[gbm] net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_89.0.4350.4-1_amd64.deb
-_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_89.0.4356.6-1_amd64.deb
+_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=903fcd0fc686d87f9cfee7f611b80e74
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-88.0.705.15 b/metadata/md5-cache/www-client/microsoft-edge-dev-88.0.705.15
index 7e0f8a79cbfb..0da8c8326b92 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-88.0.705.15
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-88.0.705.15
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_88.0.705.15-1_amd64.deb
-_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d3e0209ecec241d2cc857c4d0cddc8f
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-89.0.723.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-89.0.723.0
index bf7fc0c544e8..02da2419a561 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-89.0.723.0
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-89.0.723.0
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_89.0.723.0-1_amd64.deb
-_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d3e0209ecec241d2cc857c4d0cddc8f
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-89.0.731.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-89.0.731.0
index 3ddc3e1481cf..4d910fcd2c51 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-89.0.731.0
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-89.0.731.0
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_89.0.731.0-1_amd64.deb
-_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d3e0209ecec241d2cc857c4d0cddc8f
diff --git a/metadata/md5-cache/www-client/opera-73.0.3856.284-r1 b/metadata/md5-cache/www-client/opera-73.0.3856.284-r1
index 2566841d2419..1c16bdd39424 100644
--- a/metadata/md5-cache/www-client/opera-73.0.3856.284-r1
+++ b/metadata/md5-cache/www-client/opera-73.0.3856.284-r1
@@ -5,9 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.opera.com/
 IUSE=+proprietary-codecs suid widevine kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* amd64
-LICENSE=OPERA-2014
+LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera/desktop/73.0.3856.284/linux/opera-stable_73.0.3856.284_amd64.deb https://download2.operacdn.com/pub/opera/desktop/73.0.3856.284/linux/opera-stable_73.0.3856.284_amd64.deb https://download3.operacdn.com/pub/opera/desktop/73.0.3856.284/linux/opera-stable_73.0.3856.284_amd64.deb https://download4.operacdn.com/pub/opera/desktop/73.0.3856.284/linux/opera-stable_73.0.3856.284_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-87.0.4280.88.tar.xz )
-_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69a8648e9115d9dffabcfd9fc1040c6c
+_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=182611a2a67394862bc234a0110fb4fb
diff --git a/metadata/md5-cache/www-client/opera-beta-73.0.3856.283 b/metadata/md5-cache/www-client/opera-beta-73.0.3856.283
index a6e53330c623..a6a4a74d1248 100644
--- a/metadata/md5-cache/www-client/opera-beta-73.0.3856.283
+++ b/metadata/md5-cache/www-client/opera-beta-73.0.3856.283
@@ -5,9 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.opera.com/
 IUSE=+proprietary-codecs suid widevine kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64
-LICENSE=OPERA-2014
+LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-beta/73.0.3856.283/linux/opera-beta_73.0.3856.283_amd64.deb https://download2.operacdn.com/pub/opera-beta/73.0.3856.283/linux/opera-beta_73.0.3856.283_amd64.deb https://download3.operacdn.com/pub/opera-beta/73.0.3856.283/linux/opera-beta_73.0.3856.283_amd64.deb https://download4.operacdn.com/pub/opera-beta/73.0.3856.283/linux/opera-beta_73.0.3856.283_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-87.0.4280.88.tar.xz )
-_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54719ad08bbddf90e581a15f0e0044bc
+_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2048adab5c9e8f6df7038544a252c44f
diff --git a/metadata/md5-cache/www-client/opera-developer-74.0.3904.0-r1 b/metadata/md5-cache/www-client/opera-developer-74.0.3904.0-r1
index 3df9a971af7e..1a24ef60583c 100644
--- a/metadata/md5-cache/www-client/opera-developer-74.0.3904.0-r1
+++ b/metadata/md5-cache/www-client/opera-developer-74.0.3904.0-r1
@@ -5,9 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.opera.com/
 IUSE=+proprietary-codecs suid widevine kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64
-LICENSE=OPERA-2014
+LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-developer/74.0.3904.0/linux/opera-developer_74.0.3904.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/74.0.3904.0/linux/opera-developer_74.0.3904.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/74.0.3904.0/linux/opera-developer_74.0.3904.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/74.0.3904.0/linux/opera-developer_74.0.3904.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-88.0.4324.27.tar.xz )
-_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e6dd6ad3ffdf3354a9073fad72a44399
+_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=57d5809d53de3175271c30cfbfe6c21f
diff --git a/metadata/md5-cache/www-client/vivaldi-3.5.2115.81 b/metadata/md5-cache/www-client/vivaldi-3.5.2115.81
index af7683fbfd36..6ff18ed25fc0 100644
--- a/metadata/md5-cache/www-client/vivaldi-3.5.2115.81
+++ b/metadata/md5-cache/www-client/vivaldi-3.5.2115.81
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.5.2115.81-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.5.2115.81-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.5.2115.81-1_armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.5.2115.81-1_i386.deb )
-_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c7b2dbb05089d20d5db62516656aaed
diff --git a/metadata/md5-cache/www-client/vivaldi-3.5.2115.81-r1 b/metadata/md5-cache/www-client/vivaldi-3.5.2115.81-r1
index 41881d53c147..5da13d9e2cfa 100644
--- a/metadata/md5-cache/www-client/vivaldi-3.5.2115.81-r1
+++ b/metadata/md5-cache/www-client/vivaldi-3.5.2115.81-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.5.2115.81-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.5.2115.81-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.5.2115.81-1_armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.5.2115.81-1_i386.deb )
-_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d23c1e6cb0aa8cbcb2a47dd6bc869714
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2130.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2130.3
index 5e6165638586..9021e5a0da85 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2130.3
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2130.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.5.2130.3-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.5.2130.3-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.5.2130.3-1_armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.5.2130.3-1_i386.deb )
-_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1dc8eec1235916ad41a36a1fd06d94b3
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2131.8-r1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2131.8-r1
index df2740e4f8a9..95b61b459f32 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2131.8-r1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2131.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.5.2131.8-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.5.2131.8-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.5.2131.8-1_armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.5.2131.8-1_i386.deb )
-_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	41a786ad198d74e69b826bce17fa813c	desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d23c1e6cb0aa8cbcb2a47dd6bc869714
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index bfd14cc7d8e4..dfe891b8751e 100644
Binary files a/metadata/md5-cache/www-misc/Manifest.gz and b/metadata/md5-cache/www-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.22 b/metadata/md5-cache/www-misc/urlwatch-2.22
new file mode 100644
index 000000000000..711be374e609
--- /dev/null
+++ b/metadata/md5-cache/www-misc/urlwatch-2.22
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pycodestyle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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/alabaster[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/alabaster[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/alabaster[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/alabaster[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/appdirs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cssselect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/keyring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/minidb[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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/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 postinst prepare test
+DESCRIPTION=A tool for monitoring webpages for updates
+EAPI=7
+HOMEPAGE=https://thp.io/2008/urlwatch/
+IUSE=doc 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/appdirs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cssselect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/keyring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/minidb[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_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/u/urlwatch/urlwatch-2.22.tar.gz
+_eclasses_=distutils-r1	6a128a9211d714bf9dfb5c0c9e72558e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6bf67b86ee1cfe1c08cc1e36fd747cf4
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 7b5066c2ea5a..0086964dc755 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/chrome-binary-plugins-87.0.4280.88 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.88
index 629f5dfca776..01b72fd74d69 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.88
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.88
@@ -8,5 +8,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-pl
 RESTRICT=bindist mirror strip
 SLOT=stable
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_87.0.4280.88-1_amd64.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=3259de859b5903477401255248b093eb
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.50_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.50_beta
index 67ed889b7d3e..605031a78592 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.50_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.50_beta
@@ -8,5 +8,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-pl
 RESTRICT=bindist mirror strip
 SLOT=beta
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_88.0.4324.50-1_amd64.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=3259de859b5903477401255248b093eb
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4350.4_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4356.6_alpha
similarity index 79%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4350.4_alpha
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4356.6_alpha
index db59d89665b3..18a96e936f7f 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4350.4_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4356.6_alpha
@@ -7,6 +7,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_89.0.4350.4-1_amd64.deb
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_89.0.4356.6-1_amd64.deb
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=3259de859b5903477401255248b093eb
diff --git a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0 b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
index 666a11c03b98..7f044c673c1d 100644
--- a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
+++ b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( media-sound/pulseaudio media-libs/alsa-lib ) dev-libs/expat dev-lib
 RESTRICT=bindist strip mirror
 SLOT=0
 SRC_URI=x86? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.3.0-1_i386.deb ) amd64? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.3.0-1_amd64.deb )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mozextension	d6676073193be26f4c5d578d16367a8c	multilib	d410501a125f99ffb560b0c523cd3d1e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mozextension	d6676073193be26f4c5d578d16367a8c	multilib	d410501a125f99ffb560b0c523cd3d1e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7650a1419905736f7dad060f2952abf
diff --git a/metadata/md5-cache/www-plugins/google-talkplugin-9999 b/metadata/md5-cache/www-plugins/google-talkplugin-9999
index 64313e07f324..482fb7bf5231 100644
--- a/metadata/md5-cache/www-plugins/google-talkplugin-9999
+++ b/metadata/md5-cache/www-plugins/google-talkplugin-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=|| ( media-sound/pulseaudio media-libs/alsa-lib ) dev-libs/expat dev-libs/glib:2 sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/pango sys-apps/lsb-release selinux? ( sec-policy/selinux-googletalk ) libnotify? ( x11-libs/libnotify )
 RESTRICT=bindist strip mirror
 SLOT=0
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mozextension	d6676073193be26f4c5d578d16367a8c	multilib	d410501a125f99ffb560b0c523cd3d1e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mozextension	d6676073193be26f4c5d578d16367a8c	multilib	d410501a125f99ffb560b0c523cd3d1e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2aba46be3a00ffde86e50e2cfc9ab7a3
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 1ef12e7de67f..e2d68c72afb5 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/puma-4.3.7 b/metadata/md5-cache/www-servers/puma-4.3.7
new file mode 100644
index 000000000000..66f58cc78d82
--- /dev/null
+++ b/metadata/md5-cache/www-servers/puma-4.3.7
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] test? ( dev-ruby/rack[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] test? ( dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] test? ( dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ) 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_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_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_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_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) 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_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
+EAPI=7
+HOMEPAGE=https://puma.io/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:0 ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/puma/puma/archive/v4.3.7.tar.gz -> puma-4.3.7.tar.gz
+_eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=27e0c5ef41caf5893ba73dd426657f75
diff --git a/metadata/md5-cache/www-servers/puma-5.1.1 b/metadata/md5-cache/www-servers/puma-5.1.1
new file mode 100644
index 000000000000..c30936ac77cd
--- /dev/null
+++ b/metadata/md5-cache/www-servers/puma-5.1.1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] test? ( dev-ruby/rack[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] test? ( dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] test? ( dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ) 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_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_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_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_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) 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_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
+EAPI=7
+HOMEPAGE=https://puma.io/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:0 ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) 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_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_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/puma/puma/archive/v5.1.1.tar.gz -> puma-5.1.1.tar.gz
+_eclasses_=estack	d780995dc525ff7e6a2c4c043ffec242	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	d4dbb4c6c526fcb43401ce82bd01c953	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=76100858770c59d851a5504b32e088cc
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index b7feb3a3faf0..eff6e363d123 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/fonttosfnt-1.2.0 b/metadata/md5-cache/x11-apps/fonttosfnt-1.2.0
index fb23390a80ac..6188f7eb1339 100644
--- a/metadata/md5-cache/x11-apps/fonttosfnt-1.2.0
+++ b/metadata/md5-cache/x11-apps/fonttosfnt-1.2.0
@@ -4,10 +4,10 @@ DEPEND=media-libs/freetype:2 x11-libs/libX11 x11-libs/libfontenc x11-base/xorg-p
 DESCRIPTION=X.Org fonttosfnt application
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/fonttosfnt
-KEYWORDS=amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=media-libs/freetype:2 x11-libs/libX11 x11-libs/libfontenc
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/fonttosfnt-1.2.0.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=d5f90a79ecf6da1a2c527ab2818ef4c0
+_md5_=36b15a72e096d5d670c9d6fe1276090d
diff --git a/metadata/md5-cache/x11-apps/xkbcomp-1.4.4 b/metadata/md5-cache/x11-apps/xkbcomp-1.4.4
index 1fab75434ce1..db59e9dde4b3 100644
--- a/metadata/md5-cache/x11-apps/xkbcomp-1.4.4
+++ b/metadata/md5-cache/x11-apps/xkbcomp-1.4.4
@@ -4,10 +4,10 @@ DEPEND=>=x11-libs/libX11-1.6.9 x11-libs/libxkbfile
 DESCRIPTION=XKB keyboard description compiler
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xkbcomp
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.9 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xkbcomp-1.4.4.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=75c6c5e8d3eef7da3c505972df233100
+_md5_=f1c0e5a03a1ad655dbb9f641144332f5
diff --git a/metadata/md5-cache/x11-apps/xprop-1.2.5 b/metadata/md5-cache/x11-apps/xprop-1.2.5
index 9f263dcda4a8..f9de003ef04b 100644
--- a/metadata/md5-cache/x11-apps/xprop-1.2.5
+++ b/metadata/md5-cache/x11-apps/xprop-1.2.5
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=property displayer for X
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xprop
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xprop-1.2.5.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=dc2706da57a4e55af34517d6ad56688f
+_md5_=0d59283210b5154128a932f2f397e383
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 4082c3811dca..f5f2f50f357e 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xcb-proto-1.14.1 b/metadata/md5-cache/x11-base/xcb-proto-1.14.1
index 26607f6d061a..6bd964c13e42 100644
--- a/metadata/md5-cache/x11-base/xcb-proto-1.14.1
+++ b/metadata/md5-cache/x11-base/xcb-proto-1.14.1
@@ -4,11 +4,11 @@ DESCRIPTION=X C-language Bindings protocol headers
 EAPI=7
 HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 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 ~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=MIT
 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=https://www.x.org/releases/individual/proto/xcb-proto-1.14.1.tar.xz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=5a7d230f098d342cdbe15beece25b2f1
+_md5_=cba7230b3d104efd10d70d322063f20d
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.10 b/metadata/md5-cache/x11-base/xorg-server-1.20.10
index 854998629ce3..f77f45187402 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.20.10
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.10
@@ -5,7 +5,7 @@ DESCRIPTION=X.Org X servers
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
 IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity static-libs 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
 RDEPEND=media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(-)] selinux? ( sec-policy/selinux-xserver )
@@ -13,4 +13,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elog
 SLOT=0/1.20.10
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.10.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=0388c9a57e945f2eab99600853a76eec
+_md5_=11f0feff774f4702e82d6ecfa0ddec2c
diff --git a/metadata/md5-cache/x11-base/xorg-server-9999 b/metadata/md5-cache/x11-base/xorg-server-9999
index 335e1bd63f9c..aee9057d3cfd 100644
--- a/metadata/md5-cache/x11-base/xorg-server-9999
+++ b/metadata/md5-cache/x11-base/xorg-server-9999
@@ -12,4 +12,4 @@ RDEPEND=media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( de
 REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !wayland ) xephyr? ( kdrive )
 SLOT=0/9999
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=1801d96c9cb2f57241fab429e54e7f98
+_md5_=8559cc4137e2fa8d2ccd2d567093d651
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 84aa5191ec8f..a86105319c5f 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-390.132-r5 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r5
index f875c7a98246..a208b058c2a8 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r5
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r5
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.132/NVIDIA-FreeBSD-x86_64-390.132.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.132/NVIDIA-Linux-armv7l-gnueabihf-390.132.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.132/NVIDIA-FreeBSD-x86-390.132.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4894e10a202767e81733f12bda4a5a2d
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r5 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r5
index 0dd66d1a198e..d41028173a97 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r5
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r5
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.138/NVIDIA-FreeBSD-x86_64-390.138.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.138/NVIDIA-Linux-x86_64-390.138.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.138/NVIDIA-Linux-armv7l-gnueabihf-390.138.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.138/NVIDIA-FreeBSD-x86-390.138.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.138/NVIDIA-Linux-x86-390.138.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.138.tar.bz2 )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dd8994dd3e18cf6b7954df1d180b3e29
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r7 b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r7
index ce4290dfbada..9639e02c2475 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r7
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r7
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/435
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/435.21/NVIDIA-FreeBSD-x86_64-435.21.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/435.21/NVIDIA-Linux-x86_64-435.21.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-435.21.tar.bz2 )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ad557ff415731687476d73d25abac52f
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r3 b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r3
index af6dde3c9a86..509f5f1194f3 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r3
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/440
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/440.100/NVIDIA-FreeBSD-x86_64-440.100.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/440.100/NVIDIA-Linux-x86_64-440.100.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.100.tar.bz2 )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27b88bb267fc76dac2c486a2b9fc569b
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02-r1
index 3a3a7af78e40..981a27b6c1bb 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/450
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/450.80.02/NVIDIA-FreeBSD-x86_64-450.80.02.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/450.80.02/NVIDIA-Linux-x86_64-450.80.02.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-450.80.02.tar.bz2 )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7ab1f4549e4f5c9256ff089f2ee8c72
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-455.28-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.28-r1
index c6f86292f068..54f5fee78c87 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-455.28-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.28-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/455
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/455.28/NVIDIA-FreeBSD-x86_64-455.28.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/455.28/NVIDIA-Linux-x86_64-455.28.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-455.28.tar.bz2 )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8e637f25b00a863198d5718cda20f088
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-455.38-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.38-r1
index ea3ba49497a9..3bfe87583d88 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-455.38-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.38-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/455
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/455.38/NVIDIA-FreeBSD-x86_64-455.38.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/455.38/NVIDIA-Linux-x86_64-455.38.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-455.38.tar.bz2 )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cb7d1a1837fcebffb1587fe7b59c08f3
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-455.45.01-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.45.01-r1
index 228d031e5750..137a2ad12374 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-455.45.01-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-455.45.01-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/455
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/455.45.01/NVIDIA-FreeBSD-x86_64-455.45.01.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/455.45.01/NVIDIA-Linux-x86_64-455.45.01.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-455.45.01.tar.bz2 )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	88985b2bdec6b189a822e52048cd01af	portability	1142b2ccb57f0bb5ae58b806089e08f0	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	45b49db67094fdafbb6a16a2299e894b	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=700ca2c9e4d286f81b59b34d33738b32
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0
index 1d787061d2b7..fc0dda040a6b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0
@@ -5,10 +5,10 @@ DESCRIPTION=Generic VESA video driver
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa
 IUSE=kernel_linux
-KEYWORDS=-* ~alpha amd64 ~x86
+KEYWORDS=-* ~alpha amd64 x86
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 >=x11-libs/libpciaccess-0.12.901 x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-vesa-2.5.0.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=4fcdb36e21d5cef8890743a0941d8da0
+_md5_=47c632ffe765a2e8171e74196b05cb52
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 97bc06e0e6e7..4f609cc36c69 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/gl2ps-1.4.2 b/metadata/md5-cache/x11-libs/gl2ps-1.4.2
index f9b092355268..f2e1a2f768eb 100644
--- a/metadata/md5-cache/x11-libs/gl2ps-1.4.2
+++ b/metadata/md5-cache/x11-libs/gl2ps-1.4.2
@@ -5,10 +5,10 @@ DESCRIPTION=OpenGL to PostScript printing library
 EAPI=7
 HOMEPAGE=http://www.geuz.org/gl2ps/
 IUSE=doc png zlib
-KEYWORDS=amd64 arm arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2
 RDEPEND=media-libs/freeglut x11-libs/libXmu png? ( media-libs/libpng:0= ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://geuz.org/gl2ps/src/gl2ps-1.4.2.tgz
 _eclasses_=cmake	6b7438831d544f2fe59a3d4ab4103f52	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7bff030b551252b0641b65508b5af0a0
+_md5_=fa98f62743482dc173075b568bbb062d
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1 b/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
index fc47b5fa5d75..6915bf1808ab 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
@@ -1,16 +1,17 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.3 app-text/docbook-xsl-stylesheets dev-libs/gobject-introspection-common dev-libs/libxslt dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 virtual/pkgconfig examples? ( x11-libs/gdk-pixbuf ) >=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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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_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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt dev-libs/gobject-introspection-common dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.18.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig !aqua? ( x11-base/xorg-proto ) test? ( x11-themes/hicolor-icon-theme media-fonts/font-misc-misc media-fonts/font-cursor-misc ) >=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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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_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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/gettext-0.18.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( x11-base/xorg-proto ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-themes/hicolor-icon-theme ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Gimp ToolKit +
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=aqua cups examples +introspection test vim-syntax xinerama abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 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=LGPL-2+
-PDEPEND=x11-themes/gtk-engines-adwaita gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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_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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-2 !<gnome-base/gail-1000 !<dev-util/gtk-builder-convert-2.24.32 !<x11-libs/vte-0.28.2-r201:0 >=x11-themes/adwaita-icon-theme-3.14 x11-themes/gnome-themes-standard
+PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-themes/gtk-engines-adwaita vim-syntax? ( app-vim/gtk-syntax )
+RDEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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_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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-2 >=x11-themes/adwaita-icon-theme-3.14 x11-themes/gnome-themes-standard !<dev-util/gtk-builder-convert-2.24.32
 REQUIRED_USE=xinerama? ( !aqua )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.32.tar.xz https://dev.gentoo.org/~leio/distfiles/gtk+-2.24.32-patchset-r1.tar.xz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42da1a3c3e41177082a92c948c267ecd
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5ead39029cbf7f53a4ce406b0feac5e1
diff --git a/metadata/md5-cache/x11-libs/libX11-1.7.0 b/metadata/md5-cache/x11-libs/libX11-1.7.0
index 9f36e4c97d86..5423766c57d5 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.7.0
+++ b/metadata/md5-cache/x11-libs/libX11-1.7.0
@@ -5,11 +5,11 @@ 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_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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 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_s390_32(-)?,abi_s390_64(-)?] !<x11-base/xorg-proto-2019.2 x11-misc/compose-tables
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.0.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=598762e801721239c44f96374455509a
+_md5_=76ce3499e7c2d8a0989e48e93131c68b
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.9-r1 b/metadata/md5-cache/x11-libs/libXau-1.0.9-r1
index 7b0c0e1f6abd..faf96bf06ef3 100644
--- a/metadata/md5-cache/x11-libs/libXau-1.0.9-r1
+++ b/metadata/md5-cache/x11-libs/libXau-1.0.9-r1
@@ -5,9 +5,9 @@ DESCRIPTION=X.Org X authorization library
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXau
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXau-1.0.9.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=e8543a01932c2272306bdf3bcb372efa
+_md5_=9a12c457e653d2ac1a98845a4106c0f5
diff --git a/metadata/md5-cache/x11-libs/libXtst-1.2.3-r2 b/metadata/md5-cache/x11-libs/libXtst-1.2.3-r2
index fafc1845efcf..389331fb6f1b 100644
--- a/metadata/md5-cache/x11-libs/libXtst-1.2.3-r2
+++ b/metadata/md5-cache/x11-libs/libXtst-1.2.3-r2
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org Xlib-based client API for the XTEST & RECORD extensions librar
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXtst
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=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_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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXtst-1.2.3.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=d154804c0d3ee16ebc38ea243e034f7d
+_md5_=c6ba3238f46b4140c29ffefd89078019
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.103 b/metadata/md5-cache/x11-libs/libdrm-2.4.103
index bf527e46838e..223836a9463a 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.103
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.103
@@ -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_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 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_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.103.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5d137b7cbb4ca84666952785fd8947b3
+_md5_=029e0d181c0dda74a00b29013a20d894
diff --git a/metadata/md5-cache/x11-libs/libdrm-9999 b/metadata/md5-cache/x11-libs/libdrm-9999
index 0d9800fcf307..b3e16251bfb1 100644
--- a/metadata/md5-cache/x11-libs/libdrm-9999
+++ b/metadata/md5-cache/x11-libs/libdrm-9999
@@ -11,4 +11,4 @@ RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=daf886dbce6a81fa5d9a66ab27f6d1b9
+_md5_=a702bdb87f622d96f109c46c2a698ab5
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.14 b/metadata/md5-cache/x11-libs/libxcb-1.14
index 1419739a7566..bf9366615212 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.14
+++ b/metadata/md5-cache/x11-libs/libxcb-1.14
@@ -1,6 +1,6 @@
-BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] ) || ( ( dev-lang/python:3.9[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_6(-),python_single_target_python3_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 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 ) )
+BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] ) || ( ( dev-lang/python:3.9[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) doc? ( app-doc/doxygen[dot] ) test? ( dev-libs/libxslt ) >=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 postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-base/xcb-proto-1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elibc_Darwin? ( dev-libs/libpthread-stubs ) test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] ) dev-libs/libxslt
+DEPEND=>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-base/xcb-proto-1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elibc_Darwin? ( dev-libs/libpthread-stubs ) test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=X C-language Bindings library
 EAPI=7
 HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.12
 SRC_URI=https://www.x.org/releases/individual/lib/libxcb-1.14.tar.xz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=373965445f75f46d0a4f8cf84f388749
+_md5_=1f758d12b401c441f7d7e4c973670ccd
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-1.0.3 b/metadata/md5-cache/x11-libs/libxkbcommon-1.0.3
index 5e1a6ca83858..89141bd49267 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-1.0.3
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-1.0.3
@@ -1,15 +1,15 @@
-BDEPEND=sys-devel/bison doc? ( app-doc/doxygen ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install test
+BDEPEND=sys-devel/bison doc? ( app-doc/doxygen ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install setup test
 DEPEND=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_s390_32(-)?,abi_s390_64(-)?,xkb] ) dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables X? ( x11-base/xorg-proto )
 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_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 ~riscv ~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_s390_32(-)?,abi_s390_64(-)?,xkb] ) dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://xkbcommon.org/download/libxkbcommon-1.0.3.tar.xz
-_eclasses_=meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7ab580c1b59bf27765027d6d31eabc76
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=517e3132d5bdd53e580f430e4ec75f31
diff --git a/metadata/md5-cache/x11-libs/libxshmfence-1.3-r2 b/metadata/md5-cache/x11-libs/libxshmfence-1.3-r2
index 9c79554fa53f..2f5f646c8421 100644
--- a/metadata/md5-cache/x11-libs/libxshmfence-1.3-r2
+++ b/metadata/md5-cache/x11-libs/libxshmfence-1.3-r2
@@ -5,9 +5,9 @@ DESCRIPTION=Shared memory fences using futexes
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxshmfence
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libxshmfence-1.3.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=d5d37c0bc37f60882f7370a687f9aba9
+_md5_=1c0287e69b16cb93bd4c72f6bd1b0bf0
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 9b16e1228dc6..cd88031a87c4 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/compose-tables-1.7.0 b/metadata/md5-cache/x11-misc/compose-tables-1.7.0
index 91344cab2d6e..a9ec225624e6 100644
--- a/metadata/md5-cache/x11-misc/compose-tables-1.7.0
+++ b/metadata/md5-cache/x11-misc/compose-tables-1.7.0
@@ -4,10 +4,10 @@ DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1 x11-libs/xtrans
 DESCRIPTION=X.Org Compose Key tables from libX11
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
-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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=!<x11-libs/libX11-1.7.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.0.tar.bz2
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=ccafdde8a0ce44b0389fb6205c990dce
+_md5_=6e752d9661c9c4b8f672b219049dc9c3
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4
index 7378b2ffdb0e..12ea8b837f23 100644
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4
@@ -5,10 +5,10 @@ DESCRIPTION=VNC server for real X displays
 EAPI=7
 HOMEPAGE=https://libvnc.github.io/
 IUSE=crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=>=net-libs/libvncserver-0.9.8[ssl=] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) dev-lang/tk:0
 SLOT=0
 SRC_URI=https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz -> x11vnc-0.9.16.tar.gz
 _eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cfac0c9ce660fd88d9d7af4b1b97c91a
+_md5_=c2aaf412d6e6ac6181a1ee5743da2e80
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.31 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.31
index ab98fd81ee7d..735f4952a660 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.31
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.31
@@ -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 ~riscv ~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 ~riscv ~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.31.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fdc139b38639a314e9a67f047ab6e3ca
+_md5_=1d27ceaf8d67dc34674f11004215e5a8
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.36 b/metadata/md5-cache/x11-misc/xmobar-0.36
index ecfadfb14d00..f1f36a273505 100644
--- a/metadata/md5-cache/x11-misc/xmobar-0.36
+++ b/metadata/md5-cache/x11-misc/xmobar-0.36
@@ -1,5 +1,5 @@
 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 )
+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 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Minimalistic Text Based Status Bar
 EAPI=7
 HOMEPAGE=https://xmobar.org
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[
 RESTRICT=!test? ( test )
 SLOT=0/0.36
 SRC_URI=https://hackage.haskell.org/package/xmobar-0.36/xmobar-0.36.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a19d38e4d439fdfd14a024b7d0eb1b6c
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 8090b687cc7c..f71f27bae0c7 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/wmbiff-0.4.36 b/metadata/md5-cache/x11-plugins/wmbiff-0.4.36
index 370b310739aa..3e64598b96bc 100644
--- a/metadata/md5-cache/x11-plugins/wmbiff-0.4.36
+++ b/metadata/md5-cache/x11-plugins/wmbiff-0.4.36
@@ -5,9 +5,9 @@ DESCRIPTION=WMBiff is a dock applet for WindowMaker which can monitor up to 5 ma
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmbiff
 IUSE=crypt
-KEYWORDS=~amd64 ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 >=net-libs/gnutls-2.2.0 )
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmbiff-0.4.36.tar.gz
-_md5_=63a30c09c810f67fcdad22ccdf722eed
+_md5_=6f87ae5d47db4ce77f5e8634d90aa806
diff --git a/metadata/md5-cache/x11-plugins/wmcoincoin-2.6.3 b/metadata/md5-cache/x11-plugins/wmcoincoin-2.6.3
index 479a0f70f820..222f952789a5 100644
--- a/metadata/md5-cache/x11-plugins/wmcoincoin-2.6.3
+++ b/metadata/md5-cache/x11-plugins/wmcoincoin-2.6.3
@@ -4,9 +4,9 @@ DESCRIPTION=a dockapp for browsing dacode news and board sites
 EAPI=6
 HOMEPAGE=http://hules.free.fr/wmcoincoin
 IUSE=nls xinerama
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=amd64 ppc ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://hules.free.fr/wmcoincoin/download/wmcoincoin-2.6.3.tar.gz
-_md5_=ef090d7285dbb927da4388cb33b9492d
+_md5_=67d9d5f40d32f50bdb35f69013ecdf44
diff --git a/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r2 b/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r2
new file mode 100644
index 000000000000..6b8acd235d7f
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=x11-libs/gtk+:2 x11-libs/libXpm virtual/pkgconfig
+DESCRIPTION=dockapp that monitors one or more mailboxes
+EAPI=7
+HOMEPAGE=http://tnemeth.free.fr/projets/dockapps.html
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 x11-libs/libXpm
+SLOT=0
+SRC_URI=http://tnemeth.free.fr/projets/programmes/wmmaiload-2.3.0.tar.bz2
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f2470630b07099a1147480e26fc25341
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 4b4fedc5c760..ecfa50ff9ab6 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/xterm-351 b/metadata/md5-cache/x11-terms/xterm-351
index bf71cc7ad466..eff4858023f6 100644
--- a/metadata/md5-cache/x11-terms/xterm-351
+++ b/metadata/md5-cache/x11-terms/xterm-351
@@ -11,4 +11,4 @@ RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libute
 SLOT=0
 SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-351.tgz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd6f82dcee05319ddced2fc54e1a4f37
+_md5_=e3c401bf14e88301cffef46a94259b4d
diff --git a/metadata/md5-cache/x11-terms/xterm-360 b/metadata/md5-cache/x11-terms/xterm-360
index ea9d887801a9..71f4369b148b 100644
--- a/metadata/md5-cache/x11-terms/xterm-360
+++ b/metadata/md5-cache/x11-terms/xterm-360
@@ -11,4 +11,4 @@ RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libute
 SLOT=0
 SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-360.tgz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f17a59d09a5200860cd970268e13bddc
+_md5_=24f0e0f7255dd3fa0e341f0b4a396394
diff --git a/metadata/md5-cache/x11-terms/xterm-361 b/metadata/md5-cache/x11-terms/xterm-361
index 7ff15174dd3d..5726d04a8fd7 100644
--- a/metadata/md5-cache/x11-terms/xterm-361
+++ b/metadata/md5-cache/x11-terms/xterm-361
@@ -11,4 +11,4 @@ RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( sys-libs/libute
 SLOT=0
 SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-361.tgz
 _eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	flag-o-matic	fb54c9a3302f35aeae1c84f363e776f7	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=84415e1222c1118bbd03612d3f45512b
+_md5_=a792dd36945cb647095410825106278d
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index cf7c344a64a3..8fa57aba0ff5 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.32.0 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.32.0
index 7548e6c50409..bebe651f9403 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.32.0
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.32.0
@@ -1,14 +1,15 @@
+BDEPEND=gnome-base/librsvg:2 sys-devel/gettext virtual/pkgconfig x11-libs/gtk+:3 >=app-portage/elt-patches-20170815 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 x11-libs/gtk+:3 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=x11-themes/hicolor-icon-theme-0.10 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNOME default icon theme
-EAPI=6
+EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
 IUSE=branding
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
-RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 !<x11-themes/gnome-themes-standard-3.14
+RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.32/adwaita-icon-theme-3.32.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=19a6f8d51f01751b7cb7a5c1e7d6c8c8
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64eeae3f4c0d89fa623af5143aa26f7a
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1-r1 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1-r1
index e9ffdf807ffb..294d97c36d4a 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1-r1
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1-r1
@@ -1,7 +1,8 @@
+BDEPEND=>=gnome-base/librsvg-2.48:2 sys-devel/gettext virtual/pkgconfig x11-libs/gtk+:3 >=app-portage/elt-patches-20170815 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=gnome-base/librsvg-2.48:2 x11-libs/gtk+:3 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=x11-themes/hicolor-icon-theme-0.10 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNOME default icon theme
-EAPI=6
+EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
 IUSE=branding
 KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
@@ -10,5 +11,5 @@ RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=gnome-base/librsvg-2.48:2
 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	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f0015ea68f919455bc9980303d0b54e
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6cfd02061d35fc1f14666514214aeb4b
diff --git a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.28 b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.28
index 6c15f1b4418d..0fc734f6fb9c 100644
--- a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.28
+++ b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.28
@@ -1,12 +1,13 @@
+BDEPEND=>=dev-util/intltool-0.40 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 app-arch/xz-utils
 DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=>=dev-util/intltool-0.40 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 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Standard Themes for GNOME Applications
-EAPI=6
+EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-themes-extra
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=gnome-base/gsettings-desktop-schemas-3.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-themes-extra/3.28/gnome-themes-extra-3.28.tar.xz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	d780995dc525ff7e6a2c4c043ffec242	gnome.org	532d56d07b9eace4831aaa817d2b756a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e14ffbb6f5385a4f502dd4fe2c5672a
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	gnome.org	532d56d07b9eace4831aaa817d2b756a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ff27ef6ae71a0a8cc6e475a1342641e7
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28 b/metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28
index 7a7a44cc8222..c47bc603b776 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28
+++ b/metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28
@@ -1,13 +1,14 @@
+BDEPEND=>=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils
 DEFINED_PHASES=compile configure install test
-DEPEND=>=x11-libs/gtk+-2.24.15:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils
+DEPEND=>=x11-libs/gtk+-2.24.15:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Adwaita GTK+2 theme engine
-EAPI=6
+EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-themes-extra/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
-RDEPEND=>=x11-libs/gtk+-2.24.15:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<x11-themes/gnome-themes-standard-3.20.2-r1
+RDEPEND=>=x11-libs/gtk+-2.24.15:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-themes-extra/3.28/gnome-themes-extra-3.28.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	d780995dc525ff7e6a2c4c043ffec242	gnome.org	532d56d07b9eace4831aaa817d2b756a	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=d0e62e93b8969d645c1ec19cdd06560a
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=af7f9934623339042d14595c85f37644
diff --git a/metadata/md5-cache/x11-themes/icewm-extra-themes-1.2 b/metadata/md5-cache/x11-themes/icewm-extra-themes-1.2
index bbbd2ded75e1..6d322201535e 100644
--- a/metadata/md5-cache/x11-themes/icewm-extra-themes-1.2
+++ b/metadata/md5-cache/x11-themes/icewm-extra-themes-1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-wm/icewm
 SLOT=0
 SRC_URI=https://github.com/bbidulock/icewm-extra-themes/releases/download/1.2/icewm-extra-themes-1.2.tar.lz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=5c3f74411341019adc2ca9144bf590a5
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 766f458772d9..aa2291d9c68f 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/icewm-1.8.3 b/metadata/md5-cache/x11-wm/icewm-1.8.3
index 3c002858948f..b64dab1ace31 100644
--- a/metadata/md5-cache/x11-wm/icewm-1.8.3
+++ b/metadata/md5-cache/x11-wm/icewm-1.8.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.8.3/icewm-1.8.3.tar.lz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=a55a6c3936a0f08d97762778ea4ef236
diff --git a/metadata/md5-cache/x11-wm/icewm-1.9.2 b/metadata/md5-cache/x11-wm/icewm-1.9.2
index 6937a482f06b..e40418eeebbe 100644
--- a/metadata/md5-cache/x11-wm/icewm-1.9.2
+++ b/metadata/md5-cache/x11-wm/icewm-1.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.9.2/icewm-1.9.2.tar.lz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=35a59e0c7a81c88f43223031e34e00b0
diff --git a/metadata/md5-cache/x11-wm/icewm-2.0.0 b/metadata/md5-cache/x11-wm/icewm-2.0.0
index b118edde77c2..55c24c84581a 100644
--- a/metadata/md5-cache/x11-wm/icewm-2.0.0
+++ b/metadata/md5-cache/x11-wm/icewm-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/2.0.0/icewm-2.0.0.tar.lz
-_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
+_eclasses_=autotools	b8cf7d8850baf5b731738e6d4f00937a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	45b49db67094fdafbb6a16a2299e894b
 _md5_=7a89d0452a88ef87eb52b9a45278718b
diff --git a/metadata/md5-cache/x11-wm/xmonad-0.15 b/metadata/md5-cache/x11-wm/xmonad-0.15
index 49581fd00eec..360e2dd0f37f 100644
--- a/metadata/md5-cache/x11-wm/xmonad-0.15
+++ b/metadata/md5-cache/x11-wm/xmonad-0.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/data-default:=[profile?] dev-haskell/extensible-exceptions:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/setlocale:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.8:=[profile?] <dev-haskell/x11-1.10:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/quickcheck-2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/data-default:=[profile?] dev-haskell/extensible-exceptions:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/setlocale:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.8:=[profile?] <dev-haskell/x11-1.10:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/quickcheck-2 ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A tiling window manager
 EAPI=6
 HOMEPAGE=https://xmonad.org
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/data-default:=[profile?] dev-haskell/extensible-exceptions:=
 RESTRICT=!test? ( test )
 SLOT=0/0.15
 SRC_URI=https://hackage.haskell.org/package/xmonad-0.15/xmonad-0.15.tar.gz
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6fc8c2c92ee8804f2052153b8ad31a2c
diff --git a/metadata/md5-cache/x11-wm/xmonad-contrib-0.16 b/metadata/md5-cache/x11-wm/xmonad-contrib-0.16
index 2c1571caf581..99e7091ab47d 100644
--- a/metadata/md5-cache/x11-wm/xmonad-contrib-0.16
+++ b/metadata/md5-cache/x11-wm/xmonad-contrib-0.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.10:=[profile?] >=dev-lang/ghc-8.0.1:= >=x11-wm/xmonad-0.15:=[profile?] <x11-wm/xmonad-0.16:=[profile?] xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.10:=[profile?] >=dev-lang/ghc-8.0.1:= >=x11-wm/xmonad-0.15:=[profile?] <x11-wm/xmonad-0.16:=[profile?] xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Third party extensions for xmonad
 EAPI=7
 HOMEPAGE=https://xmonad.org/
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.10:=[profile?] >=dev-lang/ghc-8.0.1:= >=x11-wm/xmonad-0.15:=[profile?] <x11-wm/xmonad-0.16:=[profile?] xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
 SLOT=0/0.16
 SRC_URI=https://hackage.haskell.org/package/xmonad-contrib-0.16/xmonad-contrib-0.16.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	69bd92aa099f708425db9f1f01d61213	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	f2babbc5251b22d1c1811b67f7fb8ad1	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8c21bc5d1e74bc834c79eed11cb8f0d8
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 6b00d374f22b..c3f2bda3b5ac 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.3 b/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.3
new file mode 100644
index 000000000000..6b538a98c45c
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
+DESCRIPTION=A panel plug-in for disk usage and performance statistics
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-2.6.3.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a058c81aedbb797e27cf3c17b0c9ce97
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r6 b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r6
deleted file mode 100644
index b2c65a5817d2..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2:= >=x11-libs/gtk+-2.18:2= x11-libs/libX11:= <xfce-base/exo-4.15[gtk2(+)] <xfce-base/libxfce4ui-4.15:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= <xfce-base/xfce4-panel-4.15:=[gtk2(+)] ssl? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=An mail notification panel plug-in for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/
-IUSE=ipv6 ssl
-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+-2.18:2= x11-libs/libX11:= <xfce-base/exo-4.15[gtk2(+)] <xfce-base/libxfce4ui-4.15:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= <xfce-base/xfce4-panel-4.15:=[gtk2(+)] ssl? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/1.2/xfce4-mailwatch-plugin-1.2.0.tar.bz2
-_eclasses_=desktop	8f9bfcc33705104f56748d9dedb3177a	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	0a83d4ccf28a70ddf61e7073c96e515a	estack	d780995dc525ff7e6a2c4c043ffec242	eutils	69bd92aa099f708425db9f1f01d61213	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1429d4264cc7d2f9c9e5850fd1aa2a37
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.3.0 b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.3.0
index 0bcceddf3d19..9175a35f7fae 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.3.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.3.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst postrm
 DEPEND=>=dev-libs/glib-2.42:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:= ssl? ( >=net-libs/gnutls-2:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=An mail notification panel plug-in for the Xfce desktop environment
 EAPI=7
-HOMEPAGE=https://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/
+HOMEPAGE=https://www.spurint.org/projects/xfce4-mailwatch-plugin/
 IUSE=ipv6 ssl
-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.42:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:= ssl? ( >=net-libs/gnutls-2:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/1.3/xfce4-mailwatch-plugin-1.3.0.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41dedc145e50aa5e8bcc9c988107add8
+_md5_=8759a8a0d025b8c03109735735ae4361
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.4 b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.4
new file mode 100644
index 000000000000..1edaff2c8e62
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
+DESCRIPTION=An mount plug-in for the Xfce panel
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-mount-plugin/1.1/xfce4-mount-plugin-1.1.4.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=65dd2f1c7a1ba34d360c24998ac8f867
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.10 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.10
deleted file mode 100644
index 5ff83600847f..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/dbus-glib-0.30 >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.20:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= elogind? ( sys-auth/elogind ) locking? ( pam? ( sys-libs/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= ) dev-util/glib-utils dev-util/intltool sys-apps/dbus virtual/pkgconfig
-DESCRIPTION=Screen saver and locker (port of MATE screensaver)
-EAPI=7
-HOMEPAGE=https://git.xfce.org/apps/xfce4-screensaver/about/
-IUSE=elogind +locking opengl pam systemd
-KEYWORDS=~alpha amd64 ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/dbus-glib-0.30 >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.20:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= elogind? ( sys-auth/elogind ) locking? ( pam? ( sys-libs/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/0.1/xfce4-screensaver-0.1.10.tar.bz2
-_md5_=157db73829151fc76073c63b2ab60784
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.11 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.11
index 9fc828b400ae..270e6ecea6eb 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.11
+++ b/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.11
@@ -4,10 +4,10 @@ DESCRIPTION=Screen saver and locker (port of MATE screensaver)
 EAPI=7
 HOMEPAGE=https://git.xfce.org/apps/xfce4-screensaver/about/
 IUSE=elogind +locking opengl pam systemd
-KEYWORDS=~alpha amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/dbus-glib-0.30 >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.20:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= elogind? ( sys-auth/elogind ) locking? ( pam? ( sys-libs/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/0.1/xfce4-screensaver-0.1.11.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a295777aefb2c63f6504fee752c40761
+_md5_=93547cf3b8dcf0d604d94d2e6273a4c9
diff --git a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.4 b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.4
new file mode 100644
index 000000000000..5a00d90d8626
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.4
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= upower? ( >=sys-power/upower-0.9.23 )
+DESCRIPTION=System load plug-in for Xfce panel
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
+IUSE=upower
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= upower? ( >=sys-power/upower-0.9.23 )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-1.2.4.tar.bz2
+_md5_=aa19443dd83e31d2b12ca103b267b0d0
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.1 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.1
deleted file mode 100644
index 831f2f835b21..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.42 dev-libs/libxml2 >=net-libs/libsoup-2.42[ssl] >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:= upower? ( >=sys-power/upower-0.9.23 ) dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A weather plug-in for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin
-IUSE=upower
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.42 dev-libs/libxml2 >=net-libs/libsoup-2.42[ssl] >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:= upower? ( >=sys-power/upower-0.9.23 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.10/xfce4-weather-plugin-0.10.1.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c3253ab8ca02e29ee67189ecbd2451e3
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.2 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.2
index c939bd872593..3937cbef7e12 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.2
@@ -4,10 +4,10 @@ DESCRIPTION=A weather plug-in for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin
 IUSE=upower
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42 dev-libs/libxml2 >=net-libs/libsoup-2.42[ssl] >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:= upower? ( >=sys-power/upower-0.9.23 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.10/xfce4-weather-plugin-0.10.2.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=960c99cd73bf87d0777c74278455423b
+_md5_=c3253ab8ca02e29ee67189ecbd2451e3
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 33e65d3c1c09..670ca8d61dd9 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 12077 BLAKE2B 2f3ed2165704c3f21cd4304fe3c7b1c7220549685a7eaa2b3e7c032afad54f4636d2f0b3a9ec4d5d71d15b7b035403e2ef7a90326cff0da0eaf8ffd7e4fac1aa SHA512 f30fcba11723fbc57f0bea029403880a3ba6f50c0d547ae57a3947cb791df5cb0e16dcf31a4810562ece91b1fc646aa82b76a7ef6f7a60e3a0bdd95f0bc0a165
-TIMESTAMP 2020-12-18T06:08:43Z
+TIMESTAMP 2020-12-21T11:38:28Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/cR2tfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/giTRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBkdBAAhWERHsiTxY9QZGzAuj6gGLC8mvKk3jgaMiFI6oI05ZBvQmR4QrE2tWi9
-4CAEJoW2kWPIi4DoR1Sn7V0Y6sd5+DdcuV5gyeyKIUiAw/pOBYSupszXavrW2NLT
-YfaJuZSwAzkBQLMHx7uLZq2Gxqipr+nGixcmc5UZCYgblqEYdTa9DKBbHBs05tSc
-rIuOobA927lqaKbtXsSxV9dgQFt+jb4ZMYSLi0ml+ihtMwdLyf4lwZ2vGBzyWrRf
-oXDRK9u4idgb3cfR4GuyPcV7Z7sYzElNZHXB47rwL/Z04MyveCdnAMUIa8gbVEle
-exMl0xuXsaFrBaE08cXKqitsF2SqKSX9xhV444+/KBolT5KlHTEGLrrsstKWWN48
-ryYY5Z0engA0sjXCkzL9mIADSG1QN3dyDXIXnTd05Ty73M4ow3ON/hnx8HsfFNS6
-TNKBr0ib5hcDmyGReD1Cxww+btrsgCg65BWPDjopj5UT2J9yjuulbz48HtNjgW6N
-5Vi7K6QuqX0Br/9xuJcN4VVKdubGS7oqxVnxMXyEt5wytG0AaIRrtbyiv7cH0RM4
-YBlMXwAvjvcNpFEylfQ5/3pSk6q6v+4w0y4vRg+O3vqDcOJGiErUba+rSrwBJ3rX
-07okurEMP+bUjsiVGqyDFkRhgEvgDcOSKIMESvb1NG1TV08e56I=
-=2nGr
+klDoiBAAnjzOodF5VWB2P4j4FdPZTJOT70PbYDtZc4Bifyn4R7YfLqc0BbNN7y6H
+CeGy1Wl1Q7sl+3LTpFgoYHqfzHGdGwXzeue4ZF8WcxWYh81haVnqOK6+Hz5EIvN4
+TkQFoJyzph7DZcr67nsmfkK4Gs1geqvPv7QJyd6AzmyBFIXKP1274QlsphOxiq5I
+58zDzI7hr9eLYjLtERlzZo6TFNNqT7gfCYtK2mlaJDZ0uT9tAuUxtjJlA69x294I
+c5yI5mmckC8CA0EhrRqwU3Y26T/qjyhcKgns5FgghAAi5xmpyOGR6O9QTWP6GvVU
+EPcWhEqLNnqxASFEwEnbGRzt27/723GseO3aCXCEO5LNReizuczvcyvdmqpOVR3T
+tcjJ4Qj7MKU1LNKETfBErmF6H8zGGXzPWnrF7r9v6/sqGkupA2vJXAJqHY7hmaoI
+hkgeLT5LVlS8tH0k3TrKFwl3lZrQu7zXZBlbdT8e9K2SohdScvK/ax3Wt9NfQs2X
+vKYPUM9NupTshvFWb5Ctpa31tYG2W0K7v1CnNQdjVZX42NjOtYpBX1eNBRM9DTtr
+mTNN4ZU8H/SY60UtC6MVWEWeArXSmK2SDXVr7LMb38NMj+9pcXwGmA9zTnwBMOKE
+sceYtIcUIypgNGS7Ww6osLQ1l3TADBoAtLA1flt/tPiMs0IPXZY=
+=sauP
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6e9dcaf3d8d0..33efc54e44ae 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Dec 2020 06:08:40 +0000
+Mon, 21 Dec 2020 11:38:25 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index b28bf7b4a671..adc5ff7cf81a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Dec 18 06:08:40 AM UTC 2020
+Mon Dec 21 11:38:25 AM UTC 2020
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index fb26d1ca693c..10564b9e732a 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -265,6 +265,7 @@
 2012011340 ./acct-group/gatling/gatling-0-r1.ebuild
 2012041309 ./acct-group/frr/frr-0.ebuild
 2012160109 ./acct-group/dehydrated/dehydrated-0.ebuild
+2012200039 ./acct-group/postgrey/postgrey-0.ebuild
 1909291839 ./acct-user/alias/alias-0.ebuild
 1910161039 ./acct-user/bacula/bacula-0.ebuild
 1909271939 ./acct-user/bitcoin/bitcoin-0.ebuild
@@ -511,6 +512,7 @@
 2012011340 ./acct-user/gatling/gatling-0-r1.ebuild
 2012041309 ./acct-user/frr/frr-0.ebuild
 2012160109 ./acct-user/dehydrated/dehydrated-0.ebuild
+2012200039 ./acct-user/postgrey/postgrey-0.ebuild
 2012041809 ./app-accessibility/accerciser/accerciser-3.36.2.ebuild
 2007290809 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
 2011090239 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
@@ -536,6 +538,7 @@
 2004032241 ./app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild
 2002140109 ./app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
 2008302139 ./app-accessibility/orca/orca-3.36.5.ebuild
+2012191839 ./app-accessibility/orca/orca-3.36.6.ebuild
 1803270108 ./app-accessibility/powiedz/powiedz-1.0-r2.ebuild
 2002230040 ./app-accessibility/sound-icons/sound-icons-0.1.ebuild
 2004191139 ./app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r3.ebuild
@@ -555,9 +558,9 @@
 2002051839 ./app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
 2012111609 ./app-admin/ansible-lint/ansible-lint-4.1.0.ebuild
 2010280109 ./app-admin/ansible/ansible-2.10.0-r2.ebuild
-2010280109 ./app-admin/ansible/ansible-9999.ebuild
 2012031039 ./app-admin/ansible/ansible-2.10.1.ebuild
-2012152339 ./app-admin/ansible/ansible-2.10.4.ebuild
+2012200139 ./app-admin/ansible/ansible-2.10.4.ebuild
+2012200139 ./app-admin/ansible/ansible-9999.ebuild
 2004032241 ./app-admin/apache-tools/apache-tools-2.4.41.ebuild
 2006221008 ./app-admin/apache-tools/apache-tools-2.4.43.ebuild
 2009010209 ./app-admin/apache-tools/apache-tools-2.4.46.ebuild
@@ -593,7 +596,7 @@
 1910111840 ./app-admin/clog/clog-1.3.0.ebuild
 2006040938 ./app-admin/clsync/clsync-0.4.4.ebuild
 2011090239 ./app-admin/clsync/clsync-9999.ebuild
-2012020639 ./app-admin/clsync/clsync-0.4.5.ebuild
+2012181409 ./app-admin/clsync/clsync-0.4.5.ebuild
 2006201209 ./app-admin/clustershell/clustershell-1.8.3.ebuild
 2009211409 ./app-admin/conky/conky-1.10.8-r9.ebuild
 2011021309 ./app-admin/conky/conky-1.10.8-r10.ebuild
@@ -605,15 +608,16 @@
 1912110241 ./app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
 2004282039 ./app-admin/consul-template/consul-template-0.25.0.ebuild
 2006251009 ./app-admin/consul/consul-1.7.4.ebuild
-2008140839 ./app-admin/consul/consul-1.7.7.ebuild
-2008140839 ./app-admin/consul/consul-1.8.3.ebuild
 2009120909 ./app-admin/consul/consul-1.7.8.ebuild
 2009120909 ./app-admin/consul/consul-1.8.4.ebuild
+2012191139 ./app-admin/consul/consul-1.7.11.ebuild
+2012191139 ./app-admin/consul/consul-1.8.7.ebuild
+2012191139 ./app-admin/consul/consul-1.9.1.ebuild
 2008181439 ./app-admin/cpulimit/cpulimit-2.4.ebuild
 2004041009 ./app-admin/cronlocker/cronlocker-0.4.0_p20180710.ebuild
 1712300140 ./app-admin/cronolog/cronolog-1.6.2-r5.ebuild
-1912311439 ./app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
-1912311439 ./app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
+2012181739 ./app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
+2012181739 ./app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
 2012051239 ./app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild
 2012051239 ./app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild
 2008091909 ./app-admin/dio/dio-1.5.2-r1.ebuild
@@ -631,7 +635,7 @@
 1811260309 ./app-admin/elektra/elektra-0.8.20-r1.ebuild
 2004051339 ./app-admin/emacs-updater/emacs-updater-1.16.ebuild
 2009162339 ./app-admin/entr/entr-4.5.ebuild
-2009162009 ./app-admin/entr/entr-4.6.ebuild
+2012201939 ./app-admin/entr/entr-4.6.ebuild
 2005062039 ./app-admin/eselect/eselect-1.4.15.ebuild
 2005062039 ./app-admin/eselect/eselect-1.4.16.ebuild
 2012161539 ./app-admin/eselect/eselect-1.4.17.ebuild
@@ -782,19 +786,23 @@
 2002092009 ./app-admin/ps_mem/ps_mem-3.13-r1.ebuild
 2012071609 ./app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild
 1910042139 ./app-admin/psmon/psmon-1.39-r1.ebuild
-2006020338 ./app-admin/puppet-agent/puppet-agent-6.15.0.ebuild
 2009280039 ./app-admin/puppet-agent/puppet-agent-6.18.0.ebuild
 2011230239 ./app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild
+2012201309 ./app-admin/puppet-agent/puppet-agent-7.1.0.ebuild
 2007171039 ./app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
 2004141539 ./app-admin/puppet/puppet-5.5.19-r1.ebuild
 2007161009 ./app-admin/puppet/puppet-5.5.21.ebuild
 2009280039 ./app-admin/puppet/puppet-6.18.0.ebuild
 2010210909 ./app-admin/puppet/puppet-5.5.22.ebuild
 2011230239 ./app-admin/puppet/puppet-6.19.1.ebuild
+2012200539 ./app-admin/puppet/puppet-7.1.0.ebuild
 2009280039 ./app-admin/puppetdb/puppetdb-6.12.0.ebuild
 2011230239 ./app-admin/puppetdb/puppetdb-6.13.0.ebuild
-2009280039 ./app-admin/puppetserver/puppetserver-6.13.0.ebuild
-2011230239 ./app-admin/puppetserver/puppetserver-6.14.0.ebuild
+2012200539 ./app-admin/puppetdb/puppetdb-7.0.1.ebuild
+2012210510 ./app-admin/puppetserver/puppetserver-6.12.1.ebuild
+2012210510 ./app-admin/puppetserver/puppetserver-6.13.0.ebuild
+2012210510 ./app-admin/puppetserver/puppetserver-6.14.0.ebuild
+2012210510 ./app-admin/puppetserver/puppetserver-7.0.1.ebuild
 2005121809 ./app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
 2008041839 ./app-admin/pwgen/pwgen-2.08.ebuild
 2009071209 ./app-admin/pwman3/pwman3-0.10.0-r1.ebuild
@@ -857,7 +865,8 @@
 1712300140 ./app-admin/sud/sud-1.3-r1.ebuild
 2011041709 ./app-admin/sudo/sudo-9999.ebuild
 2011141239 ./app-admin/sudo/sudo-1.9.3_p1.ebuild
-2012011409 ./app-admin/sudo/sudo-1.9.4.ebuild
+2012181509 ./app-admin/sudo/sudo-1.9.4_p1.ebuild
+2012202139 ./app-admin/sudo/sudo-1.9.4_p2.ebuild
 2003261841 ./app-admin/superadduser/superadduser-1.15.ebuild
 2004211009 ./app-admin/superadduser/superadduser-1.0.9.ebuild
 2008112209 ./app-admin/supervisor/supervisor-4.2.0.ebuild
@@ -907,13 +916,14 @@
 2003280339 ./app-admin/yadm/yadm-2.4.0.ebuild
 2011101839 ./app-admin/graylog/graylog-3.3.8.ebuild
 2011272009 ./app-admin/graylog/graylog-4.0.1.ebuild
+2012202239 ./app-admin/graylog/graylog-3.3.9.ebuild
 2012130439 ./app-admin/ansible-base/ansible-base-2.10.2.ebuild
 2012130439 ./app-admin/ansible-base/ansible-base-2.10.3.ebuild
 2012152339 ./app-admin/ansible-base/ansible-base-2.10.4.ebuild
 2010011509 ./app-admin/xkcdpass/xkcdpass-1.17.3-r1.ebuild
 2010020009 ./app-admin/op-cli-bin/op-cli-bin-1.7.0.ebuild
-2011030939 ./app-admin/selint/selint-1.1.0.ebuild
 2011030939 ./app-admin/selint/selint-9999.ebuild
+2012201939 ./app-admin/selint/selint-1.1.0.ebuild
 2012031339 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.23.1.ebuild
 2007171839 ./app-antivirus/clamav/clamav-0.102.4.ebuild
 2012180439 ./app-antivirus/clamav/clamav-0.103.0-r2.ebuild
@@ -956,6 +966,7 @@
 2011141839 ./app-arch/fastjar/fastjar-0.98-r3.ebuild
 2004202139 ./app-arch/file-roller/file-roller-3.32.4.ebuild
 2008252009 ./app-arch/file-roller/file-roller-3.36.3.ebuild
+2012181539 ./app-arch/file-roller/file-roller-3.38.0.ebuild
 1712291639 ./app-arch/funzix/funzix-1.0.ebuild
 2006080009 ./app-arch/gcab/gcab-1.4.ebuild
 2004142009 ./app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
@@ -968,11 +979,10 @@
 2003212239 ./app-arch/lcab/lcab-1.0_beta12.ebuild
 2006222138 ./app-arch/lha/lha-114i_p20201004.ebuild
 2008051739 ./app-arch/libarchive/libarchive-3.4.3.ebuild
-2012011439 ./app-arch/libarchive/libarchive-3.5.0.ebuild
+2012182139 ./app-arch/libarchive/libarchive-3.5.0.ebuild
 2011141839 ./app-arch/libpar2/libpar2-0.4.ebuild
 2007132139 ./app-arch/lrzip/lrzip-0.631_p20190619.ebuild
-2008311709 ./app-arch/lz4/lz4-1.9.2.ebuild
-2012172009 ./app-arch/lz4/lz4-1.9.3.ebuild
+2012202009 ./app-arch/lz4/lz4-1.9.3.ebuild
 2002230040 ./app-arch/lz5/lz5-2.0.ebuild
 2012041739 ./app-arch/lzip/lzip-1.21.ebuild
 1912261409 ./app-arch/lziprecover/lziprecover-1.21.ebuild
@@ -1002,8 +1012,8 @@
 2006251039 ./app-arch/pet2tgz/pet2tgz-0.3-r1.ebuild
 2007110609 ./app-arch/pigz/pigz-2.4-r1.ebuild
 2008181709 ./app-arch/pixz/pixz-1.0.6-r1.ebuild
-2008200509 ./app-arch/pixz/pixz-1.0.7.ebuild
 2008200509 ./app-arch/pixz/pixz-9999.ebuild
+2012202339 ./app-arch/pixz/pixz-1.0.7.ebuild
 2008210639 ./app-arch/plzip/plzip-1.8.ebuild
 1712281839 ./app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild
 1711201653 ./app-arch/pxz/pxz-5.0_pre20151029.ebuild
@@ -1052,6 +1062,7 @@
 2011142339 ./app-arch/wimlib/wimlib-1.13.0.ebuild
 2004032241 ./app-arch/xar/xar-1.8-r2.ebuild
 2012041739 ./app-arch/xar/xar-1.8-r3.ebuild
+2012201339 ./app-arch/xar/xar-1.8-r4.ebuild
 2012030239 ./app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
 2006150539 ./app-arch/xdms/xdms-1.3.2-r1.ebuild
 2005072209 ./app-arch/xz-utils/xz-utils-9999.ebuild
@@ -1063,10 +1074,11 @@
 1912261409 ./app-arch/zpaq-extras/zpaq-extras-3.ebuild
 1706301419 ./app-arch/zpaq/zpaq-7.15.ebuild
 2010061709 ./app-arch/zstd/zstd-1.4.4-r4.ebuild
-2010061709 ./app-arch/zstd/zstd-1.4.5.ebuild
-2012171339 ./app-arch/zstd/zstd-1.4.7.ebuild
+2012202339 ./app-arch/zstd/zstd-1.4.5.ebuild
+2012192109 ./app-arch/zstd/zstd-1.4.8.ebuild
 2007311939 ./app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild
 2011231039 ./app-arch/lxqt-archiver/lxqt-archiver-0.3.0.ebuild
+2012201509 ./app-arch/stormlib/stormlib-9.23-r1.ebuild
 2002140109 ./app-backup/amanda/amanda-3.3.9.ebuild
 2002140109 ./app-backup/amanda/amanda-3.4.1.ebuild
 2002140109 ./app-backup/amanda/amanda-3.4.2.ebuild
@@ -1103,7 +1115,7 @@
 2011051609 ./app-backup/burp/burp-2.3.36.ebuild
 1806240109 ./app-backup/ccollect/ccollect-0.8.ebuild
 1807151809 ./app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
-1706110757 ./app-backup/cdbkup/cdbkup-1.0-r2.ebuild
+2012181209 ./app-backup/cdbkup/cdbkup-1.0-r2.ebuild
 1906012109 ./app-backup/consul-backinator/consul-backinator-1.6.5.ebuild
 1910111840 ./app-backup/cpdup/cpdup-1.18.ebuild
 2009201739 ./app-backup/dar/dar-2.5.11.ebuild
@@ -1135,8 +1147,8 @@
 2010080009 ./app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
 1908281239 ./app-backup/rdumpfs/rdumpfs-0.1.ebuild
 1912110241 ./app-backup/rdup/rdup-1.1.15.ebuild
-1810092039 ./app-backup/rear/rear-2.4.ebuild
-2011121009 ./app-backup/rear/rear-2.6.ebuild
+2012181209 ./app-backup/rear/rear-2.4.ebuild
+2012181209 ./app-backup/rear/rear-2.6.ebuild
 2002122139 ./app-backup/reoback/reoback-1.0_p3-r1.ebuild
 2001271609 ./app-backup/restic/restic-0.9.6.ebuild
 2010101039 ./app-backup/restic/restic-0.10.0.ebuild
@@ -1209,24 +1221,24 @@
 2011190209 ./app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
 2010310409 ./app-benchmarks/hyperfine/hyperfine-1.11.0.ebuild
 1910051539 ./app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
-2009150109 ./app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
+2012181209 ./app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
 2011201409 ./app-cdr/bchunk/bchunk-1.2.2.ebuild
 2002112051 ./app-cdr/bin2iso/bin2iso-19b-r2.ebuild
-1912110241 ./app-cdr/brasero/brasero-3.12.2-r1.ebuild
-1803032108 ./app-cdr/burncdda/burncdda-1.8.3.ebuild
+2012181209 ./app-cdr/brasero/brasero-3.12.2-r1.ebuild
+2012181209 ./app-cdr/burncdda/burncdda-1.8.3.ebuild
 1910111840 ./app-cdr/ccd2iso/ccd2iso-0.3.ebuild
 2002222009 ./app-cdr/cdck/cdck-0.7.0-r2.ebuild
 1904162309 ./app-cdr/cddetect/cddetect-2.1.ebuild
 2006081209 ./app-cdr/cdemu-daemon/cdemu-daemon-3.2.4.ebuild
 2006081209 ./app-cdr/cdemu/cdemu-3.2.4.ebuild
 1805212238 ./app-cdr/cdlabelgen/cdlabelgen-4.3.0.ebuild
-2004032241 ./app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+2012181209 ./app-cdr/cdrdao/cdrdao-1.2.4.ebuild
 2004032241 ./app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
 2007242138 ./app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
 2012072209 ./app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
-1904222309 ./app-cdr/cdw/cdw-0.8.1.ebuild
-2006250909 ./app-cdr/cdw/cdw-0.8.1-r1.ebuild
-2006250909 ./app-cdr/cdw/cdw-9999.ebuild
+2012181209 ./app-cdr/cdw/cdw-0.8.1-r1.ebuild
+2012181209 ./app-cdr/cdw/cdw-0.8.1.ebuild
+2012181209 ./app-cdr/cdw/cdw-9999.ebuild
 2003261841 ./app-cdr/cue2toc/cue2toc-0.4.ebuild
 1702282250 ./app-cdr/cuecue/cuecue-0.2.2-r2.ebuild
 2005151039 ./app-cdr/cuecue/cuecue-0.2.2-r3.ebuild
@@ -1235,14 +1247,14 @@
 1712281509 ./app-cdr/daa2iso/daa2iso-0.1.7e.ebuild
 1712122339 ./app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild
 2010011509 ./app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild
-2004032241 ./app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
+2012181209 ./app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
 1810202109 ./app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
-1712281509 ./app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
+2012181209 ./app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
 1902121339 ./app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
 1712281509 ./app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild
 2006081209 ./app-cdr/gcdemu/gcdemu-3.2.4.ebuild
 2005181609 ./app-cdr/geteltorito/geteltorito-0.6.ebuild
-1702282250 ./app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
+2012181209 ./app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
 2006251809 ./app-cdr/iat/iat-0.1.7-r1.ebuild
 1912040409 ./app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild
 1912111539 ./app-cdr/isomaster/isomaster-1.3.13.ebuild
@@ -1252,11 +1264,11 @@
 1709041820 ./app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild
 1705211156 ./app-cdr/mirage2iso/mirage2iso-9999.ebuild
 1806030209 ./app-cdr/mkcdtoc/mkcdtoc-1.0.ebuild
-1702282250 ./app-cdr/mp3burn/mp3burn-0.4.2.ebuild
-1806030209 ./app-cdr/multicd/multicd-1.7.5-r1.ebuild
+2012181209 ./app-cdr/mp3burn/mp3burn-0.4.2.ebuild
+2012181209 ./app-cdr/multicd/multicd-1.7.5-r1.ebuild
 1912110241 ./app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild
 1702282250 ./app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
-1702282250 ./app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
+2012181209 ./app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
 1912110241 ./app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild
 1908281239 ./app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
 1905191409 ./app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
@@ -1383,10 +1395,8 @@
 1911131109 ./app-crypt/kstart/kstart-4.2.ebuild
 2004211009 ./app-crypt/libb2/libb2-0.98.1-r2.ebuild
 2004261509 ./app-crypt/libb2/libb2-0.98.1-r3.ebuild
-1811171839 ./app-crypt/libmd/libmd-1.0.0-r1.ebuild
-1805261309 ./app-crypt/libmd/libmd-1.0.0.ebuild
 1910231539 ./app-crypt/libmd/libmd-99999.ebuild
-2012172009 ./app-crypt/libmd/libmd-1.0.1.ebuild
+2012202239 ./app-crypt/libmd/libmd-1.0.1.ebuild
 2001091009 ./app-crypt/libnitrokey/libnitrokey-3.5.ebuild
 2001091009 ./app-crypt/libnitrokey/libnitrokey-9999.ebuild
 2002030009 ./app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -1445,7 +1455,7 @@
 2003201209 ./app-crypt/rainbowcrack/rainbowcrack-1.7.ebuild
 2010071939 ./app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild
 2004032241 ./app-crypt/rhash/rhash-1.3.6-r1.ebuild
-2008180139 ./app-crypt/rhash/rhash-1.4.0.ebuild
+2012181809 ./app-crypt/rhash/rhash-1.4.0.ebuild
 2006300939 ./app-crypt/rotix/rotix-0.83-r1.ebuild
 2002140109 ./app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
 2002140109 ./app-crypt/sbsigntools/sbsigntools-0.9.2.ebuild
@@ -1460,7 +1470,7 @@
 1712072339 ./app-crypt/signify/signify-23.ebuild
 1809291039 ./app-crypt/signify/signify-24.ebuild
 2009030039 ./app-crypt/signify/signify-29.ebuild
-2011150209 ./app-crypt/signify/signify-30.ebuild
+2012202239 ./app-crypt/signify/signify-30.ebuild
 2001101209 ./app-crypt/signing-party/signing-party-2.10-r1.ebuild
 2007122009 ./app-crypt/signing-party/signing-party-2.11.ebuild
 2011142339 ./app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
@@ -2666,10 +2676,10 @@
 2004032241 ./app-emulation/libcacard/libcacard-2.6.0.ebuild
 2011160239 ./app-emulation/libdsk/libdsk-1.5.8.ebuild
 1812071939 ./app-emulation/libguestfs-appliance/libguestfs-appliance-1.38.0.ebuild
-2012040209 ./app-emulation/libguestfs/libguestfs-1.36.13.ebuild
-2012040209 ./app-emulation/libguestfs/libguestfs-1.36.15.ebuild
-2012040209 ./app-emulation/libguestfs/libguestfs-1.38.6.ebuild
-2012091539 ./app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild
+2012181209 ./app-emulation/libguestfs/libguestfs-1.36.13.ebuild
+2012181209 ./app-emulation/libguestfs/libguestfs-1.36.15.ebuild
+2012181209 ./app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild
+2012181209 ./app-emulation/libguestfs/libguestfs-1.38.6.ebuild
 2009230909 ./app-emulation/libpod/libpod-2.1.0.ebuild
 2008161109 ./app-emulation/libspectrum/libspectrum-1.4.4.ebuild
 1902160209 ./app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild
@@ -2695,7 +2705,6 @@
 2005271839 ./app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
 2005271839 ./app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild
 2001291739 ./app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0-r1.ebuild
-2005140909 ./app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild
 2007110438 ./app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-5.0.0.ebuild
 2012131509 ./app-emulation/qemu/qemu-5.1.0-r2.ebuild
 2012131509 ./app-emulation/qemu/qemu-5.1.0-r3.ebuild
@@ -2804,9 +2813,11 @@
 2007261939 ./app-emulation/xen-pvgrub/xen-pvgrub-4.14.0.ebuild
 2011110409 ./app-emulation/xen-pvgrub/xen-pvgrub-4.13.2.ebuild
 2011121939 ./app-emulation/xen-tools/xen-tools-4.13.2-r1.ebuild
-2011182039 ./app-emulation/xen-tools/xen-tools-4.14.0-r4.ebuild
-2011272009 ./app-emulation/xen/xen-4.14.0-r6.ebuild
+2012202239 ./app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild
+2012202239 ./app-emulation/xen-tools/xen-tools-4.14.0-r5.ebuild
 2012031109 ./app-emulation/xen/xen-4.13.2-r2.ebuild
+2012202239 ./app-emulation/xen/xen-4.13.2-r3.ebuild
+2012202239 ./app-emulation/xen/xen-4.14.0-r7.ebuild
 2006280009 ./app-emulation/xtrs/xtrs-4.9d-r5.ebuild
 2009230439 ./app-emulation/crun/crun-0.14.1.ebuild
 2010071239 ./app-emulation/crun/crun-0.15.ebuild
@@ -2986,8 +2997,8 @@
 2008191809 ./app-i18n/ibus-table/ibus-table-1.9.21-r2.ebuild
 2008281639 ./app-i18n/ibus-table/ibus-table-1.12.0.ebuild
 2009111739 ./app-i18n/ibus-table/ibus-table-1.12.1.ebuild
-2011061639 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild
-2011131739 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild
+2012181709 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild
+2012181709 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.2.ebuild
 1708121738 ./app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
 2011162309 ./app-i18n/ibus/ibus-1.5.23.ebuild
 2012072139 ./app-i18n/ibus/ibus-1.5.22.ebuild
@@ -3229,7 +3240,7 @@
 2007101238 ./app-misc/carbon-c-relay/carbon-c-relay-3.7.2.ebuild
 1907151839 ./app-misc/cbview/cbview-0.06-r1.ebuild
 1912210209 ./app-misc/cdargs/cdargs-1.35-r2.ebuild
-1810041139 ./app-misc/cdcat/cdcat-0.3-r1.ebuild
+2012181209 ./app-misc/cdcat/cdcat-0.3-r1.ebuild
 1902081939 ./app-misc/cdctl/cdctl-0.16.ebuild
 1810202209 ./app-misc/cdircmp/cdircmp-0.3-r2.ebuild
 2002112051 ./app-misc/cdspeed/cdspeed-0.4-r2.ebuild
@@ -3340,7 +3351,6 @@
 2005120239 ./app-misc/go-jira/go-jira-1.0.23.ebuild
 2009260339 ./app-misc/go-jira/go-jira-1.0.26.ebuild
 2010080139 ./app-misc/go-jira/go-jira-1.0.27.ebuild
-2011070309 ./app-misc/golly/golly-3.4.ebuild
 2012162309 ./app-misc/golly/golly-4.0.ebuild
 2003090909 ./app-misc/goobook/goobook-3.4-r1.ebuild
 1807081439 ./app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
@@ -3404,7 +3414,6 @@
 2007061339 ./app-misc/lsx/lsx-0.1-r1.ebuild
 1911180839 ./app-misc/ltunify/ltunify-0.2-r2.ebuild
 1809152239 ./app-misc/lxsplit/lxsplit-0.2.4-r1.ebuild
-2004032241 ./app-misc/mc/mc-4.8.24.ebuild
 2007071209 ./app-misc/mc/mc-9999.ebuild
 2011271409 ./app-misc/mc/mc-4.8.25-r1.ebuild
 2012151339 ./app-misc/mc/mc-4.8.25.ebuild
@@ -3459,6 +3468,8 @@
 2006271008 ./app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
 1711031506 ./app-misc/pal/pal-0.4.3-r2.ebuild
 2012091539 ./app-misc/pax-utils/pax-utils-1.2.6.ebuild
+2012200109 ./app-misc/pax-utils/pax-utils-1.2.7.ebuild
+2012202339 ./app-misc/pax-utils/pax-utils-1.2.8.ebuild
 2002230040 ./app-misc/pdfpc/pdfpc-4.3.0.ebuild
 2004261709 ./app-misc/pdfpc/pdfpc-4.4.0.ebuild
 1702282250 ./app-misc/perltrash/perltrash-0.3-r1.ebuild
@@ -3575,7 +3586,9 @@
 1702282250 ./app-misc/tpipe/tpipe-1.6-r1.ebuild
 1702282250 ./app-misc/tprint/tprint-1.1.0-r1.ebuild
 2007281338 ./app-misc/tracker-miners/tracker-miners-2.3.3.ebuild
-2006080009 ./app-misc/tracker/tracker-2.3.4.ebuild
+2012191839 ./app-misc/tracker-miners/tracker-miners-2.3.4.ebuild
+2012191839 ./app-misc/tracker/tracker-2.3.4.ebuild
+2012191839 ./app-misc/tracker/tracker-2.3.5.ebuild
 2005121009 ./app-misc/trash-cli/trash-cli-0.17.1.14_p20170816-r1.ebuild
 2012071109 ./app-misc/trash-cli/trash-cli-0.20.11.23.ebuild
 2006040009 ./app-misc/ttyload/ttyload-0.5.3.ebuild
@@ -3698,7 +3711,7 @@
 2002230040 ./app-office/sc/sc-7.16-r2.ebuild
 2007172209 ./app-office/scribus/scribus-1.5.5_p20200626.ebuild
 2011161239 ./app-office/scribus/scribus-9999.ebuild
-2012172009 ./app-office/scribus/scribus-1.5.6.1.ebuild
+2012202239 ./app-office/scribus/scribus-1.5.6.1.ebuild
 2011251309 ./app-office/skrooge/skrooge-2.23.0-r1.ebuild
 2012060209 ./app-office/skrooge/skrooge-2.24.0.ebuild
 1908061309 ./app-office/texmacs/texmacs-1.99.11.ebuild
@@ -3734,18 +3747,12 @@
 2007181809 ./app-pda/ifuse/ifuse-1.1.3-r1.ebuild
 1805252038 ./app-pda/iripdb/iripdb-0.1.3b.ebuild
 2004032241 ./app-pda/jpilot/jpilot-1.8.2-r1.ebuild
-2005091109 ./app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild
-2005101639 ./app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
-2012172009 ./app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
-2005091109 ./app-pda/libplist/libplist-2.1.0.ebuild
-2007181409 ./app-pda/libplist/libplist-2.2.0-r1.ebuild
-2012172009 ./app-pda/libplist/libplist-2.2.0-r2.ebuild
-1911201439 ./app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
-2005091109 ./app-pda/libusbmuxd/libusbmuxd-2.0.1.ebuild
-2012172009 ./app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
+2012202239 ./app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
+2012202239 ./app-pda/libplist/libplist-2.2.0-r2.ebuild
+2012202239 ./app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
 2009231339 ./app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
 2005121009 ./app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild
-2012172009 ./app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
+2012202239 ./app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
 1904080809 ./app-portage/cfg-update/cfg-update-1.8.9.ebuild
 1702282250 ./app-portage/conf-update/conf-update-1.0.3-r1.ebuild
 1907192139 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild
@@ -3755,19 +3762,17 @@
 2002111509 ./app-portage/diffmask/diffmask-9999.ebuild
 2009271939 ./app-portage/diffmask/diffmask-0.3.3-r4.ebuild
 2002262109 ./app-portage/distpatch/distpatch-0.1.2-r2.ebuild
-2010251009 ./app-portage/eix/eix-0.34.10.ebuild
-2011172209 ./app-portage/eix/eix-0.34.9.ebuild
-2012172009 ./app-portage/eix/eix-0.34.11.ebuild
+2012202239 ./app-portage/eix/eix-0.34.11.ebuild
 2009021909 ./app-portage/elicense/elicense-1.0.2.ebuild
 2009021909 ./app-portage/elicense/elicense-9999.ebuild
 2011231339 ./app-portage/elogv/elogv-0.7.8-r3.ebuild
 2011231339 ./app-portage/elogv/elogv-0.7.9.ebuild
 2012030239 ./app-portage/elogviewer/elogviewer-3.0-r2.ebuild
-2003261841 ./app-portage/elt-patches/elt-patches-20170826.1.ebuild
-2004211009 ./app-portage/elt-patches/elt-patches-20170317.ebuild
-2004211009 ./app-portage/elt-patches/elt-patches-20170422.ebuild
-2004211009 ./app-portage/elt-patches/elt-patches-20170815.ebuild
-2012051839 ./app-portage/elt-patches/elt-patches-20201205.ebuild
+2012181739 ./app-portage/elt-patches/elt-patches-20170317.ebuild
+2012181739 ./app-portage/elt-patches/elt-patches-20170422.ebuild
+2012181739 ./app-portage/elt-patches/elt-patches-20170815.ebuild
+2012181739 ./app-portage/elt-patches/elt-patches-20170826.1.ebuild
+2012181739 ./app-portage/elt-patches/elt-patches-20201205.ebuild
 2004032241 ./app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
 1905181309 ./app-portage/epkg/epkg-0.4-r1.ebuild
 2010042209 ./app-portage/esearch/esearch-1.3-r3.ebuild
@@ -3792,9 +3797,6 @@
 2007231309 ./app-portage/genlop/genlop-0.30.10-r1.ebuild
 2007231309 ./app-portage/genlop/genlop-0.30.10-r2.ebuild
 2007231309 ./app-portage/genlop/genlop-0.30.9-r1.ebuild
-2011140409 ./app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
-2011140409 ./app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
-2011140409 ./app-portage/gentoolkit/gentoolkit-0.4.8.ebuild
 2011140409 ./app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
 2011140409 ./app-portage/gentoolkit/gentoolkit-9999.ebuild
 2005301039 ./app-portage/gentoopm/gentoopm-0.3.1.ebuild
@@ -3806,8 +3808,8 @@
 1902251309 ./app-portage/golop/golop-9999.ebuild
 2009161639 ./app-portage/gpyutils/gpyutils-9999.ebuild
 2011181009 ./app-portage/gpyutils/gpyutils-0.4.5.ebuild
-2006051909 ./app-portage/grs/grs-0.7.ebuild
-2006051909 ./app-portage/grs/grs-9999.ebuild
+2012181209 ./app-portage/grs/grs-0.7.ebuild
+2012181209 ./app-portage/grs/grs-9999.ebuild
 2010071739 ./app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
 2002101509 ./app-portage/gverify/gverify-2.ebuild
 1905181309 ./app-portage/hackport/hackport-9999.ebuild
@@ -3876,13 +3878,14 @@
 2011292239 ./app-shells/bash/bash-4.4_p23-r2.ebuild
 2011292239 ./app-shells/bash/bash-5.0_p18.ebuild
 2012071639 ./app-shells/bash/bash-5.1.ebuild
+2012201339 ./app-shells/bash/bash-5.1_p4.ebuild
 1912110241 ./app-shells/bashdb/bashdb-4.4.1.0.1.ebuild
 2005031640 ./app-shells/bashdb/bashdb-5.0.1.1.0.ebuild
 2005131639 ./app-shells/bashdb/bashdb-5.0.1.1.2.ebuild
 2004032241 ./app-shells/bashish/bashish-2.2.4.ebuild
 1707171556 ./app-shells/ccsh/ccsh-0.0.4-r4.ebuild
 2007091038 ./app-shells/ctypes-sh/ctypes-sh-1.2.ebuild
-2011021309 ./app-shells/dash/dash-0.5.11.2.ebuild
+2012202009 ./app-shells/dash/dash-0.5.11.2.ebuild
 1712261510 ./app-shells/dsh/dsh-0.25.10-r1.ebuild
 1702282250 ./app-shells/esh/esh-0.8.5-r2.ebuild
 1912110241 ./app-shells/fish/fish-2.7.1.ebuild
@@ -3959,7 +3962,7 @@
 2012140439 ./app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
 1706101306 ./app-text/an/an-1.2-r1.ebuild
 1702282250 ./app-text/an/an-1.2.ebuild
-2011271939 ./app-text/an/an-1.2_p6.ebuild
+2012211309 ./app-text/an/an-1.2_p6.ebuild
 2011281109 ./app-text/ansifilter/ansifilter-2.17.ebuild
 2002112051 ./app-text/antiword/antiword-0.37-r1.ebuild
 1801051609 ./app-text/antixls/antixls-0.3b.ebuild
@@ -4021,7 +4024,7 @@
 2004211009 ./app-text/delta/delta-20060803-r1.ebuild
 2011041909 ./app-text/dictd/dictd-1.13.0-r1.ebuild
 1702282250 ./app-text/diction/diction-1.13.ebuild
-2011271209 ./app-text/diction/diction-1.14.ebuild
+2012211309 ./app-text/diction/diction-1.14.ebuild
 2002112051 ./app-text/diff-pdf/diff-pdf-0.3.ebuild
 2010221439 ./app-text/diff-pdf/diff-pdf-0.4.1.ebuild
 2005201838 ./app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
@@ -4037,9 +4040,9 @@
 2004211009 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
 2004211009 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
 2004211009 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
-2004211009 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
 2012041739 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
 2012041739 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
+2012201509 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
 2007242338 ./app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
 2004211009 ./app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
 2004211009 ./app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -4058,7 +4061,7 @@
 2004032241 ./app-text/dos2unix/dos2unix-7.3.5.ebuild
 2012030239 ./app-text/dos2unix/dos2unix-7.4.2.ebuild
 2004032241 ./app-text/dvipng/dvipng-1.15-r1.ebuild
-2010231439 ./app-text/dvipng/dvipng-1.17.ebuild
+2012202139 ./app-text/dvipng/dvipng-1.17.ebuild
 2006042108 ./app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
 2003261841 ./app-text/dvisvgm/dvisvgm-2.6.1.ebuild
 2003261841 ./app-text/dvisvgm/dvisvgm-2.7.ebuild
@@ -4072,9 +4075,9 @@
 2009041409 ./app-text/enchant/enchant-2.2.8.ebuild
 2004032241 ./app-text/enscript/enscript-1.6.6.ebuild
 2004032241 ./app-text/epspdf/epspdf-0.6.0-r1.ebuild
-2012172009 ./app-text/epspdf/epspdf-0.6.3-r1.ebuild
+2012211309 ./app-text/epspdf/epspdf-0.6.3-r1.ebuild
 2011072109 ./app-text/epstool/epstool-3.08-r1.ebuild
-2012170251 ./app-text/epstool/epstool-3.09.ebuild
+2012181339 ./app-text/epstool/epstool-3.09.ebuild
 2008302139 ./app-text/evince/evince-3.36.7.ebuild
 2001220109 ./app-text/expander/expander-2.0.5-r2.ebuild
 1911181009 ./app-text/extract_url/extract_url-1.6.2.ebuild
@@ -4085,7 +4088,7 @@
 2002291009 ./app-text/fictionup/fictionup-0.2.1.ebuild
 2011150109 ./app-text/flpsed/flpsed-0.7.3.ebuild
 2010201139 ./app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
-2012172009 ./app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
+2012211309 ./app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
 2011151839 ./app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
 2010112239 ./app-text/gocr/gocr-0.50.ebuild
 2010051809 ./app-text/grip/grip-4.5.2-r1.ebuild
@@ -4093,15 +4096,15 @@
 2002231739 ./app-text/groonga/groonga-6.1.2.ebuild
 2002231739 ./app-text/groonga/groonga-8.0.2.ebuild
 2006041239 ./app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
-1912291809 ./app-text/gspell/gspell-1.6.1.ebuild
 2004131939 ./app-text/gspell/gspell-1.8.3.ebuild
+2012191839 ./app-text/gspell/gspell-1.8.4.ebuild
 2004131939 ./app-text/gtkspell/gtkspell-3.0.10.ebuild
 2006080009 ./app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
 2008302139 ./app-text/gtranslator/gtranslator-3.36.0.ebuild
 2008042209 ./app-text/gv/gv-3.7.3.90.ebuild
 2004032241 ./app-text/hd2u/hd2u-1.0.3.ebuild
 2006290009 ./app-text/highlight/highlight-3.57.ebuild
-2012172009 ./app-text/highlight/highlight-3.57-r1.ebuild
+2012211309 ./app-text/highlight/highlight-3.57-r1.ebuild
 2011272109 ./app-text/hnb/hnb-1.9.18-r1.ebuild
 1702282250 ./app-text/htag/htag-0.0.24-r1.ebuild
 2006201809 ./app-text/html-xml-utils/html-xml-utils-7.7.ebuild
@@ -4181,7 +4184,7 @@
 1707141650 ./app-text/lout/lout-3.40.ebuild
 2004032241 ./app-text/lv/lv-4.51-r4.ebuild
 2009140439 ./app-text/mandoc/mandoc-1.14.5.ebuild
-2012140439 ./app-text/mandoc/mandoc-1.14.5-r1.ebuild
+2012200109 ./app-text/mandoc/mandoc-1.14.5-r1.ebuild
 2004211009 ./app-text/manpager/manpager-1.ebuild
 1904071139 ./app-text/master-pdf-editor/master-pdf-editor-5.3.22.ebuild
 2005041739 ./app-text/master-pdf-editor/master-pdf-editor-5.4.38-r1.ebuild
@@ -4313,15 +4316,14 @@
 1702282250 ./app-text/trang/trang-20151127.ebuild
 2003261841 ./app-text/tree/tree-1.7.0-r1.ebuild
 2004211009 ./app-text/tree/tree-1.7.0.ebuild
-2011271139 ./app-text/tree/tree-1.8.0.ebuild
+2012211309 ./app-text/tree/tree-1.8.0.ebuild
 2005311939 ./app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
 1801131539 ./app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
 2004032241 ./app-text/txt2man/txt2man-1.6.0.ebuild
 2006151609 ./app-text/txt2man/txt2man-1.7.0.ebuild
-2012180209 ./app-text/txt2man/txt2man-1.7.1.ebuild
+2012201939 ./app-text/txt2man/txt2man-1.7.1.ebuild
 1702282250 ./app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild
-2010111239 ./app-text/txt2tags/txt2tags-3.3.ebuild
-2012171639 ./app-text/txt2tags/txt2tags-3.7.ebuild
+2012201939 ./app-text/txt2tags/txt2tags-3.7.ebuild
 2011270009 ./app-text/u2ps/u2ps-1.2.ebuild
 2011271909 ./app-text/u2ps/u2ps-1.1.ebuild
 2001122039 ./app-text/unac/unac-1.8.0.ebuild
@@ -4333,7 +4335,7 @@
 2002161409 ./app-text/vilistextum/vilistextum-2.8.0.20191023-r1.ebuild
 2010311609 ./app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
 2004032241 ./app-text/wdiff/wdiff-1.2.2.ebuild
-2012131109 ./app-text/wdiff/wdiff-1.2.2-r1.ebuild
+2012211309 ./app-text/wdiff/wdiff-1.2.2-r1.ebuild
 2007220739 ./app-text/webgen/webgen-1.7.1.ebuild
 2011281109 ./app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
 2012080339 ./app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
@@ -4369,9 +4371,8 @@
 2006031238 ./app-text/yodl/yodl-4.02.02-r1.ebuild
 2008241209 ./app-text/zathura-cb/zathura-cb-0.1.8.ebuild
 2008241209 ./app-text/zathura-cb/zathura-cb-9999.ebuild
-1812111309 ./app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
-2001081809 ./app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
 2001081809 ./app-text/zathura-djvu/zathura-djvu-9999.ebuild
+2012202239 ./app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
 1810171609 ./app-text/zathura-meta/zathura-meta-0.ebuild
 2008241239 ./app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
 2010151539 ./app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -5021,7 +5022,7 @@
 2004032241 ./dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
 1906221309 ./dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
 2001261709 ./dev-cpp/cpp-hocon/cpp-hocon-0.2.1.ebuild
-2012172009 ./dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
+2012202239 ./dev-cpp/cpp-hocon/cpp-hocon-0.3.0.ebuild
 2009231339 ./dev-cpp/ctemplate/ctemplate-2.4.ebuild
 2007211909 ./dev-cpp/eigen/eigen-3.3.7.ebuild
 2010121939 ./dev-cpp/eigen/eigen-3.3.8-r1.ebuild
@@ -5047,8 +5048,7 @@
 2004032241 ./dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
 2004032241 ./dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
 2001151039 ./dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.3.0.ebuild
-1702282250 ./dev-cpp/libmcpp/libmcpp-2.7.2-r2.ebuild
-1804182009 ./dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
+2012201939 ./dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
 1910222139 ./dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
 2006132027 ./dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild
 1804140239 ./dev-cpp/libxsd-frontend/libxsd-frontend-2.0.0.ebuild
@@ -5215,7 +5215,7 @@
 2011132309 ./dev-db/mysql/mysql-5.7.31.ebuild
 2011132109 ./dev-db/mysql/mysql-8.0.21-r1.ebuild
 2011251939 ./dev-db/mysql/mysql-5.7.32.ebuild
-2011300439 ./dev-db/mysql/mysql-8.0.22.ebuild
+2012210009 ./dev-db/mysql/mysql-8.0.22.ebuild
 1804060238 ./dev-db/mysqltuner/mysqltuner-1.6.18.ebuild
 1904100139 ./dev-db/mysqltuner/mysqltuner-1.7.13.ebuild
 1907312209 ./dev-db/mysqltuner/mysqltuner-1.7.15.ebuild
@@ -5238,10 +5238,8 @@
 2002241539 ./dev-db/oracle-instantclient/oracle-instantclient-19.5.0.0.ebuild
 2002241539 ./dev-db/oracle-instantclient/oracle-instantclient-19.6.0.0.ebuild
 2010020339 ./dev-db/oracle-instantclient/oracle-instantclient-19.6.0.0-r1.ebuild
-2007261638 ./dev-db/percona-server/percona-server-5.7.27.30-r1.ebuild
-2007261638 ./dev-db/percona-server/percona-server-8.0.19.10-r1.ebuild
-2010090309 ./dev-db/percona-server/percona-server-8.0.20.11-r2.ebuild
-2011090309 ./dev-db/percona-server/percona-server-8.0.21.12.ebuild
+2012210009 ./dev-db/percona-server/percona-server-8.0.21.12.ebuild
+2012210209 ./dev-db/percona-server/percona-server-8.0.22.13.ebuild
 1804180139 ./dev-db/percona-toolkit/percona-toolkit-2.2.20.ebuild
 1904182339 ./dev-db/percona-toolkit/percona-toolkit-3.0.13.ebuild
 1805070108 ./dev-db/percona-toolkit/percona-toolkit-3.0.9.ebuild
@@ -5258,6 +5256,7 @@
 2009121509 ./dev-db/pgadmin4/pgadmin4-4.25.ebuild
 2011201609 ./dev-db/pgadmin4/pgadmin4-4.28.ebuild
 2012042309 ./dev-db/pgadmin4/pgadmin4-4.26.ebuild
+2012181809 ./dev-db/pgadmin4/pgadmin4-4.29.ebuild
 2012170139 ./dev-db/pgagent/pgagent-4.0.0-r1.ebuild
 1908190109 ./dev-db/pgbadger/pgbadger-11.0.ebuild
 2011231509 ./dev-db/pgbadger/pgbadger-11.3.ebuild
@@ -5277,6 +5276,7 @@
 2012170739 ./dev-db/pgpool2/pgpool2-9999.ebuild
 2008140409 ./dev-db/pgrouting/pgrouting-2.6.2-r1.ebuild
 2011260609 ./dev-db/pgrouting/pgrouting-3.1.1.ebuild
+2012211409 ./dev-db/pgrouting/pgrouting-3.1.2.ebuild
 2008140409 ./dev-db/pgtap/pgtap-0.99.0.ebuild
 2012090739 ./dev-db/pgtap/pgtap-1.1.0.ebuild
 2006251039 ./dev-db/pgxnclient/pgxnclient-1.3-r2.ebuild
@@ -5292,8 +5292,8 @@
 2008140409 ./dev-db/postgis/postgis-2.5.4.ebuild
 2008182109 ./dev-db/postgis/postgis-2.5.5.ebuild
 2008182109 ./dev-db/postgis/postgis-3.0.2.ebuild
-2011221209 ./dev-db/postgis/postgis-3.0.3.ebuild
-2011221239 ./dev-db/postgis/postgis-3.1.0_alpha3.ebuild
+2012190239 ./dev-db/postgis/postgis-3.0.3-r1.ebuild
+2012190239 ./dev-db/postgis/postgis-3.1.0_alpha3-r1.ebuild
 2011141709 ./dev-db/postgresql/postgresql-10.15.ebuild
 2011141709 ./dev-db/postgresql/postgresql-11.10.ebuild
 2011141709 ./dev-db/postgresql/postgresql-12.5.ebuild
@@ -5651,7 +5651,7 @@
 2008011139 ./dev-haskell/bifunctors/bifunctors-5.5.6.ebuild
 2008182039 ./dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild
 2008041009 ./dev-haskell/binary-tagged/binary-tagged-0.2.ebuild
-2008011139 ./dev-haskell/binary/binary-0.8.7.0.ebuild
+2012211239 ./dev-haskell/binary/binary-0.8.7.0.ebuild
 2008182039 ./dev-haskell/biocore/biocore-0.3.1.ebuild
 2010031309 ./dev-haskell/biofasta/biofasta-0.0.3.ebuild
 2010031309 ./dev-haskell/biosff/biosff-0.3.7.1.ebuild
@@ -5702,7 +5702,7 @@
 2010041409 ./dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild
 2008300109 ./dev-haskell/classy-prelude/classy-prelude-1.5.0.ebuild
 1912151339 ./dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
-2004132310 ./dev-haskell/clock/clock-0.7.2.ebuild
+2012210239 ./dev-haskell/clock/clock-0.7.2.ebuild
 1912150309 ./dev-haskell/cmark/cmark-0.6.ebuild
 1912150309 ./dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
 1912150309 ./dev-haskell/code-page/code-page-0.1.3.ebuild
@@ -6049,8 +6049,8 @@
 2008192339 ./dev-haskell/pango/pango-0.13.8.1.ebuild
 1911101840 ./dev-haskell/parallel-io/parallel-io-0.3.3-r3.ebuild
 2008182039 ./dev-haskell/parallel/parallel-3.2.2.0.ebuild
-2005271009 ./dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
-2008011139 ./dev-haskell/parsec/parsec-3.1.14.0.ebuild
+2012202209 ./dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
+2012202209 ./dev-haskell/parsec/parsec-3.1.14.0.ebuild
 1911101840 ./dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
 2008011139 ./dev-haskell/path-io/path-io-1.6.0-r1.ebuild
 2010271209 ./dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
@@ -6747,7 +6747,7 @@
 1702282250 ./dev-java/javassist/javassist-2.6-r2.ebuild
 1912111539 ./dev-java/javassist/javassist-3.18.2.ebuild
 2011021309 ./dev-java/javatoolkit/javatoolkit-0.6.3.ebuild
-2012151339 ./dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
+2012211309 ./dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
 1702282250 ./dev-java/javax-inject/javax-inject-1-r2.ebuild
 1802021208 ./dev-java/javax-inject/javax-inject-1-r3.ebuild
 1702282250 ./dev-java/javolution/javolution-4.0.2-r1.ebuild
@@ -7088,8 +7088,8 @@
 2011251139 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild
 2012101339 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.61.ebuild
 2012101339 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.41.ebuild
-2012141109 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild
 2012141109 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.40.ebuild
+2012211309 ./dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.60.ebuild
 2010200739 ./dev-java/toolbar/toolbar-1.1.0-r2.ebuild
 2010200739 ./dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
 2007200439 ./dev-java/treelayout/treelayout-1.0.2.ebuild
@@ -7205,6 +7205,7 @@
 2009051139 ./dev-lang/ghc/ghc-8.10.1.ebuild
 2009051139 ./dev-lang/ghc/ghc-8.8.3.ebuild
 2009051139 ./dev-lang/ghc/ghc-8.8.4.ebuild
+2012210139 ./dev-lang/ghc/ghc-8.10.2.ebuild
 2004131439 ./dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
 2006121109 ./dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild
 2006220009 ./dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
@@ -7285,8 +7286,6 @@
 2008031539 ./dev-lang/mono/mono-6.10.0.104.ebuild
 2007282239 ./dev-lang/mozart-stdlib/mozart-stdlib-2.0.1.ebuild
 2007282239 ./dev-lang/mozart/mozart-2.0.1.ebuild
-2006270009 ./dev-lang/mujs/mujs-1.0.6.ebuild
-2009181139 ./dev-lang/mujs/mujs-1.0.7.ebuild
 2011172209 ./dev-lang/mujs/mujs-1.0.9.ebuild
 2010071039 ./dev-lang/nasm/nasm-2.15.05.ebuild
 2012050009 ./dev-lang/nim/nim-1.4.2.ebuild
@@ -7317,9 +7316,9 @@
 2010181439 ./dev-lang/perl/perl-5.32.0-r1.ebuild
 2010181439 ./dev-lang/perl/perl-5.32.0.ebuild
 2012080539 ./dev-lang/php/php-8.0.0.ebuild
-2012150539 ./dev-lang/php/php-7.2.34.ebuild
 2012151409 ./dev-lang/php/php-7.3.25.ebuild
 2012151409 ./dev-lang/php/php-7.4.13.ebuild
+2012210139 ./dev-lang/php/php-7.2.34.ebuild
 2011170309 ./dev-lang/polyml/polyml-5.6.ebuild
 2011170309 ./dev-lang/polyml/polyml-5.8.ebuild
 2012120109 ./dev-lang/python-exec/python-exec-2.4.6-r2.ebuild
@@ -7336,12 +7335,12 @@
 2012141439 ./dev-lang/python/python-3.10.0_alpha3.ebuild
 2012141439 ./dev-lang/python/python-3.8.7_rc1.ebuild
 2012141439 ./dev-lang/python/python-3.9.1.ebuild
-2012170251 ./dev-lang/python/python-2.7.18-r5.ebuild
 2012170251 ./dev-lang/python/python-3.6.12-r1.ebuild
 2012170539 ./dev-lang/python/python-3.6.12.ebuild
 2012170251 ./dev-lang/python/python-3.7.9-r1.ebuild
 2012170251 ./dev-lang/python/python-3.8.6-r1.ebuild
 2012170251 ./dev-lang/python/python-3.9.0-r1.ebuild
+2012201539 ./dev-lang/python/python-2.7.18-r5.ebuild
 2006251009 ./dev-lang/qu-prolog/qu-prolog-10.5.ebuild
 2007191109 ./dev-lang/qu-prolog/qu-prolog-10.4.ebuild
 2009111824 ./dev-lang/qu-prolog/qu-prolog-10.6.ebuild
@@ -7414,9 +7413,10 @@
 2009181139 ./dev-lang/vala/vala-0.48.6.ebuild
 2010120039 ./dev-lang/vala/vala-0.40.24.ebuild
 2010120039 ./dev-lang/vala/vala-0.48.11.ebuild
-2010120109 ./dev-lang/vala/vala-0.50.1.ebuild
 2011141239 ./dev-lang/vala/vala-0.46.13.ebuild
 2011141239 ./dev-lang/vala/vala-0.48.9.ebuild
+2012191839 ./dev-lang/vala/vala-0.48.12.ebuild
+2012191839 ./dev-lang/vala/vala-0.50.2.ebuild
 1911101840 ./dev-lang/whitespace/whitespace-0.4.ebuild
 2009121639 ./dev-lang/xsb/xsb-3.8.0.ebuild
 2005112139 ./dev-lang/yap/yap-6.3.3-r1.ebuild
@@ -7450,7 +7450,7 @@
 2007280139 ./dev-libs/apr-util/apr-util-1.6.1-r6.ebuild
 2003261841 ./dev-libs/apr/apr-1.6.5-r1.ebuild
 2004032241 ./dev-libs/apr/apr-1.6.3-r4.ebuild
-2009061109 ./dev-libs/apr/apr-1.7.0-r1.ebuild
+2012191739 ./dev-libs/apr/apr-1.7.0-r1.ebuild
 2007041609 ./dev-libs/argtable/argtable-2.13-r1.ebuild
 1912252009 ./dev-libs/atcore/atcore-1.0.0.ebuild
 2004032241 ./dev-libs/atf/atf-0.21-r2.ebuild
@@ -7474,7 +7474,6 @@
 1912110241 ./dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
 2009252339 ./dev-libs/boost/boost-1.72.0-r2.ebuild
 2011242239 ./dev-libs/boost/boost-1.74.0-r1.ebuild
-2009181139 ./dev-libs/botan/botan-2.15.0.ebuild
 2011172209 ./dev-libs/botan/botan-2.16.0.ebuild
 2012030239 ./dev-libs/botan/botan-2.17.2.ebuild
 2011160239 ./dev-libs/busybee/busybee-0.7.0.ebuild
@@ -7574,7 +7573,7 @@
 2007171109 ./dev-libs/freexl/freexl-1.0.5.ebuild
 2012041739 ./dev-libs/fribidi/fribidi-1.0.9.ebuild
 2006132027 ./dev-libs/fstrm/fstrm-0.3.0.ebuild
-2010121239 ./dev-libs/fstrm/fstrm-0.6.0.ebuild
+2012202239 ./dev-libs/fstrm/fstrm-0.6.0.ebuild
 2011061839 ./dev-libs/gdl/gdl-3.34.0.ebuild
 2007231439 ./dev-libs/geoip/geoip-1.6.10.ebuild
 2007231439 ./dev-libs/geoip/geoip-1.6.11.ebuild
@@ -7588,15 +7587,15 @@
 2009181139 ./dev-libs/girara/girara-0.3.4.ebuild
 2011061839 ./dev-libs/gjs/gjs-1.64.4.ebuild
 2012102109 ./dev-libs/gjs/gjs-1.66.1.ebuild
-2006132027 ./dev-libs/glib/glib-2.62.6.ebuild
-2011141239 ./dev-libs/glib/glib-2.64.5.ebuild
-2012091809 ./dev-libs/glib/glib-2.66.2.ebuild
-2012091809 ./dev-libs/glib/glib-2.66.3.ebuild
 2012171739 ./dev-libs/glib/glib-2.66.4.ebuild
+2012190109 ./dev-libs/glib/glib-2.62.6.ebuild
+2012190109 ./dev-libs/glib/glib-2.64.5.ebuild
+2012190109 ./dev-libs/glib/glib-2.66.2.ebuild
+2012190109 ./dev-libs/glib/glib-2.66.3.ebuild
 2004032241 ./dev-libs/gmime/gmime-2.6.23-r1.ebuild
 2012011309 ./dev-libs/gmime/gmime-3.2.7.ebuild
 2006102139 ./dev-libs/gmp/gmp-6.2.0-r1.ebuild
-2011151339 ./dev-libs/gmp/gmp-6.2.1.ebuild
+2012211309 ./dev-libs/gmp/gmp-6.2.1.ebuild
 1910111840 ./dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
 1712231939 ./dev-libs/gnulib/gnulib-9999-r1.ebuild
 2002122139 ./dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
@@ -7618,7 +7617,7 @@
 2012130439 ./dev-libs/gumbo/gumbo-0.10.1.ebuild
 2012091239 ./dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
 2011260239 ./dev-libs/hiredis/hiredis-0.14.1.ebuild
-2011260239 ./dev-libs/hiredis/hiredis-1.0.0.ebuild
+2012181739 ./dev-libs/hiredis/hiredis-1.0.0.ebuild
 2011142339 ./dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
 2011160239 ./dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild
 2006101739 ./dev-libs/hyperscan/hyperscan-5.2.1-r1.ebuild
@@ -7626,9 +7625,11 @@
 2009081739 ./dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
 2006132027 ./dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
 2010301909 ./dev-libs/icu-layoutex/icu-layoutex-68.1.ebuild
+2012182139 ./dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild
 2011061509 ./dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
 2006062038 ./dev-libs/icu/icu-67.1.ebuild
 2011282209 ./dev-libs/icu/icu-68.1.ebuild
+2012182139 ./dev-libs/icu/icu-68.2.ebuild
 2008232009 ./dev-libs/igraph/igraph-0.7.1-r2.ebuild
 2009291909 ./dev-libs/igraph/igraph-0.8.2.ebuild
 2011150209 ./dev-libs/igraph/igraph-0.8.3.ebuild
@@ -7641,8 +7642,8 @@
 2008201709 ./dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild
 2010121539 ./dev-libs/intel-neo/intel-neo-20.37.17906.ebuild
 2011031509 ./dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
-2004090139 ./dev-libs/isl/isl-0.22.1.ebuild
-2011140039 ./dev-libs/isl/isl-0.23-r1.ebuild
+2012190009 ./dev-libs/isl/isl-0.22.1.ebuild
+2012211309 ./dev-libs/isl/isl-0.23-r1.ebuild
 2004032241 ./dev-libs/ivykis/ivykis-0.42.2.ebuild
 2004032241 ./dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
 2004032241 ./dev-libs/ivykis/ivykis-0.42.4.ebuild
@@ -7664,7 +7665,7 @@
 2006132027 ./dev-libs/json-glib/json-glib-1.4.4.ebuild
 2011090239 ./dev-libs/json-glib/json-glib-1.6.0.ebuild
 2008091739 ./dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
-2012091539 ./dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
+2012191339 ./dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
 2008302139 ./dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild
 2006041239 ./dev-libs/jthread/jthread-1.3.3.ebuild
 2012180009 ./dev-libs/judy/judy-1.0.5-r2.ebuild
@@ -7747,13 +7748,13 @@
 2009191939 ./dev-libs/libcharon/libcharon-4.7.0.ebuild
 2011302209 ./dev-libs/libcharon/libcharon-4.8.0.ebuild
 2008031509 ./dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
-2012070009 ./dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
+2012202239 ./dev-libs/libclc/libclc-0.2.0_pre20201001.ebuild
 2005061939 ./dev-libs/libclsync/libclsync-0.4.4-r1.ebuild
 2002151310 ./dev-libs/libconfig/libconfig-1.5.ebuild
 2002151310 ./dev-libs/libconfig/libconfig-1.7.1.ebuild
 2012161439 ./dev-libs/libconfig/libconfig-1.7.2.ebuild
 2002151310 ./dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild
-2006132027 ./dev-libs/libcroco/libcroco-0.6.13.ebuild
+2012190109 ./dev-libs/libcroco/libcroco-0.6.13.ebuild
 2008151509 ./dev-libs/libcss/libcss-0.8.0-r2.ebuild
 2008151509 ./dev-libs/libcss/libcss-0.9.0-r1.ebuild
 2008151509 ./dev-libs/libcss/libcss-0.9.1-r1.ebuild
@@ -7787,7 +7788,7 @@
 2011281539 ./dev-libs/libev/libev-4.33.ebuild
 2010160039 ./dev-libs/libevdev/libevdev-1.9.1.ebuild
 2010152239 ./dev-libs/libevdev/libevdev-9999.ebuild
-2012140439 ./dev-libs/libevdev/libevdev-1.10.0.ebuild
+2012202239 ./dev-libs/libevdev/libevdev-1.10.0.ebuild
 2006070109 ./dev-libs/libevent/libevent-2.1.11.ebuild
 2007051809 ./dev-libs/libevent/libevent-2.1.12.ebuild
 2007051809 ./dev-libs/libevent/libevent-2.1.9999.ebuild
@@ -7797,10 +7798,10 @@
 2002230040 ./dev-libs/libf2c/libf2c-20130927-r1.ebuild
 1806020408 ./dev-libs/libfastjson/libfastjson-0.99.8.ebuild
 2003261841 ./dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
-2011112309 ./dev-libs/libffi/libffi-3.3-r2.ebuild
+2012181609 ./dev-libs/libffi/libffi-3.3-r2.ebuild
 2006091709 ./dev-libs/libfilezilla/libfilezilla-0.20.2.ebuild
 2008281509 ./dev-libs/libfilezilla/libfilezilla-0.24.1.ebuild
-2010232209 ./dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild
+2012210339 ./dev-libs/libfilezilla/libfilezilla-0.25.0.ebuild
 2010311309 ./dev-libs/libflatarray/libflatarray-0.4.0_pre20201009.ebuild
 2007061839 ./dev-libs/libfmt/libfmt-9999.ebuild
 2009071209 ./dev-libs/libfmt/libfmt-7.0.3.ebuild
@@ -7820,8 +7821,7 @@
 2011090239 ./dev-libs/libgdata/libgdata-0.17.13.ebuild
 2005132039 ./dev-libs/libgee/libgee-0.20.3.ebuild
 2012161639 ./dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
-2011241139 ./dev-libs/libgit2/libgit2-1.0.1-r1.ebuild
-2012172009 ./dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
+2012202009 ./dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
 2008302139 ./dev-libs/libgnome-games-support/libgnome-games-support-1.6.1.ebuild
 2009201639 ./dev-libs/libgpg-error/libgpg-error-1.38.ebuild
 2009201639 ./dev-libs/libgpg-error/libgpg-error-1.39.ebuild
@@ -7830,6 +7830,7 @@
 1912110241 ./dev-libs/libgpuarray/libgpuarray-0.6.0.ebuild
 1912110241 ./dev-libs/libgpuarray/libgpuarray-0.6.7.ebuild
 2006132027 ./dev-libs/libgudev/libgudev-233-r1.ebuild
+2012191839 ./dev-libs/libgudev/libgudev-234.ebuild
 2006132027 ./dev-libs/libgusb/libgusb-0.3.3.ebuild
 2012131539 ./dev-libs/libgusb/libgusb-0.3.5.ebuild
 2008302139 ./dev-libs/libgweather/libgweather-3.36.1.ebuild
@@ -7841,7 +7842,7 @@
 2006132027 ./dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
 2009231639 ./dev-libs/libinput/libinput-1.16.1.ebuild
 2012041739 ./dev-libs/libinput/libinput-1.16.3.ebuild
-2012140439 ./dev-libs/libinput/libinput-1.16.4.ebuild
+2012202239 ./dev-libs/libinput/libinput-1.16.4.ebuild
 2004211009 ./dev-libs/libintl/libintl-0.19.7.ebuild
 2007271109 ./dev-libs/libintl/libintl-0.20.2.ebuild
 2008300439 ./dev-libs/libintl/libintl-0.20.1.ebuild
@@ -7859,10 +7860,6 @@
 2004032241 ./dev-libs/libksba/libksba-1.3.5-r1.ebuild
 2005202239 ./dev-libs/libksba/libksba-1.4.0.ebuild
 2011191309 ./dev-libs/libksba/libksba-1.5.0.ebuild
-2003261841 ./dev-libs/liblinear/liblinear-221.ebuild
-2003261841 ./dev-libs/liblinear/liblinear-230.ebuild
-2007221139 ./dev-libs/liblinear/liblinear-240-r1.ebuild
-2011041039 ./dev-libs/liblinear/liblinear-210-r1.ebuild
 2012131539 ./dev-libs/liblinear/liblinear-241.ebuild
 2002100209 ./dev-libs/liblist/liblist-2.4.ebuild
 2011142339 ./dev-libs/liblogging/liblogging-1.0.6.ebuild
@@ -7928,9 +7925,9 @@
 2012092039 ./dev-libs/libpeas/libpeas-1.26.0-r100.ebuild
 1904130639 ./dev-libs/libpfm/libpfm-4.8.0.ebuild
 2005281909 ./dev-libs/libpfm/libpfm-4.10.1.ebuild
-2012041739 ./dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
+2012181339 ./dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
 2004032241 ./dev-libs/libpipeline/libpipeline-1.5.2.ebuild
-2008131939 ./dev-libs/libpipeline/libpipeline-1.5.3.ebuild
+2012210510 ./dev-libs/libpipeline/libpipeline-1.5.3.ebuild
 1702282250 ./dev-libs/libplatform/libplatform-2.0.1.ebuild
 1702282250 ./dev-libs/libplatform/libplatform-2.1.0.1.ebuild
 1903130109 ./dev-libs/libplatform/libplatform-9999.ebuild
@@ -7938,6 +7935,7 @@
 2011160239 ./dev-libs/libpo6/libpo6-0.8.0.ebuild
 2009202339 ./dev-libs/libpqxx/libpqxx-7.1.2.ebuild
 2011231439 ./dev-libs/libpqxx/libpqxx-7.2.1.ebuild
+2012181809 ./dev-libs/libpqxx/libpqxx-7.3.0.ebuild
 2012080309 ./dev-libs/libprelude/libprelude-5.2.0-r10.ebuild
 2012160039 ./dev-libs/libprelude/libprelude-4.0.0.ebuild
 2012160039 ./dev-libs/libprelude/libprelude-4.1.0.ebuild
@@ -8010,7 +8008,6 @@
 1801051439 ./dev-libs/libtermkey/libtermkey-0.20.ebuild
 2008080909 ./dev-libs/libtermkey/libtermkey-0.22.ebuild
 1911300139 ./dev-libs/libtomfloat/libtomfloat-0.02-r1.ebuild
-2006041239 ./dev-libs/libtommath/libtommath-1.1.0.ebuild
 2009071209 ./dev-libs/libtommath/libtommath-1.2.0.ebuild
 1911300139 ./dev-libs/libtompoly/libtompoly-0.04-r1.ebuild
 2011010939 ./dev-libs/libtpms/libtpms-0.7.4.ebuild
@@ -8038,13 +8035,13 @@
 2005061709 ./dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild
 2005061709 ./dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
 2006132027 ./dev-libs/libuv/libuv-9999.ebuild
-2011242239 ./dev-libs/libuv/libuv-1.40.0.ebuild
+2012182309 ./dev-libs/libuv/libuv-1.40.0.ebuild
 1901071339 ./dev-libs/libvarlink/libvarlink-16.ebuild
 2002182339 ./dev-libs/libvarlink/libvarlink-18.ebuild
 2005060209 ./dev-libs/libvarlink/libvarlink-19.ebuild
 2003261841 ./dev-libs/libverto/libverto-0.3.0.ebuild
-2003261841 ./dev-libs/libverto/libverto-0.3.1.ebuild
 2004032241 ./dev-libs/libverto/libverto-0.2.5-r1.ebuild
+2012202239 ./dev-libs/libverto/libverto-0.3.1.ebuild
 2002151310 ./dev-libs/libvformat/libvformat-1.13-r2.ebuild
 2010141239 ./dev-libs/libvoikko/libvoikko-4.3.ebuild
 2002151310 ./dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150309.ebuild
@@ -8064,7 +8061,7 @@
 2002222009 ./dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
 1902160939 ./dev-libs/libxdiff/libxdiff-0.23-r2.ebuild
 2010131309 ./dev-libs/libxls/libxls-1.6.1.ebuild
-2012030339 ./dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
+2012182309 ./dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
 2006251009 ./dev-libs/libxmlb/libxmlb-0.1.15.ebuild
 2008191209 ./dev-libs/libxmlb/libxmlb-0.2.0.ebuild
 2011060509 ./dev-libs/libxmlb/libxmlb-0.2.1.ebuild
@@ -8196,7 +8193,7 @@
 2005311939 ./dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
 1912312039 ./dev-libs/pugixml/pugixml-9999.ebuild
 2010071039 ./dev-libs/pugixml/pugixml-1.10.ebuild
-2012151009 ./dev-libs/pugixml/pugixml-1.11.2.ebuild
+2012192339 ./dev-libs/pugixml/pugixml-1.11.3.ebuild
 2006040939 ./dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild
 2005212208 ./dev-libs/qoauth/qoauth-2.0.1_pre20160315-r3.ebuild
 1805050439 ./dev-libs/qqwing/qqwing-1.3.3.ebuild
@@ -8316,17 +8313,18 @@
 2011222239 ./dev-libs/utfcpp/utfcpp-3.1.2.ebuild
 2011222239 ./dev-libs/utfcpp/utfcpp-3.1.ebuild
 2011222239 ./dev-libs/utfcpp/utfcpp-9999.ebuild
-1912110241 ./dev-libs/uthash/uthash-2.0.2.ebuild
-2010071939 ./dev-libs/uthash/uthash-2.1.0.ebuild
+2012201939 ./dev-libs/uthash/uthash-2.1.0.ebuild
 2004032241 ./dev-libs/uulib/uulib-0.5.20-r1.ebuild
 2009181139 ./dev-libs/vala-common/vala-common-0.48.6.ebuild
 2010120039 ./dev-libs/vala-common/vala-common-0.48.11.ebuild
-2010120109 ./dev-libs/vala-common/vala-common-0.50.1.ebuild
 2011141239 ./dev-libs/vala-common/vala-common-0.48.9.ebuild
+2012191839 ./dev-libs/vala-common/vala-common-0.48.12.ebuild
+2012191839 ./dev-libs/vala-common/vala-common-0.50.2.ebuild
 2006021208 ./dev-libs/vc/vc-1.3.0.ebuild
 2006021208 ./dev-libs/vc/vc-1.3.3.ebuild
 2006021208 ./dev-libs/vc/vc-1.4.1.ebuild
 2010141239 ./dev-libs/voikko-fi/voikko-fi-2.3.ebuild
+2012201039 ./dev-libs/voikko-fi/voikko-fi-2.4.ebuild
 2004032241 ./dev-libs/volume_key/volume_key-0.3.11.ebuild
 2011261139 ./dev-libs/volume_key/volume_key-0.3.12-r2.ebuild
 2012140439 ./dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
@@ -8404,6 +8402,7 @@
 2011031509 ./dev-libs/level-zero/level-zero-0.91.10.ebuild
 2010080539 ./dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild
 2007171839 ./dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
+2012201509 ./dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
 2012170139 ./dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
 2012090139 ./dev-libs/libucl/libucl-0.8.1-r100.ebuild
 2012090139 ./dev-libs/libucl/libucl-9999.ebuild
@@ -8440,6 +8439,7 @@
 2012171809 ./dev-libs/s2n/s2n-0.10.21-r1.ebuild
 2012162341 ./dev-libs/miniz/miniz-2.1.0-r1.ebuild
 2012162341 ./dev-libs/miniz/miniz-9999.ebuild
+2012201509 ./dev-libs/libtomcrypt/libtomcrypt-1.18.2.ebuild
 1912111539 ./dev-lisp/abcl/abcl-1.5.0.ebuild
 1710302307 ./dev-lisp/alexandria/alexandria-20171029.ebuild
 1911181939 ./dev-lisp/asdf/asdf-3.3.1.ebuild
@@ -8497,8 +8497,8 @@
 1912110241 ./dev-lua/lua-cjson/lua-cjson-2.1.0.7.ebuild
 2012011340 ./dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
 2012011340 ./dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild
-2012050239 ./dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild
-2012050239 ./dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild
+2012210209 ./dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
+2012210209 ./dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
 2011291909 ./dev-lua/lua-term/lua-term-0.7-r101.ebuild
 2012031639 ./dev-lua/lua-term/lua-term-0.3.ebuild
 2012031639 ./dev-lua/lua-term/lua-term-0.7.ebuild
@@ -8649,7 +8649,7 @@
 2010031709 ./dev-ml/facile/facile-1.1.3.ebuild
 1704021137 ./dev-ml/fieldslib/fieldslib-0.9.0.ebuild
 2010280709 ./dev-ml/fieldslib/fieldslib-0.14.0.ebuild
-2012171539 ./dev-ml/findlib/findlib-1.8.1-r1.ebuild
+2012202209 ./dev-ml/findlib/findlib-1.8.1-r2.ebuild
 2006041239 ./dev-ml/fmt/fmt-0.8.4.ebuild
 2006041239 ./dev-ml/fpath/fpath-0.7.2.ebuild
 1702282250 ./dev-ml/gen/gen-0.4.0.1.ebuild
@@ -8679,6 +8679,7 @@
 2011291409 ./dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc1.ebuild
 2011291339 ./dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
 2011291339 ./dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild
+2012191239 ./dev-ml/llvm-ocaml/llvm-ocaml-11.0.1_rc2.ebuild
 2006041239 ./dev-ml/logs/logs-0.6.2.ebuild
 2010280709 ./dev-ml/lwt/lwt-5.3.0-r1.ebuild
 1910111840 ./dev-ml/lwt_react/lwt_react-1.0.1.ebuild
@@ -10553,7 +10554,7 @@
 2004032241 ./dev-perl/Text-Aspell/Text-Aspell-0.90.0-r2.ebuild
 2004032241 ./dev-perl/Text-Autoformat/Text-Autoformat-1.740.0.ebuild
 1912110241 ./dev-perl/Text-BibTeX/Text-BibTeX-0.850.0.ebuild
-1912110241 ./dev-perl/Text-BibTeX/Text-BibTeX-0.880.0.ebuild
+2012201939 ./dev-perl/Text-BibTeX/Text-BibTeX-0.880.0.ebuild
 1912110241 ./dev-perl/Text-CSV-Simple/Text-CSV-Simple-1.0.0-r1.ebuild
 2004032241 ./dev-perl/Text-CSV/Text-CSV-1.950.0.ebuild
 2004032241 ./dev-perl/Text-CSV_XS/Text-CSV_XS-1.340.0.ebuild
@@ -10653,7 +10654,7 @@
 1803190338 ./dev-perl/UltraDNS/UltraDNS-0.60.0-r2.ebuild
 2004211009 ./dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0-r1.ebuild
 2006031839 ./dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
-2012171109 ./dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
+2012211309 ./dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
 2004032241 ./dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild
 2003261841 ./dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r1.ebuild
 2004032241 ./dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild
@@ -11335,8 +11336,8 @@
 2011300409 ./dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2.ebuild
 2011170339 ./dev-python/3to2/3to2-1.1.1-r1.ebuild
 2010122209 ./dev-python/APScheduler/APScheduler-3.6.3.ebuild
-2012130439 ./dev-python/Babel/Babel-2.9.0.ebuild
 2012162109 ./dev-python/Babel/Babel-2.8.1.ebuild
+2012201509 ./dev-python/Babel/Babel-2.9.0.ebuild
 2005111309 ./dev-python/BitVector/BitVector-3.4.9.ebuild
 2009181339 ./dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
 2010162139 ./dev-python/HeapDict/HeapDict-1.0.0.ebuild
@@ -11368,8 +11369,8 @@
 2011140510 ./dev-python/aiohttp-socks/aiohttp-socks-0.5.5.ebuild
 2011270309 ./dev-python/aiohttp/aiohttp-3.6.2-r1.ebuild
 2011270309 ./dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
-2012070739 ./dev-python/aiohttp/aiohttp-3.7.3.ebuild
 2012112109 ./dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
+2012200109 ./dev-python/aiohttp/aiohttp-3.7.3.ebuild
 2009251039 ./dev-python/aiorpcX/aiorpcX-0.18.4-r1.ebuild
 2010160510 ./dev-python/aiosmtpd/aiosmtpd-1.2.ebuild
 2011101209 ./dev-python/aiosmtpd/aiosmtpd-1.2.2.ebuild
@@ -11426,7 +11427,6 @@
 2008030639 ./dev-python/backcall/backcall-0.2.0.ebuild
 2012032039 ./dev-python/backports-tempfile/backports-tempfile-1.0-r1.ebuild
 2012032039 ./dev-python/backports-weakref/backports-weakref-1.0_p1-r1.ebuild
-2009201909 ./dev-python/backports/backports-1.0-r1.ebuild
 2011181009 ./dev-python/bandit/bandit-1.6.2-r1.ebuild
 2012030109 ./dev-python/bashate/bashate-0.6.0.ebuild
 2004222209 ./dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
@@ -11458,6 +11458,7 @@
 2012170209 ./dev-python/boto3/boto3-1.16.38.ebuild
 2012172009 ./dev-python/boto3/boto3-1.16.16.ebuild
 2012180239 ./dev-python/boto3/boto3-1.16.39.ebuild
+2012191209 ./dev-python/boto3/boto3-1.16.40.ebuild
 2007300909 ./dev-python/botocore/botocore-9999.ebuild
 2011211109 ./dev-python/botocore/botocore-1.19.23.ebuild
 2012051239 ./dev-python/botocore/botocore-1.19.30.ebuild
@@ -11466,6 +11467,7 @@
 2012170209 ./dev-python/botocore/botocore-1.19.38.ebuild
 2012172009 ./dev-python/botocore/botocore-1.19.16.ebuild
 2012180239 ./dev-python/botocore/botocore-1.19.39.ebuild
+2012191209 ./dev-python/botocore/botocore-1.19.40.ebuild
 2012162109 ./dev-python/bottle/bottle-0.12.19.ebuild
 2009181339 ./dev-python/bottleneck/bottleneck-1.3.2.ebuild
 2011151409 ./dev-python/bpython/bpython-0.20.ebuild
@@ -11473,7 +11475,7 @@
 2012131209 ./dev-python/breathe/breathe-4.22.1.ebuild
 2012161339 ./dev-python/breathe/breathe-4.25.0.ebuild
 2012162039 ./dev-python/breathe/breathe-4.25.1.ebuild
-2011281139 ./dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
+2012201309 ./dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
 2006272339 ./dev-python/brython/brython-3.7.3.ebuild
 2007010939 ./dev-python/brython/brython-3.7.4.ebuild
 2008150239 ./dev-python/bsddb3/bsddb3-6.2.7.ebuild
@@ -11500,6 +11502,7 @@
 2012011340 ./dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
 2012040409 ./dev-python/cfn-python-lint/cfn-python-lint-0.43.0.ebuild
 2012161339 ./dev-python/cfn-python-lint/cfn-python-lint-0.44.0.ebuild
+2012191209 ./dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild
 2003271809 ./dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
 2006040939 ./dev-python/chai/chai-1.1.2.ebuild
 2008220909 ./dev-python/chameleon/chameleon-3.8.1.ebuild
@@ -11521,6 +11524,7 @@
 2011291209 ./dev-python/clang-python/clang-python-12.0.0.9999.ebuild
 2011291409 ./dev-python/clang-python/clang-python-11.0.1.9999.ebuild
 2011291409 ./dev-python/clang-python/clang-python-11.0.1_rc1.ebuild
+2012191239 ./dev-python/clang-python/clang-python-11.0.1_rc2.ebuild
 2012170609 ./dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
 2012180009 ./dev-python/cli_helpers/cli_helpers-9999.ebuild
 2004261809 ./dev-python/click-log/click-log-0.3.2.ebuild
@@ -11559,6 +11563,7 @@
 2011181209 ./dev-python/cov-core/cov-core-1.15.0-r2.ebuild
 2011181209 ./dev-python/coverage/coverage-4.5.4.ebuild
 2011281709 ./dev-python/coverage/coverage-5.3.ebuild
+2012201139 ./dev-python/coverage/coverage-5.3.1.ebuild
 2010162139 ./dev-python/crcmod/crcmod-1.7-r4.ebuild
 2010070339 ./dev-python/croniter/croniter-0.3.30.ebuild
 2010300139 ./dev-python/cryptography/cryptography-3.2.ebuild
@@ -11584,6 +11589,7 @@
 2011270309 ./dev-python/dask/dask-2.30.0.ebuild
 2009201139 ./dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild
 2009112009 ./dev-python/dbusmock/dbusmock-0.19.ebuild
+2012200139 ./dev-python/dbusmock/dbusmock-0.20.0.ebuild
 2006010008 ./dev-python/ddt/ddt-1.2.2.ebuild
 2011151509 ./dev-python/debtcollector/debtcollector-2.2.0.ebuild
 2009201339 ./dev-python/decorator/decorator-4.4.2-r1.ebuild
@@ -11591,11 +11597,12 @@
 2010180309 ./dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
 2011232309 ./dev-python/denonavr/denonavr-0.9.7.ebuild
 2012141139 ./dev-python/denonavr/denonavr-0.9.8.ebuild
+2012211239 ./dev-python/denonavr/denonavr-0.9.9.ebuild
 2007081609 ./dev-python/deprecated/deprecated-1.2.10.ebuild
 2011232009 ./dev-python/deprecation/deprecation-2.1.0.ebuild
 2008180909 ./dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
 2003262339 ./dev-python/diff-match-patch/diff-match-patch-20181111.ebuild
-2011171739 ./dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
+2012201939 ./dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
 2012131209 ./dev-python/dill/dill-0.3.3.ebuild
 2004211139 ./dev-python/discogs-client/discogs-client-2.2.2.ebuild
 2009091039 ./dev-python/diskcache/diskcache-5.0.3.ebuild
@@ -11732,7 +11739,8 @@
 2005032209 ./dev-python/fudge/fudge-1.1.1.ebuild
 2012010039 ./dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
 2008021139 ./dev-python/funcy/funcy-1.10.1.ebuild
-2008021139 ./dev-python/funcy/funcy-1.14.ebuild
+2012201809 ./dev-python/funcy/funcy-1.14-r1.ebuild
+2012201809 ./dev-python/funcy/funcy-1.14.ebuild
 1912300109 ./dev-python/fuse-python/fuse-python-1.0.0.ebuild
 2001051415 ./dev-python/fusepy/fusepy-3.0.1.ebuild
 2009201909 ./dev-python/future/future-0.18.2-r1.ebuild
@@ -11779,9 +11787,7 @@
 2010160510 ./dev-python/hacking/hacking-2.0.0.ebuild
 2012172009 ./dev-python/hcloud-python/hcloud-python-1.10.0.ebuild
 2008021139 ./dev-python/hgdistver/hgdistver-0.25.ebuild
-2011151209 ./dev-python/hiredis/hiredis-1.0.1-r1.ebuild
-2011151209 ./dev-python/hiredis/hiredis-1.0.1.ebuild
-2012172009 ./dev-python/hiredis/hiredis-1.1.0.ebuild
+2012202339 ./dev-python/hiredis/hiredis-1.1.0.ebuild
 2009041409 ./dev-python/hpack/hpack-3.0.0.ebuild
 2010010309 ./dev-python/hpack/hpack-4.0.0.ebuild
 2012060339 ./dev-python/html2text/html2text-2020.1.16-r1.ebuild
@@ -11884,7 +11890,7 @@
 2011171639 ./dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
 2007292039 ./dev-python/jmespath/jmespath-0.10.0.ebuild
 2011190309 ./dev-python/joblib/joblib-0.17.0.ebuild
-2012150239 ./dev-python/joblib/joblib-1.0.0.ebuild
+2012210039 ./dev-python/joblib/joblib-1.0.0.ebuild
 2010260109 ./dev-python/josepy/josepy-1.4.0.ebuild
 2012020439 ./dev-python/josepy/josepy-1.5.0.ebuild
 2003201209 ./dev-python/jsmin/jsmin-2.2.2.ebuild
@@ -11935,8 +11941,7 @@
 2004231639 ./dev-python/libnacl/libnacl-1.6.1.ebuild
 2011241809 ./dev-python/libnacl/libnacl-1.7.2.ebuild
 2004191539 ./dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
-2010181909 ./dev-python/libtmux/libtmux-0.8.3.ebuild
-2011090239 ./dev-python/libtmux/libtmux-0.8.5.ebuild
+2012192309 ./dev-python/libtmux/libtmux-0.8.5.ebuild
 2010060239 ./dev-python/libvirt-python/libvirt-python-6.7.0.ebuild
 2011060439 ./dev-python/libvirt-python/libvirt-python-6.9.0.ebuild
 2011102139 ./dev-python/libvirt-python/libvirt-python-6.8.0.ebuild
@@ -11950,6 +11955,7 @@
 2011291409 ./dev-python/lit/lit-11.0.1.9999.ebuild
 2011291409 ./dev-python/lit/lit-11.0.1_rc1.ebuild
 2012041739 ./dev-python/lit/lit-11.0.0.ebuild
+2012191239 ./dev-python/lit/lit-11.0.1_rc2.ebuild
 2005091109 ./dev-python/livereload/livereload-2.6.1.ebuild
 2012051639 ./dev-python/livereload/livereload-2.6.3.ebuild
 2008292109 ./dev-python/llfuse/llfuse-1.3.6.ebuild
@@ -11981,6 +11987,7 @@
 2008300439 ./dev-python/markups/markups-3.0.0-r1.ebuild
 2009201739 ./dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
 2010141409 ./dev-python/marshmallow/marshmallow-3.5.1.ebuild
+2012200139 ./dev-python/marshmallow/marshmallow-3.10.0.ebuild
 2009181339 ./dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
 2009181339 ./dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
 2011090239 ./dev-python/matplotlib/matplotlib-3.3.2.ebuild
@@ -12000,8 +12007,8 @@
 2005311639 ./dev-python/mimerender/mimerender-0.6.0.ebuild
 2008241709 ./dev-python/minidb/minidb-2.0.4.ebuild
 2011090239 ./dev-python/minimock/minimock-1.2.8-r1.ebuild
-2011181009 ./dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
-2012172009 ./dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
+2012202339 ./dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
+2012211239 ./dev-python/miniupnpc/miniupnpc-2.2.1.ebuild
 2006292239 ./dev-python/misaka/misaka-2.1.1.ebuild
 2011281509 ./dev-python/mistune/mistune-0.8.4-r1.ebuild
 2005091439 ./dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.ebuild
@@ -12029,6 +12036,7 @@
 2007201509 ./dev-python/msgpack/msgpack-0.6.2.ebuild
 2011021309 ./dev-python/msgpack/msgpack-1.0.0.ebuild
 2012140609 ./dev-python/msgpack/msgpack-1.0.1.ebuild
+2012191209 ./dev-python/msgpack/msgpack-1.0.2.ebuild
 2011281109 ./dev-python/multidict/multidict-5.0.0.ebuild
 2012031739 ./dev-python/multidict/multidict-5.1.0.ebuild
 2011281739 ./dev-python/munch/munch-2.5.0-r1.ebuild
@@ -12041,7 +12049,6 @@
 2012180109 ./dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
 2009050139 ./dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
 2009251339 ./dev-python/namespace-google/namespace-google-1-r1.ebuild
-2011281139 ./dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
 2011281709 ./dev-python/namespace-paste/namespace-paste-1-r1.ebuild
 2007140239 ./dev-python/namespace-repoze/namespace-repoze-1.ebuild
 2009041409 ./dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -12127,8 +12134,7 @@
 2011181309 ./dev-python/osc-lib/osc-lib-2.2.1.ebuild
 2011271909 ./dev-python/oslo-cache/oslo-cache-2.6.1.ebuild
 2011181309 ./dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild
-2011172239 ./dev-python/oslo-config/oslo-config-8.3.2.ebuild
-2011191939 ./dev-python/oslo-config/oslo-config-8.3.3.ebuild
+2012200109 ./dev-python/oslo-config/oslo-config-8.3.3.ebuild
 2011172239 ./dev-python/oslo-context/oslo-context-3.1.1.ebuild
 2011271909 ./dev-python/oslo-db/oslo-db-8.4.0.ebuild
 2011160309 ./dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
@@ -12159,7 +12165,7 @@
 2009201909 ./dev-python/packaging/packaging-20.4-r1.ebuild
 2011281209 ./dev-python/packaging/packaging-20.5.ebuild
 2011282309 ./dev-python/packaging/packaging-20.7.ebuild
-2012121239 ./dev-python/packaging/packaging-20.8.ebuild
+2012201509 ./dev-python/packaging/packaging-20.8.ebuild
 2001311139 ./dev-python/pafy/pafy-0.5.5.ebuild
 2001311139 ./dev-python/pafy/pafy-9999.ebuild
 2003251509 ./dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
@@ -12320,10 +12326,8 @@
 2010050039 ./dev-python/pyelftools/pyelftools-0.26.ebuild
 2009271009 ./dev-python/pyenchant/pyenchant-3.1.0.ebuild
 2012141539 ./dev-python/pyenchant/pyenchant-3.2.0.ebuild
-2011192139 ./dev-python/pyfakefs/pyfakefs-4.3.0.ebuild
-2011241109 ./dev-python/pyfakefs/pyfakefs-4.3.1.ebuild
-2011281139 ./dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
-2012062109 ./dev-python/pyfakefs/pyfakefs-4.2.1.ebuild
+2012202339 ./dev-python/pyfakefs/pyfakefs-4.3.2.ebuild
+2012202339 ./dev-python/pyfakefs/pyfakefs-4.3.3.ebuild
 2003081509 ./dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
 2010030339 ./dev-python/pyflakes/pyflakes-2.2.0.ebuild
 2008021239 ./dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -12339,11 +12343,11 @@
 2009161339 ./dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild
 2009281909 ./dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild
 2010150509 ./dev-python/pyghmi/pyghmi-1.5.5.ebuild
-2011030309 ./dev-python/pygit2/pygit2-1.3.0.ebuild
-2012172009 ./dev-python/pygit2/pygit2-1.4.0.ebuild
+2012202009 ./dev-python/pygit2/pygit2-1.4.0.ebuild
 2011100109 ./dev-python/pyglet/pyglet-1.5.7-r1.ebuild
-2011161139 ./dev-python/pyglet/pyglet-1.5.10.ebuild
 2011190439 ./dev-python/pyglet/pyglet-1.5.11.ebuild
+2012202239 ./dev-python/pyglet/pyglet-1.5.10.ebuild
+2012181209 ./dev-python/pyglet/pyglet-1.5.13.ebuild
 2011261009 ./dev-python/pygments/pygments-2.7.2.ebuild
 2012062109 ./dev-python/pygments/pygments-2.7.3.ebuild
 2009252309 ./dev-python/pygobject/pygobject-3.34.0-r1.ebuild
@@ -12353,6 +12357,7 @@
 2010091139 ./dev-python/pygraphviz/pygraphviz-1.6.ebuild
 2009071139 ./dev-python/pygresql/pygresql-5.2.ebuild
 2012010609 ./dev-python/pygresql/pygresql-5.2.1.ebuild
+2012181539 ./dev-python/pygresql/pygresql-5.2.2.ebuild
 2009221309 ./dev-python/pyh2o/pyh2o-1.ebuild
 2011281509 ./dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
 2008071509 ./dev-python/pyilmbase/pyilmbase-2.5.2-r1.ebuild
@@ -12399,7 +12404,7 @@
 2009201309 ./dev-python/pypam/pypam-0.5.0-r6.ebuild
 2009272109 ./dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
 2011071239 ./dev-python/pyparted/pyparted-3.11.6.ebuild
-2012172009 ./dev-python/pyparted/pyparted-3.11.7.ebuild
+2012202239 ./dev-python/pyparted/pyparted-3.11.7.ebuild
 2012111839 ./dev-python/pypax/pypax-0.9.5.ebuild
 2012111839 ./dev-python/pypax/pypax-9999.ebuild
 2001051415 ./dev-python/pypcap/pypcap-1.2.3.ebuild
@@ -12450,7 +12455,6 @@
 2012112109 ./dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
 2012070609 ./dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
 2008231509 ./dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
-2008021239 ./dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
 2011181209 ./dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
 2012011409 ./dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
 2012111609 ./dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
@@ -12480,6 +12484,7 @@
 2009211939 ./dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild
 2012012109 ./dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
 2012151409 ./dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild
+2012181439 ./dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
 2011271239 ./dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
 2012062109 ./dev-python/pytest-xprocess/pytest-xprocess-0.16.0.ebuild
 2007120109 ./dev-python/pytest/pytest-5.4.3.ebuild
@@ -12494,7 +12499,7 @@
 2009302109 ./dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
 2011271909 ./dev-python/python-barbicanclient/python-barbicanclient-5.0.1.ebuild
 2011191439 ./dev-python/python-blazarclient/python-blazarclient-3.1.1.ebuild
-2012172009 ./dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
+2012201509 ./dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
 2011191439 ./dev-python/python-ceilometerclient/python-ceilometerclient-2.9.0.ebuild
 2011181309 ./dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild
 2009211840 ./dev-python/python-cstruct/python-cstruct-1.8.ebuild
@@ -12618,7 +12623,6 @@
 2010272309 ./dev-python/rebulk/rebulk-2.0.1.ebuild
 2005171109 ./dev-python/recommonmark/recommonmark-0.6.0.ebuild
 2009040409 ./dev-python/redis-py/redis-py-3.5.3.ebuild
-2011232009 ./dev-python/redis-py/redis-py-3.3.11.ebuild
 2001182209 ./dev-python/rednose/rednose-0.4.3.ebuild
 2006090639 ./dev-python/reflink/reflink-0.2.1-r1.ebuild
 2011281709 ./dev-python/regex/regex-2020.4.4-r1.ebuild
@@ -12677,7 +12681,7 @@
 2011281709 ./dev-python/scrypt/scrypt-0.8.16.ebuild
 2009181339 ./dev-python/seaborn/seaborn-0.10.1.ebuild
 2012162309 ./dev-python/secretstorage/secretstorage-3.2.0.ebuild
-2012170039 ./dev-python/secretstorage/secretstorage-3.3.0.ebuild
+2012181339 ./dev-python/secretstorage/secretstorage-3.3.0.ebuild
 2012010039 ./dev-python/selenium/selenium-3.141.0-r1.ebuild
 2011142209 ./dev-python/semantic_version/semantic_version-2.8.5.ebuild
 2010240109 ./dev-python/semver/semver-2.13.0.ebuild
@@ -12736,7 +12740,7 @@
 2010182239 ./dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
 2006052238 ./dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild
 2011192309 ./dev-python/sphinx-gallery/sphinx-gallery-0.8.1.ebuild
-2012180239 ./dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
+2012210039 ./dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
 2008150239 ./dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
 2010160639 ./dev-python/sphinx-notfound-page/sphinx-notfound-page-0.5.ebuild
 2011192309 ./dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
@@ -12744,6 +12748,7 @@
 2008221039 ./dev-python/sphinx/sphinx-2.4.4.ebuild
 2012020039 ./dev-python/sphinx/sphinx-3.2.1.ebuild
 2012011340 ./dev-python/sphinx/sphinx-3.3.1.ebuild
+2012202339 ./dev-python/sphinx/sphinx-3.4.0.ebuild
 2011090239 ./dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
 2004221139 ./dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
 2012130339 ./dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
@@ -12769,6 +12774,7 @@
 2012041609 ./dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.ebuild
 2012041609 ./dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
 2011171739 ./dev-python/spyder-kernels/spyder-kernels-1.10.0.ebuild
+2012181209 ./dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild
 2011171939 ./dev-python/spyder/spyder-4.2.0.ebuild
 2005302109 ./dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
 2010150509 ./dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
@@ -12776,6 +12782,7 @@
 2011231109 ./dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
 2012130409 ./dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
 2012180239 ./dev-python/sqlalchemy/sqlalchemy-1.3.21.ebuild
+2012191209 ./dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
 2012030509 ./dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
 2012151009 ./dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
 2011180209 ./dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -12804,7 +12811,6 @@
 2011301139 ./dev-python/sybil/sybil-2.0.1.ebuild
 2010272309 ./dev-python/symengine/symengine-0.6.1-r1.ebuild
 2010272309 ./dev-python/sympy/sympy-1.6.2.ebuild
-2011292309 ./dev-python/sympy/sympy-1.7.ebuild
 2012131539 ./dev-python/sympy/sympy-1.7.1.ebuild
 2009181139 ./dev-python/tabulate/tabulate-0.8.7.ebuild
 2004182239 ./dev-python/tagpy/tagpy-2018.1-r1.ebuild
@@ -12858,7 +12864,7 @@
 2008250139 ./dev-python/transitions/transitions-0.8.2-r1.ebuild
 2012151009 ./dev-python/translate-toolkit/translate-toolkit-3.2.0.ebuild
 2010102209 ./dev-python/treq/treq-20.9.0.ebuild
-2011281439 ./dev-python/trustme/trustme-0.6.0-r1.ebuild
+2012201309 ./dev-python/trustme/trustme-0.6.0-r1.ebuild
 2005291109 ./dev-python/tvdb_api/tvdb_api-2.0-r1.ebuild
 2011281909 ./dev-python/twine/twine-3.2.0.ebuild
 2008041509 ./dev-python/twisted/twisted-19.10.0.ebuild
@@ -12866,6 +12872,7 @@
 2005041009 ./dev-python/twython/twython-3.7.0.ebuild
 2005091339 ./dev-python/txAMQP/txAMQP-0.8.2.ebuild
 2007201509 ./dev-python/txaio/txaio-20.4.1.ebuild
+2012200139 ./dev-python/txaio/txaio-20.12.1.ebuild
 2004261609 ./dev-python/txgithub/txgithub-15.0.0-r1.ebuild
 2005082339 ./dev-python/txrequests/txrequests-0.9.6.ebuild
 2011281639 ./dev-python/typed-ast/typed-ast-1.4.1.ebuild
@@ -12876,8 +12883,8 @@
 2011151239 ./dev-python/ujson/ujson-4.0.1.ebuild
 2011120039 ./dev-python/uncertainties/uncertainties-3.1.4-r1.ebuild
 2008021239 ./dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
-2003272009 ./dev-python/unidecode/unidecode-0.04.21.ebuild
 2006102109 ./dev-python/unidecode/unidecode-1.1.1.ebuild
+2012202339 ./dev-python/unidecode/unidecode-1.1.2.ebuild
 2009201109 ./dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
 2010162139 ./dev-python/unittest2/unittest2-1.1.0-r1.ebuild
 2010122209 ./dev-python/uranium/uranium-4.7.0.ebuild
@@ -12890,7 +12897,7 @@
 2011120009 ./dev-python/urllib3/urllib3-1.26.1.ebuild
 2011261009 ./dev-python/urllib3/urllib3-1.25.11.ebuild
 2011281439 ./dev-python/urllib3/urllib3-1.26.2.ebuild
-2012021409 ./dev-python/urllib3/urllib3-1.26.2-r1.ebuild
+2012201309 ./dev-python/urllib3/urllib3-1.26.2-r1.ebuild
 2009181139 ./dev-python/urwid/urwid-2.1.1.ebuild
 2012111809 ./dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
 2010120139 ./dev-python/utidylib/utidylib-0.6-r1.ebuild
@@ -12905,7 +12912,7 @@
 2003251909 ./dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild
 2009201739 ./dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild
 2011261009 ./dev-python/virtualenv/virtualenv-20.1.0.ebuild
-2012130339 ./dev-python/virtualenv/virtualenv-20.2.1.ebuild
+2012201509 ./dev-python/virtualenv/virtualenv-20.2.1.ebuild
 2005020739 ./dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r1.ebuild
 2009042209 ./dev-python/visitor/visitor-0.1.3-r1.ebuild
 2010200839 ./dev-python/vobject/vobject-0.9.6.1-r2.ebuild
@@ -12919,6 +12926,7 @@
 2011220009 ./dev-python/watchdog/watchdog-0.10.4.ebuild
 2012101339 ./dev-python/watchdog/watchdog-0.10.5.ebuild
 2012101339 ./dev-python/watchdog/watchdog-1.0.0.ebuild
+2012191209 ./dev-python/watchdog/watchdog-1.0.2.ebuild
 2009201909 ./dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
 2010162139 ./dev-python/weasyprint/weasyprint-51.ebuild
 2005101838 ./dev-python/webassets/webassets-2.0.ebuild
@@ -13030,7 +13038,7 @@
 2011270209 ./dev-python/pybind11/pybind11-2.6.0.ebuild
 2012170709 ./dev-python/pybind11/pybind11-2.6.1.ebuild
 2010221039 ./dev-python/pyproject2setuppy/pyproject2setuppy-8.ebuild
-2011281739 ./dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
+2012201509 ./dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
 2008292109 ./dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.ebuild
 2009261709 ./dev-python/pypy-exe-bin/pypy-exe-bin-7.3.2.ebuild
 2011131509 ./dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_rc1.ebuild
@@ -13070,9 +13078,8 @@
 2012060409 ./dev-python/ifaddr/ifaddr-0.1.6.ebuild
 2001142109 ./dev-python/pychromecast/pychromecast-4.1.0.ebuild
 2011151039 ./dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
-2011151039 ./dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild
-2011171739 ./dev-python/python-language-server/python-language-server-0.36.1.ebuild
 2012170339 ./dev-python/python-language-server/python-language-server-0.36.2.ebuild
+2012201939 ./dev-python/python-language-server/python-language-server-0.36.1.ebuild
 2012111609 ./dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
 2012111609 ./dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
 2011010939 ./dev-python/patch-ng/patch-ng-1.17.4.ebuild
@@ -13120,7 +13127,7 @@
 2012111609 ./dev-python/zconfig/zconfig-3.5.0.ebuild
 2012111609 ./dev-python/dbutils/dbutils-1.3.ebuild
 2012111609 ./dev-python/dbutils/dbutils-2.0.ebuild
-2008220909 ./dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
+2012210039 ./dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
 2011172109 ./dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
 2011261139 ./dev-python/mongomock/mongomock-3.21.0.ebuild
 2008220909 ./dev-python/sentinels/sentinels-1.0.0.ebuild
@@ -13134,7 +13141,7 @@
 2012130339 ./dev-python/distlib/distlib-0.3.1-r1.ebuild
 2010310511 ./dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
 2011232009 ./dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
-2010010039 ./dev-python/websockets/websockets-8.1.ebuild
+2012202039 ./dev-python/websockets/websockets-8.1.ebuild
 2008072239 ./dev-python/cppy/cppy-1.1.0.ebuild
 2012030209 ./dev-python/dataclasses/dataclasses-0.7.ebuild
 2012141539 ./dev-python/dataclasses/dataclasses-0.8.ebuild
@@ -13187,7 +13194,7 @@
 2011160309 ./dev-python/spur/spur-0.3.22.ebuild
 2012161409 ./dev-python/fsspec/fsspec-0.8.2.ebuild
 2012161409 ./dev-python/fsspec/fsspec-0.8.5.ebuild
-2011190309 ./dev-python/loky/loky-2.9.0.ebuild
+2012210039 ./dev-python/loky/loky-2.9.0.ebuild
 2008220909 ./dev-python/text-unidecode/text-unidecode-1.3.ebuild
 2008011209 ./dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
 2012070239 ./dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
@@ -13240,8 +13247,8 @@
 2011171739 ./dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.1.ebuild
 2011131139 ./dev-python/pyscreenshot/pyscreenshot-2.2.ebuild
 2012061239 ./dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
-2009151139 ./dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
-2009211939 ./dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
+2012202009 ./dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
+2012202009 ./dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
 2012111609 ./dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
 2012061309 ./dev-python/pytest-regressions/pytest-regressions-2.0.2.ebuild
 2012170339 ./dev-python/pytest-regressions/pytest-regressions-2.1.1.ebuild
@@ -13272,22 +13279,22 @@
 2010082309 ./dev-python/pydantic/pydantic-1.6.1.ebuild
 2012062039 ./dev-python/imread/imread-0.7.3-r1.ebuild
 2012170339 ./dev-python/exdown/exdown-0.7.1.ebuild
-2010200039 ./dev-python/zstd/zstd-1.4.5.1.ebuild
+2012200109 ./dev-python/zstd/zstd-1.4.5.1.ebuild
 2012070739 ./dev-python/re-assert/re-assert-1.1.0.ebuild
 2010292009 ./dev-python/libpy_simdjson/libpy_simdjson-0.4.0.ebuild
 2011090239 ./dev-python/braintree/braintree-4.4.0.ebuild
 2011091109 ./dev-python/chart-studio/chart-studio-1.1.0.ebuild
 2011091109 ./dev-python/plotly-geo/plotly-geo-1.0.0.ebuild
-2011171739 ./dev-python/pyls-black/pyls-black-0.4.6.ebuild
-2011171739 ./dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
+2012201939 ./dev-python/pyls-black/pyls-black-0.4.6.ebuild
 2012170339 ./dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild
-2011171739 ./dev-python/three-merge/three-merge-0.1.1.ebuild
-2011260139 ./dev-python/pytaglib/pytaglib-1.4.6.ebuild
+2012201939 ./dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
+2012201939 ./dev-python/three-merge/three-merge-0.1.1.ebuild
+2012181339 ./dev-python/pytaglib/pytaglib-1.4.6.ebuild
 2012120739 ./dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
 2012140439 ./dev-python/pynest2d/pynest2d-4.8.0.ebuild
-2012111609 ./dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
-2012110510 ./dev-python/pysimdjson/pysimdjson-3.1.1.ebuild
-2012130439 ./dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild
+2012201309 ./dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
+2012190539 ./dev-python/pysimdjson/pysimdjson-3.1.1-r1.ebuild
+2012211239 ./dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
 2012080909 ./dev-python/backrefs/backrefs-4.5.0.ebuild
 2012080909 ./dev-python/bracex/bracex-2.0.1.ebuild
 2012080909 ./dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild
@@ -13303,6 +13310,7 @@
 2012080909 ./dev-python/wcmatch/wcmatch-7.1.ebuild
 2012140609 ./dev-python/tree-sitter/tree-sitter-0.2.0.ebuild
 2012142209 ./dev-python/stomp-py/stomp-py-6.1.0.ebuild
+2012191909 ./dev-python/whatever/whatever-0.6.ebuild
 2010181809 ./dev-qt/assistant/assistant-5.15.1.ebuild
 2011260209 ./dev-qt/assistant/assistant-5.15.2.ebuild
 2010181809 ./dev-qt/designer/designer-5.15.1.ebuild
@@ -14379,42 +14387,42 @@
 2009190909 ./dev-ruby/acme-client/acme-client-2.0.7.ebuild
 2005182138 ./dev-ruby/actioncable/actioncable-5.2.4.3.ebuild
 2009100839 ./dev-ruby/actioncable/actioncable-5.2.4.4.ebuild
-2010080839 ./dev-ruby/actioncable/actioncable-6.0.3.4.ebuild
-2010080839 ./dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild
+2012202239 ./dev-ruby/actioncable/actioncable-6.0.3.4.ebuild
+2012202239 ./dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild
 2005182138 ./dev-ruby/actionmailer/actionmailer-5.2.4.3.ebuild
 2009100839 ./dev-ruby/actionmailer/actionmailer-5.2.4.4.ebuild
-2010080839 ./dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild
+2012202239 ./dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild
 2009160939 ./dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.1.ebuild
 1912151039 ./dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild
 2008161939 ./dev-ruby/actionpack/actionpack-5.2.4.3-r1.ebuild
-2010080839 ./dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
 2012121139 ./dev-ruby/actionpack/actionpack-5.2.4.4.ebuild
-2010080839 ./dev-ruby/actiontext/actiontext-6.0.3.4.ebuild
+2012202239 ./dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
+2012202239 ./dev-ruby/actiontext/actiontext-6.0.3.4.ebuild
 2006180809 ./dev-ruby/actionview/actionview-5.2.4.3.ebuild
 2008151039 ./dev-ruby/actionview/actionview-5.2.4.3-r1.ebuild
-2010080839 ./dev-ruby/actionview/actionview-6.0.3.4.ebuild
 2012121139 ./dev-ruby/actionview/actionview-5.2.4.4.ebuild
+2012202239 ./dev-ruby/actionview/actionview-6.0.3.4.ebuild
 2005182138 ./dev-ruby/activejob/activejob-5.2.4.3.ebuild
 2009100839 ./dev-ruby/activejob/activejob-5.2.4.4.ebuild
-2010150809 ./dev-ruby/activejob/activejob-6.0.3.4.ebuild
+2012202239 ./dev-ruby/activejob/activejob-6.0.3.4.ebuild
 1911091139 ./dev-ruby/activeldap/activeldap-5.2.4.ebuild
 2005191309 ./dev-ruby/activeldap/activeldap-6.0.2.ebuild
 2008170809 ./dev-ruby/activeldap/activeldap-6.0.3.ebuild
 2012061039 ./dev-ruby/activeldap/activeldap-6.0.4.ebuild
 1905120840 ./dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2.ebuild
 2006180809 ./dev-ruby/activemodel/activemodel-5.2.4.3.ebuild
-2010080839 ./dev-ruby/activemodel/activemodel-6.0.3.4.ebuild
 2012121139 ./dev-ruby/activemodel/activemodel-5.2.4.4.ebuild
+2012202239 ./dev-ruby/activemodel/activemodel-6.0.3.4.ebuild
 2009170839 ./dev-ruby/activerecord/activerecord-5.2.4.3.ebuild
 2009170839 ./dev-ruby/activerecord/activerecord-5.2.4.4.ebuild
-2010080839 ./dev-ruby/activerecord/activerecord-6.0.3.4.ebuild
+2012202239 ./dev-ruby/activerecord/activerecord-6.0.3.4.ebuild
 2005182138 ./dev-ruby/activestorage/activestorage-5.2.4.3.ebuild
 2009100839 ./dev-ruby/activestorage/activestorage-5.2.4.4.ebuild
-2010080839 ./dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
+2012202239 ./dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
 2006180809 ./dev-ruby/activesupport/activesupport-5.2.4.3.ebuild
 2010080839 ./dev-ruby/activesupport/activesupport-6.0.3.4.ebuild
-2011221239 ./dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild
 2012121139 ./dev-ruby/activesupport/activesupport-5.2.4.4.ebuild
+2012202039 ./dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild
 2008230939 ./dev-ruby/acts_as_list/acts_as_list-1.0.1.ebuild
 2004191539 ./dev-ruby/addressable/addressable-2.6.0.ebuild
 2004191539 ./dev-ruby/addressable/addressable-2.7.0.ebuild
@@ -14516,7 +14524,7 @@
 2005112339 ./dev-ruby/capybara/capybara-3.31.0.ebuild
 2006220739 ./dev-ruby/capybara/capybara-3.33.0.ebuild
 2007221209 ./dev-ruby/capybara/capybara-3.32.2.ebuild
-2011270909 ./dev-ruby/capybara/capybara-3.34.0.ebuild
+2012202239 ./dev-ruby/capybara/capybara-3.34.0.ebuild
 2004272039 ./dev-ruby/certificate_authority/certificate_authority-0.1.6-r2.ebuild
 2008221109 ./dev-ruby/certificate_authority/certificate_authority-1.0.0.ebuild
 2009151009 ./dev-ruby/charlock_holmes/charlock_holmes-0.7.7.ebuild
@@ -14577,7 +14585,7 @@
 2012150609 ./dev-ruby/daemons/daemons-1.3.1.ebuild
 1910252109 ./dev-ruby/dalli/dalli-2.7.10.ebuild
 2002151839 ./dev-ruby/dalli/dalli-2.7.10-r1.ebuild
-2009270939 ./dev-ruby/dalli/dalli-2.7.11.ebuild
+2012202039 ./dev-ruby/dalli/dalli-2.7.11.ebuild
 1905150839 ./dev-ruby/database_cleaner/database_cleaner-1.7.0.ebuild
 2005121739 ./dev-ruby/date_validator/date_validator-0.10.0.ebuild
 1904282339 ./dev-ruby/dbf/dbf-4.1.2.ebuild
@@ -14605,6 +14613,7 @@
 1902022039 ./dev-ruby/dnsruby/dnsruby-1.61.2.ebuild
 1908160709 ./dev-ruby/dnsruby/dnsruby-1.61.3.ebuild
 2003011139 ./dev-ruby/docile/docile-1.3.2.ebuild
+2012190939 ./dev-ruby/docile/docile-1.3.3.ebuild
 2003180939 ./dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
 2012150609 ./dev-ruby/domain_name/domain_name-0.5.20180417.ebuild
 2007140639 ./dev-ruby/dotenv/dotenv-2.7.6.ebuild
@@ -14637,7 +14646,6 @@
 2009250939 ./dev-ruby/exifr/exifr-1.3.8.ebuild
 2010200809 ./dev-ruby/exifr/exifr-1.3.9.ebuild
 1911241709 ./dev-ruby/facter/facter-9999.ebuild
-2009251909 ./dev-ruby/facter/facter-3.14.13.ebuild
 2011210909 ./dev-ruby/facter/facter-3.14.14.ebuild
 1905042139 ./dev-ruby/factory_girl/factory_girl-4.8.1.ebuild
 2004122139 ./dev-ruby/fakefs/fakefs-0.19.2.ebuild
@@ -14684,7 +14692,7 @@
 2007250908 ./dev-ruby/forgery/forgery-0.8.1.ebuild
 2007270539 ./dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r1.ebuild
 1911050909 ./dev-ruby/fuubar/fuubar-2.5.0.ebuild
-2004271109 ./dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
+2012202239 ./dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
 2011241039 ./dev-ruby/gettext-setup/gettext-setup-0.34-r2.ebuild
 1912111009 ./dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.1.ebuild
 2006261109 ./dev-ruby/gh/gh-0.18.0.ebuild
@@ -14692,7 +14700,7 @@
 2005240739 ./dev-ruby/gist/gist-5.1.0.ebuild
 2007120939 ./dev-ruby/git/git-1.7.0.ebuild
 2005192008 ./dev-ruby/globalid/globalid-0.4.2.ebuild
-2008211009 ./dev-ruby/globalid/globalid-0.4.2-r1.ebuild
+2012202239 ./dev-ruby/globalid/globalid-0.4.2-r1.ebuild
 2008210739 ./dev-ruby/gnuplot/gnuplot-2.6.2-r2.ebuild
 1910311009 ./dev-ruby/google-protobuf/google-protobuf-3.10.1.ebuild
 2002151109 ./dev-ruby/google-protobuf/google-protobuf-3.11.4.ebuild
@@ -14713,7 +14721,7 @@
 2004212309 ./dev-ruby/hashie/hashie-3.6.0.ebuild
 2004212309 ./dev-ruby/hashie/hashie-4.0.0.ebuild
 2004212309 ./dev-ruby/hashie/hashie-4.1.0.ebuild
-2005232209 ./dev-ruby/hashie/hashie-4.1.0-r1.ebuild
+2012202239 ./dev-ruby/hashie/hashie-4.1.0-r1.ebuild
 2008210739 ./dev-ruby/hashr/hashr-2.0.1.ebuild
 2004191539 ./dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild
 1910170909 ./dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild
@@ -14745,13 +14753,13 @@
 1807242109 ./dev-ruby/i18n/i18n-0.7.0-r3.ebuild
 2001130939 ./dev-ruby/i18n/i18n-1.8.2.ebuild
 2006050938 ./dev-ruby/i18n/i18n-1.7.1.ebuild
-2009140939 ./dev-ruby/i18n/i18n-1.8.5.ebuild
+2012202039 ./dev-ruby/i18n/i18n-1.8.5.ebuild
 2004041009 ./dev-ruby/ice_nine/ice_nine-0.11.2.ebuild
 2004011009 ./dev-ruby/idn-ruby/idn-ruby-0.1.0.ebuild
 2007200539 ./dev-ruby/image_processing/image_processing-1.10.3.ebuild
 2007200939 ./dev-ruby/image_processing/image_processing-1.11.0.ebuild
 2009220809 ./dev-ruby/image_processing/image_processing-1.12.0.ebuild
-2011090239 ./dev-ruby/image_processing/image_processing-1.12.1.ebuild
+2012202239 ./dev-ruby/image_processing/image_processing-1.12.1.ebuild
 2008161939 ./dev-ruby/imagesize/imagesize-0.1.1_p20100902-r1.ebuild
 2007221309 ./dev-ruby/inflecto/inflecto-0.0.2.ebuild
 2002021039 ./dev-ruby/instance_storage/instance_storage-1.0.0.ebuild
@@ -14775,7 +14783,7 @@
 2004122139 ./dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
 2006292039 ./dev-ruby/kramdown/kramdown-2.3.0.ebuild
 1901161039 ./dev-ruby/launchy/launchy-2.4.3-r2.ebuild
-2004180909 ./dev-ruby/launchy/launchy-2.5.0.ebuild
+2012202239 ./dev-ruby/launchy/launchy-2.5.0.ebuild
 2004122139 ./dev-ruby/lemon/lemon-0.9.1.ebuild
 2008092040 ./dev-ruby/letter_opener/letter_opener-1.7.0.ebuild
 2008092040 ./dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
@@ -14837,7 +14845,7 @@
 2011090239 ./dev-ruby/mini_magick/mini_magick-4.11.0.ebuild
 2004220039 ./dev-ruby/mini_mime/mini_mime-1.0.1.ebuild
 2008081139 ./dev-ruby/mini_mime/mini_mime-1.0.2.ebuild
-2007200539 ./dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
+2012202239 ./dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
 2004122139 ./dev-ruby/minitar/minitar-0.9.ebuild
 2007270539 ./dev-ruby/minitest-around/minitest-around-0.5.0.ebuild
 2007142009 ./dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
@@ -14862,7 +14870,6 @@
 2008081009 ./dev-ruby/mqtt/mqtt-0.5.0.ebuild
 2002050939 ./dev-ruby/msgpack/msgpack-1.3.3.ebuild
 2007110839 ./dev-ruby/multi_json/multi_json-1.15.0.ebuild
-2012150609 ./dev-ruby/multi_json/multi_json-1.13.1.ebuild
 2012171109 ./dev-ruby/multi_json/multi_json-1.14.1.ebuild
 2012150609 ./dev-ruby/multi_test/multi_test-0.1.2.ebuild
 2006261739 ./dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild
@@ -14982,6 +14989,7 @@
 2009110839 ./dev-ruby/puppet_forge/puppet_forge-2.3.4.ebuild
 2009280039 ./dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild
 2011230239 ./dev-ruby/puppetdb-termini/puppetdb-termini-6.13.0.ebuild
+2012200539 ./dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
 2003031039 ./dev-ruby/pusher-client/pusher-client-0.6.2.ebuild
 2004122139 ./dev-ruby/qed/qed-2.9.2.ebuild
 2005101209 ./dev-ruby/racc/racc-1.4.14.ebuild
@@ -14998,17 +15006,17 @@
 2007171009 ./dev-ruby/rack/rack-2.0.9.ebuild
 2012150609 ./dev-ruby/rack/rack-2.2.3.ebuild
 2005241209 ./dev-ruby/radius/radius-0.7.5.ebuild
-2004210009 ./dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
 2004212309 ./dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3.ebuild
+2012202239 ./dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
 1910012139 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.2.0.ebuild
 1910070909 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0.ebuild
-2009110739 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
+2012202239 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
 2005182138 ./dev-ruby/rails/rails-5.2.4.3.ebuild
 2009100839 ./dev-ruby/rails/rails-5.2.4.4.ebuild
 2010080839 ./dev-ruby/rails/rails-6.0.3.4.ebuild
 2007240809 ./dev-ruby/railties/railties-5.2.4.3.ebuild
-2010080839 ./dev-ruby/railties/railties-6.0.3.4.ebuild
 2012121139 ./dev-ruby/railties/railties-5.2.4.4.ebuild
+2012202239 ./dev-ruby/railties/railties-6.0.3.4.ebuild
 2001241039 ./dev-ruby/rainbow/rainbow-3.0.0.ebuild
 2007100739 ./dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
 2012150609 ./dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
@@ -15048,9 +15056,9 @@
 2002260939 ./dev-ruby/ref/ref-2.0.0.ebuild
 2003061039 ./dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
 2009091239 ./dev-ruby/regexp_parser/regexp_parser-1.7.1.ebuild
-2012021039 ./dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
 2012021039 ./dev-ruby/regexp_parser/regexp_parser-2.0.0.ebuild
-2007261839 ./dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
+2012202239 ./dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
+2012202239 ./dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
 2002061809 ./dev-ruby/request_store/request_store-1.5.0.ebuild
 2001121139 ./dev-ruby/rest-client/rest-client-2.1.0.ebuild
 2012150609 ./dev-ruby/rexical/rexical-1.0.7.ebuild
@@ -15113,7 +15121,7 @@
 2012150609 ./dev-ruby/rspec/rspec-2.99.0.ebuild
 2012150609 ./dev-ruby/rspec/rspec-3.8.0.ebuild
 1908140809 ./dev-ruby/rspectacular/rspectacular-0.70.8.ebuild
-2004271109 ./dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
+2012202239 ./dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
 1904132109 ./dev-ruby/ruby-atk/ruby-atk-3.3.2.ebuild
 1905302239 ./dev-ruby/ruby-atk/ruby-atk-3.3.6.ebuild
 1909071539 ./dev-ruby/ruby-atk/ruby-atk-3.3.7.ebuild
@@ -15219,7 +15227,7 @@
 2009081509 ./dev-ruby/ruby-prof/ruby-prof-1.4.1.ebuild
 2011090939 ./dev-ruby/ruby-prof/ruby-prof-1.4.2.ebuild
 1905282139 ./dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1.ebuild
-2004271109 ./dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
+2012202239 ./dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
 2004122139 ./dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r2.ebuild
 2007261239 ./dev-ruby/ruby-romkan/ruby-romkan-0.4-r6.ebuild
 1904132109 ./dev-ruby/ruby-rsvg/ruby-rsvg-3.3.2.ebuild
@@ -15289,7 +15297,7 @@
 2007252039 ./dev-ruby/seed-fu/seed-fu-2.3.9.ebuild
 1911271709 ./dev-ruby/selenium-webdriver/selenium-webdriver-3.142.6.ebuild
 2003121709 ./dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7.ebuild
-2009080909 ./dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild
+2012202239 ./dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild
 2012150609 ./dev-ruby/semantic_puppet/semantic_puppet-1.0.2.ebuild
 2007252039 ./dev-ruby/semver2/semver2-3.4.2.ebuild
 2002230909 ./dev-ruby/serialport/serialport-1.3.1.ebuild
@@ -15306,9 +15314,9 @@
 2007200609 ./dev-ruby/shoulda-context/shoulda-context-1.2.2.ebuild
 1903291239 ./dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3.ebuild
 2005031009 ./dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0.ebuild
-2007142009 ./dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild
 2007142009 ./dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0-r1.ebuild
-2009080909 ./dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild
+2012202239 ./dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild
+2012202239 ./dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild
 2007200609 ./dev-ruby/shoulda/shoulda-3.6.0.ebuild
 2009061109 ./dev-ruby/shoulda/shoulda-3.6.0-r1.ebuild
 2012150609 ./dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
@@ -15328,7 +15336,7 @@
 1905012309 ./dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild
 2003011139 ./dev-ruby/sinatra/sinatra-2.0.8.1.ebuild
 2006211209 ./dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild
-2009190939 ./dev-ruby/sinatra/sinatra-2.1.0.ebuild
+2012202239 ./dev-ruby/sinatra/sinatra-2.1.0.ebuild
 2007252039 ./dev-ruby/six/six-0.2.0.ebuild
 1911042139 ./dev-ruby/slim/slim-3.0.9-r1.ebuild
 2005100909 ./dev-ruby/slim/slim-4.1.0.ebuild
@@ -15490,14 +15498,14 @@
 2010061639 ./dev-ruby/xml-simple/xml-simple-1.1.5.ebuild
 2004122139 ./dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
 2011231009 ./dev-ruby/xmlrpc/xmlrpc-0.3.1.ebuild
-2004220939 ./dev-ruby/xpath/xpath-3.2.0.ebuild
+2012202239 ./dev-ruby/xpath/xpath-3.2.0.ebuild
 2012171109 ./dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
 2010200839 ./dev-ruby/yard/yard-0.9.25.ebuild
 2012150609 ./dev-ruby/yard/yard-0.9.20.ebuild
 2007020809 ./dev-ruby/zeitwerk/zeitwerk-2.3.1.ebuild
 2007150639 ./dev-ruby/zeitwerk/zeitwerk-2.4.0.ebuild
 2010311109 ./dev-ruby/zeitwerk/zeitwerk-2.4.1.ebuild
-2011281009 ./dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
+2012202039 ./dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
 2012150609 ./dev-ruby/zentest/zentest-4.12.0.ebuild
 2002091409 ./dev-ruby/rqrcode_core/rqrcode_core-0.1.0.ebuild
 2003291109 ./dev-ruby/rqrcode_core/rqrcode_core-0.1.2.ebuild
@@ -15595,7 +15603,7 @@
 2002271039 ./dev-tcltk/tablelist/tablelist-6.8.ebuild
 2010131039 ./dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
 2004032241 ./dev-tcltk/tcllib/tcllib-1.19.ebuild
-2011172239 ./dev-tcltk/tcllib/tcllib-1.20.ebuild
+2012181739 ./dev-tcltk/tcllib/tcllib-1.20.ebuild
 1810062239 ./dev-tcltk/tclperl/tclperl-3.2-r1.ebuild
 2009041909 ./dev-tcltk/tclpython/tclpython-5.0.ebuild
 2002111439 ./dev-tcltk/tclreadline/tclreadline-2.1.0-r5.ebuild
@@ -15626,10 +15634,10 @@
 1911131109 ./dev-tcltk/vtcl/vtcl-1.6.0-r2.ebuild
 2001300939 ./dev-tex/abntex/abntex-0.9_beta2-r1.ebuild
 1912110241 ./dev-tex/biber/biber-2.12.ebuild
-2005041739 ./dev-tex/biber/biber-2.14.ebuild
+2012192309 ./dev-tex/biber/biber-2.14.ebuild
 2001191739 ./dev-tex/biblatex-gost/biblatex-gost-1.17.ebuild
 1909272239 ./dev-tex/biblatex/biblatex-3.12.ebuild
-2005041739 ./dev-tex/biblatex/biblatex-3.14.ebuild
+2012192309 ./dev-tex/biblatex/biblatex-3.14.ebuild
 2002111439 ./dev-tex/bibtex2html/bibtex2html-1.99.ebuild
 2005311939 ./dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild
 1909082039 ./dev-tex/catdvi/catdvi-0.14-r2.ebuild
@@ -15641,9 +15649,7 @@
 2011241409 ./dev-tex/frakturx/frakturx-20070103-r1.ebuild
 2004032241 ./dev-tex/glossaries/glossaries-4.41.ebuild
 2006241539 ./dev-tex/glossaries/glossaries-4.46.ebuild
-2010031709 ./dev-tex/hevea/hevea-2.29.ebuild
-2010031709 ./dev-tex/hevea/hevea-2.30.ebuild
-2012172009 ./dev-tex/hevea/hevea-2.31.ebuild
+2012202239 ./dev-tex/hevea/hevea-2.31.ebuild
 2004032241 ./dev-tex/html2latex/html2latex-1.1-r1.ebuild
 1909082039 ./dev-tex/hyphen_show/hyphen_show-20000425-r1.ebuild
 2004032241 ./dev-tex/ivritex/ivritex-1.1.2.ebuild
@@ -15657,7 +15663,7 @@
 2004032241 ./dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild
 2003261841 ./dev-tex/latexdiff/latexdiff-9999.ebuild
 2004121609 ./dev-tex/latexdiff/latexdiff-1.3.0.ebuild
-2012172009 ./dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
+2012202209 ./dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
 2003261841 ./dev-tex/latexmk/latexmk-465.ebuild
 2004032241 ./dev-tex/latexmk/latexmk-456.ebuild
 2004251439 ./dev-tex/latexmk/latexmk-469.ebuild
@@ -15820,9 +15826,9 @@
 1911160409 ./dev-util/cargo-ebuild/cargo-ebuild-0.2.0.ebuild
 2005090009 ./dev-util/cargo-ebuild/cargo-ebuild-0.3.0.ebuild
 2008130139 ./dev-util/cargo-ebuild/cargo-ebuild-0.3.1.ebuild
-2010090109 ./dev-util/catalyst/catalyst-3.0.14.ebuild
-2010310309 ./dev-util/catalyst/catalyst-9999.ebuild
-2012171739 ./dev-util/catalyst/catalyst-3.0.15.ebuild
+2012181209 ./dev-util/catalyst/catalyst-3.0.14.ebuild
+2012181209 ./dev-util/catalyst/catalyst-3.0.15.ebuild
+2012200639 ./dev-util/catalyst/catalyst-9999.ebuild
 2003152212 ./dev-util/catfish/catfish-1.4.13.ebuild
 2010262009 ./dev-util/catfish/catfish-4.15.0.ebuild
 2010131539 ./dev-util/catkin/catkin-0.8.8-r1.ebuild
@@ -15841,6 +15847,7 @@
 2010031409 ./dev-util/checkbashisms/checkbashisms-2.20.2.ebuild
 2010031409 ./dev-util/checkbashisms/checkbashisms-2.20.3.ebuild
 2010031409 ./dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
+2012210309 ./dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
 1709012313 ./dev-util/checkstyle/checkstyle-7.2.ebuild
 2005302339 ./dev-util/clair/clair-2.1.3.ebuild
 2007262038 ./dev-util/clair/clair-2.1.4.ebuild
@@ -15859,7 +15866,7 @@
 2005221739 ./dev-util/cmake/cmake-3.13.5.ebuild
 2011191309 ./dev-util/cmake/cmake-3.18.5.ebuild
 2012171109 ./dev-util/cmake/cmake-3.17.4-r1.ebuild
-2012171639 ./dev-util/cmake/cmake-3.19.2.ebuild
+2012182339 ./dev-util/cmake/cmake-3.19.2.ebuild
 2004032241 ./dev-util/cmocka/cmocka-1.1.5.ebuild
 2004080939 ./dev-util/codeblocks/codeblocks-9999.ebuild
 2007061039 ./dev-util/codeblocks/codeblocks-20.03-r1.ebuild
@@ -15924,7 +15931,7 @@
 2004032241 ./dev-util/debhelper/debhelper-9.20160814.ebuild
 2005201409 ./dev-util/debhelper/debhelper-13.1.ebuild
 2007091139 ./dev-util/debhelper/debhelper-13.2.ebuild
-2012030209 ./dev-util/debhelper/debhelper-13.2.1.ebuild
+2012211309 ./dev-util/debhelper/debhelper-13.2.1.ebuild
 2009181209 ./dev-util/debootstrap/debootstrap-1.0.123.ebuild
 2011221539 ./dev-util/debugedit/debugedit-4.16.0.ebuild
 2012111039 ./dev-util/debugedit/debugedit-4.16.1.ebuild
@@ -15932,15 +15939,14 @@
 2004211009 ./dev-util/dejagnu/dejagnu-1.6.ebuild
 2006290009 ./dev-util/dejagnu/dejagnu-1.6.2.ebuild
 2004032241 ./dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
-2012170709 ./dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
+2012211309 ./dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
 2008302139 ./dev-util/devhelp/devhelp-3.36.2.ebuild
 2003261841 ./dev-util/dialog/dialog-1.3.20200228.ebuild
 2004011639 ./dev-util/dialog/dialog-1.3.20200327.ebuild
 2006062109 ./dev-util/dialog/dialog-1.3.20170131.ebuild
 2011141839 ./dev-util/diffball/diffball-1.0.1-r2.ebuild
 2011272109 ./dev-util/difffilter/difffilter-0.3.3-r1.ebuild
-2011272309 ./dev-util/diffoscope/diffoscope-162.ebuild
-2012130139 ./dev-util/diffoscope/diffoscope-163.ebuild
+2012181209 ./dev-util/diffoscope/diffoscope-163.ebuild
 2003261841 ./dev-util/diffstat/diffstat-1.63.ebuild
 2006062109 ./dev-util/diffstat/diffstat-1.60.ebuild
 2006062109 ./dev-util/diffstat/diffstat-1.61.ebuild
@@ -15970,7 +15976,6 @@
 2012121709 ./dev-util/dwdiff/dwdiff-2.1.2.ebuild
 2012121709 ./dev-util/dwdiff/dwdiff-2.1.3.ebuild
 2001191639 ./dev-util/edb-debugger/edb-debugger-9999.ebuild
-2010311339 ./dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
 2012142309 ./dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
 2004300915 ./dev-util/edi/edi-0.8.0.ebuild
 2008302309 ./dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild
@@ -16020,7 +16025,7 @@
 2012081909 ./dev-util/gnome-builder/gnome-builder-3.38.1.ebuild
 2004202139 ./dev-util/gnome-devel-docs/gnome-devel-docs-3.32.1.ebuild
 2005172009 ./dev-util/gob/gob-2.0.20.ebuild
-2011172039 ./dev-util/goland/goland-2020.2.3.ebuild
+2012182139 ./dev-util/goland/goland-2020.3.ebuild
 2008210639 ./dev-util/google-perftools/google-perftools-2.8.ebuild
 2008210939 ./dev-util/google-perftools/google-perftools-2.7-r1.ebuild
 2001211409 ./dev-util/gource/gource-0.51.ebuild
@@ -16056,13 +16061,13 @@
 2011222009 ./dev-util/include-what-you-use/include-what-you-use-11.0.ebuild
 2003261841 ./dev-util/indent/indent-2.2.11_p5.ebuild
 2004032241 ./dev-util/indent/indent-2.2.11-r1.ebuild
-2012140439 ./dev-util/indent/indent-2.2.12.ebuild
+2012211309 ./dev-util/indent/indent-2.2.12.ebuild
 2009201739 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.ebuild
 2011031509 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
 2009212109 ./dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r3.ebuild
 2004211009 ./dev-util/intltool/intltool-0.51.0-r2.ebuild
 2002140109 ./dev-util/its4/its4-1.1.1-r1.ebuild
-2012150209 ./dev-util/itstool/itstool-2.0.6-r1.ebuild
+2012191139 ./dev-util/itstool/itstool-2.0.6-r1.ebuild
 1911032339 ./dev-util/japi-compliance-checker/japi-compliance-checker-9999.ebuild
 1912031509 ./dev-util/japi-compliance-checker/japi-compliance-checker-2.4.ebuild
 1911100109 ./dev-util/jarwizard/jarwizard-2.50.ebuild
@@ -16106,6 +16111,7 @@
 2011291209 ./dev-util/lldb/lldb-12.0.0.9999.ebuild
 2011291409 ./dev-util/lldb/lldb-11.0.1.9999.ebuild
 2011291409 ./dev-util/lldb/lldb-11.0.1_rc1.ebuild
+2012191239 ./dev-util/lldb/lldb-11.0.1_rc2.ebuild
 2002230040 ./dev-util/lockrun/lockrun-20120508-r1.ebuild
 1911050009 ./dev-util/lsuio/lsuio-0.2.0-r1.ebuild
 2006212138 ./dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -16142,6 +16148,7 @@
 2009241809 ./dev-util/ninja/ninja-9999.ebuild
 2011292139 ./dev-util/ninja/ninja-1.10.2.ebuild
 2012140439 ./dev-util/ninja/ninja-1.10.1.ebuild
+2012201909 ./dev-util/ninja/ninja-1.10.2-r1.ebuild
 1908180239 ./dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
 2002091639 ./dev-util/numdiff/numdiff-5.9.0.ebuild
 1705210024 ./dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
@@ -16197,7 +16204,7 @@
 2005071839 ./dev-util/perf/perf-5.4.20.ebuild
 2006130209 ./dev-util/perf/perf-5.7-r1.ebuild
 2010282339 ./dev-util/perf/perf-5.8.ebuild
-2011191939 ./dev-util/perf/perf-5.9.9.ebuild
+2012181339 ./dev-util/perf/perf-5.9.9.ebuild
 2011281109 ./dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
 2012051039 ./dev-util/pkgcheck/pkgcheck-0.7.9.ebuild
 2012121109 ./dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -16301,7 +16308,7 @@
 2004051339 ./dev-util/shellcheck/shellcheck-0.7.1.ebuild
 1912170009 ./dev-util/shelltestrunner/shelltestrunner-1.9.ebuild
 2004211009 ./dev-util/shflags/shflags-1.0.3.ebuild
-2012140439 ./dev-util/shflags/shflags-1.2.3.ebuild
+2012211309 ./dev-util/shflags/shflags-1.2.3.ebuild
 2004032241 ./dev-util/shtool/shtool-2.0.8-r1.ebuild
 1702282250 ./dev-util/shunit2/shunit2-2.1.6-r1.ebuild
 2009071209 ./dev-util/smem/smem-1.5-r1.ebuild
@@ -16406,11 +16413,8 @@
 2005150039 ./dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild
 2011130009 ./dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
 2010091209 ./dev-util/cargo-c/cargo-c-0.6.2.ebuild
-2009241009 ./dev-util/cvise/cvise-1.6.0.ebuild
-2009301109 ./dev-util/cvise/cvise-1.7.0-r1.ebuild
-2010212209 ./dev-util/cvise/cvise-1.8.0.ebuild
 2012161709 ./dev-util/cvise/cvise-2.0.0.ebuild
-2012172009 ./dev-util/cvise/cvise-1.9.0.ebuild
+2012202239 ./dev-util/cvise/cvise-1.9.0.ebuild
 2005310739 ./dev-util/github-cli/github-cli-0.8.0.ebuild
 2006072109 ./dev-util/github-cli/github-cli-0.9.0-r1.ebuild
 2006130039 ./dev-util/github-cli/github-cli-9999.ebuild
@@ -16454,13 +16458,12 @@
 1809152309 ./dev-vcs/cvsutils/cvsutils-0.2.5-r1.ebuild
 2003261841 ./dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild
 2003261841 ./dev-vcs/cvsync/cvsync-9999.ebuild
-2008112239 ./dev-vcs/darcs/darcs-2.14.5.ebuild
 2010241209 ./dev-vcs/darcs/darcs-2.16.3.ebuild
 1807302309 ./dev-vcs/easygit/easygit-1.7.5.2.ebuild
 2010012309 ./dev-vcs/fossil/fossil-2.12.1.ebuild
 2008121239 ./dev-vcs/git-annex/git-annex-8.20200810.ebuild
 2012071239 ./dev-vcs/git-cola/git-cola-3.8.ebuild
-2012171209 ./dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+2012181009 ./dev-vcs/git-cola/git-cola-3.5-r1.ebuild
 1712241839 ./dev-vcs/git-crypt/git-crypt-0.6.0.ebuild
 1912110241 ./dev-vcs/git-deploy/git-deploy-6.0.1_p20131024-r1.ebuild
 2001091509 ./dev-vcs/git-flow/git-flow-1.12.3.ebuild
@@ -16486,7 +16489,7 @@
 2012070809 ./dev-vcs/git/git-9999-r2.ebuild
 2012070809 ./dev-vcs/git/git-9999-r3.ebuild
 2012070809 ./dev-vcs/git/git-9999.ebuild
-2012151039 ./dev-vcs/git/git-2.30.0_rc0.ebuild
+2012192139 ./dev-vcs/git/git-2.30.0_rc1.ebuild
 2002271939 ./dev-vcs/gitg/gitg-3.32.1-r1.ebuild
 2001162209 ./dev-vcs/github-pages-publish/github-pages-publish-0.1.3.ebuild
 1904080339 ./dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r1.ebuild
@@ -16846,8 +16849,8 @@
 1712012239 ./games-emulation/caps/caps-20071115.ebuild
 1911021809 ./games-emulation/desmume/desmume-0.9.11-r2.ebuild
 2007051509 ./games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
-2010242139 ./games-emulation/dolphin/dolphin-9999.ebuild
 2012030239 ./games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
+2012190009 ./games-emulation/dolphin/dolphin-9999.ebuild
 2001041739 ./games-emulation/dosbox/dosbox-9999.ebuild
 2001052309 ./games-emulation/dosbox/dosbox-0.74.3.ebuild
 2006061209 ./games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -16963,6 +16966,7 @@
 1710040103 ./games-engines/stratagus/stratagus-2.4.1.ebuild
 2011230339 ./games-engines/stratagus/stratagus-2.4.3.ebuild
 2012152209 ./games-engines/stratagus/stratagus-2.4.3-r100.ebuild
+2012201409 ./games-engines/stratagus/stratagus-3.0.0-r1.ebuild
 1707090132 ./games-engines/xzip/xzip-1.8.2-r3.ebuild
 2004101409 ./games-engines/zoom/zoom-1.1.5-r1.ebuild
 2011281509 ./games-engines/dMagnetic/dMagnetic-0.28.ebuild
@@ -17389,6 +17393,7 @@
 1801271808 ./games-strategy/wargus-data/wargus-data-0-r1.ebuild
 1801271808 ./games-strategy/wargus/wargus-2.4.1.ebuild
 2011230339 ./games-strategy/wargus/wargus-2.4.3.ebuild
+2012201409 ./games-strategy/wargus/wargus-3.0.0-r1.ebuild
 2007220239 ./games-strategy/warmux/warmux-11.04.1-r1.ebuild
 2006280009 ./games-strategy/warzone2100/warzone2100-3.2.3.ebuild
 2006280009 ./games-strategy/warzone2100/warzone2100-3.3.0.ebuild
@@ -17399,6 +17404,7 @@
 1806110509 ./games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
 2004241239 ./games-strategy/settlers-2-gold-data/settlers-2-gold-data-0.ebuild
 2011230339 ./games-strategy/war1gus/war1gus-2.4.3.ebuild
+2012191839 ./games-strategy/war1gus/war1gus-3.0.0.ebuild
 2012171209 ./games-strategy/julius/julius-1.4.1.ebuild
 1808251839 ./games-util/antimicro/antimicro-2.23.ebuild
 2010230309 ./games-util/atlas/atlas-0.6.1_beta_pre20181202.ebuild
@@ -17473,9 +17479,8 @@
 2007192109 ./gnome-base/gnome-core-libs/gnome-core-libs-3.36.4.ebuild
 2008302139 ./gnome-base/gnome-core-libs/gnome-core-libs-3.36.5.ebuild
 2008302139 ./gnome-base/gnome-desktop/gnome-desktop-3.36.5.ebuild
-2010120039 ./gnome-base/gnome-desktop/gnome-desktop-3.36.7.ebuild
-2011161709 ./gnome-base/gnome-desktop/gnome-desktop-3.38.1.ebuild
 2012052209 ./gnome-base/gnome-desktop/gnome-desktop-3.38.2.ebuild
+2012181609 ./gnome-base/gnome-desktop/gnome-desktop-3.36.8.ebuild
 2008302139 ./gnome-base/gnome-extra-apps/gnome-extra-apps-3.36.5.ebuild
 2012142009 ./gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild
 2011061839 ./gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
@@ -17500,9 +17505,9 @@
 2006132027 ./gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
 2003261841 ./gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
 2006162009 ./gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
-2011072309 ./gnome-base/librsvg/librsvg-2.40.21.ebuild
 2011051939 ./gnome-base/librsvg/librsvg-2.48.8.ebuild
 2011090239 ./gnome-base/librsvg/librsvg-2.48.9.ebuild
+2012190109 ./gnome-base/librsvg/librsvg-2.40.21.ebuild
 2008302139 ./gnome-base/nautilus/nautilus-3.36.3.ebuild
 2004260039 ./gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r3.ebuild
 2004270309 ./gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
@@ -17530,15 +17535,17 @@
 2008302139 ./gnome-extra/evolution-ews/evolution-ews-3.36.5.ebuild
 2012140439 ./gnome-extra/evolution-ews/evolution-ews-3.38.2.ebuild
 2003261841 ./gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
-2008302139 ./gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild
+2012181209 ./gnome-extra/gnome-boxes/gnome-boxes-3.36.6.ebuild
 2008302139 ./gnome-extra/gnome-calculator/gnome-calculator-3.36.0.ebuild
 2008302139 ./gnome-extra/gnome-calendar/gnome-calendar-3.36.2.ebuild
 2012140439 ./gnome-extra/gnome-calendar/gnome-calendar-3.38.1.ebuild
+2012202209 ./gnome-extra/gnome-calendar/gnome-calendar-3.38.2.ebuild
 2006291909 ./gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild
 2008302139 ./gnome-extra/gnome-clocks/gnome-clocks-3.36.2.ebuild
 2008302139 ./gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild
 2007020939 ./gnome-extra/gnome-commander/gnome-commander-1.10.3.ebuild
-2012140439 ./gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
+2012191509 ./gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
+2012191509 ./gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild
 1912081509 ./gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild
 2004202139 ./gnome-extra/gnome-documents/gnome-documents-3.34.0.ebuild
 2004202009 ./gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90-r1.ebuild
@@ -17566,6 +17573,7 @@
 2008302139 ./gnome-extra/gnome-system-monitor/gnome-system-monitor-3.36.1.ebuild
 2006012338 ./gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
 2008302139 ./gnome-extra/gnome-user-docs/gnome-user-docs-3.36.2.ebuild
+2012191839 ./gnome-extra/gnome-user-docs/gnome-user-docs-3.36.6.ebuild
 2004202139 ./gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
 2003261841 ./gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
 2008302139 ./gnome-extra/gnome-weather/gnome-weather-3.36.1.ebuild
@@ -17596,6 +17604,7 @@
 2006162009 ./gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
 2011141239 ./gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
 2008302139 ./gnome-extra/yelp/yelp-3.36.0.ebuild
+2012191839 ./gnome-extra/yelp/yelp-3.36.2.ebuild
 2003261841 ./gnome-extra/zenity/zenity-3.32.0.ebuild
 2008302339 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-13.ebuild
 2012051309 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-16-r1.ebuild
@@ -17740,6 +17749,7 @@
 2011140009 ./gui-apps/wayland-logout/wayland-logout-9999.ebuild
 2007190109 ./gui-libs/amtk/amtk-5.0.2.ebuild
 2012110639 ./gui-libs/libhandy/libhandy-0.0.13.ebuild
+2012191409 ./gui-libs/libhandy/libhandy-1.0.2.ebuild
 2012110639 ./gui-libs/tepl/tepl-4.4.0.ebuild
 2008051739 ./gui-libs/wlroots/wlroots-0.11.0.ebuild
 2011112009 ./gui-libs/wlroots/wlroots-9999.ebuild
@@ -17755,8 +17765,9 @@
 2012160540 ./gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.6.0.ebuild
 2012160540 ./gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
 2009302139 ./gui-wm/sway/sway-1.5.ebuild
-2011112339 ./gui-wm/sway/sway-9999.ebuild
 2012112109 ./gui-wm/sway/sway-1.5.1.ebuild
+2012200109 ./gui-wm/sway/sway-1.5.1-r1.ebuild
+2012200109 ./gui-wm/sway/sway-9999.ebuild
 2011140009 ./gui-wm/wayfire/wayfire-0.6.0.ebuild
 2011140009 ./gui-wm/wayfire/wayfire-9999.ebuild
 2011181939 ./gui-wm/wayfire/wayfire-0.5.0.ebuild
@@ -17847,8 +17858,8 @@
 2012122109 ./kde-apps/incidenceeditor/incidenceeditor-20.12.0.ebuild
 2011252009 ./kde-apps/juk/juk-20.08.3.ebuild
 2012122109 ./kde-apps/juk/juk-20.12.0.ebuild
-2011252009 ./kde-apps/k3b/k3b-20.08.3.ebuild
-2012122109 ./kde-apps/k3b/k3b-20.12.0.ebuild
+2012181209 ./kde-apps/k3b/k3b-20.08.3.ebuild
+2012181209 ./kde-apps/k3b/k3b-20.12.0.ebuild
 2011252009 ./kde-apps/kaccounts-integration/kaccounts-integration-20.08.3.ebuild
 2012122109 ./kde-apps/kaccounts-integration/kaccounts-integration-20.12.0.ebuild
 2011252009 ./kde-apps/kaccounts-providers/kaccounts-providers-20.08.3.ebuild
@@ -18337,7 +18348,7 @@
 2010080539 ./kde-frameworks/kmediaplayer/kmediaplayer-5.74.0.ebuild
 2011142109 ./kde-frameworks/kmediaplayer/kmediaplayer-5.76.0.ebuild
 2010080539 ./kde-frameworks/knewstuff/knewstuff-5.74.0.ebuild
-2012122109 ./kde-frameworks/knewstuff/knewstuff-5.77.0.ebuild
+2012200309 ./kde-frameworks/knewstuff/knewstuff-5.77.0-r1.ebuild
 2010080539 ./kde-frameworks/knotifications/knotifications-5.74.0.ebuild
 2012122109 ./kde-frameworks/knotifications/knotifications-5.77.0.ebuild
 2010080539 ./kde-frameworks/knotifyconfig/knotifyconfig-5.74.0.ebuild
@@ -18383,7 +18394,7 @@
 2010080539 ./kde-frameworks/oxygen-icons/oxygen-icons-5.74.0.ebuild
 2012122109 ./kde-frameworks/oxygen-icons/oxygen-icons-5.77.0.ebuild
 2010080539 ./kde-frameworks/plasma/plasma-5.74.0-r1.ebuild
-2012122109 ./kde-frameworks/plasma/plasma-5.77.0.ebuild
+2012200309 ./kde-frameworks/plasma/plasma-5.77.0-r1.ebuild
 2010080539 ./kde-frameworks/prison/prison-5.74.0.ebuild
 2012122109 ./kde-frameworks/prison/prison-5.77.0.ebuild
 2010080539 ./kde-frameworks/purpose/purpose-5.74.0.ebuild
@@ -18403,7 +18414,7 @@
 2010080539 ./kde-frameworks/kquickcharts/kquickcharts-5.74.0.ebuild
 2012122109 ./kde-frameworks/kquickcharts/kquickcharts-5.77.0.ebuild
 2010270339 ./kde-frameworks/kdav/kdav-5.74.0.ebuild
-2012122109 ./kde-frameworks/kdav/kdav-5.77.0.ebuild
+2012181709 ./kde-frameworks/kdav/kdav-5.77.0-r1.ebuild
 2003020109 ./kde-misc/basket/basket-2.49b.ebuild
 2005162209 ./kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild
 2011252009 ./kde-misc/kdeconnect/kdeconnect-20.08.3.ebuild
@@ -18419,6 +18430,7 @@
 2011021509 ./kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild
 2001121509 ./kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild
 2011251939 ./kde-misc/krename/krename-5.0.1.ebuild
+2012181709 ./kde-misc/krename/krename-5.0.1-r1.ebuild
 2010162109 ./kde-misc/krusader/krusader-2.7.2.ebuild
 2002182339 ./kde-misc/kshutdown/kshutdown-5.2.ebuild
 1912091439 ./kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild
@@ -18687,15 +18699,17 @@
 1904020139 ./mail-filter/postfwd/postfwd-2.00-r1.ebuild
 1907081509 ./mail-filter/postfwd/postfwd-2.02.ebuild
 1702282250 ./mail-filter/postgrey/postgrey-1.36-r1.ebuild
-1703180938 ./mail-filter/postgrey/postgrey-1.37.ebuild
+2012211309 ./mail-filter/postgrey/postgrey-1.37.ebuild
+2012200609 ./mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild
 2006151839 ./mail-filter/postsrsd/postsrsd-1.6.ebuild
+2012210339 ./mail-filter/postsrsd/postsrsd-1.10.ebuild
 2007161209 ./mail-filter/procmail/procmail-3.22-r14.ebuild
 2005251309 ./mail-filter/razor/razor-2.85-r3.ebuild
 2002230040 ./mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
 2012100209 ./mail-filter/rspamd/rspamd-2.5-r1.ebuild
 2012100209 ./mail-filter/rspamd/rspamd-2.6-r100.ebuild
-2012100209 ./mail-filter/rspamd/rspamd-2.6-r2.ebuild
 2012100209 ./mail-filter/rspamd/rspamd-9999.ebuild
+2012200609 ./mail-filter/rspamd/rspamd-2.6-r2.ebuild
 2005271639 ./mail-filter/scmail/scmail-1.3.ebuild
 1902152139 ./mail-filter/sieve-connect/sieve-connect-0.87-r1.ebuild
 2004261709 ./mail-filter/sieve-connect/sieve-connect-0.90.ebuild
@@ -18935,6 +18949,7 @@
 2004032241 ./media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
 2004032241 ./media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
 2012041739 ./media-fonts/liberation-fonts/liberation-fonts-2.1.0.ebuild
+2012211309 ./media-fonts/liberation-fonts/liberation-fonts-2.1.2.ebuild
 2004032241 ./media-fonts/libertine/libertine-5.3.0.20120702-r2.ebuild
 2004032241 ./media-fonts/libertine/libertine-5.3.0.20120702-r3.ebuild
 1805221709 ./media-fonts/lklug/lklug-0.6-r1.ebuild
@@ -19074,7 +19089,7 @@
 2012031609 ./media-gfx/blender/blender-2.91.0.ebuild
 2012171839 ./media-gfx/blender/blender-2.83.10.ebuild
 2005032209 ./media-gfx/cairosvg/cairosvg-2.4.2.ebuild
-2010300309 ./media-gfx/cairosvg/cairosvg-2.5.0.ebuild
+2012202239 ./media-gfx/cairosvg/cairosvg-2.5.0.ebuild
 1805010009 ./media-gfx/cellwriter/cellwriter-1.3.5.ebuild
 2011041109 ./media-gfx/cellwriter/cellwriter-1.3.6.ebuild
 2009181139 ./media-gfx/chafa/chafa-1.4.1.ebuild
@@ -19109,6 +19124,7 @@
 2008091239 ./media-gfx/entangle/entangle-3.0.ebuild
 2008302139 ./media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild
 2008302139 ./media-gfx/eog/eog-3.36.3.ebuild
+2012191839 ./media-gfx/eog/eog-3.36.4.ebuild
 2008090009 ./media-gfx/eom/eom-1.24.0-r2.ebuild
 2009252339 ./media-gfx/eom/eom-1.24.1.ebuild
 2009031339 ./media-gfx/ephoto/ephoto-1.5.ebuild
@@ -19183,7 +19199,7 @@
 2007301139 ./media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
 2012041739 ./media-gfx/graphite2/graphite2-1.3.14.ebuild
 2008202339 ./media-gfx/graphviz/graphviz-2.42.3-r1.ebuild
-2012041739 ./media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
+2012210039 ./media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
 1910111911 ./media-gfx/grub-splashes/grub-splashes-20091109.ebuild
 2009071209 ./media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
 2009071209 ./media-gfx/gscan2pdf/gscan2pdf-2.8.1.ebuild
@@ -19193,18 +19209,18 @@
 2004032241 ./media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
 1912131839 ./media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
 2010252209 ./media-gfx/hugin/hugin-2019.2.0.ebuild
-2012051039 ./media-gfx/hugin/hugin-9999.ebuild
-2012172309 ./media-gfx/hugin/hugin-2020.0.0.ebuild
+2012201239 ./media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+2012201239 ./media-gfx/hugin/hugin-9999.ebuild
 1811260309 ./media-gfx/icc-examin/icc-examin-0.56_p20171007.ebuild
 1811260309 ./media-gfx/icc-examin/icc-examin-9999.ebuild
 2004032241 ./media-gfx/icon-slicer/icon-slicer-0.3.ebuild
 2007231139 ./media-gfx/icoutils/icoutils-0.32.3.ebuild
 2005172009 ./media-gfx/igal/igal-2.0-r1.ebuild
 2011300509 ./media-gfx/imagemagick/imagemagick-9999.ebuild
-2012062009 ./media-gfx/imagemagick/imagemagick-6.9.11.44.ebuild
-2012062009 ./media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
-2012062009 ./media-gfx/imagemagick/imagemagick-7.0.10.44.ebuild
-2012062009 ./media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
+2012202339 ./media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
+2012202339 ./media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
+2012202339 ./media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
+2012202339 ./media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
 2012141139 ./media-gfx/imageworsener/imageworsener-1.3.3.ebuild
 2006172009 ./media-gfx/img2pdf/img2pdf-0.3.6.ebuild
 2001192309 ./media-gfx/imv/imv-4.0.1-r2.ebuild
@@ -19309,8 +19325,7 @@
 1805290208 ./media-gfx/pqstego/pqstego-0.0.1.ebuild
 1902252339 ./media-gfx/propaganda/propaganda-1.0-r1.ebuild
 1812252339 ./media-gfx/psftools/psftools-1.0.10.ebuild
-2012160139 ./media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
-2012170251 ./media-gfx/pstoedit/pstoedit-3.75.ebuild
+2012181339 ./media-gfx/pstoedit/pstoedit-3.75.ebuild
 2007051139 ./media-gfx/qimgv/qimgv-0.9.1.ebuild
 2009291009 ./media-gfx/qiv/qiv-2.3.2-r1.ebuild
 2012041739 ./media-gfx/qrencode/qrencode-4.1.1.ebuild
@@ -19329,15 +19344,13 @@
 2011090239 ./media-gfx/sane-frontends/sane-frontends-1.0.14-r6.ebuild
 2005310309 ./media-gfx/scantailor-advanced/scantailor-advanced-1.0.16-r1.ebuild
 2010060809 ./media-gfx/scour/scour-0.37.ebuild
-2003261841 ./media-gfx/scrot/scrot-0.8_p13-r1.ebuild
-2003261841 ./media-gfx/scrot/scrot-1.2.ebuild
-2004291139 ./media-gfx/scrot/scrot-1.3-r1.ebuild
 2008071439 ./media-gfx/scrot/scrot-9999.ebuild
-2012172009 ./media-gfx/scrot/scrot-1.4.ebuild
+2012202209 ./media-gfx/scrot/scrot-1.4.ebuild
 1702282250 ./media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
 2008302139 ./media-gfx/shotwell/shotwell-0.30.10.ebuild
 2011090239 ./media-gfx/shotwell/shotwell-0.30.11.ebuild
 2012131539 ./media-gfx/simple-scan/simple-scan-3.36.4.ebuild
+2012191839 ./media-gfx/simple-scan/simple-scan-3.36.7.ebuild
 2012061539 ./media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
 2012061539 ./media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
 2012061539 ./media-gfx/slic3r/slic3r-9999.ebuild
@@ -19402,8 +19415,8 @@
 2002162209 ./media-libs/aften/aften-0.0.8-r2.ebuild
 1912110241 ./media-libs/allegro/allegro-4.4.2-r2.ebuild
 2007041609 ./media-libs/allegro/allegro-5.2.5.0.ebuild
-2009010609 ./media-libs/allegro/allegro-5.2.6.0.ebuild
 2009071209 ./media-libs/allegro/allegro-4.4.3.1.ebuild
+2012202239 ./media-libs/allegro/allegro-5.2.6.0.ebuild
 2008021509 ./media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
 2010211109 ./media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
 2011090239 ./media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
@@ -19547,7 +19560,7 @@
 1902251409 ./media-libs/intel-mediasdk/intel-mediasdk-18.4.1.ebuild
 1810230209 ./media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
 2007292009 ./media-libs/jbig2dec/jbig2dec-0.18.ebuild
-2012172009 ./media-libs/jbig2dec/jbig2dec-0.19.ebuild
+2012211309 ./media-libs/jbig2dec/jbig2dec-0.19.ebuild
 1702282250 ./media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild
 2012041739 ./media-libs/jbigkit/jbigkit-2.1.ebuild
 2006291939 ./media-libs/jpeg/jpeg-9d.ebuild
@@ -19627,7 +19640,7 @@
 2012041739 ./media-libs/libepoxy/libepoxy-1.5.4.ebuild
 2004032241 ./media-libs/libexif-gtk/libexif-gtk-0.3.5-r2.ebuild
 2006242039 ./media-libs/libexif/libexif-0.6.22.ebuild
-2011221539 ./media-libs/libexif/libexif-0.6.22_p20201105.ebuild
+2012211139 ./media-libs/libexif/libexif-0.6.22_p20201105.ebuild
 2004261339 ./media-libs/libextractor/libextractor-1.9-r1.ebuild
 2004032241 ./media-libs/libfame/libfame-0.9.1-r2.ebuild
 2009241009 ./media-libs/libffado/libffado-2.4.4.ebuild
@@ -19810,10 +19823,10 @@
 2009231339 ./media-libs/lvtk/lvtk-1.2.0-r1.ebuild
 2004032241 ./media-libs/memphis/memphis-0.2.3.ebuild
 2010162009 ./media-libs/mesa/mesa-20.1.10.ebuild
-2012102309 ./media-libs/mesa/mesa-9999.ebuild
-2012140439 ./media-libs/mesa/mesa-20.2.4.ebuild
 2012170209 ./media-libs/mesa/mesa-20.2.6.ebuild
 2012162341 ./media-libs/mesa/mesa-20.3.1.ebuild
+2012202239 ./media-libs/mesa/mesa-20.2.4.ebuild
+2012201509 ./media-libs/mesa/mesa-9999.ebuild
 2012160039 ./media-libs/mlt/mlt-6.22.1-r1.ebuild
 1801230038 ./media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild
 2006042339 ./media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
@@ -19921,9 +19934,9 @@
 2004032241 ./media-libs/soxr/soxr-0.1.3-r1.ebuild
 2004032241 ./media-libs/spandsp/spandsp-0.0.6.ebuild
 2004032241 ./media-libs/speex/speex-1.2.0-r1.ebuild
-2012161439 ./media-libs/speex/speex-1.2.0-r2.ebuild
+2012211309 ./media-libs/speex/speex-1.2.0-r2.ebuild
 2004032241 ./media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
-2012161439 ./media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
+2012211309 ./media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
 2011130009 ./media-libs/sratom/sratom-0.6.6.ebuild
 2002112051 ./media-libs/stimg/stimg-0.1.0.ebuild
 2007211239 ./media-libs/stk/stk-4.6.1.ebuild
@@ -19936,6 +19949,7 @@
 2006132027 ./media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
 1906090109 ./media-libs/theoraplay/theoraplay-0_pre20180524.ebuild
 2007220239 ./media-libs/tiff/tiff-4.1.0.ebuild
+2012201709 ./media-libs/tiff/tiff-4.2.0.ebuild
 2012010139 ./media-libs/tremor/tremor-0_pre20130223-r2.ebuild
 1805292338 ./media-libs/tse3/tse3-0.3.1-r1.ebuild
 2012041739 ./media-libs/urt/urt-3.1b-r3.ebuild
@@ -19971,10 +19985,9 @@
 2009151209 ./media-libs/x264/x264-9999.ebuild
 2008251609 ./media-libs/x265/x265-9999.ebuild
 2009071209 ./media-libs/x265/x265-3.4.ebuild
-2004261509 ./media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
 2012062339 ./media-libs/xine-lib/xine-lib-1.2.11.ebuild
 2012062339 ./media-libs/xine-lib/xine-lib-1.2.9999.ebuild
-2012172009 ./media-libs/xine-lib/xine-lib-1.2.10.ebuild
+2012202009 ./media-libs/xine-lib/xine-lib-1.2.10.ebuild
 2007220239 ./media-libs/xvid/xvid-1.3.5-r1.ebuild
 2007220239 ./media-libs/xvid/xvid-1.3.5.ebuild
 2010222009 ./media-libs/xvid/xvid-1.3.7.ebuild
@@ -20490,7 +20503,7 @@
 1803300609 ./media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild
 1803300609 ./media-plugins/vdr-zappilot/vdr-zappilot-0.0.5.ebuild
 2010091139 ./media-plugins/xsynth-dssi/xsynth-dssi-0.9.4.ebuild
-2012172039 ./media-plugins/mythplugins/mythplugins-31.0-r1.ebuild
+2012181209 ./media-plugins/mythplugins/mythplugins-31.0-r1.ebuild
 2005151539 ./media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.2.ebuild
 2006111109 ./media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.16.2.ebuild
 2007292139 ./media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-9999.ebuild
@@ -20559,7 +20572,7 @@
 1703112346 ./media-sound/SmarTagger/SmarTagger-0.1-r2.ebuild
 1912131310 ./media-sound/a2jmidid/a2jmidid-9999.ebuild
 2007042339 ./media-sound/a2jmidid/a2jmidid-9.ebuild
-2004261339 ./media-sound/abcde/abcde-2.9.3-r1.ebuild
+2012181209 ./media-sound/abcde/abcde-2.9.3-r1.ebuild
 1906050109 ./media-sound/abcm2ps/abcm2ps-8.14.4.ebuild
 2001180709 ./media-sound/abcm2ps/abcm2ps-8.14.6.ebuild
 2008231809 ./media-sound/abcmidi/abcmidi-2020.06.07.ebuild
@@ -20596,7 +20609,7 @@
 1905221909 ./media-sound/audicle/audicle-1.0.0.7-r2.ebuild
 1910161509 ./media-sound/audiocompress/audiocompress-2.0.ebuild
 2009071209 ./media-sound/audiotag/audiotag-0.19-r1.ebuild
-2001051415 ./media-sound/audiotools/audiotools-3.1.1.ebuild
+2012181209 ./media-sound/audiotools/audiotools-3.1.1.ebuild
 2008082009 ./media-sound/aumix/aumix-2.9.1.ebuild
 1906051109 ./media-sound/awesfx/awesfx-0.5.1e.ebuild
 2011141839 ./media-sound/aylet/aylet-0.5.ebuild
@@ -20647,7 +20660,7 @@
 1803052238 ./media-sound/deinvert/deinvert-9999.ebuild
 2003212209 ./media-sound/denemo/denemo-2.3.0-r1.ebuild
 2010142239 ./media-sound/din/din-48.ebuild
-2012172009 ./media-sound/din/din-49.1.ebuild
+2012202239 ./media-sound/din/din-49.1.ebuild
 2008051739 ./media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
 1912291610 ./media-sound/drumstick/drumstick-1.1.3.ebuild
 2002222009 ./media-sound/dvda-author/dvda-author-10.06-r1.ebuild
@@ -20687,6 +20700,7 @@
 2002031439 ./media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20190315.ebuild
 2009031339 ./media-sound/gnomad/gnomad-2.9.6.ebuild
 2008302139 ./media-sound/gnome-music/gnome-music-3.36.4.1.ebuild
+2012191839 ./media-sound/gnome-music/gnome-music-3.36.7.ebuild
 2004202139 ./media-sound/gnome-sound-recorder/gnome-sound-recorder-3.34.0.ebuild
 2002112051 ./media-sound/gnump3d/gnump3d-3.0-r2.ebuild
 2009061309 ./media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
@@ -20764,7 +20778,7 @@
 1804040108 ./media-sound/mp3_check/mp3_check-1.98-r1.ebuild
 2006211639 ./media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
 2002112051 ./media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
-1910161509 ./media-sound/mp3c/mp3c-0.31-r1.ebuild
+2012181209 ./media-sound/mp3c/mp3c-0.31-r1.ebuild
 2008221939 ./media-sound/mp3cat/mp3cat-0.5.ebuild
 1906221139 ./media-sound/mp3check/mp3check-0.8.7.ebuild
 2003010639 ./media-sound/mp3diags/mp3diags-1.5.01.ebuild
@@ -20802,13 +20816,13 @@
 2006251709 ./media-sound/mumble/mumble-1.3.1-r1.ebuild
 2008252139 ./media-sound/mumble/mumble-1.3.2.ebuild
 2011170309 ./media-sound/mumble/mumble-9999.ebuild
-2012030239 ./media-sound/mumble/mumble-1.3.3.ebuild
+2012201539 ./media-sound/mumble/mumble-1.3.3.ebuild
 1801230038 ./media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.3.0.ebuild
 1805120339 ./media-sound/mup/mup-6.6.ebuild
 2006212039 ./media-sound/murmur/murmur-1.3.1.ebuild
 2007091209 ./media-sound/murmur/murmur-1.3.2.ebuild
 2011171209 ./media-sound/murmur/murmur-9999.ebuild
-2012030239 ./media-sound/murmur/murmur-1.3.3.ebuild
+2012201539 ./media-sound/murmur/murmur-1.3.3.ebuild
 2008081539 ./media-sound/muse/muse-0.9.2_p20161002.ebuild
 2011142339 ./media-sound/musepack-tools/musepack-tools-465-r1.ebuild
 2011181009 ./media-sound/musescore/musescore-3.5.2.ebuild
@@ -20877,15 +20891,15 @@
 2012050539 ./media-sound/pulseeffects/pulseeffects-4.8.3.ebuild
 2008082009 ./media-sound/pwavecat/pwavecat-0.4.5.ebuild
 2010091209 ./media-sound/qastools/qastools-0.23.0.ebuild
-2009171109 ./media-sound/qjackctl/qjackctl-9999.ebuild
 2009231339 ./media-sound/qjackctl/qjackctl-0.6.3.ebuild
+2012200809 ./media-sound/qjackctl/qjackctl-0.9.0.ebuild
+2012200809 ./media-sound/qjackctl/qjackctl-9999.ebuild
 2008221939 ./media-sound/qmidiarp/qmidiarp-0.6.5.ebuild
 2005201609 ./media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
 2008091509 ./media-sound/qmmp/qmmp-9999.ebuild
 2011040409 ./media-sound/qmmp/qmmp-1.4.2.ebuild
-1912170009 ./media-sound/qsampler/qsampler-0.5.6.ebuild
-2008221939 ./media-sound/qsampler/qsampler-0.6.3.ebuild
 2009171109 ./media-sound/qsampler/qsampler-9999.ebuild
+2012202109 ./media-sound/qsampler/qsampler-0.6.3.ebuild
 2009032009 ./media-sound/qsynth/qsynth-9999.ebuild
 2010131239 ./media-sound/qsynth/qsynth-0.6.3.ebuild
 2005210139 ./media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
@@ -20960,7 +20974,7 @@
 2011270039 ./media-sound/teamspeak-client/teamspeak-client-3.5.3-r1.ebuild
 2011270039 ./media-sound/teamspeak-client/teamspeak-client-3.5.6-r1.ebuild
 2005211139 ./media-sound/teamspeak-server/teamspeak-server-3.12.1.ebuild
-2011300139 ./media-sound/teamspeak-server/teamspeak-server-3.13.2.ebuild
+2012190009 ./media-sound/teamspeak-server/teamspeak-server-3.13.3.ebuild
 1810131209 ./media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild
 2011150109 ./media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
 2001171409 ./media-sound/timemachine/timemachine-0.3.4.ebuild
@@ -21097,7 +21111,7 @@
 2005032339 ./media-video/cheese/cheese-3.34.0-r1.ebuild
 1912110241 ./media-video/clive/clive-2.3.0.1.ebuild
 2002230040 ./media-video/cpvts/cpvts-1.2-r1.ebuild
-2011090239 ./media-video/devedeng/devedeng-4.16.0-r1.ebuild
+2012181209 ./media-video/devedeng/devedeng-4.16.0-r1.ebuild
 2004032241 ./media-video/dirac/dirac-1.0.2-r1.ebuild
 2004261409 ./media-video/dv2sub/dv2sub-0.3-r1.ebuild
 1807262239 ./media-video/dvbackup/dvbackup-0.0.4-r2.ebuild
@@ -21109,13 +21123,13 @@
 2005181938 ./media-video/dvdbackup/dvdbackup-0.4.2.ebuild
 1911092239 ./media-video/dvdimagecmp/dvdimagecmp-0.3-r1.ebuild
 2004261539 ./media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
-2004261509 ./media-video/dvdstyler/dvdstyler-3.0.4.ebuild
+2012181209 ./media-video/dvdstyler/dvdstyler-3.0.4.ebuild
 1801070909 ./media-video/dvgrab/dvgrab-3.5-r1.ebuild
 1702282250 ./media-video/ffcast/ffcast-2.4.8.ebuild
 2007281739 ./media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
 2007230839 ./media-video/ffmpeg/ffmpeg-4.2.4.ebuild
 2010222009 ./media-video/ffmpeg/ffmpeg-9999.ebuild
-2012102339 ./media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+2012211309 ./media-video/ffmpeg/ffmpeg-4.3.1.ebuild
 2009261609 ./media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
 2004261339 ./media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
 2010141139 ./media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild
@@ -21140,7 +21154,6 @@
 2011150109 ./media-video/jubler/jubler-5.1.ebuild
 1912251909 ./media-video/kaffeine/kaffeine-2.0.18.ebuild
 2011150109 ./media-video/kino/kino-1.3.4-r1.ebuild
-2011130109 ./media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild
 2001220909 ./media-video/libva-utils/libva-utils-2.4.0.ebuild
 2007131109 ./media-video/libva-utils/libva-utils-2.8.0.ebuild
 2010231439 ./media-video/libva-utils/libva-utils-9999.ebuild
@@ -21230,7 +21243,7 @@
 2006290009 ./media-video/smtube/smtube-20.1.0.ebuild
 1702282250 ./media-video/snappy/snappy-1.0-r1.ebuild
 1706250051 ./media-video/sonic-snap/sonic-snap-1.7-r1.ebuild
-1910271639 ./media-video/streamdvd/streamdvd-0.4-r2.ebuild
+2012181209 ./media-video/streamdvd/streamdvd-0.4-r2.ebuild
 1911092239 ./media-video/sub2srt/sub2srt-0.5.3.ebuild
 1807261839 ./media-video/subcheck/subcheck-0.78.2-r1.ebuild
 2008022209 ./media-video/subliminal/subliminal-9999.ebuild
@@ -21281,14 +21294,13 @@
 2009152139 ./media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
 2009152139 ./media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
 2009152139 ./media-video/x264-encoder/x264-encoder-9999.ebuild
-1910111911 ./media-video/xine-ui/xine-ui-0.99.10.ebuild
-2012172009 ./media-video/xine-ui/xine-ui-0.99.12.ebuild
+2012202009 ./media-video/xine-ui/xine-ui-0.99.12.ebuild
 1912111539 ./media-video/xvattr/xvattr-1.3-r3.ebuild
 2004032241 ./media-video/xvid4conf/xvid4conf-1.12.ebuild
 2011221109 ./media-video/yle-dl/yle-dl-20201022.ebuild
 2007140139 ./media-video/rav1e/rav1e-9999.ebuild
 2010091209 ./media-video/rav1e/rav1e-0.3.3.ebuild
-2012172009 ./media-video/rav1e/rav1e-0.3.4.ebuild
+2012202009 ./media-video/rav1e/rav1e-0.3.4.ebuild
 1912021109 ./media-video/celluloid/celluloid-0.16.ebuild
 2004171539 ./media-video/celluloid/celluloid-0.19.ebuild
 2004181239 ./media-video/celluloid/celluloid-0.18.ebuild
@@ -21353,7 +21365,7 @@
 2007190339 ./net-analyzer/cacti-spine/cacti-spine-1.2.13.ebuild
 2008030839 ./net-analyzer/cacti-spine/cacti-spine-1.2.14.ebuild
 2007190339 ./net-analyzer/cacti/cacti-1.2.13.ebuild
-2008030839 ./net-analyzer/cacti/cacti-1.2.14.ebuild
+2012202009 ./net-analyzer/cacti/cacti-1.2.14.ebuild
 2008201139 ./net-analyzer/calamaris/calamaris-2.99.4.5.ebuild
 2005060939 ./net-analyzer/carl/carl-0.9-r3.ebuild
 2008201309 ./net-analyzer/carl/carl-0.9-r4.ebuild
@@ -21435,7 +21447,6 @@
 2002112051 ./net-analyzer/hydra/hydra-9.0.ebuild
 2008040009 ./net-analyzer/hydra/hydra-9.1.ebuild
 2011270339 ./net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
-2009040539 ./net-analyzer/icinga2/icinga2-2.12.0.ebuild
 2010142139 ./net-analyzer/icinga2/icinga2-2.11.6.ebuild
 2010161509 ./net-analyzer/icinga2/icinga2-9999.ebuild
 2011150209 ./net-analyzer/icinga2/icinga2-2.12.1.ebuild
@@ -21493,8 +21504,6 @@
 1702282250 ./net-analyzer/mping/mping-2.01.ebuild
 2002230040 ./net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild
 2002230040 ./net-analyzer/mrtg/mrtg-2.17.7.ebuild
-2004032241 ./net-analyzer/mtr/mtr-0.87.ebuild
-2009221139 ./net-analyzer/mtr/mtr-0.93-r2.ebuild
 2010041039 ./net-analyzer/mtr/mtr-9999.ebuild
 2011080009 ./net-analyzer/mtr/mtr-0.94.ebuild
 1912140109 ./net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild
@@ -21538,8 +21547,8 @@
 2012140439 ./net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
 2003261841 ./net-analyzer/netcat/netcat-110.20180111.ebuild
 2004211009 ./net-analyzer/netcat/netcat-110-r9.ebuild
-2012180109 ./net-analyzer/netdata/netdata-1.27.0.ebuild
 2012180109 ./net-analyzer/netdata/netdata-9999.ebuild
+2012181739 ./net-analyzer/netdata/netdata-1.28.0.ebuild
 2008201139 ./net-analyzer/netdiscover/netdiscover-0.7.ebuild
 2002112051 ./net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild
 2008201039 ./net-analyzer/nethogs/nethogs-0.8.6.ebuild
@@ -21558,7 +21567,7 @@
 2003291609 ./net-analyzer/nfdump/nfdump-1.6.20.ebuild
 2008021409 ./net-analyzer/nfdump/nfdump-1.6.21.ebuild
 2004032241 ./net-analyzer/ngrep/ngrep-1.45-r3.ebuild
-2012140439 ./net-analyzer/ngrep/ngrep-1.47.ebuild
+2012211309 ./net-analyzer/ngrep/ngrep-1.47.ebuild
 1907151840 ./net-analyzer/nipper/nipper-0.12.0.ebuild
 2009181139 ./net-analyzer/nload/nload-0.7.4-r1.ebuild
 2010151309 ./net-analyzer/nmap/nmap-9999.ebuild
@@ -21639,7 +21648,6 @@
 1702282250 ./net-analyzer/sbd/sbd-1.37-r1.ebuild
 1702282250 ./net-analyzer/scanlogd/scanlogd-2.2.7.ebuild
 2011271209 ./net-analyzer/scanssh/scanssh-2.1.2.ebuild
-2002071539 ./net-analyzer/scapy/scapy-2.4.3.ebuild
 2012031439 ./net-analyzer/scapy/scapy-2.4.4.ebuild
 2012040639 ./net-analyzer/scapy/scapy-9999.ebuild
 1811300139 ./net-analyzer/scli/scli-0.4.0-r1.ebuild
@@ -21707,7 +21715,7 @@
 1901021709 ./net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild
 2009301309 ./net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
 1910111911 ./net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild
-2011271939 ./net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
+2012211309 ./net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
 1702282250 ./net-analyzer/tcptrack/tcptrack-1.4.2.ebuild
 1909040639 ./net-analyzer/telegraf/telegraf-1.10.4.ebuild
 1909210009 ./net-analyzer/telegraf/telegraf-1.11.5.ebuild
@@ -21740,8 +21748,10 @@
 2011090239 ./net-analyzer/wapiti/wapiti-9999.ebuild
 2001301739 ./net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild
 2012160039 ./net-analyzer/wireshark/wireshark-3.4.0.ebuild
-2012171339 ./net-analyzer/wireshark/wireshark-3.4.1.ebuild
-2012160039 ./net-analyzer/wireshark/wireshark-99999999.ebuild
+2012181739 ./net-analyzer/wireshark/wireshark-3.4.1.ebuild
+2012210209 ./net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
+2012201939 ./net-analyzer/wireshark/wireshark-3.4.2.ebuild
+2012210209 ./net-analyzer/wireshark/wireshark-99999999.ebuild
 2002112051 ./net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
 2011270309 ./net-analyzer/xprobe/xprobe-0.3-r1.ebuild
 2001281909 ./net-analyzer/yersinia/yersinia-9999.ebuild
@@ -21861,7 +21871,7 @@
 2010171709 ./net-dns/knot/knot-2.9.7.ebuild
 2011140309 ./net-dns/knot/knot-3.0.2.ebuild
 2004032241 ./net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
-2012031039 ./net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+2012211309 ./net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
 2011172209 ./net-dns/libidn/libidn-1.36.ebuild
 2006141939 ./net-dns/libidn2/libidn2-2.3.0.ebuild
 2008181439 ./net-dns/maradns/maradns-3.5.0005.ebuild
@@ -21884,6 +21894,7 @@
 2012160039 ./net-dns/pdns-recursor/pdns-recursor-4.4.1.ebuild
 2012172339 ./net-dns/pdns-recursor/pdns-recursor-4.4.2.ebuild
 2012160039 ./net-dns/pdns/pdns-4.3.1.ebuild
+2012182339 ./net-dns/pdns/pdns-4.4.0.ebuild
 1912110241 ./net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
 2004032241 ./net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
 2005021209 ./net-dns/rbldnsd/rbldnsd-0.998b-r2.ebuild
@@ -21902,8 +21913,8 @@
 2009181139 ./net-dns/unbound/unbound-1.11.0.ebuild
 2010090209 ./net-dns/unbound/unbound-1.12.0.ebuild
 2012070340 ./net-dns/unbound/unbound-1.12.0-r1.ebuild
-2012142039 ./net-dns/unbound/unbound-1.13.0-r1.ebuild
-2012170251 ./net-dns/unbound/unbound-1.13.0.ebuild
+2012201909 ./net-dns/unbound/unbound-1.13.0-r1.ebuild
+2012201909 ./net-dns/unbound/unbound-1.13.0.ebuild
 2002231739 ./net-dns/updatedd/updatedd-2.6-r5.ebuild
 2012090709 ./net-dns/valtz/valtz-0.8.ebuild
 2005121009 ./net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.0.ebuild
@@ -22002,12 +22013,12 @@
 2003280339 ./net-fs/smbnetfs/smbnetfs-0.6.2.ebuild
 1808262039 ./net-fs/smbtad/smbtad-1.2.6.ebuild
 2007271709 ./net-fs/sshfs/sshfs-3.7.0.ebuild
-1702282250 ./net-fs/wdfs/wdfs-1.4.2-r1.ebuild
+2012181339 ./net-fs/wdfs/wdfs-1.4.2-r2.ebuild
 2003071439 ./net-ftp/atftp/atftp-0.7.2-r1.ebuild
 1910111911 ./net-ftp/cmdftp/cmdftp-0.9.8.ebuild
 2006091709 ./net-ftp/filezilla/filezilla-3.47.2.1.ebuild
 2008281509 ./net-ftp/filezilla/filezilla-3.50.0.ebuild
-2010232209 ./net-ftp/filezilla/filezilla-3.51.0.ebuild
+2012210339 ./net-ftp/filezilla/filezilla-3.51.0.ebuild
 2011021309 ./net-ftp/frox/frox-0.7.18-r6.ebuild
 2004032241 ./net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
 2004211009 ./net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
@@ -22018,7 +22029,7 @@
 1702282250 ./net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild
 2003261841 ./net-ftp/ncftp/ncftp-3.2.6-r1.ebuild
 2004032241 ./net-ftp/ncftp/ncftp-3.2.6.ebuild
-2012180209 ./net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
+2012211309 ./net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
 2009071209 ./net-ftp/proftpd/proftpd-1.3.7a.ebuild
 1805212239 ./net-ftp/profxp/profxp-3_pre2-r2.ebuild
 2008300509 ./net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.ebuild
@@ -22067,6 +22078,7 @@
 2011142339 ./net-im/librvp/librvp-0.9.7.ebuild
 2007201939 ./net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.1.ebuild
 2008170039 ./net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.2.ebuild
+2012200609 ./net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.1.ebuild
 2002022239 ./net-im/mcabber/mcabber-1.1.0-r1.ebuild
 2002241639 ./net-im/mcabber/mcabber-1.1.0-r2.ebuild
 2010191009 ./net-im/mcabber/mcabber-9999.ebuild
@@ -22095,11 +22107,11 @@
 1902221239 ./net-im/sendxmpp/sendxmpp-1.24.ebuild
 2012161209 ./net-im/signal-desktop-bin/signal-desktop-bin-1.39.2.ebuild
 2002110039 ./net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild
-2011052109 ./net-im/skypeforlinux/skypeforlinux-8.66.0.74.ebuild
 2012112139 ./net-im/skypeforlinux/skypeforlinux-8.67.0.87.ebuild
+2012191639 ./net-im/skypeforlinux/skypeforlinux-8.67.0.96.ebuild
 2012140439 ./net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
-2011210409 ./net-im/swift/swift-4.0.2-r100.ebuild
 2012031609 ./net-im/swift/swift-4.0.2-r4.ebuild
+2012210239 ./net-im/swift/swift-4.0.2-r101.ebuild
 2010262009 ./net-im/telegram-desktop-bin/telegram-desktop-bin-2.4.4.ebuild
 2011041809 ./net-im/telegram-desktop-bin/telegram-desktop-bin-2.4.5.ebuild
 2011140039 ./net-im/telegram-desktop-bin/telegram-desktop-bin-2.4.7.ebuild
@@ -22118,6 +22130,7 @@
 2011240909 ./net-im/telegram-desktop/telegram-desktop-2.4.11.ebuild
 2003170039 ./net-im/psimedia/psimedia-9999.ebuild
 2010101809 ./net-im/teams/teams-1.3.00.25560.ebuild
+2012182309 ./net-im/teams/teams-1.3.00.30857.ebuild
 2011100139 ./net-im/zoom/zoom-5.4.53391.1108.ebuild
 2011281639 ./net-im/zoom/zoom-5.4.54779.1115-r3.ebuild
 2012092009 ./net-im/zoom/zoom-5.4.56259.1207.ebuild
@@ -22128,7 +22141,6 @@
 2012082239 ./net-im/element-desktop-bin/element-desktop-bin-1.7.15.ebuild
 2010080109 ./net-im/prosody-modules/prosody-modules-9999.ebuild
 2010121509 ./net-im/prosody-modules/prosody-modules-0_pre20201004.ebuild
-2006062109 ./net-irc/anope/anope-2.0.7.ebuild
 2012162341 ./net-irc/anope/anope-2.0.9.ebuild
 2004211609 ./net-irc/atheme-services/atheme-services-7.2.10_p2-r2.ebuild
 2002112051 ./net-irc/bnc/bnc-2.9.4-r1.ebuild
@@ -22140,7 +22152,8 @@
 2011291139 ./net-irc/emech/emech-3.0.99_p3.ebuild
 2004280809 ./net-irc/epic5/epic5-2.0.1.ebuild
 2012160039 ./net-irc/hexchat/hexchat-2.14.3.ebuild
-2012160039 ./net-irc/hexchat/hexchat-9999.ebuild
+2012210109 ./net-irc/hexchat/hexchat-2.14.3-r100.ebuild
+2012210109 ./net-irc/hexchat/hexchat-9999.ebuild
 1709110046 ./net-irc/ii/ii-9999.ebuild
 2010091139 ./net-irc/ii/ii-1.8.ebuild
 2004091609 ./net-irc/inspircd/inspircd-3.4.0-r1.ebuild
@@ -22185,7 +22198,8 @@
 2011171409 ./net-irc/unrealircd/unrealircd-5.0.7-r2.ebuild
 2009181139 ./net-irc/weechat/weechat-2.9.ebuild
 2011121439 ./net-irc/weechat/weechat-3.0.ebuild
-2011121439 ./net-irc/weechat/weechat-9999.ebuild
+2012210039 ./net-irc/weechat/weechat-3.0-r100.ebuild
+2012210039 ./net-irc/weechat/weechat-9999.ebuild
 2008220909 ./net-irc/znc/znc-1.8.1.ebuild
 2009100039 ./net-irc/znc/znc-9999.ebuild
 2011122009 ./net-irc/znc/znc-1.8.2.ebuild
@@ -22199,6 +22213,7 @@
 2011150839 ./net-libs/aqbanking/aqbanking-6.2.5.ebuild
 2012160039 ./net-libs/axtls/axtls-2.1.5-r1.ebuild
 2012160039 ./net-libs/axtls/axtls-2.1.5.ebuild
+2012210009 ./net-libs/axtls/axtls-2.1.5-r100.ebuild
 2011142339 ./net-libs/balde-markdown/balde-markdown-0.1.ebuild
 1912110241 ./net-libs/balde/balde-0.1.1.ebuild
 2009050539 ./net-libs/biblesync/biblesync-2.1.0.ebuild
@@ -22232,8 +22247,8 @@
 2010101039 ./net-libs/gloox/gloox-1.0.24.ebuild
 2004032241 ./net-libs/gnet/gnet-2.0.8-r2.ebuild
 2008302139 ./net-libs/gnome-online-accounts/gnome-online-accounts-3.36.0.ebuild
-2012030039 ./net-libs/gnutls/gnutls-3.6.15.ebuild
 2012030039 ./net-libs/gnutls/gnutls-3.7.0.ebuild
+2012210209 ./net-libs/gnutls/gnutls-3.6.15.ebuild
 1908021309 ./net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0.ebuild
 1905052209 ./net-libs/google-cloud-cpp/google-cloud-cpp-0.5.0.ebuild
 1906041939 ./net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild
@@ -22305,7 +22320,7 @@
 1708261307 ./net-libs/libgrss/libgrss-0.5.0-r1.ebuild
 1905230039 ./net-libs/libgrss/libgrss-0.7.0.ebuild
 2009160109 ./net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
-2012172009 ./net-libs/libgsasl/libgsasl-1.8.1.ebuild
+2012202009 ./net-libs/libgsasl/libgsasl-1.8.1.ebuild
 2004032241 ./net-libs/libgssglue/libgssglue-0.4-r1.ebuild
 2006060309 ./net-libs/libhackrf/libhackrf-2018.01.1.ebuild
 2006060309 ./net-libs/libhackrf/libhackrf-9999.ebuild
@@ -22345,8 +22360,7 @@
 1806052039 ./net-libs/libmirisdr/libmirisdr-9999.ebuild
 2004211009 ./net-libs/libmnl/libmnl-1.0.3-r1.ebuild
 2004211009 ./net-libs/libmnl/libmnl-1.0.4.ebuild
-2006041239 ./net-libs/libmrss/libmrss-0.19.2.ebuild
-2012172009 ./net-libs/libmrss/libmrss-0.19.2-r1.ebuild
+2012202239 ./net-libs/libmrss/libmrss-0.19.2-r1.ebuild
 2002111509 ./net-libs/libnatpmp/libnatpmp-20150609.ebuild
 1907031039 ./net-libs/libndp/libndp-1.7.ebuild
 1912292339 ./net-libs/libnet/libnet-1.2.9999.ebuild
@@ -22381,8 +22395,7 @@
 2004211009 ./net-libs/libnsl/libnsl-0-r1.ebuild
 2009071209 ./net-libs/libnsl/libnsl-1.3.0-r1.ebuild
 2008011109 ./net-libs/libntlm/libntlm-1.6.ebuild
-2006041239 ./net-libs/libnxml/libnxml-0.18.3.ebuild
-2012172009 ./net-libs/libnxml/libnxml-0.18.3-r1.ebuild
+2012202239 ./net-libs/libnxml/libnxml-0.18.3-r1.ebuild
 2004032241 ./net-libs/liboauth/liboauth-1.0.3-r1.ebuild
 2002112051 ./net-libs/liboping/liboping-1.10.0-r2.ebuild
 2009212239 ./net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild
@@ -22402,7 +22415,7 @@
 2002151310 ./net-libs/libprotoident/libprotoident-2.0.12.ebuild
 2006132027 ./net-libs/libproxy/libproxy-0.4.15-r1.ebuild
 2010111239 ./net-libs/libproxy/libproxy-0.4.15-r2.ebuild
-2012171509 ./net-libs/libproxy/libproxy-0.4.16.ebuild
+2012211309 ./net-libs/libproxy/libproxy-0.4.16.ebuild
 2010061839 ./net-libs/libpsl/libpsl-0.21.0.ebuild
 2010061839 ./net-libs/libpsl/libpsl-0.21.1.ebuild
 1708172003 ./net-libs/libqmi/libqmi-1.12.6.ebuild
@@ -22424,7 +22437,7 @@
 2012061139 ./net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
 2010270339 ./net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
 2008241239 ./net-libs/libsmi/libsmi-0.4.8-r1.ebuild
-2012030739 ./net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+2012211309 ./net-libs/libsmi/libsmi-0.5.0-r1.ebuild
 2007290809 ./net-libs/libsoup/libsoup-2.70.0.ebuild
 1907151840 ./net-libs/libsrsirc/libsrsirc-0.0.14-r1.ebuild
 2004032241 ./net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
@@ -22474,8 +22487,8 @@
 2009130310 ./net-libs/mbedtls/mbedtls-2.16.8.ebuild
 2012072239 ./net-libs/mbedtls/mbedtls-2.24.0.ebuild
 2004032241 ./net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
-2011221539 ./net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild
-2012172009 ./net-libs/miniupnpc/miniupnpc-2.2.0.ebuild
+2012201939 ./net-libs/miniupnpc/miniupnpc-2.2.0.ebuild
+2012211239 ./net-libs/miniupnpc/miniupnpc-2.2.1.ebuild
 1912281339 ./net-libs/nDPI/nDPI-3.0-r1.ebuild
 2001281509 ./net-libs/nDPI/nDPI-3.0-r2.ebuild
 2003101139 ./net-libs/nDPI/nDPI-9999.ebuild
@@ -22491,8 +22504,8 @@
 2002151310 ./net-libs/net6/net6-1.3.14-r2.ebuild
 1702282250 ./net-libs/netwib/netwib-5.39.0.ebuild
 2009011309 ./net-libs/nghttp2/nghttp2-1.41.0.ebuild
-2012131209 ./net-libs/nghttp2/nghttp2-1.42.0.ebuild
-2012131209 ./net-libs/nghttp2/nghttp2-9999.ebuild
+2012201509 ./net-libs/nghttp2/nghttp2-1.42.0.ebuild
+2012191139 ./net-libs/nghttp2/nghttp2-9999.ebuild
 2002112051 ./net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
 2002112051 ./net-libs/nghttp3/nghttp3-9999.ebuild
 2002112051 ./net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
@@ -22567,6 +22580,7 @@
 1912110241 ./net-libs/wandio/wandio-4.2.1.ebuild
 2005260939 ./net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
 2012032139 ./net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
+2012191909 ./net-libs/webkit-gtk/webkit-gtk-2.30.4.ebuild
 2002112051 ./net-libs/wvstreams/wvstreams-99999.ebuild
 2007081009 ./net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
 2009182109 ./net-libs/xrootd/xrootd-5.0.2.ebuild
@@ -22581,9 +22595,8 @@
 2004191909 ./net-libs/libnma/libnma-1.8.24.ebuild
 2006072339 ./net-libs/libnma/libnma-1.8.28.ebuild
 2009241009 ./net-libs/libnma/libnma-1.8.30.ebuild
-2011070709 ./net-libs/libslirp/libslirp-4.3.1.ebuild
 2012141339 ./net-libs/libslirp/libslirp-4.4.0.ebuild
-2012151409 ./net-libs/libslirp/libslirp-4.3.1-r1.ebuild
+2012181339 ./net-libs/libslirp/libslirp-4.3.1-r1.ebuild
 2009182109 ./net-libs/xrootd-ceph/xrootd-ceph-5.0.2.ebuild
 2010091439 ./net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild
 2010161409 ./net-libs/xrootd-ceph/xrootd-ceph-4.12.5.ebuild
@@ -22609,7 +22622,7 @@
 2006200039 ./net-mail/courier-imap/courier-imap-4.18.2.ebuild
 1702282250 ./net-mail/courierpassd/courierpassd-1.1.2-r1.ebuild
 2009050739 ./net-mail/cyrus-imapd/cyrus-imapd-3.0.13.ebuild
-2012172009 ./net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
+2012202239 ./net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
 1804250038 ./net-mail/dbmail/dbmail-3.2.3-r1.ebuild
 2012010109 ./net-mail/dbmail/dbmail-3.2.3-r3.ebuild
 2004211009 ./net-mail/dot-forward/dot-forward-0.71-r4.ebuild
@@ -22619,6 +22632,7 @@
 2012160039 ./net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild
 2012160039 ./net-mail/dovecot/dovecot-2.3.11.3.ebuild
 2012160039 ./net-mail/dovecot/dovecot-2.3.7.2.ebuild
+2012202209 ./net-mail/dovecot/dovecot-2.3.11.3-r100.ebuild
 2009050439 ./net-mail/email/email-3.1.3-r1.ebuild
 1712171839 ./net-mail/eps/eps-1.7-r1.ebuild
 2002230040 ./net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
@@ -22635,8 +22649,7 @@
 2007101539 ./net-mail/isync/isync-1.3.1.ebuild
 2010162109 ./net-mail/isync/isync-1.3.3.ebuild
 2010162109 ./net-mail/isync/isync-9999.ebuild
-2002230040 ./net-mail/lbdb/lbdb-0.41.ebuild
-2012171209 ./net-mail/lbdb/lbdb-0.47.ebuild
+2012201939 ./net-mail/lbdb/lbdb-0.47.ebuild
 1702282250 ./net-mail/libdbx/libdbx-1.0.3.ebuild
 2008182039 ./net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild
 2006080939 ./net-mail/mailbase/mailbase-1.5-r1.ebuild
@@ -22755,6 +22768,7 @@
 2012160039 ./net-misc/asterisk/asterisk-16.12.0-r1.ebuild
 2012160039 ./net-misc/asterisk/asterisk-16.13.0.ebuild
 2012160039 ./net-misc/asterisk/asterisk-16.14.0.ebuild
+2012201909 ./net-misc/asterisk/asterisk-16.14.0-r100.ebuild
 2010311439 ./net-misc/astmanproxy/astmanproxy-1.28.2.ebuild
 1910022239 ./net-misc/autossh/autossh-1.4g.ebuild
 1911110039 ./net-misc/autoupnp/autoupnp-0.4.7.ebuild
@@ -22787,7 +22801,6 @@
 1912111540 ./net-misc/cfengine/cfengine-3.6.2.ebuild
 1903250839 ./net-misc/cgminer/cgminer-4.10.0.ebuild
 1903250839 ./net-misc/cgminer/cgminer-4.9.2.ebuild
-2011060639 ./net-misc/chrony/chrony-3.5.1-r1.ebuild
 2011240609 ./net-misc/chrony/chrony-9999.ebuild
 2011260209 ./net-misc/chrony/chrony-4.0.ebuild
 2009131039 ./net-misc/clockspeed/clockspeed-0.62-r7.ebuild
@@ -22840,7 +22853,7 @@
 2002101140 ./net-misc/dropbox-cli/dropbox-cli-19.ebuild
 2005121009 ./net-misc/dropbox-cli/dropbox-cli-2020.03.04.ebuild
 2012121539 ./net-misc/dropbox/dropbox-111.4.472.ebuild
-2012161939 ./net-misc/dropbox/dropbox-112.4.321.ebuild
+2012201909 ./net-misc/dropbox/dropbox-112.4.321.ebuild
 2005280909 ./net-misc/econnman/econnman-1.1-r1.ebuild
 2009050409 ./net-misc/efax/efax-0.9a_p19_p1.ebuild
 2012060309 ./net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild
@@ -22850,6 +22863,7 @@
 2012061239 ./net-misc/electrum/electrum-4.0.6.ebuild
 2012101339 ./net-misc/electrum/electrum-4.0.7.ebuild
 2012180239 ./net-misc/electrum/electrum-4.0.8.ebuild
+2012191209 ./net-misc/electrum/electrum-4.0.9.ebuild
 2008081539 ./net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild
 2008081539 ./net-misc/ena-driver/ena-driver-2.2.3-r1.ebuild
 2006212339 ./net-misc/endlessh/endlessh-1.1-r1.ebuild
@@ -22879,6 +22893,7 @@
 2004202139 ./net-misc/gnome-online-miners/gnome-online-miners-3.34.0.ebuild
 1908181439 ./net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.7.ebuild
 2012060209 ./net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.8.ebuild
+2012190109 ./net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.9.ebuild
 2007260139 ./net-misc/gns3-gui/gns3-gui-2.2.11.ebuild
 2007260139 ./net-misc/gns3-server/gns3-server-2.2.11.ebuild
 2002230040 ./net-misc/gofish/gofish-1.2.ebuild
@@ -22888,7 +22903,7 @@
 2009201739 ./net-misc/grive/grive-0.5.1-r1.ebuild
 2009271739 ./net-misc/grive/grive-0.5.2_pre20200205.ebuild
 2009160109 ./net-misc/gsasl/gsasl-1.8.0-r1.ebuild
-2012172009 ./net-misc/gsasl/gsasl-1.8.1.ebuild
+2012202009 ./net-misc/gsasl/gsasl-1.8.1.ebuild
 2001151039 ./net-misc/gsutil/gsutil-4.41.ebuild
 2001151039 ./net-misc/gsutil/gsutil-4.45.ebuild
 2002010239 ./net-misc/gsutil/gsutil-4.47.ebuild
@@ -22903,8 +22918,8 @@
 2003261841 ./net-misc/htpdate/htpdate-1.0.7.ebuild
 2003261841 ./net-misc/htpdate/htpdate-1.2.0.ebuild
 2003261841 ./net-misc/htpdate/htpdate-1.2.2.ebuild
-2005091109 ./net-misc/httpie/httpie-2.1.0.ebuild
 2010131309 ./net-misc/httpie/httpie-2.2.0.ebuild
+2012210309 ./net-misc/httpie/httpie-2.3.0.ebuild
 1702282250 ./net-misc/httptype/httptype-1.3.9-r1.ebuild
 2007181739 ./net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild
 1702282250 ./net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild
@@ -22952,6 +22967,7 @@
 2002010209 ./net-misc/kafkacat/kafkacat-1.5.0.ebuild
 2011251239 ./net-misc/kea/kea-9999.ebuild
 2012172209 ./net-misc/kea/kea-1.8.1-r1.ebuild
+2012191939 ./net-misc/kea/kea-1.8.2.ebuild
 2011291139 ./net-misc/keychain/keychain-2.8.5.ebuild
 2006212208 ./net-misc/knock/knock-0.7-r1.ebuild
 1911050009 ./net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1-r1.ebuild
@@ -22985,10 +23001,8 @@
 2012031009 ./net-misc/minidlna/minidlna-1.3.0.ebuild
 2002230040 ./net-misc/minissdpd/minissdpd-1.5.20190824.ebuild
 2010102139 ./net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
-2005140939 ./net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild
-2010102139 ./net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild
 2011011039 ./net-misc/miniupnpd/miniupnpd-2.2.0.ebuild
-2010311139 ./net-misc/miniupnpd/miniupnpd-2.2.0_rc3.ebuild
+2012211239 ./net-misc/miniupnpd/miniupnpd-2.2.1.ebuild
 2004032241 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
 2012142009 ./net-misc/modemmanager/modemmanager-1.10.0.ebuild
 2012142009 ./net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
@@ -23050,7 +23064,7 @@
 2005102009 ./net-misc/nyx/nyx-2.1.0-r1.ebuild
 1910052209 ./net-misc/ofono/ofono-1.16.ebuild
 1910210509 ./net-misc/ofono/ofono-1.30.ebuild
-2012030309 ./net-misc/ofono/ofono-1.31.ebuild
+2012211309 ./net-misc/ofono/ofono-1.31.ebuild
 2007171839 ./net-misc/oidentd/oidentd-2.5.0.ebuild
 1811232039 ./net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
 1708300038 ./net-misc/olsrd/olsrd-0.9.6.1.ebuild
@@ -23252,14 +23266,8 @@
 2008111439 ./net-misc/yandex-disk/yandex-disk-0.1.5.1039_p1.ebuild
 2004261409 ./net-misc/you-get/you-get-0.4.1355-r1.ebuild
 2009041739 ./net-misc/you-get/you-get-0.4.1432.ebuild
-2009220939 ./net-misc/youtube-dl/youtube-dl-2020.09.20.ebuild
-2011281339 ./net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild
-2011291139 ./net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild
 2011291139 ./net-misc/youtube-dl/youtube-dl-9999.ebuild
-2012012209 ./net-misc/youtube-dl/youtube-dl-2020.12.02.ebuild
-2012050309 ./net-misc/youtube-dl/youtube-dl-2020.12.05.ebuild
-2012121239 ./net-misc/youtube-dl/youtube-dl-2020.12.12.ebuild
-2012140439 ./net-misc/youtube-dl/youtube-dl-2020.12.14.ebuild
+2012182339 ./net-misc/youtube-dl/youtube-dl-2020.12.14.ebuild
 2011260709 ./net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild
 2011260709 ./net-misc/youtube-viewer/youtube-viewer-9999.ebuild
 1904210639 ./net-misc/zerotier/zerotier-1.2.12.ebuild
@@ -23283,6 +23291,8 @@
 2012131409 ./net-misc/gallery-dl/gallery-dl-1.16.0.ebuild
 2011162139 ./net-misc/pssh/pssh-2.3.4-r1.ebuild
 2012051809 ./net-misc/frr/frr-7.5.ebuild
+2012200609 ./net-misc/websocat/websocat-1.6.0-r1.ebuild
+2012191009 ./net-misc/websocat/websocat-1.6.0.ebuild
 2008291539 ./net-nds/adtool/adtool-1.3.3-r1.ebuild
 2004032241 ./net-nds/gssproxy/gssproxy-0.8.2.ebuild
 2008310309 ./net-nds/gssproxy/gssproxy-0.8.3.ebuild
@@ -23292,9 +23302,7 @@
 1805091839 ./net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild
 1911091712 ./net-nds/led/led-1.111.ebuild
 2006291539 ./net-nds/nsscache/nsscache-0.39.ebuild
-2010181839 ./net-nds/openldap/openldap-2.4.54.ebuild
-2010281309 ./net-nds/openldap/openldap-2.4.53-r1.ebuild
-2011211739 ./net-nds/openldap/openldap-2.4.56.ebuild
+2012181739 ./net-nds/openldap/openldap-2.4.56.ebuild
 1912052009 ./net-nds/phpldapadmin/phpldapadmin-1.2.5.ebuild
 2003261841 ./net-nds/rpcbind/rpcbind-9999.ebuild
 2004032241 ./net-nds/rpcbind/rpcbind-1.2.5.ebuild
@@ -23391,7 +23399,7 @@
 2011021509 ./net-p2p/ncdc/ncdc-9999.ebuild
 2010071039 ./net-p2p/nicotine+/nicotine+-2.0.1-r1.ebuild
 2011260139 ./net-p2p/nicotine+/nicotine+-2.1.2.ebuild
-2012110139 ./net-p2p/nicotine+/nicotine+-2.2.0.ebuild
+2012181339 ./net-p2p/nicotine+/nicotine+-2.2.0.ebuild
 1702282250 ./net-p2p/opendchub/opendchub-0.8.2.ebuild
 2008301509 ./net-p2p/qbittorrent/qbittorrent-4.2.5-r2.ebuild
 2008301509 ./net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -23455,7 +23463,7 @@
 2006262239 ./net-print/cups-filters/cups-filters-9999.ebuild
 2007071739 ./net-print/cups-filters/cups-filters-1.27.5.ebuild
 2009111039 ./net-print/cups-filters/cups-filters-1.28.2.ebuild
-2009251109 ./net-print/cups-filters/cups-filters-1.28.3.ebuild
+2012211309 ./net-print/cups-filters/cups-filters-1.28.3.ebuild
 2002111439 ./net-print/cups-pdf/cups-pdf-3.0.1.ebuild
 1907282009 ./net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
 2009162339 ./net-print/cups-windows/cups-windows-6.0-r1.ebuild
@@ -23622,7 +23630,7 @@
 2005140739 ./net-vpn/tailscale/tailscale-0.98_p0.ebuild
 2005182039 ./net-vpn/tailscale/tailscale-0.98.ebuild
 2012150509 ./net-vpn/tailscale/tailscale-1.2.10.ebuild
-2012160739 ./net-vpn/tailscale/tailscale-1.2.10-r1.ebuild
+2012202239 ./net-vpn/tailscale/tailscale-1.2.10-r1.ebuild
 2006081009 ./net-vpn/ocserv/ocserv-1.0.1.ebuild
 2011212209 ./net-vpn/ocserv/ocserv-1.1.1.ebuild
 2004060609 ./net-vpn/mullvad-netns/mullvad-netns-9999.ebuild
@@ -23660,23 +23668,23 @@
 2006020009 ./net-wireless/dump1090/dump1090-9999.ebuild
 2004202139 ./net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.1.ebuild
 2011110739 ./net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.3.ebuild
-2012172009 ./net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
 2012172009 ./net-wireless/gnuradio/gnuradio-9999.ebuild
+2012182309 ./net-wireless/gnuradio/gnuradio-3.8.2.0-r1.ebuild
 1912111540 ./net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild
 1904182109 ./net-wireless/gqrx-scanner/gqrx-scanner-1.0.1_p20190329.ebuild
-2009212239 ./net-wireless/gqrx/gqrx-9999.ebuild
-2012171909 ./net-wireless/gqrx/gqrx-2.14.3.ebuild
-2006020009 ./net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild
-2006020009 ./net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
-2006022109 ./net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild
-2006022109 ./net-wireless/gr-iio/gr-iio-9999.ebuild
+2012182309 ./net-wireless/gqrx/gqrx-2.14.3-r1.ebuild
+2012182309 ./net-wireless/gqrx/gqrx-9999.ebuild
+2012182309 ./net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006-r1.ebuild
+2012182309 ./net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
+2012182309 ./net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild
+2012182309 ./net-wireless/gr-iio/gr-iio-9999.ebuild
 2009212109 ./net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild
 2009212109 ./net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
 2006020009 ./net-wireless/gr-osmosdr/gr-osmosdr-0.2.0.ebuild
-2009041939 ./net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild
-2011242139 ./net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
-2006020009 ./net-wireless/gr-paint/gr-paint-0.0_p20200517.ebuild
-2006020009 ./net-wireless/gr-paint/gr-paint-9999.ebuild
+2012182339 ./net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
+2012182309 ./net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+2012182309 ./net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild
+2012182309 ./net-wireless/gr-paint/gr-paint-9999.ebuild
 2008300539 ./net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
 2008300539 ./net-wireless/gr-rds/gr-rds-9999.ebuild
 1909122209 ./net-wireless/gr-scan/gr-scan-20160211.ebuild
@@ -23687,7 +23695,6 @@
 2009271309 ./net-wireless/horst/horst-9999.ebuild
 2006041239 ./net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild
 2004220139 ./net-wireless/hostapd/hostapd-9999.ebuild
-2009272009 ./net-wireless/hostapd/hostapd-2.9-r1.ebuild
 2010091209 ./net-wireless/hostapd/hostapd-2.9-r3.ebuild
 2006221739 ./net-wireless/inspectrum/inspectrum-9999.ebuild
 2012042309 ./net-wireless/inspectrum/inspectrum-0.2.3.ebuild
@@ -23703,7 +23710,7 @@
 2008142139 ./net-wireless/kismet-rest/kismet-rest-9999.ebuild
 2010251839 ./net-wireless/kismet/kismet-9999.ebuild
 2012041909 ./net-wireless/kismet/kismet-2020.09.4.ebuild
-2012050609 ./net-wireless/kismet/kismet-2020.12.2.ebuild
+2012202039 ./net-wireless/kismet/kismet-2020.12.2.ebuild
 2012072139 ./net-wireless/kismetdb/kismetdb-2019.05.05.ebuild
 2012072139 ./net-wireless/kismetdb/kismetdb-9999.ebuild
 2008032109 ./net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1-r2.ebuild
@@ -23771,7 +23778,7 @@
 2011171939 ./net-wireless/unifi/unifi-6.1.26.ebuild
 2012031809 ./net-wireless/unifi/unifi-6.0.41.ebuild
 2012082239 ./net-wireless/unifi/unifi-6.0.42.ebuild
-2012171739 ./net-wireless/unifi/unifi-6.0.43.ebuild
+2012201909 ./net-wireless/unifi/unifi-6.0.43.ebuild
 2006221709 ./net-wireless/urh/urh-2.8.8.ebuild
 2006221709 ./net-wireless/urh/urh-9999.ebuild
 2012030039 ./net-wireless/wavemon/wavemon-0.8.0.ebuild
@@ -23794,6 +23801,16 @@
 2010072339 ./net-wireless/gr-scopy/gr-scopy-9999.ebuild
 2010072339 ./net-wireless/libm2k/libm2k-0.0_p20201005.ebuild
 2010072339 ./net-wireless/libm2k/libm2k-9999.ebuild
+2012182309 ./net-wireless/liblms7002m/liblms7002m-0.0_p20200518.ebuild
+2012182309 ./net-wireless/liblms7002m/liblms7002m-9999.ebuild
+2012182309 ./net-wireless/libusb3380/libusb3380-0.0_p20190125.ebuild
+2012182309 ./net-wireless/libusb3380/libusb3380-9999.ebuild
+2012182309 ./net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild
+2012182309 ./net-wireless/libxtrx/libxtrx-9999.ebuild
+2012182309 ./net-wireless/libxtrxdsp/libxtrxdsp-0.0_p20200830.ebuild
+2012182309 ./net-wireless/libxtrxdsp/libxtrxdsp-9999.ebuild
+2012182309 ./net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild
+2012182309 ./net-wireless/libxtrxll/libxtrxll-9999.ebuild
 2002110109 ./perl-core/Archive-Tar/Archive-Tar-2.300.0.ebuild
 1706160332 ./perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.125.0-r1.ebuild
 1912110241 ./perl-core/CPAN-Meta/CPAN-Meta-2.150.1.ebuild
@@ -24265,7 +24282,7 @@
 1702282250 ./sci-chemistry/numbat/numbat-0.999-r1.ebuild
 1710160551 ./sci-chemistry/openbabel-perl/openbabel-perl-2.4.1.ebuild
 2009071209 ./sci-chemistry/openbabel/openbabel-2.4.1.ebuild
-2012020639 ./sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild
+2012181409 ./sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild
 1702282250 ./sci-chemistry/pdbcat/pdbcat-1.3.ebuild
 2009162339 ./sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild
 1702282250 ./sci-chemistry/pdbmat/pdbmat-3.89.ebuild
@@ -24497,6 +24514,7 @@
 2012160039 ./sci-geosciences/osm2pgsql/osm2pgsql-0.96.0.ebuild
 2012160039 ./sci-geosciences/osm2pgsql/osm2pgsql-1.3.0.ebuild
 2012160039 ./sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+2012211339 ./sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild
 2011181009 ./sci-geosciences/qgis/qgis-3.16.0-r1.ebuild
 2011210009 ./sci-geosciences/qgis/qgis-9999.ebuild
 2011240139 ./sci-geosciences/qgis/qgis-3.16.1.ebuild
@@ -24636,10 +24654,10 @@
 2008051139 ./sci-libs/gdal/gdal-3.0.4-r1.ebuild
 2012150709 ./sci-libs/gdal/gdal-3.2.0-r1.ebuild
 2006041239 ./sci-libs/geos/geos-3.8.1.ebuild
-2012092339 ./sci-libs/geos/geos-3.9.0.ebuild
+2012181439 ./sci-libs/geos/geos-3.9.0-r2.ebuild
 2011150109 ./sci-libs/gerris/gerris-20131206-r1.ebuild
 2009091439 ./sci-libs/getdata/getdata-0.9.0-r3.ebuild
-2009111825 ./sci-libs/gmsh/gmsh-4.6.0.ebuild
+2012201809 ./sci-libs/gmsh/gmsh-4.6.0.ebuild
 2003261841 ./sci-libs/gsl/gsl-2.4.ebuild
 2003261841 ./sci-libs/gsl/gsl-2.5.ebuild
 2004032241 ./sci-libs/gsl/gsl-2.5-r1.ebuild
@@ -24717,9 +24735,10 @@
 1907031339 ./sci-libs/libqalculate/libqalculate-3.2.0-r1.ebuild
 2002112051 ./sci-libs/libqalculate/libqalculate-2.8.1.ebuild
 2004032241 ./sci-libs/libqalculate/libqalculate-0.9.9.ebuild
-1708130355 ./sci-libs/libsc/libsc-2.0.ebuild
-1904150439 ./sci-libs/libsc/libsc-2.2.ebuild
-1707301304 ./sci-libs/libsc/libsc-9999.ebuild
+2012201639 ./sci-libs/libsc/libsc-2.0.ebuild
+2012201639 ./sci-libs/libsc/libsc-2.2-r100.ebuild
+2012201639 ./sci-libs/libsc/libsc-2.2.ebuild
+2012201639 ./sci-libs/libsc/libsc-9999.ebuild
 2011170139 ./sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
 2011170139 ./sci-libs/libsigrok/libsigrok-0.5.2.ebuild
 2011170139 ./sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -24803,7 +24822,8 @@
 2006041239 ./sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
 2012160039 ./sci-libs/p4est/p4est-2.0.ebuild
 2012160039 ./sci-libs/p4est/p4est-2.2.ebuild
-2012160039 ./sci-libs/p4est/p4est-9999.ebuild
+2012201639 ./sci-libs/p4est/p4est-2.2-r100.ebuild
+2012201639 ./sci-libs/p4est/p4est-9999.ebuild
 2001111939 ./sci-libs/parmetis/parmetis-4.0.3-r1.ebuild
 2002112051 ./sci-libs/pastix/pastix-5.2.3.ebuild
 2011140510 ./sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
@@ -24820,7 +24840,6 @@
 2007201009 ./sci-libs/proj/proj-7.0.1.ebuild
 2012092339 ./sci-libs/proj/proj-7.1.1.ebuild
 1702282250 ./sci-libs/punc/punc-1.5.ebuild
-2004230009 ./sci-libs/pyshp/pyshp-2.1.0.ebuild
 2012162209 ./sci-libs/pyshp/pyshp-2.1.2.ebuild
 2009230039 ./sci-libs/qd/qd-2.3.17.ebuild
 2009230039 ./sci-libs/qd/qd-2.3.22.ebuild
@@ -24862,9 +24881,8 @@
 2011290209 ./sci-libs/tensorflow/tensorflow-2.4.0_rc3.ebuild
 2012070709 ./sci-libs/tensorflow/tensorflow-2.4.0_rc4.ebuild
 2006111539 ./sci-libs/tnt/tnt-3.0.12.ebuild
-1908130939 ./sci-libs/trilinos/trilinos-12.14.1.ebuild
-2006102109 ./sci-libs/trilinos/trilinos-12.18.1.ebuild
 2010250039 ./sci-libs/trilinos/trilinos-13.0.0.ebuild
+2012210039 ./sci-libs/trilinos/trilinos-13.0.1.ebuild
 1702282250 ./sci-libs/udunits/udunits-2.2.20.ebuild
 2002112051 ./sci-libs/udunits/udunits-2.1.24-r1.ebuild
 2009182009 ./sci-libs/ufconfig/ufconfig-3.7.1.ebuild
@@ -24899,14 +24917,14 @@
 2003142039 ./sci-libs/spglib/spglib-1.14.1.ebuild
 2004141609 ./sci-libs/brial/brial-1.2.8.ebuild
 2010040239 ./sci-libs/brial/brial-1.2.10.ebuild
-2010122209 ./sci-libs/cartopy/cartopy-0.18.0.ebuild
+2012191809 ./sci-libs/cartopy/cartopy-0.18.0.ebuild
 2008010109 ./sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
 2005010139 ./sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
 2005010139 ./sci-libs/ginkgo/ginkgo-9999.ebuild
 2005041609 ./sci-libs/linbox/linbox-1.6.3.ebuild
 2005151939 ./sci-libs/ignition-common/ignition-common-3.5.0.ebuild
 2009211709 ./sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0-r1.ebuild
-2008142139 ./sci-libs/volk/volk-2.3.0-r2.ebuild
+2012182309 ./sci-libs/volk/volk-2.4.1.ebuild
 2008130009 ./sci-libs/libhomfly/libhomfly-1.02.6.ebuild
 2010051809 ./sci-libs/libecpint/libecpint-1.0.2.ebuild
 2010122209 ./sci-libs/rtree/rtree-0.9.4-r1.ebuild
@@ -24952,6 +24970,7 @@
 2002140110 ./sci-mathematics/fann/fann-9999.ebuild
 2004061039 ./sci-mathematics/flint/flint-2.5.2-r1.ebuild
 2010272309 ./sci-mathematics/flint/flint-2.6.3.ebuild
+2012190209 ./sci-mathematics/flint/flint-2.7.0.ebuild
 2002140110 ./sci-mathematics/form/form-4.1.ebuild
 2002140110 ./sci-mathematics/form/form-4.2.0.ebuild
 2002140110 ./sci-mathematics/form/form-4.2.1.ebuild
@@ -25180,7 +25199,7 @@
 2011302139 ./sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
 2012161209 ./sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
 2012161209 ./sci-visualization/gnuplot/gnuplot-5.4.1.ebuild
-2012171609 ./sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild
+2012211309 ./sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild
 2005172009 ./sci-visualization/grace/grace-5.1.25.ebuild
 2005172009 ./sci-visualization/grace/grace-5.1.25_p7.ebuild
 1912210209 ./sci-visualization/gri/gri-2.12.23-r1.ebuild
@@ -25193,8 +25212,7 @@
 1804020308 ./sci-visualization/opendx/opendx-4.4.4-r7.ebuild
 2009111825 ./sci-visualization/paraview/paraview-5.8.0-r3.ebuild
 2011251939 ./sci-visualization/paraview/paraview-5.8.1.ebuild
-2009181339 ./sci-visualization/pythonprop/pythonprop-0.29.ebuild
-2011092209 ./sci-visualization/pythonprop/pythonprop-0.30.ebuild
+2012191809 ./sci-visualization/pythonprop/pythonprop-0.30.ebuild
 2002230040 ./sci-visualization/quickplot/quickplot-0.10.6.ebuild
 2002230040 ./sci-visualization/quickplot/quickplot-0.10.8.ebuild
 2002230040 ./sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
@@ -25989,7 +26007,7 @@
 1910111911 ./sys-apps/ack/ack-3.0.0.ebuild
 1912102109 ./sys-apps/ack/ack-3.2.0.ebuild
 2006111709 ./sys-apps/ack/ack-3.3.1.ebuild
-2012081109 ./sys-apps/ack/ack-3.4.0.ebuild
+2012192309 ./sys-apps/ack/ack-3.4.0.ebuild
 2004211009 ./sys-apps/acl/acl-2.2.53.ebuild
 2011232009 ./sys-apps/acl/acl-2.2.53-r1.ebuild
 2006171909 ./sys-apps/agedu/agedu-20200617.ebuild
@@ -26004,13 +26022,13 @@
 2012081009 ./sys-apps/apparmor/apparmor-3.0.1.ebuild
 2008051909 ./sys-apps/apply-default-acl/apply-default-acl-0.4.4.ebuild
 1712021939 ./sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
-2006061509 ./sys-apps/attr/attr-2.4.48-r3.ebuild
-2009080009 ./sys-apps/attr/attr-9999.ebuild
 2011232009 ./sys-apps/attr/attr-2.4.48-r4.ebuild
+2012201939 ./sys-apps/attr/attr-2.4.48-r5.ebuild
+2012201939 ./sys-apps/attr/attr-9999.ebuild
 2003241639 ./sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild
 2008302139 ./sys-apps/baobab/baobab-3.34.1.ebuild
 1712021939 ./sys-apps/bar/bar-1.11.1.ebuild
-1910111911 ./sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
+2012182339 ./sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
 2002112051 ./sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
 2002112051 ./sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
 2012130609 ./sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
@@ -26118,6 +26136,7 @@
 2010090209 ./sys-apps/fakeroot/fakeroot-1.25.3.ebuild
 2004032241 ./sys-apps/fbset/fbset-2.1.ebuild
 2006120709 ./sys-apps/fd/fd-8.1.1.ebuild
+2012191409 ./sys-apps/fd/fd-8.2.1.ebuild
 2005072109 ./sys-apps/file/file-5.37-r1.ebuild
 2005282309 ./sys-apps/file/file-5.38-r1.ebuild
 2009080009 ./sys-apps/file/file-5.39-r3.ebuild
@@ -26184,7 +26203,6 @@
 1908181539 ./sys-apps/hponcfg/hponcfg-5.4.0.0.ebuild
 2004290209 ./sys-apps/hponcfg/hponcfg-5.5.0.0.ebuild
 1708111138 ./sys-apps/hprofile/hprofile-6.1.3.ebuild
-2004032241 ./sys-apps/hwdata-gentoo/hwdata-gentoo-0.4.ebuild
 2008130609 ./sys-apps/hwids/hwids-20200204.ebuild
 2008130609 ./sys-apps/hwids/hwids-20200306.ebuild
 2008142239 ./sys-apps/hwids/hwids-99999999.ebuild
@@ -26194,9 +26212,8 @@
 1808310240 ./sys-apps/hwinfo/hwinfo-21.4.ebuild
 2011051139 ./sys-apps/hwloc/hwloc-2.3.0.ebuild
 2012111239 ./sys-apps/hwloc/hwloc-1.11.13.ebuild
-2004032241 ./sys-apps/hwsetup/hwsetup-1.2-r3.ebuild
 2003111509 ./sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
-2010101109 ./sys-apps/i2c-tools/i2c-tools-4.2.ebuild
+2012181139 ./sys-apps/i2c-tools/i2c-tools-4.2.ebuild
 2010142339 ./sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.8-r1.ebuild
 2010142339 ./sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-99999.ebuild
 1912050309 ./sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r1.ebuild
@@ -26236,14 +26253,15 @@
 2008041709 ./sys-apps/irqbalance/irqbalance-1.7.0.ebuild
 2010300209 ./sys-apps/isapnptools/isapnptools-1.27.ebuild
 2006291439 ./sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
-2007161309 ./sys-apps/kbd/kbd-2.3.0-r1.ebuild
 2009141939 ./sys-apps/kbd/kbd-2.2.0-r2.ebuild
 2012162109 ./sys-apps/kbd/kbd-2.4.0.ebuild
 2012162109 ./sys-apps/kbd/kbd-9999.ebuild
+2012210510 ./sys-apps/kbd/kbd-2.3.0-r1.ebuild
 2007131109 ./sys-apps/kcheck/kcheck-0.0.2-r1.ebuild
 2007131109 ./sys-apps/kcheck/kcheck-9999.ebuild
 2008050509 ./sys-apps/kexec-tools/kexec-tools-9999.ebuild
 2008101239 ./sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild
+2012200009 ./sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
 2004211009 ./sys-apps/keyutils/keyutils-1.6.1.ebuild
 2007081439 ./sys-apps/keyutils/keyutils-1.6.3.ebuild
 2009201309 ./sys-apps/kmod/kmod-26-r5.ebuild
@@ -26264,13 +26282,12 @@
 1912110241 ./sys-apps/lmctfy/lmctfy-0.5.0-r1.ebuild
 1702282250 ./sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
 2008160409 ./sys-apps/logwatch/logwatch-7.5.3.ebuild
-2008160409 ./sys-apps/logwatch/logwatch-7.5.4.ebuild
 2008160409 ./sys-apps/logwatch/logwatch-9999.ebuild
+2012210510 ./sys-apps/logwatch/logwatch-7.5.4.ebuild
 1908101739 ./sys-apps/lsadb/lsadb-0.1.3-r1.ebuild
 2004032241 ./sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
 2002180839 ./sys-apps/lsd/lsd-0.16.0.ebuild
-2004160809 ./sys-apps/lsd/lsd-0.17.0.ebuild
-2008302309 ./sys-apps/lsd/lsd-0.18.0.ebuild
+2012190039 ./sys-apps/lsd/lsd-0.19.0.ebuild
 2004032241 ./sys-apps/lshw/lshw-02.18b.ebuild
 2008192339 ./sys-apps/lshw/lshw-02.18b-r1.ebuild
 1711271440 ./sys-apps/lssbus/lssbus-0.1.ebuild
@@ -26301,14 +26318,12 @@
 2005062039 ./sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
 2004032241 ./sys-apps/mlocate/mlocate-0.26-r2.ebuild
 2004121939 ./sys-apps/mlocate/mlocate-0.26-r3.ebuild
-2006100439 ./sys-apps/moreutils/moreutils-0.63.ebuild
 2011281239 ./sys-apps/moreutils/moreutils-0.64.ebuild
 1910111911 ./sys-apps/most/most-5.1.0.ebuild
 2002112051 ./sys-apps/most/most-5.0.0a-r1.ebuild
 1702282250 ./sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild
 2002231739 ./sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild
 2003241909 ./sys-apps/mount-gtk/mount-gtk-1.4.5.1.ebuild
-1910051539 ./sys-apps/mouseemu/mouseemu-0.12.ebuild
 2012162009 ./sys-apps/mouseemu/mouseemu-0.15.ebuild
 1702282250 ./sys-apps/msr-tools/msr-tools-1.3.ebuild
 1712171539 ./sys-apps/mtree/mtree-1.0.4.ebuild
@@ -26327,9 +26342,8 @@
 2004260809 ./sys-apps/nvme-cli/nvme-cli-1.10.1.ebuild
 2004260839 ./sys-apps/nvme-cli/nvme-cli-1.11.1.ebuild
 2008250139 ./sys-apps/onerng/onerng-3.6-r3.ebuild
-2010042339 ./sys-apps/opal-utils/opal-utils-6.5.2.ebuild
 2010042339 ./sys-apps/opal-utils/opal-utils-6.6.2.ebuild
-2011030809 ./sys-apps/opal-utils/opal-utils-6.7.ebuild
+2012181339 ./sys-apps/opal-utils/opal-utils-6.7.ebuild
 2012011439 ./sys-apps/openrc/openrc-0.41.2.ebuild
 2012011439 ./sys-apps/openrc/openrc-0.42.1.ebuild
 2012011439 ./sys-apps/openrc/openrc-9999.ebuild
@@ -26369,10 +26383,10 @@
 2009122339 ./sys-apps/portage/portage-9999.ebuild
 2009181139 ./sys-apps/portage/portage-3.0.4-r1.ebuild
 2011070209 ./sys-apps/portage/portage-3.0.8.ebuild
-2011190109 ./sys-apps/portage/portage-3.0.9.ebuild
 2011222309 ./sys-apps/portage/portage-3.0.10-r1.ebuild
 2012040239 ./sys-apps/portage/portage-3.0.11-r2.ebuild
 2012071209 ./sys-apps/portage/portage-3.0.12.ebuild
+2012181739 ./sys-apps/portage/portage-3.0.9.ebuild
 2010142339 ./sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r4.ebuild
 2005281139 ./sys-apps/prctl/prctl-1.6-r1.ebuild
 2009170039 ./sys-apps/preload/preload-0.6.4-r3.ebuild
@@ -26447,7 +26461,6 @@
 2009150709 ./sys-apps/semodule-utils/semodule-utils-9999.ebuild
 2012030639 ./sys-apps/semodule-utils/semodule-utils-3.1.ebuild
 2002112051 ./sys-apps/sensei-raw-ctl/sensei-raw-ctl-0.0_pre20180729.ebuild
-1908101709 ./sys-apps/servicelog/servicelog-1.1.14.ebuild
 2012162009 ./sys-apps/servicelog/servicelog-1.1.15.ebuild
 2004032241 ./sys-apps/setserial/setserial-2.17-r5.ebuild
 2003261841 ./sys-apps/sg3_utils/sg3_utils-1.45-r1.ebuild
@@ -26553,7 +26566,7 @@
 2009212109 ./sys-apps/earlyoom/earlyoom-9999.ebuild
 2003261841 ./sys-apps/nosig/nosig-2.ebuild
 2005060039 ./sys-apps/lsvpd/lsvpd-1.7.10.ebuild
-2005290509 ./sys-apps/lsvpd/lsvpd-1.7.11.ebuild
+2012181339 ./sys-apps/lsvpd/lsvpd-1.7.11.ebuild
 2003042239 ./sys-apps/mlxup-bin/mlxup-bin-4.13.0.ebuild
 2011151339 ./sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
 2010102209 ./sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
@@ -26578,8 +26591,8 @@
 2005261739 ./sys-auth/google-authenticator/google-authenticator-1.09.ebuild
 2005162009 ./sys-auth/keystone/keystone-2020.1.9999.ebuild
 2005302109 ./sys-auth/keystone/keystone-17.0.0.ebuild
-2010180109 ./sys-auth/keystone/keystone-18.0.0.ebuild
 2010180109 ./sys-auth/keystone/keystone-2020.2.9999.ebuild
+2012200109 ./sys-auth/keystone/keystone-18.0.0.ebuild
 1909131639 ./sys-auth/libfprint/libfprint-1.0.ebuild
 1912271639 ./sys-auth/libfprint/libfprint-1.90.0.ebuild
 2003191309 ./sys-auth/libfprint/libfprint-1.90.1.ebuild
@@ -26601,7 +26614,7 @@
 2004032241 ./sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
 2006081009 ./sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
 2002112051 ./sys-auth/otpcalc/otpcalc-0.97-r8.ebuild
-1912111540 ./sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
+2012191809 ./sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
 1910130039 ./sys-auth/pam-script/pam-script-1.1.8.ebuild
 1910130039 ./sys-auth/pam-script/pam-script-1.1.9.ebuild
 2012171609 ./sys-auth/pam_abl/pam_abl-0.6.0.ebuild
@@ -26609,7 +26622,7 @@
 2012131809 ./sys-auth/pam_dotfile/pam_dotfile-0.7-r2.ebuild
 2004032241 ./sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild
 2004181139 ./sys-auth/pam_krb5/pam_krb5-4.9.ebuild
-2005062039 ./sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
+2012191839 ./sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
 2004211009 ./sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
 2011172009 ./sys-auth/pam_mount/pam_mount-2.16-r3.ebuild
 2012052209 ./sys-auth/pam_mount/pam_mount-2.17.ebuild
@@ -26745,7 +26758,8 @@
 1912261809 ./sys-block/storcli/storcli-7.1017.ebuild
 2004290209 ./sys-block/storcli/storcli-7.1211.ebuild
 2008061709 ./sys-block/storcli/storcli-7.1316.ebuild
-2008061709 ./sys-block/storcli/storcli-7.1410.ebuild
+2012210309 ./sys-block/storcli/storcli-7.1410.ebuild
+2012210309 ./sys-block/storcli/storcli-7.1508.ebuild
 1911072009 ./sys-block/tapecat/tapecat-1.0.0-r1.ebuild
 2008251609 ./sys-block/targetcli-fb/targetcli-fb-2.1.53.ebuild
 1906271839 ./sys-block/tgt/tgt-1.0.78.ebuild
@@ -26769,7 +26783,6 @@
 2010262039 ./sys-block/zram-init/zram-init-9999.ebuild
 2002112051 ./sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
 2010160339 ./sys-boot/arcload/arcload-0.50-r3.ebuild
-1907151840 ./sys-boot/bootcreator/bootcreator-1.1.ebuild
 1907151840 ./sys-boot/bootcreator/bootcreator-1.2.ebuild
 2006041239 ./sys-boot/colo/colo-1.22.ebuild
 2002230040 ./sys-boot/cromwell-bin/cromwell-bin-2.40-r1.ebuild
@@ -26796,14 +26809,12 @@
 1910191339 ./sys-boot/nettrom/nettrom-2.3.3.ebuild
 1911201909 ./sys-boot/os-prober/os-prober-1.77.ebuild
 2005202309 ./sys-boot/palo/palo-2.12-r1.ebuild
-2005210009 ./sys-boot/palo/palo-2.13.ebuild
 2005310139 ./sys-boot/palo/palo-2.14.ebuild
 2005311039 ./sys-boot/palo/palo-9999.ebuild
 2006061709 ./sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.3.ebuild
 2004032241 ./sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
 2007132139 ./sys-boot/plymouth/plymouth-9999.ebuild
 2009201209 ./sys-boot/plymouth/plymouth-0.9.5-r1.ebuild
-1912310139 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190925.ebuild
 2011230809 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
 2012120139 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
 2012120039 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201201.ebuild
@@ -26811,7 +26822,6 @@
 2012071109 ./sys-boot/refind/refind-0.12.0-r1.ebuild
 2010160339 ./sys-boot/sgibootcd/sgibootcd-0.12.ebuild
 1808152009 ./sys-boot/shim/shim-15.5-r1.ebuild
-1805071938 ./sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
 1906282209 ./sys-boot/silo/silo-1.4.14_p20170829.ebuild
 2006030539 ./sys-boot/silo/silo-1.4.14_p20200602.ebuild
 1910052209 ./sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -26838,8 +26848,8 @@
 2010012139 ./sys-cluster/cinder/cinder-2020.1.9999.ebuild
 2010190109 ./sys-cluster/cinder/cinder-2020.2.9999.ebuild
 2010280109 ./sys-cluster/cinder/cinder-16.2.0.ebuild
-2012081109 ./sys-cluster/cinder/cinder-17.0.1.ebuild
 2012090709 ./sys-cluster/cinder/cinder-16.2.1.ebuild
+2012200109 ./sys-cluster/cinder/cinder-17.0.1.ebuild
 2008291939 ./sys-cluster/classads/classads-1.0.10.ebuild
 2002222009 ./sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
 2002222009 ./sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
@@ -26874,9 +26884,9 @@
 2010091209 ./sys-cluster/glusterfs/glusterfs-7.7.ebuild
 2010091539 ./sys-cluster/glusterfs/glusterfs-7.8-r1.ebuild
 2010071839 ./sys-cluster/heat/heat-2020.1.9999.ebuild
-2010190239 ./sys-cluster/heat/heat-15.0.0.ebuild
 2010190239 ./sys-cluster/heat/heat-2020.2.9999.ebuild
 2011080139 ./sys-cluster/heat/heat-14.1.0.ebuild
+2012200109 ./sys-cluster/heat/heat-15.0.0.ebuild
 2010050209 ./sys-cluster/hpl/hpl-2.0-r4.ebuild
 2010050209 ./sys-cluster/hpl/hpl-2.3.ebuild
 2010311309 ./sys-cluster/hpx/hpx-1.5.1.ebuild
@@ -26887,58 +26897,73 @@
 2012170709 ./sys-cluster/keepalived/keepalived-2.1.5.ebuild
 2008081739 ./sys-cluster/knem/knem-1.1.3-r2.ebuild
 2008081739 ./sys-cluster/knem/knem-9999.ebuild
-2010260639 ./sys-cluster/kube-apiserver/kube-apiserver-1.17.13.ebuild
 2010260639 ./sys-cluster/kube-apiserver/kube-apiserver-1.18.10.ebuild
 2010260639 ./sys-cluster/kube-apiserver/kube-apiserver-1.19.3.ebuild
-2011230539 ./sys-cluster/kube-apiserver/kube-apiserver-1.17.14.ebuild
-2011230539 ./sys-cluster/kube-apiserver/kube-apiserver-1.18.12.ebuild
-2011230539 ./sys-cluster/kube-apiserver/kube-apiserver-1.19.4.ebuild
 2012100009 ./sys-cluster/kube-apiserver/kube-apiserver-1.20.0.ebuild
-2010260639 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.17.13.ebuild
+2012192309 ./sys-cluster/kube-apiserver/kube-apiserver-1.17.14.ebuild
+2012200409 ./sys-cluster/kube-apiserver/kube-apiserver-1.18.12.ebuild
+2012182339 ./sys-cluster/kube-apiserver/kube-apiserver-1.18.14.ebuild
+2012200409 ./sys-cluster/kube-apiserver/kube-apiserver-1.19.4.ebuild
+2012182339 ./sys-cluster/kube-apiserver/kube-apiserver-1.19.6.ebuild
+2012182239 ./sys-cluster/kube-apiserver/kube-apiserver-1.20.1.ebuild
 2010260639 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.18.10.ebuild
 2010260639 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.19.3.ebuild
-2011230539 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.17.14.ebuild
-2011230539 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.18.12.ebuild
-2011230539 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.19.4.ebuild
 2012100009 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.20.0.ebuild
-2010260639 ./sys-cluster/kube-proxy/kube-proxy-1.17.13.ebuild
+2012192309 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.17.14.ebuild
+2012200409 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.18.12.ebuild
+2012182339 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.18.14.ebuild
+2012200409 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.19.4.ebuild
+2012182339 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.19.6.ebuild
+2012182239 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.20.1.ebuild
 2010260639 ./sys-cluster/kube-proxy/kube-proxy-1.18.10.ebuild
 2010260639 ./sys-cluster/kube-proxy/kube-proxy-1.19.3.ebuild
-2011230539 ./sys-cluster/kube-proxy/kube-proxy-1.17.14.ebuild
-2011230539 ./sys-cluster/kube-proxy/kube-proxy-1.18.12.ebuild
-2011230539 ./sys-cluster/kube-proxy/kube-proxy-1.19.4.ebuild
 2012100009 ./sys-cluster/kube-proxy/kube-proxy-1.20.0.ebuild
+2012192309 ./sys-cluster/kube-proxy/kube-proxy-1.17.14.ebuild
+2012200409 ./sys-cluster/kube-proxy/kube-proxy-1.18.12.ebuild
+2012182339 ./sys-cluster/kube-proxy/kube-proxy-1.18.14.ebuild
+2012200409 ./sys-cluster/kube-proxy/kube-proxy-1.19.4.ebuild
+2012182339 ./sys-cluster/kube-proxy/kube-proxy-1.19.6.ebuild
+2012182239 ./sys-cluster/kube-proxy/kube-proxy-1.20.1.ebuild
 2004291509 ./sys-cluster/kube-router/kube-router-0.4.0.ebuild
 2008121109 ./sys-cluster/kube-router/kube-router-1.0.1.ebuild
 2010071939 ./sys-cluster/kube-router/kube-router-1.1.0.ebuild
-2010260639 ./sys-cluster/kube-scheduler/kube-scheduler-1.17.13.ebuild
+2012192239 ./sys-cluster/kube-router/kube-router-1.1.1.ebuild
 2010260639 ./sys-cluster/kube-scheduler/kube-scheduler-1.18.10.ebuild
 2010260639 ./sys-cluster/kube-scheduler/kube-scheduler-1.19.3.ebuild
-2011230539 ./sys-cluster/kube-scheduler/kube-scheduler-1.17.14.ebuild
-2011230539 ./sys-cluster/kube-scheduler/kube-scheduler-1.18.12.ebuild
-2011230539 ./sys-cluster/kube-scheduler/kube-scheduler-1.19.4.ebuild
 2012100009 ./sys-cluster/kube-scheduler/kube-scheduler-1.20.0.ebuild
-2010260639 ./sys-cluster/kubeadm/kubeadm-1.17.13.ebuild
+2012192309 ./sys-cluster/kube-scheduler/kube-scheduler-1.17.14.ebuild
+2012200409 ./sys-cluster/kube-scheduler/kube-scheduler-1.18.12.ebuild
+2012182339 ./sys-cluster/kube-scheduler/kube-scheduler-1.18.14.ebuild
+2012200409 ./sys-cluster/kube-scheduler/kube-scheduler-1.19.4.ebuild
+2012182339 ./sys-cluster/kube-scheduler/kube-scheduler-1.19.6.ebuild
+2012182239 ./sys-cluster/kube-scheduler/kube-scheduler-1.20.1.ebuild
 2010260639 ./sys-cluster/kubeadm/kubeadm-1.18.10.ebuild
 2010260639 ./sys-cluster/kubeadm/kubeadm-1.19.3.ebuild
-2011230539 ./sys-cluster/kubeadm/kubeadm-1.17.14.ebuild
-2011230539 ./sys-cluster/kubeadm/kubeadm-1.18.12.ebuild
-2011230539 ./sys-cluster/kubeadm/kubeadm-1.19.4.ebuild
 2012100009 ./sys-cluster/kubeadm/kubeadm-1.20.0.ebuild
-2010260639 ./sys-cluster/kubectl/kubectl-1.17.13.ebuild
+2012192309 ./sys-cluster/kubeadm/kubeadm-1.17.14.ebuild
+2012200409 ./sys-cluster/kubeadm/kubeadm-1.18.12.ebuild
+2012182339 ./sys-cluster/kubeadm/kubeadm-1.18.14.ebuild
+2012200409 ./sys-cluster/kubeadm/kubeadm-1.19.4.ebuild
+2012182339 ./sys-cluster/kubeadm/kubeadm-1.19.6.ebuild
+2012182239 ./sys-cluster/kubeadm/kubeadm-1.20.1.ebuild
 2010260639 ./sys-cluster/kubectl/kubectl-1.18.10.ebuild
 2010260639 ./sys-cluster/kubectl/kubectl-1.19.3.ebuild
-2011230539 ./sys-cluster/kubectl/kubectl-1.17.14.ebuild
-2011230539 ./sys-cluster/kubectl/kubectl-1.18.12.ebuild
-2011230539 ./sys-cluster/kubectl/kubectl-1.19.4.ebuild
 2012100009 ./sys-cluster/kubectl/kubectl-1.20.0.ebuild
-2010260639 ./sys-cluster/kubelet/kubelet-1.17.13.ebuild
+2012192309 ./sys-cluster/kubectl/kubectl-1.17.14.ebuild
+2012200409 ./sys-cluster/kubectl/kubectl-1.18.12.ebuild
+2012182339 ./sys-cluster/kubectl/kubectl-1.18.14.ebuild
+2012200409 ./sys-cluster/kubectl/kubectl-1.19.4.ebuild
+2012182339 ./sys-cluster/kubectl/kubectl-1.19.6.ebuild
+2012182239 ./sys-cluster/kubectl/kubectl-1.20.1.ebuild
 2010260639 ./sys-cluster/kubelet/kubelet-1.18.10.ebuild
 2010260639 ./sys-cluster/kubelet/kubelet-1.19.3.ebuild
-2011230539 ./sys-cluster/kubelet/kubelet-1.17.14.ebuild
-2011230539 ./sys-cluster/kubelet/kubelet-1.18.12.ebuild
-2011230539 ./sys-cluster/kubelet/kubelet-1.19.4.ebuild
 2012100009 ./sys-cluster/kubelet/kubelet-1.20.0.ebuild
+2012192309 ./sys-cluster/kubelet/kubelet-1.17.14.ebuild
+2012200409 ./sys-cluster/kubelet/kubelet-1.18.12.ebuild
+2012182339 ./sys-cluster/kubelet/kubelet-1.18.14.ebuild
+2012200409 ./sys-cluster/kubelet/kubelet-1.19.4.ebuild
+2012182339 ./sys-cluster/kubelet/kubelet-1.19.6.ebuild
+2012182239 ./sys-cluster/kubelet/kubelet-1.20.1.ebuild
 1903190209 ./sys-cluster/legion/legion-16.08.0-r1.ebuild
 1903190209 ./sys-cluster/legion/legion-16.10.0.ebuild
 1903190209 ./sys-cluster/legion/legion-17.02.0.ebuild
@@ -26970,9 +26995,9 @@
 2011170309 ./sys-cluster/mpich2/mpich2-1.5.ebuild
 1712240039 ./sys-cluster/native-mpi/native-mpi-0.ebuild
 2010071839 ./sys-cluster/neutron/neutron-2020.1.9999.ebuild
-2010190109 ./sys-cluster/neutron/neutron-17.0.0.ebuild
 2010190109 ./sys-cluster/neutron/neutron-2020.2.9999.ebuild
 2010280109 ./sys-cluster/neutron/neutron-16.2.0.ebuild
+2012200109 ./sys-cluster/neutron/neutron-17.0.0.ebuild
 2005170039 ./sys-cluster/nova/nova-2020.1.9999.ebuild
 2010200039 ./sys-cluster/nova/nova-2020.2.9999.ebuild
 2012032109 ./sys-cluster/nova/nova-22.0.1.ebuild
@@ -27016,7 +27041,7 @@
 2002222009 ./sys-cluster/resource-agents/resource-agents-4.0.1.ebuild
 2010211609 ./sys-cluster/resource-agents/resource-agents-4.6.1.ebuild
 2004032241 ./sys-cluster/sanlock/sanlock-3.6.0.ebuild
-2012161439 ./sys-cluster/sanlock/sanlock-3.8.2.ebuild
+2012211309 ./sys-cluster/sanlock/sanlock-3.8.2.ebuild
 2010161439 ./sys-cluster/singularity/singularity-3.6.4.ebuild
 2011272239 ./sys-cluster/singularity/singularity-3.7.0.ebuild
 2012011539 ./sys-cluster/slurm/slurm-20.11.0.1.ebuild
@@ -27100,7 +27125,8 @@
 1912111540 ./sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
 1912111540 ./sys-devel/binutils-apple/binutils-apple-8.1.ebuild
 1912111540 ./sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
-2011271839 ./sys-devel/binutils-apple/binutils-apple-11.3.1.ebuild
+2012192309 ./sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild
+2012211139 ./sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild
 2005230009 ./sys-devel/binutils-config/binutils-config-9999.ebuild
 2008051739 ./sys-devel/binutils-config/binutils-config-5.3.2.ebuild
 2002140110 ./sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild
@@ -27119,7 +27145,7 @@
 2011211939 ./sys-devel/bison/bison-3.6.4.ebuild
 2011211939 ./sys-devel/bison/bison-3.7.1-r1.ebuild
 2011230009 ./sys-devel/bison/bison-3.7.4.ebuild
-2012140439 ./sys-devel/bison/bison-3.7.3.ebuild
+2012211309 ./sys-devel/bison/bison-3.7.3.ebuild
 2008231139 ./sys-devel/bmake/bmake-20200318.ebuild
 2012010009 ./sys-devel/bmake/bmake-20201117.ebuild
 2004032241 ./sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
@@ -27129,18 +27155,21 @@
 2011291409 ./sys-devel/clang-common/clang-common-11.0.1_rc1.ebuild
 2011291409 ./sys-devel/clang-common/clang-common-12.0.0.9999.ebuild
 2012041739 ./sys-devel/clang-common/clang-common-11.0.0.ebuild
+2012191239 ./sys-devel/clang-common/clang-common-11.0.1_rc2.ebuild
 2003092139 ./sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild
 2007152209 ./sys-devel/clang-runtime/clang-runtime-12.0.0.9999.ebuild
 2010110939 ./sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild
 2011291409 ./sys-devel/clang-runtime/clang-runtime-11.0.1.9999.ebuild
 2011291409 ./sys-devel/clang-runtime/clang-runtime-11.0.1_rc1.ebuild
 2012041739 ./sys-devel/clang-runtime/clang-runtime-11.0.0.ebuild
+2012191239 ./sys-devel/clang-runtime/clang-runtime-11.0.1_rc2.ebuild
 2011291339 ./sys-devel/clang/clang-10.0.1.ebuild
 2011292309 ./sys-devel/clang/clang-11.0.1.9999.ebuild
 2011292309 ./sys-devel/clang/clang-11.0.1_rc1.ebuild
 2011292309 ./sys-devel/clang/clang-12.0.0.9999.ebuild
 2011291339 ./sys-devel/clang/clang-9.0.1.ebuild
 2012041739 ./sys-devel/clang/clang-11.0.0.ebuild
+2012191239 ./sys-devel/clang/clang-11.0.1_rc2.ebuild
 1910071309 ./sys-devel/cons/cons-2.3.0.ebuild
 2003261841 ./sys-devel/crossdev/crossdev-99999999.ebuild
 2009041339 ./sys-devel/crossdev/crossdev-20200801.ebuild
@@ -27165,8 +27194,10 @@
 2009111939 ./sys-devel/gcc/gcc-10.2.1_pre9999.ebuild
 2011040209 ./sys-devel/gcc/gcc-6.5.0-r3.ebuild
 2011041109 ./sys-devel/gcc/gcc-10.2.0-r3.ebuild
-2012100209 ./sys-devel/gcc/gcc-9.3.0-r2.ebuild
 2012172039 ./sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
+2012190009 ./sys-devel/gcc/gcc-10.2.0-r4.ebuild
+2012190039 ./sys-devel/gcc/gcc-8.4.0-r2.ebuild
+2012182109 ./sys-devel/gcc/gcc-9.3.0-r2.ebuild
 1912111540 ./sys-devel/gdb-apple/gdb-apple-1752.ebuild
 2010151239 ./sys-devel/gdb/gdb-9.2.ebuild
 2012041839 ./sys-devel/gdb/gdb-10.1.ebuild
@@ -27193,12 +27224,14 @@
 2011291409 ./sys-devel/lld/lld-11.0.1.9999.ebuild
 2011291409 ./sys-devel/lld/lld-11.0.1_rc1.ebuild
 2012041739 ./sys-devel/lld/lld-11.0.0.ebuild
+2012191239 ./sys-devel/lld/lld-11.0.1_rc2.ebuild
 2003092139 ./sys-devel/llvm-common/llvm-common-9.0.1.ebuild
 2010110939 ./sys-devel/llvm-common/llvm-common-10.0.1.ebuild
 2011291209 ./sys-devel/llvm-common/llvm-common-12.0.0.9999.ebuild
 2011291409 ./sys-devel/llvm-common/llvm-common-11.0.1.9999.ebuild
 2011291409 ./sys-devel/llvm-common/llvm-common-11.0.1_rc1.ebuild
 2012041739 ./sys-devel/llvm-common/llvm-common-11.0.0.ebuild
+2012191239 ./sys-devel/llvm-common/llvm-common-11.0.1_rc2.ebuild
 2009082109 ./sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild
 2009271639 ./sys-devel/llvm-roc/llvm-roc-3.8.0.ebuild
 2011182109 ./sys-devel/llvm-roc/llvm-roc-3.9.0.ebuild
@@ -27209,14 +27242,15 @@
 2011291239 ./sys-devel/llvm/llvm-12.0.0.9999.ebuild
 2011291239 ./sys-devel/llvm/llvm-9.0.1.ebuild
 2012041739 ./sys-devel/llvm/llvm-11.0.0.ebuild
+2012191239 ./sys-devel/llvm/llvm-11.0.1_rc2.ebuild
 2006040739 ./sys-devel/llvmgold/llvmgold-9.ebuild
 2007152209 ./sys-devel/llvmgold/llvmgold-12.ebuild
 2008010139 ./sys-devel/llvmgold/llvmgold-10.ebuild
 2012041739 ./sys-devel/llvmgold/llvmgold-11.ebuild
 2009140139 ./sys-devel/m4/m4-1.4.17.ebuild
 2009140139 ./sys-devel/m4/m4-1.4.18-r1.ebuild
-2003261841 ./sys-devel/make/make-4.3.ebuild
 2004211009 ./sys-devel/make/make-4.2.1-r4.ebuild
+2012210510 ./sys-devel/make/make-4.3.ebuild
 2001292109 ./sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild
 1912111540 ./sys-devel/native-cctools/native-cctools-4.ebuild
 2011262009 ./sys-devel/native-cctools/native-cctools-5.ebuild
@@ -27232,7 +27266,6 @@
 2012011109 ./sys-devel/slibtool/slibtool-0.5.31.ebuild
 2005221039 ./sys-devel/smatch/smatch-1.60.ebuild
 2005221039 ./sys-devel/smatch/smatch-9999.ebuild
-2004011039 ./sys-devel/sparse/sparse-0.6.1.ebuild
 2007130109 ./sys-devel/sparse/sparse-0.6.2.ebuild
 2007130109 ./sys-devel/sparse/sparse-9999.ebuild
 1910271939 ./sys-devel/ucpp/ucpp-1.3.4.ebuild
@@ -27284,8 +27317,8 @@
 2011190239 ./sys-firmware/intel-microcode/intel-microcode-20201112_p20201116-r1.ebuild
 1702282250 ./sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3.ebuild
 1708061641 ./sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1.ebuild
-2006280009 ./sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
-2011070709 ./sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
+2012181209 ./sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
+2012181209 ./sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
 1702282250 ./sys-firmware/ivtv-firmware/ivtv-firmware-20080701-r1.ebuild
 2009081009 ./sys-firmware/iwl1000-ucode/iwl1000-ucode-39.31.5.1-r1.ebuild
 1702282250 ./sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild
@@ -27377,8 +27410,7 @@
 2004032241 ./sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
 2012030239 ./sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
 2004211009 ./sys-fs/dosfstools/dosfstools-4.1.ebuild
-2003081409 ./sys-fs/duperemove/duperemove-0.11.1.ebuild
-2012172009 ./sys-fs/duperemove/duperemove-0.11.2.ebuild
+2012202239 ./sys-fs/duperemove/duperemove-0.11.2.ebuild
 2007041709 ./sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
 2007041709 ./sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
 1908010139 ./sys-fs/e2tools/e2tools-0.0.16.4.ebuild
@@ -27427,8 +27459,6 @@
 2002251209 ./sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
 2011140009 ./sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild
 2011221539 ./sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
-2002230040 ./sys-fs/iprutils/iprutils-2.4.17.1.ebuild
-2002230040 ./sys-fs/iprutils/iprutils-2.4.7.ebuild
 2005200209 ./sys-fs/iprutils/iprutils-2.4.18.1.ebuild
 1912111540 ./sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1.ebuild
 2012030239 ./sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
@@ -27469,7 +27499,7 @@
 1702282250 ./sys-fs/nilfs-utils/nilfs-utils-2.2.2.ebuild
 2002112051 ./sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild
 2004231409 ./sys-fs/ntfs3g/ntfs3g-2017.3.23-r3.ebuild
-2006100339 ./sys-fs/ntfs3g/ntfs3g-2017.3.23.5.ebuild
+2012200409 ./sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild
 2002151310 ./sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
 2004032241 ./sys-fs/quota/quota-4.05-r1.ebuild
 2011101639 ./sys-fs/quota/quota-4.06.ebuild
@@ -27490,9 +27520,7 @@
 2006071539 ./sys-fs/snapraid/snapraid-11.5.ebuild
 1910090409 ./sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
 2011170809 ./sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.3.ebuild
-2004032241 ./sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
-2011071209 ./sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild
-2012172009 ./sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
+2012202239 ./sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
 1812241139 ./sys-fs/squashfuse/squashfuse-0.1.100.ebuild
 1901081309 ./sys-fs/squashfuse/squashfuse-0.1.103.ebuild
 2004211009 ./sys-fs/static-dev/static-dev-0.1.ebuild
@@ -27527,17 +27555,17 @@
 2007251209 ./sys-fs/xfsprogs/xfsprogs-5.7.0.ebuild
 2009070409 ./sys-fs/xfsprogs/xfsprogs-5.8.0.ebuild
 2010202239 ./sys-fs/xfsprogs/xfsprogs-5.9.0.ebuild
-2012141509 ./sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild
+2012182309 ./sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild
 2007241139 ./sys-fs/xwmfs/xwmfs-0.86.ebuild
 2003221409 ./sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild
-2012030239 ./sys-fs/zerofree/zerofree-1.1.1.ebuild
+2012202339 ./sys-fs/zerofree/zerofree-1.1.1.ebuild
 2009022339 ./sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
 2009281339 ./sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild
 2009281339 ./sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild
 2010220609 ./sys-fs/zfs-kmod/zfs-kmod-0.8.5.ebuild
 2011032339 ./sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
 2012012209 ./sys-fs/zfs-kmod/zfs-kmod-2.0.0.ebuild
-2012151339 ./sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
+2012182309 ./sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
 2011060609 ./sys-fs/zfs/zfs-0.8.5.ebuild
 2011252212 ./sys-fs/zfs/zfs-9999.ebuild
 2012012209 ./sys-fs/zfs/zfs-2.0.0.ebuild
@@ -27594,8 +27622,8 @@
 2008092309 ./sys-kernel/cryptodev/cryptodev-9999.ebuild
 2009130915 ./sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild
 2012160009 ./sys-kernel/dracut/dracut-050-r2.ebuild
-2012160009 ./sys-kernel/dracut/dracut-051.ebuild
 2012160009 ./sys-kernel/dracut/dracut-9999.ebuild
+2012202039 ./sys-kernel/dracut/dracut-051-r1.ebuild
 2004032241 ./sys-kernel/genkernel/genkernel-3.5.3.3.ebuild
 2007250539 ./sys-kernel/genkernel/genkernel-4.0.10.ebuild
 2009051609 ./sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild
@@ -27627,6 +27655,7 @@
 2012150109 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.1.ebuild
 2012170309 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.84.ebuild
 2012170339 ./sys-kernel/gentoo-sources/gentoo-sources-5.9.15.ebuild
+2012182009 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.1-r1.ebuild
 2010261209 ./sys-kernel/git-sources/git-sources-5.10_rc1.ebuild
 2011021809 ./sys-kernel/git-sources/git-sources-5.10_rc2.ebuild
 2011091109 ./sys-kernel/git-sources/git-sources-5.10_rc3.ebuild
@@ -27673,8 +27702,8 @@
 2011110939 ./sys-kernel/pf-sources/pf-sources-5.9_p4.ebuild
 2011231139 ./sys-kernel/pf-sources/pf-sources-5.9_p5.ebuild
 2012022109 ./sys-kernel/pf-sources/pf-sources-5.9_p6.ebuild
-2012141709 ./sys-kernel/pf-sources/pf-sources-5.10_p1.ebuild
 2012141439 ./sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild
+2012191039 ./sys-kernel/pf-sources/pf-sources-5.10_p1-r1.ebuild
 1903250339 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.14.98_p20190215.ebuild
 1912031639 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.19.75_p20190925.ebuild
 2010140209 ./sys-kernel/raspberrypi-image/raspberrypi-image-5.4.51_p20200902.ebuild
@@ -27715,19 +27744,21 @@
 2010172209 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.72.ebuild
 2011112209 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.77.ebuild
 2011112209 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.8.ebuild
-2011190409 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.78.ebuild
-2011190409 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.9.ebuild
-2011230339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.79.ebuild
-2011230339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.10.ebuild
-2011242309 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.80.ebuild
-2011242309 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.11.ebuild
-2012022339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.81.ebuild
-2012022339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.12.ebuild
-2012091509 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.82.ebuild
-2012091509 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.13.ebuild
-2012112039 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.83.ebuild
-2012112039 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.14.ebuild
-2012170309 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.10.1.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.10.1.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.78.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.79.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.80.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.81.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.82.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.83.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.84.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.10.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.11.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.12.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.13.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.14.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.15.ebuild
+2012210339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.9.ebuild
 2010230839 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.72-r1.ebuild
 2010280509 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.72.ebuild
 2011112209 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.8.ebuild
@@ -27761,6 +27792,10 @@
 2012112039 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.14.ebuild
 2012140439 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r2.ebuild
 2012170309 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.1.ebuild
+2012182239 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.1-r1.ebuild
+2012200339 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.84-r1.ebuild
+2012191839 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.84.ebuild
+2012191839 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.15.ebuild
 2011070709 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.72.ebuild
 2011112209 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.77.ebuild
 2011112209 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.9.8.ebuild
@@ -27780,6 +27815,9 @@
 2012112039 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.9.14.ebuild
 2012140439 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80-r1.ebuild
 2012170309 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.1.ebuild
+2012182239 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.1-r1.ebuild
+2012191839 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.84.ebuild
+2012191839 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.9.15.ebuild
 2007181939 ./sys-kernel/bliss-initramfs/bliss-initramfs-8.1.0-r1.ebuild
 2009201639 ./sys-kernel/bliss-initramfs/bliss-initramfs-9.3.0.ebuild
 2007152309 ./sys-kernel/bliss-kernel-bin/bliss-kernel-bin-4.14.178.ebuild
@@ -27795,17 +27833,19 @@
 2011291409 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.9999.ebuild
 2011291409 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1_rc1.ebuild
 2012041739 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild
+2012191239 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1_rc2.ebuild
 2003092139 ./sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
 2010110939 ./sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
 2011291209 ./sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
 2011291409 ./sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild
 2011291409 ./sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild
 2012041739 ./sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
+2012191239 ./sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild
 2005072109 ./sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
 2005072109 ./sys-libs/cracklib/cracklib-2.9.7.ebuild
 1912111540 ./sys-libs/csu/csu-79.ebuild
 1912261239 ./sys-libs/csu/csu-85-r1.ebuild
-1702282250 ./sys-libs/cygwin-crypt/cygwin-crypt-1.4.ebuild
+2012181739 ./sys-libs/cygwin-crypt/cygwin-crypt-1.4.ebuild
 1912251739 ./sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2-r4.ebuild
 1912251739 ./sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9-r4.ebuild
 1912251739 ./sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1-r4.ebuild
@@ -27883,12 +27923,14 @@
 2011291409 ./sys-libs/libcxx/libcxx-11.0.1.9999.ebuild
 2011291409 ./sys-libs/libcxx/libcxx-11.0.1_rc1.ebuild
 2012041739 ./sys-libs/libcxx/libcxx-11.0.0.ebuild
+2012191239 ./sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild
 2003092139 ./sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild
 2010061709 ./sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild
 2011291209 ./sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild
 2011291409 ./sys-libs/libcxxabi/libcxxabi-11.0.1.9999.ebuild
 2011291409 ./sys-libs/libcxxabi/libcxxabi-11.0.1_rc1.ebuild
 2012041739 ./sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild
+2012191239 ./sys-libs/libcxxabi/libcxxabi-11.0.1_rc2.ebuild
 2003030309 ./sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild
 2003162339 ./sys-libs/libfaketime/libfaketime-0.9.7.ebuild
 2006140039 ./sys-libs/libfaketime/libfaketime-0.9.8.ebuild
@@ -27898,7 +27940,6 @@
 2011172009 ./sys-libs/libhx/libhx-3.25.ebuild
 2009191539 ./sys-libs/libieee1284/libieee1284-0.2.11-r8.ebuild
 2009171909 ./sys-libs/libixp/libixp-0.5_p20110208-r3.ebuild
-2004032241 ./sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
 2010260309 ./sys-libs/libnih/libnih-1.0.3-r4.ebuild
 2006132027 ./sys-libs/libomp/libomp-9.0.1.ebuild
 2010110939 ./sys-libs/libomp/libomp-10.0.1.ebuild
@@ -27906,6 +27947,7 @@
 2011291409 ./sys-libs/libomp/libomp-11.0.1.9999.ebuild
 2011291409 ./sys-libs/libomp/libomp-11.0.1_rc1.ebuild
 2012041739 ./sys-libs/libomp/libomp-11.0.0.ebuild
+2012191239 ./sys-libs/libomp/libomp-11.0.1_rc2.ebuild
 2008302139 ./sys-libs/libosinfo/libosinfo-1.8.0-r1.ebuild
 2004032241 ./sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
 2012101539 ./sys-libs/librtas/librtas-2.0.2-r1.ebuild
@@ -27932,7 +27974,6 @@
 2005111139 ./sys-libs/libutempter/libutempter-1.2.0.ebuild
 2008301309 ./sys-libs/libutempter/libutempter-1.2.1.ebuild
 1903050109 ./sys-libs/libuuid/libuuid-1.0.3.ebuild
-2002230040 ./sys-libs/libvpd/libvpd-2.2.6.ebuild
 2012162009 ./sys-libs/libvpd/libvpd-2.2.8.ebuild
 2008051739 ./sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
 2012130339 ./sys-libs/libxcrypt/libxcrypt-4.4.17.ebuild
@@ -27942,6 +27983,7 @@
 2011291209 ./sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
 2011291409 ./sys-libs/llvm-libunwind/llvm-libunwind-11.0.1.9999.ebuild
 2011291409 ./sys-libs/llvm-libunwind/llvm-libunwind-11.0.1_rc1.ebuild
+2012191239 ./sys-libs/llvm-libunwind/llvm-libunwind-11.0.1_rc2.ebuild
 2004032241 ./sys-libs/lwp/lwp-2.8.ebuild
 2012041739 ./sys-libs/mtdev/mtdev-1.1.6.ebuild
 2002191739 ./sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild
@@ -27969,8 +28011,6 @@
 2004211009 ./sys-libs/pwdb/pwdb-0.62-r1.ebuild
 2001301109 ./sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild
 2005302239 ./sys-libs/readline/readline-8.0_p4.ebuild
-2007301209 ./sys-libs/readline/readline-6.3_p8-r3.ebuild
-2007301209 ./sys-libs/readline/readline-7.0_p5-r1.ebuild
 2012071509 ./sys-libs/readline/readline-8.1.ebuild
 1803291439 ./sys-libs/rpmatch-standalone/rpmatch-standalone-1.0.ebuild
 2004032241 ./sys-libs/slang/slang-2.3.2.ebuild
@@ -27981,7 +28021,6 @@
 1712292340 ./sys-libs/tapi/tapi-2.0.0.ebuild
 2006280009 ./sys-libs/tdb/tdb-1.4.3.ebuild
 2012172309 ./sys-libs/tevent/tevent-0.10.2.ebuild
-2008021839 ./sys-libs/timezone-data/timezone-data-2020a.ebuild
 2012140439 ./sys-libs/timezone-data/timezone-data-2020d.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild
@@ -28087,7 +28126,7 @@
 2004190539 ./sys-process/htop/htop-2.2.0.ebuild
 2009031439 ./sys-process/htop/htop-3.0.1.ebuild
 2012130339 ./sys-process/htop/htop-3.0.3.ebuild
-2012151339 ./sys-process/htop/htop-3.0.2.ebuild
+2012211309 ./sys-process/htop/htop-3.0.2.ebuild
 2006270039 ./sys-process/incron/incron-0.5.12_p20191114.ebuild
 2010280739 ./sys-process/iotop/iotop-0.6.ebuild
 1910071209 ./sys-process/latencytop/latencytop-0.5-r1.ebuild
@@ -28105,7 +28144,6 @@
 2012100539 ./sys-process/numactl/numactl-2.0.14.ebuild
 1912290039 ./sys-process/numad/numad-0.5-r3.ebuild
 1912290039 ./sys-process/numad/numad-9999.ebuild
-2011040409 ./sys-process/parallel/parallel-20200922.ebuild
 2011281209 ./sys-process/parallel/parallel-20201122.ebuild
 2012170019 ./sys-process/parallel/parallel-20201022.ebuild
 1907151840 ./sys-process/pkill-darwin/pkill-darwin-1.0.ebuild
@@ -28143,22 +28181,21 @@
 2005291309 ./sys-process/minicoredumper/minicoredumper-2.0.1-r1.ebuild
 2009071209 ./sys-process/bashtop/bashtop-0.9.25.ebuild
 2005062039 ./virtual/acl/acl-0-r1.ebuild
-2005062039 ./virtual/acl/acl-0-r2.ebuild
-2005062039 ./virtual/acl/acl-0.ebuild
-2010100009 ./virtual/awk/awk-1.ebuild
-1910111911 ./virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild
+2012200709 ./virtual/acl/acl-0-r2.ebuild
+2012200709 ./virtual/acl/acl-0.ebuild
+2012200709 ./virtual/awk/awk-1.ebuild
+2012200709 ./virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild
 2006012309 ./virtual/blas/blas-3.8.ebuild
 2007310009 ./virtual/cblas/cblas-3.8.ebuild
-2004032241 ./virtual/cdrtools/cdrtools-0.ebuild
 2004211009 ./virtual/checkpassword/checkpassword-0.ebuild
-2004032241 ./virtual/commonlisp/commonlisp-0.ebuild
+2012200709 ./virtual/commonlisp/commonlisp-0.ebuild
 2007311609 ./virtual/cron/cron-0-r2.ebuild
 2004211009 ./virtual/daemontools/daemontools-0.ebuild
 2005062039 ./virtual/dev-manager/dev-manager-0-r2.ebuild
 2006250039 ./virtual/editor/editor-0-r3.ebuild
-2004211009 ./virtual/eject/eject-0-r1.ebuild
+2012200709 ./virtual/eject/eject-0-r1.ebuild
 2004211009 ./virtual/fam/fam-0-r1.ebuild
-2004211009 ./virtual/fortran/fortran-0.ebuild
+2012200709 ./virtual/fortran/fortran-0.ebuild
 2004032241 ./virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild
 2012041739 ./virtual/glu/glu-9.0-r2.ebuild
 1910111911 ./virtual/gnustep-back/gnustep-back-0.25.0.ebuild
@@ -28166,23 +28203,23 @@
 1910111911 ./virtual/gnustep-back/gnustep-back-0.26.2.ebuild
 1910111911 ./virtual/gnustep-back/gnustep-back-0.27.0.ebuild
 2005091739 ./virtual/gnustep-back/gnustep-back-0.28.0.ebuild
-2007290039 ./virtual/gsasl/gsasl-2.ebuild
-2004032241 ./virtual/httpd-basic/httpd-basic-0-r2.ebuild
-2004032241 ./virtual/httpd-cgi/httpd-cgi-0-r1.ebuild
-2004032241 ./virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
-2004062109 ./virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
+2012200709 ./virtual/gsasl/gsasl-2.ebuild
+2012200709 ./virtual/httpd-basic/httpd-basic-0-r2.ebuild
+2012200709 ./virtual/httpd-cgi/httpd-cgi-0-r1.ebuild
+2012200709 ./virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
+2012200709 ./virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
 2012080439 ./virtual/httpd-php/httpd-php-8.0.ebuild
 2012150539 ./virtual/httpd-php/httpd-php-7.2.ebuild
 2012150539 ./virtual/httpd-php/httpd-php-7.3.ebuild
 2012150539 ./virtual/httpd-php/httpd-php-7.4.ebuild
 2004032241 ./virtual/imagemagick-tools/imagemagick-tools-0.ebuild
-2004032241 ./virtual/imap-c-client/imap-c-client-1.ebuild
-2004032241 ./virtual/imap-c-client/imap-c-client-2.ebuild
+2012200709 ./virtual/imap-c-client/imap-c-client-1.ebuild
+2012200709 ./virtual/imap-c-client/imap-c-client-2.ebuild
 2004211009 ./virtual/inetd/inetd-0.ebuild
 2011131309 ./virtual/jack/jack-1.ebuild
 2009191139 ./virtual/jdk/jdk-1.8.0-r5.ebuild
 2009191139 ./virtual/jdk/jdk-11-r1.ebuild
-1905272109 ./virtual/jpeg-compat/jpeg-compat-62.ebuild
+2012200709 ./virtual/jpeg-compat/jpeg-compat-62.ebuild
 2012041739 ./virtual/jpeg/jpeg-100.ebuild
 2009191139 ./virtual/jre/jre-1.8.0-r3.ebuild
 2009191139 ./virtual/jre/jre-11-r2.ebuild
@@ -28194,31 +28231,31 @@
 2002112051 ./virtual/libelf/libelf-2.ebuild
 2005062039 ./virtual/libelf/libelf-3.ebuild
 2004032241 ./virtual/libffi/libffi-3.3_rc0.ebuild
-2004032241 ./virtual/libgudev/libgudev-230.ebuild
-2004032241 ./virtual/libgudev/libgudev-232.ebuild
 2004211009 ./virtual/libgudev/libgudev-215-r3.ebuild
-2004211009 ./virtual/libiconv/libiconv-0-r1.ebuild
-2004211009 ./virtual/libiconv/libiconv-0.ebuild
+2012200739 ./virtual/libgudev/libgudev-230.ebuild
+2012200739 ./virtual/libgudev/libgudev-232.ebuild
 2005062039 ./virtual/libiconv/libiconv-0-r2.ebuild
-2004211009 ./virtual/libintl/libintl-0-r1.ebuild
-2004211009 ./virtual/libintl/libintl-0-r2.ebuild
-2004211009 ./virtual/libintl/libintl-0.ebuild
+2012200709 ./virtual/libiconv/libiconv-0-r1.ebuild
+2012200709 ./virtual/libiconv/libiconv-0.ebuild
+2012200709 ./virtual/libintl/libintl-0-r1.ebuild
+2012200709 ./virtual/libintl/libintl-0-r2.ebuild
+2012200709 ./virtual/libintl/libintl-0.ebuild
 2004032241 ./virtual/libudev/libudev-232-r1.ebuild
 2004032241 ./virtual/libudev/libudev-232-r3.ebuild
 2004211009 ./virtual/libudev/libudev-215-r1.ebuild
 2004211009 ./virtual/libudev/libudev-232-r2.ebuild
 2005062039 ./virtual/libusb/libusb-0-r2.ebuild
-2005062039 ./virtual/libusb/libusb-1-r1.ebuild
-2010192009 ./virtual/libusb/libusb-1-r2.ebuild
+2012200839 ./virtual/libusb/libusb-1-r1.ebuild
+2012200839 ./virtual/libusb/libusb-1-r2.ebuild
 2008130639 ./virtual/linux-sources/linux-sources-3-r4.ebuild
 1706261050 ./virtual/linuxtv-dvb-headers/linuxtv-dvb-headers-5.8.ebuild
-2005062039 ./virtual/logger/logger-0-r1.ebuild
+2012200709 ./virtual/logger/logger-0-r1.ebuild
 2005062039 ./virtual/mailx/mailx-1.ebuild
 2005062039 ./virtual/mailx/mailx-2.ebuild
 2009191009 ./virtual/mailx/mailx-3.ebuild
 2004211009 ./virtual/man/man-0-r3.ebuild
 2012111539 ./virtual/man/man-0-r4.ebuild
-2004211009 ./virtual/mda/mda-0.ebuild
+2012200709 ./virtual/mda/mda-0.ebuild
 2010241809 ./virtual/mpi/mpi-2.0-r3.ebuild
 2010241809 ./virtual/mpi/mpi-2.0-r4.ebuild
 2010241809 ./virtual/mpi/mpi-2.0-r5.ebuild
@@ -28367,11 +28404,11 @@
 2006132027 ./virtual/pkgconfig/pkgconfig-2.ebuild
 1910111911 ./virtual/pmake/pmake-1.ebuild
 2007290039 ./virtual/podofo-build/podofo-build-0.9.6.ebuild
-2009201739 ./virtual/python-cffi/python-cffi-1.ebuild
-2009201309 ./virtual/python-greenlet/python-greenlet-1.0-r2.ebuild
+2012200839 ./virtual/python-cffi/python-cffi-1.ebuild
+2012200839 ./virtual/python-greenlet/python-greenlet-1.0-r2.ebuild
 2010062139 ./virtual/qmail/qmail-1.03.ebuild
-2004032241 ./virtual/resolvconf/resolvconf-1.ebuild
-2008071109 ./virtual/ruby-ssl/ruby-ssl-11.ebuild
+2012200739 ./virtual/resolvconf/resolvconf-1.ebuild
+2012200839 ./virtual/ruby-ssl/ruby-ssl-11.ebuild
 2008071109 ./virtual/rubygems/rubygems-15.ebuild
 2008071109 ./virtual/rubygems/rubygems-16.ebuild
 2010091209 ./virtual/rust/rust-1.46.0.ebuild
@@ -28383,15 +28420,15 @@
 2004211009 ./virtual/ssh/ssh-0.ebuild
 2011072109 ./virtual/szip/szip-2.1.ebuild
 2004211009 ./virtual/tex-base/tex-base-0.ebuild
-2004211009 ./virtual/texi2dvi/texi2dvi-0-r2.ebuild
+2012200739 ./virtual/texi2dvi/texi2dvi-0-r2.ebuild
 2012031439 ./virtual/tmpfiles/tmpfiles-0-r1.ebuild
-2012041739 ./virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
+2012200739 ./virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
 2011172209 ./virtual/udev/udev-217-r2.ebuild
 2004032241 ./virtual/w3m/w3m-0.ebuild
 1912222309 ./virtual/wine/wine-0-r7.ebuild
 2004211009 ./virtual/yacc/yacc-0.ebuild
-2012091539 ./virtual/libcrypt/libcrypt-1-r1.ebuild
-2012091539 ./virtual/libcrypt/libcrypt-2.ebuild
+2012181739 ./virtual/libcrypt/libcrypt-1-r1.ebuild
+2012181739 ./virtual/libcrypt/libcrypt-2.ebuild
 1708230039 ./www-apache/anyterm/anyterm-1.1.29-r1.ebuild
 1702282250 ./www-apache/libapreq2/libapreq2-2.13-r1.ebuild
 2012141139 ./www-apache/libapreq2/libapreq2-2.15-r1.ebuild
@@ -28520,6 +28557,7 @@
 2006290009 ./www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.7.ebuild
 2006290009 ./www-apps/liquid_feedback_frontend/liquid_feedback_frontend-3.0.6.ebuild
 2012081309 ./www-apps/mediawiki/mediawiki-1.35.0.ebuild
+2012201939 ./www-apps/mediawiki/mediawiki-1.35.1.ebuild
 2006141409 ./www-apps/mirmon/mirmon-2.11-r2.ebuild
 2011092039 ./www-apps/moodle/moodle-3.10.ebuild
 2011092039 ./www-apps/moodle/moodle-3.5.15.ebuild
@@ -28585,8 +28623,8 @@
 2012091309 ./www-apps/wordpress/wordpress-5.6.ebuild
 1912121239 ./www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild
 2012162139 ./www-client/chromium/chromium-87.0.4280.88.ebuild
-2012162139 ./www-client/chromium/chromium-88.0.4324.41.ebuild
-2012162139 ./www-client/chromium/chromium-89.0.4350.4.ebuild
+2012181209 ./www-client/chromium/chromium-88.0.4324.50.ebuild
+2012191239 ./www-client/chromium/chromium-89.0.4356.6.ebuild
 2002231739 ./www-client/dillo/dillo-9999.ebuild
 2008061509 ./www-client/dillo/dillo-3.0.5-r3.ebuild
 2012030239 ./www-client/dillo/dillo-3.1_pre20181005.ebuild
@@ -28603,7 +28641,7 @@
 2012170709 ./www-client/firefox/firefox-78.6.0.ebuild
 2012151639 ./www-client/firefox/firefox-84.0.ebuild
 2012171109 ./www-client/google-chrome-beta/google-chrome-beta-88.0.4324.50.ebuild
-2012111209 ./www-client/google-chrome-unstable/google-chrome-unstable-89.0.4350.4.ebuild
+2012181139 ./www-client/google-chrome-unstable/google-chrome-unstable-89.0.4356.6.ebuild
 2012030039 ./www-client/google-chrome/google-chrome-87.0.4280.88.ebuild
 2002231739 ./www-client/httrack/httrack-3.49.2-r2.ebuild
 1808061609 ./www-client/jd/jd-2.8.5_p120826.ebuild
@@ -28620,9 +28658,9 @@
 1910102139 ./www-client/midori/midori-9.0.ebuild
 1702282250 ./www-client/netrik/netrik-1.16.1-r1.ebuild
 2011132010 ./www-client/netsurf/netsurf-3.10-r4.ebuild
-2012172109 ./www-client/opera-beta/opera-beta-73.0.3856.283.ebuild
-2012172039 ./www-client/opera-developer/opera-developer-74.0.3904.0-r1.ebuild
-2012172039 ./www-client/opera/opera-73.0.3856.284-r1.ebuild
+2012181909 ./www-client/opera-beta/opera-beta-73.0.3856.283.ebuild
+2012181909 ./www-client/opera-developer/opera-developer-74.0.3904.0-r1.ebuild
+2012181909 ./www-client/opera/opera-73.0.3856.284-r1.ebuild
 2008102039 ./www-client/otter/otter-1.0.01-r1.ebuild
 2008102039 ./www-client/otter/otter-9999.ebuild
 2009151409 ./www-client/pybugz/pybugz-0.13.ebuild
@@ -28671,6 +28709,7 @@
 2004231239 ./www-misc/urlwatch/urlwatch-2.17.ebuild
 2005101339 ./www-misc/urlwatch/urlwatch-2.18-r1.ebuild
 2009211840 ./www-misc/urlwatch/urlwatch-2.21.ebuild
+2012200039 ./www-misc/urlwatch/urlwatch-2.22.ebuild
 2012171609 ./www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
 1902092209 ./www-misc/visitors/visitors-0.7-r2.ebuild
 1907151840 ./www-misc/wsmake/wsmake-0.6.4-r1.ebuild
@@ -28679,8 +28718,8 @@
 2011111239 ./www-plugins/adobe-flash/adobe-flash-32.0.0.453.ebuild
 2008250009 ./www-plugins/browserpass/browserpass-3.0.7.ebuild
 2012030039 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.88.ebuild
-2012111209 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4350.4_alpha.ebuild
 2012171109 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-88.0.4324.50_beta.ebuild
+2012181139 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4356.6_alpha.ebuild
 1909232039 ./www-plugins/google-talkplugin/google-talkplugin-5.41.3.0.ebuild
 1909232039 ./www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
 2006081209 ./www-plugins/lightspark/lightspark-0.8.2-r1.ebuild
@@ -28724,6 +28763,8 @@
 2007191239 ./www-servers/puma/puma-4.3.4-r1.ebuild
 2008140239 ./www-servers/puma/puma-3.12.5-r1.ebuild
 2011211109 ./www-servers/puma/puma-5.0.4.ebuild
+2012181239 ./www-servers/puma/puma-4.3.7.ebuild
+2012181239 ./www-servers/puma/puma-5.1.1.ebuild
 1912111540 ./www-servers/resin/resin-4.0.48-r1.ebuild
 2012131839 ./www-servers/servefile/servefile-0.5.1.ebuild
 1708221206 ./www-servers/sniproxy/sniproxy-0.5.0.ebuild
@@ -28754,8 +28795,8 @@
 2004032241 ./x11-apps/bitmap/bitmap-1.0.9.ebuild
 2003261841 ./x11-apps/editres/editres-1.0.7.ebuild
 2006142109 ./x11-apps/fonttosfnt/fonttosfnt-1.1.0.ebuild
-2012140439 ./x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild
 2012161809 ./x11-apps/fonttosfnt/fonttosfnt-1.2.1.ebuild
+2012202239 ./x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild
 2003261841 ./x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
 2003261841 ./x11-apps/fstobdf/fstobdf-1.0.6.ebuild
 2012041739 ./x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
@@ -28811,7 +28852,7 @@
 2004032241 ./x11-apps/xinput/xinput-1.6.3.ebuild
 2006250009 ./x11-apps/xinput_calibrator/xinput_calibrator-0.7.5-r2.ebuild
 2004032241 ./x11-apps/xkbcomp/xkbcomp-1.4.3.ebuild
-2012140439 ./x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
+2012202239 ./x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
 2004032241 ./x11-apps/xkbevd/xkbevd-1.1.4.ebuild
 2003261841 ./x11-apps/xkbprint/xkbprint-1.0.5.ebuild
 2004032241 ./x11-apps/xkbutils/xkbutils-1.0.4.ebuild
@@ -28828,7 +28869,7 @@
 2003261841 ./x11-apps/xmore/xmore-1.0.3.ebuild
 2004032241 ./x11-apps/xpr/xpr-1.0.5.ebuild
 2004032241 ./x11-apps/xprop/xprop-1.2.4.ebuild
-2012140439 ./x11-apps/xprop/xprop-1.2.5.ebuild
+2012202239 ./x11-apps/xprop/xprop-1.2.5.ebuild
 2004032241 ./x11-apps/xrandr/xrandr-1.5.1.ebuild
 2012041739 ./x11-apps/xrdb/xrdb-1.2.0.ebuild
 1702282250 ./x11-apps/xrectsel/xrectsel-0.3.2.ebuild
@@ -28846,14 +28887,14 @@
 2005220539 ./x11-apps/xisxwayland/xisxwayland-9999.ebuild
 2006151809 ./x11-apps/xisxwayland/xisxwayland-1.ebuild
 2012041739 ./x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
-2012140439 ./x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
+2012202239 ./x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
 2005190009 ./x11-base/xorg-drivers/xorg-drivers-9999.ebuild
 2012150109 ./x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
 2005190009 ./x11-base/xorg-proto/xorg-proto-9999.ebuild
 2012041739 ./x11-base/xorg-proto/xorg-proto-2020.1.ebuild
-2012012109 ./x11-base/xorg-server/xorg-server-9999.ebuild
 2012041739 ./x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
-2012120239 ./x11-base/xorg-server/xorg-server-1.20.10.ebuild
+2012201509 ./x11-base/xorg-server/xorg-server-1.20.10.ebuild
+2012201509 ./x11-base/xorg-server/xorg-server-9999.ebuild
 2012150109 ./x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
 2011182139 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r5.ebuild
 2011182139 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r5.ebuild
@@ -28897,7 +28938,7 @@
 1910111911 ./x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild
 1903300039 ./x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild
 2002112051 ./x11-drivers/xf86-video-vesa/xf86-video-vesa-2.4.0.ebuild
-2012070009 ./x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild
+2012202239 ./x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild
 1910111911 ./x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
 1910111911 ./x11-libs/agg/agg-2.5-r3.ebuild
 2012162341 ./x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild
@@ -28917,17 +28958,17 @@
 2012171009 ./x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild
 1803052238 ./x11-libs/gl2ps/gl2ps-1.4.0.ebuild
 2004172339 ./x11-libs/gl2ps/gl2ps-1.3.9.ebuild
-2012170409 ./x11-libs/gl2ps/gl2ps-1.4.2.ebuild
+2012181339 ./x11-libs/gl2ps/gl2ps-1.4.2.ebuild
 2004032241 ./x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
 2006290009 ./x11-libs/goffice/goffice-0.10.47.ebuild
 2012140439 ./x11-libs/goffice/goffice-0.10.48.ebuild
 2004032241 ./x11-libs/goocanvas/goocanvas-1.0.0.ebuild
 2012030239 ./x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
-2006132027 ./x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
 2009181139 ./x11-libs/gtk+/gtk+-3.24.20.ebuild
 2011141239 ./x11-libs/gtk+/gtk+-3.24.22.ebuild
 2012102109 ./x11-libs/gtk+/gtk+-3.24.24-r1.ebuild
 2012102109 ./x11-libs/gtk+/gtk+-3.24.24.ebuild
+2012190109 ./x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
 2006291909 ./x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
 1702282250 ./x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5.ebuild
 2002222009 ./x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild
@@ -28943,10 +28984,10 @@
 2007152009 ./x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild
 2012041739 ./x11-libs/libSM/libSM-1.2.3-r1.ebuild
 2012041739 ./x11-libs/libX11/libX11-1.6.12.ebuild
-2012140439 ./x11-libs/libX11/libX11-1.7.0.ebuild
+2012202239 ./x11-libs/libX11/libX11-1.7.0.ebuild
 2004032241 ./x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
 2004032241 ./x11-libs/libXau/libXau-1.0.9.ebuild
-2012140439 ./x11-libs/libXau/libXau-1.0.9-r1.ebuild
+2012202239 ./x11-libs/libXau/libXau-1.0.9-r1.ebuild
 2012041739 ./x11-libs/libXaw/libXaw-1.0.13-r2.ebuild
 2012041739 ./x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
 1902221339 ./x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
@@ -28969,7 +29010,7 @@
 2012041739 ./x11-libs/libXres/libXres-1.2.0-r1.ebuild
 2012041739 ./x11-libs/libXt/libXt-1.2.0.ebuild
 2004032241 ./x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
-2012140439 ./x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
+2012202239 ./x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
 2012041739 ./x11-libs/libXv/libXv-1.0.11-r2.ebuild
 2012041739 ./x11-libs/libXvMC/libXvMC-1.0.12.ebuild
 2004032241 ./x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
@@ -28982,9 +29023,9 @@
 2003291839 ./x11-libs/libdockapp/libdockapp-0.7.2-r2.ebuild
 2005301339 ./x11-libs/libdockapp/libdockapp-0.7.2-r3.ebuild
 2006151909 ./x11-libs/libdockapp/libdockapp-0.7.3.ebuild
-2004042209 ./x11-libs/libdrm/libdrm-9999.ebuild
 2007312109 ./x11-libs/libdrm/libdrm-2.4.102.ebuild
-2012140439 ./x11-libs/libdrm/libdrm-2.4.103.ebuild
+2012202239 ./x11-libs/libdrm/libdrm-2.4.103.ebuild
+2012201509 ./x11-libs/libdrm/libdrm-9999.ebuild
 2008040239 ./x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
 2002222009 ./x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
 2002222009 ./x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
@@ -29029,14 +29070,14 @@
 2012041739 ./x11-libs/libvdpau/libvdpau-1.4.ebuild
 2004032241 ./x11-libs/libwnck/libwnck-2.31.0.ebuild
 2011061839 ./x11-libs/libwnck/libwnck-3.36.0.ebuild
-2012052309 ./x11-libs/libxcb/libxcb-1.14.ebuild
+2012190109 ./x11-libs/libxcb/libxcb-1.14.ebuild
 2007312109 ./x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
 2012041739 ./x11-libs/libxkbcommon/libxkbcommon-1.0.1-r1.ebuild
-2012140439 ./x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild
+2012202239 ./x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild
 2012041739 ./x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
 2004032241 ./x11-libs/libxklavier/libxklavier-5.4.ebuild
 2004032241 ./x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
-2012140439 ./x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
+2012202239 ./x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
 1808261209 ./x11-libs/libyui-gtk/libyui-gtk-2.44.9.ebuild
 1808261209 ./x11-libs/libyui-ncurses/libyui-ncurses-2.48.3.ebuild
 1808261209 ./x11-libs/libyui-qt/libyui-qt-2.47.1.ebuild
@@ -29387,7 +29428,7 @@
 2005050139 ./x11-misc/wmname/wmname-0.1-r1.ebuild
 2003261841 ./x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
 2004032241 ./x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
-2012151409 ./x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
+2012211309 ./x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
 2002112051 ./x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
 1911092309 ./x11-misc/x2x/x2x-1.27-r3.ebuild
 1805220439 ./x11-misc/xaos/xaos-3.6.ebuild
@@ -29452,7 +29493,7 @@
 1905150039 ./x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild
 2010060709 ./x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
 2010060709 ./x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
-2012140439 ./x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
+2012202239 ./x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
 2002230040 ./x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
 2002230040 ./x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
 2002121439 ./x11-misc/xlockmore/xlockmore-5.50.ebuild
@@ -29553,7 +29594,7 @@
 2011150209 ./x11-misc/clipmenu/clipmenu-6.1.0.ebuild
 2011221239 ./x11-misc/clipmenu/clipmenu-6.2.0.ebuild
 2011150209 ./x11-misc/clipnotify/clipnotify-1.0.2.ebuild
-2012140439 ./x11-misc/compose-tables/compose-tables-1.7.0.ebuild
+2012202239 ./x11-misc/compose-tables/compose-tables-1.7.0.ebuild
 1805220439 ./x11-plugins/allin1/allin1-0.5.0-r2.ebuild
 1805220439 ./x11-plugins/asapm/asapm-3.1-r1.ebuild
 1804280409 ./x11-plugins/asclock/asclock-2.0.12-r3.ebuild
@@ -29662,7 +29703,7 @@
 2012171539 ./x11-plugins/wmbattery/wmbattery-2.54.ebuild
 1805220439 ./x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
 2003081439 ./x11-plugins/wmbiff/wmbiff-0.4.35.ebuild
-2012030509 ./x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
+2012181409 ./x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
 2003011839 ./x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
 2003081439 ./x11-plugins/wmbio/wmbio-1.02.ebuild
 2012171539 ./x11-plugins/wmblob/wmblob-1.0.4.ebuild
@@ -29676,7 +29717,7 @@
 2002250109 ./x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
 2003291839 ./x11-plugins/wmcms/wmcms-0.3.5-r4.ebuild
 1805220439 ./x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
-2012031339 ./x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
+2012181409 ./x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
 2004032241 ./x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild
 2002112051 ./x11-plugins/wmcpuload/wmcpuload-1.1.1.ebuild
 2009231139 ./x11-plugins/wmcpuwatch/wmcpuwatch-0.2-r1.ebuild
@@ -29705,6 +29746,7 @@
 1810211139 ./x11-plugins/wmload/wmload-0.9.7-r1.ebuild
 1907151840 ./x11-plugins/wmlongrun/wmlongrun-0.3.1.ebuild
 2012171539 ./x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
+2012210039 ./x11-plugins/wmmaiload/wmmaiload-2.3.0-r2.ebuild
 2001300409 ./x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
 2002112051 ./x11-plugins/wmmemload/wmmemload-0.1.8-r1.ebuild
 2012171709 ./x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
@@ -29796,17 +29838,17 @@
 2012030239 ./x11-terms/tilda/tilda-1.5.2.ebuild
 2005081846 ./x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.2.ebuild
 2004032241 ./x11-terms/xterm/xterm-337.ebuild
-2004200309 ./x11-terms/xterm/xterm-351.ebuild
-2009231239 ./x11-terms/xterm/xterm-360.ebuild
-2012041739 ./x11-terms/xterm/xterm-361.ebuild
+2012201539 ./x11-terms/xterm/xterm-351.ebuild
+2012201539 ./x11-terms/xterm/xterm-360.ebuild
+2012201539 ./x11-terms/xterm/xterm-361.ebuild
 1805220439 ./x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
 2010171709 ./x11-terms/kitty-terminfo/kitty-terminfo-0.19.1.ebuild
 2010171709 ./x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
 2011251109 ./x11-terms/kitty-terminfo/kitty-terminfo-0.19.2.ebuild
 2007142239 ./x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
 2002230040 ./x11-themes/adapta-gtk-theme/adapta-gtk-theme-3.95.0.11.ebuild
-2004032241 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
-2011282039 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-r1.ebuild
+2012190109 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
+2012190109 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-r1.ebuild
 2001211409 ./x11-themes/adwaita-qt/adwaita-qt-1.1.1.ebuild
 2007142239 ./x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild
 2003261841 ./x11-themes/arc-icon-theme/arc-icon-theme-20161122.ebuild
@@ -29858,7 +29900,7 @@
 1702282250 ./x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.12.0.ebuild
 2003261841 ./x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.10.1.ebuild
 2003261841 ./x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0.ebuild
-2004032241 ./x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
+2012190109 ./x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
 2002122139 ./x11-themes/gnustep-neos-theme/gnustep-neos-theme-0.1.ebuild
 1911192139 ./x11-themes/gnustep-silver-theme/gnustep-silver-theme-3.1-r1.ebuild
 1909291339 ./x11-themes/goddard-backgrounds/goddard-backgrounds-13.0.0.3-r1.ebuild
@@ -29870,7 +29912,7 @@
 2006131539 ./x11-themes/greybird/greybird-3.22.11.ebuild
 2009041209 ./x11-themes/greybird/greybird-3.22.12.ebuild
 2012030239 ./x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild
-2004032241 ./x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
+2012190109 ./x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
 2007201609 ./x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
 1912241509 ./x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
 1912241509 ./x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild
@@ -30147,6 +30189,7 @@
 2002112051 ./xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.0.ebuild
 2011172239 ./xfce-extra/xfce4-dict/xfce4-dict-0.8.4.ebuild
 1910131439 ./xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.2.ebuild
+2012210309 ./xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.3.ebuild
 1912061739 ./xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r4.ebuild
 1912061739 ./xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1-r2.ebuild
 2008051739 ./xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.5.1.ebuild
@@ -30155,9 +30198,9 @@
 1912312009 ./xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild
 2012030239 ./xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.4.ebuild
 1912061739 ./xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r4.ebuild
-2005291909 ./xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r6.ebuild
-2012172009 ./xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.3.0.ebuild
+2012202339 ./xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.3.0.ebuild
 1812021439 ./xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.3.ebuild
+2012210339 ./xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.4.ebuild
 1910102139 ./xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.2.ebuild
 1910131439 ./xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.2.ebuild
 2002112051 ./xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r4.ebuild
@@ -30167,14 +30210,14 @@
 2010090009 ./xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.6-r1.ebuild
 2011070239 ./xfce-extra/xfce4-power-manager/xfce4-power-manager-1.7.1.ebuild
 2006292139 ./xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
-2010062139 ./xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
-2012172009 ./xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild
+2012202239 ./xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild
 2012030239 ./xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
 1911031709 ./xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
 2011201309 ./xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
 1910202009 ./xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.1.ebuild
 2003091039 ./xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.2.ebuild
 2012030239 ./xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild
+2012210309 ./xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.4.ebuild
 2007191709 ./xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.3.ebuild
 2009181139 ./xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.1.1.ebuild
 2009181139 ./xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.1.ebuild
@@ -30182,15 +30225,13 @@
 2002112051 ./xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild
 2007161739 ./xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
 1910202039 ./xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.1.ebuild
-2004192139 ./xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.1.ebuild
-2012172009 ./xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.2.ebuild
+2012202239 ./xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.2.ebuild
 2009181139 ./xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.6.ebuild
 2012051239 ./xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6-r3.ebuild
 2012030239 ./xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
 1910102139 ./xfce-extra/xfdashboard/xfdashboard-0.7.5.ebuild
 2011171409 ./xfce-extra/xfdashboard/xfdashboard-0.7.90.ebuild
 2001032239 ./skel.ebuild
-2012170251 metadata/md5-cache/acct-group/Manifest.gz
 2012170251 metadata/md5-cache/acct-group/abrt-0
 2012170251 metadata/md5-cache/acct-group/adm-0
 2012170251 metadata/md5-cache/acct-group/airdcppd-0
@@ -30458,7 +30499,8 @@
 2012170251 metadata/md5-cache/acct-group/xrootd-0
 2012170251 metadata/md5-cache/acct-group/ziproxy-0
 2012170251 metadata/md5-cache/acct-group/znc-0
-2012170251 metadata/md5-cache/acct-user/Manifest.gz
+2012200039 metadata/md5-cache/acct-group/Manifest.gz
+2012200039 metadata/md5-cache/acct-group/postgrey-0
 2012170251 metadata/md5-cache/acct-user/abrt-0
 2012170251 metadata/md5-cache/acct-user/airdcppd-0
 2012170251 metadata/md5-cache/acct-user/alias-0
@@ -30705,6 +30747,8 @@
 2012170251 metadata/md5-cache/acct-user/xrootd-0
 2012170251 metadata/md5-cache/acct-user/ziproxy-0
 2012170251 metadata/md5-cache/acct-user/znc-0
+2012200039 metadata/md5-cache/acct-user/Manifest.gz
+2012200039 metadata/md5-cache/acct-user/postgrey-0
 2002230040 metadata/md5-cache/app-accessibility/sound-icons-0.1
 2004032241 metadata/md5-cache/app-accessibility/mbrola-3.0.1h-r6
 2011252124 metadata/md5-cache/app-accessibility/at-spi2-atk-2.34.2
@@ -30721,7 +30765,6 @@
 2011252124 metadata/md5-cache/app-accessibility/powiedz-1.0-r2
 2011252124 metadata/md5-cache/app-accessibility/speech-dispatcher-0.9.1
 2011252124 metadata/md5-cache/app-accessibility/speech-tools-2.5.0
-2012170251 metadata/md5-cache/app-accessibility/Manifest.gz
 2012170251 metadata/md5-cache/app-accessibility/accerciser-3.36.2
 2012170019 metadata/md5-cache/app-accessibility/brltty-6.1
 2012170251 metadata/md5-cache/app-accessibility/caribou-0.4.21-r1
@@ -30742,6 +30785,8 @@
 2012170019 metadata/md5-cache/app-accessibility/speechd-el-2.8
 2012162341 metadata/md5-cache/app-accessibility/sphinx2-0.6
 2012162341 metadata/md5-cache/app-accessibility/yasr-0.6.9-r1
+2012191839 metadata/md5-cache/app-accessibility/Manifest.gz
+2012191839 metadata/md5-cache/app-accessibility/orca-3.36.6
 1903312039 metadata/md5-cache/app-admin/checksec-1.11.1
 1810171539 metadata/md5-cache/app-admin/checksec-1.9.0
 1907241909 metadata/md5-cache/app-admin/checksec-2.0.1
@@ -30842,16 +30887,13 @@
 2011252124 metadata/md5-cache/app-admin/chroot_safe-1.4-r1
 2011252124 metadata/md5-cache/app-admin/chrootuid-1.3-r2
 2011252124 metadata/md5-cache/app-admin/consul-1.7.4
-2011252124 metadata/md5-cache/app-admin/consul-1.7.7
 2011252124 metadata/md5-cache/app-admin/consul-1.7.8
-2011252124 metadata/md5-cache/app-admin/consul-1.8.3
 2011252124 metadata/md5-cache/app-admin/consul-1.8.4
 2011252124 metadata/md5-cache/app-admin/consul-template-0.25.0
 2011252124 metadata/md5-cache/app-admin/cpulimit-2.4
 2011252124 metadata/md5-cache/app-admin/dio-1.5.2-r1
 2011252124 metadata/md5-cache/app-admin/doas-6.0
 2011252124 metadata/md5-cache/app-admin/entr-4.5
-2011252124 metadata/md5-cache/app-admin/entr-4.6
 2011252124 metadata/md5-cache/app-admin/fetchlog-1.4-r1
 2011252124 metadata/md5-cache/app-admin/genromfs-0.5.2
 2011252124 metadata/md5-cache/app-admin/github-backup-utils-2.22.0
@@ -30871,8 +30913,6 @@
 2011252124 metadata/md5-cache/app-admin/paxtest-0.9.15-r1
 2011252124 metadata/md5-cache/app-admin/puppetdb-6.12.0
 2011252124 metadata/md5-cache/app-admin/puppetdb-6.13.0
-2011252124 metadata/md5-cache/app-admin/puppetserver-6.13.0
-2011252124 metadata/md5-cache/app-admin/puppetserver-6.14.0
 2011252124 metadata/md5-cache/app-admin/pwcrypt-1.2.2-r2
 2011252124 metadata/md5-cache/app-admin/pydf-12-r1
 2011252124 metadata/md5-cache/app-admin/qpage-3.3
@@ -30882,7 +30922,6 @@
 2011252124 metadata/md5-cache/app-admin/rasdaemon-0.6.2-r4
 2011252124 metadata/md5-cache/app-admin/rasdaemon-0.6.5
 2011252124 metadata/md5-cache/app-admin/rasdaemon-0.6.6
-2011252124 metadata/md5-cache/app-admin/selint-1.1.0
 2011252124 metadata/md5-cache/app-admin/su-exec-0.2
 2011252124 metadata/md5-cache/app-admin/syslog-summary-1.14-r5
 2011252124 metadata/md5-cache/app-admin/sysrqd-17
@@ -30893,7 +30932,6 @@
 2011272009 metadata/md5-cache/app-admin/graylog-4.0.1
 2012030739 metadata/md5-cache/app-admin/mongo-tools-100.2.0
 2012030239 metadata/md5-cache/app-admin/sshguard-2.4.1
-2012031339 metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.23.1
 2012032339 metadata/md5-cache/app-admin/mongo-tools-100.2.1
 2012032339 metadata/md5-cache/app-admin/mongo-tools-4.2.11
 2012050009 metadata/md5-cache/app-admin/doas-6.6.1
@@ -30903,8 +30941,6 @@
 2012170251 metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1
 2012170251 metadata/md5-cache/app-admin/ansible-2.10.0-r2
 2012170251 metadata/md5-cache/app-admin/ansible-2.10.1
-2012170251 metadata/md5-cache/app-admin/ansible-2.10.4
-2012170251 metadata/md5-cache/app-admin/ansible-9999
 2012170251 metadata/md5-cache/app-admin/ansible-base-2.10.2
 2012170251 metadata/md5-cache/app-admin/ansible-base-2.10.3
 2012170251 metadata/md5-cache/app-admin/ansible-base-2.10.4
@@ -30928,7 +30964,6 @@
 2012162341 metadata/md5-cache/app-admin/chrpath-0.16
 2012170251 metadata/md5-cache/app-admin/clog-1.3.0
 2012162341 metadata/md5-cache/app-admin/clsync-0.4.4
-2012162341 metadata/md5-cache/app-admin/clsync-0.4.5
 2012162341 metadata/md5-cache/app-admin/clsync-9999
 2012170251 metadata/md5-cache/app-admin/clustershell-1.8.3
 2012170251 metadata/md5-cache/app-admin/conky-1.10.8-r10
@@ -30940,8 +30975,6 @@
 2012170019 metadata/md5-cache/app-admin/conserver-8.2.6
 2012152339 metadata/md5-cache/app-admin/cronlocker-0.4.0_p20180710
 2012162341 metadata/md5-cache/app-admin/cronolog-1.6.2-r5
-2012162341 metadata/md5-cache/app-admin/cygwin-rebase-4.4.4
-2012162341 metadata/md5-cache/app-admin/cygwin-rebase-9999
 2012170251 metadata/md5-cache/app-admin/diamond-4.0.515.20170311-r1
 2012170251 metadata/md5-cache/app-admin/diamond-4.0.515.20200620-r1
 2012170251 metadata/md5-cache/app-admin/docker-bench-0.2.2
@@ -30956,7 +30989,6 @@
 2012170251 metadata/md5-cache/app-admin/eselect-1.4.16
 2012170251 metadata/md5-cache/app-admin/eselect-1.4.17
 2012170251 metadata/md5-cache/app-admin/eselect-9999
-2012170251 metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
 2012170251 metadata/md5-cache/app-admin/fam-2.7.0_p17_p2
 2012170019 metadata/md5-cache/app-admin/fam-2.7.0_p17_p3
 2012170251 metadata/md5-cache/app-admin/fluentd-1.2.6-r1
@@ -30982,9 +31014,6 @@
 2012170251 metadata/md5-cache/app-admin/gnome-system-log-3.9.90
 2012170251 metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823
 2012170251 metadata/md5-cache/app-admin/hardinfo-0.6_alpha_pre20201116
-2012170251 metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1
-2012170251 metadata/md5-cache/app-admin/haskell-updater-1.3.1
-2012170251 metadata/md5-cache/app-admin/haskell-updater-1.3.2
 2012162341 metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r29
 2012170251 metadata/md5-cache/app-admin/helm-3.3.4
 2012170251 metadata/md5-cache/app-admin/helm-3.4.1
@@ -31035,15 +31064,11 @@
 2012162341 metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
 2012170251 metadata/md5-cache/app-admin/ps_mem-3.13-r1
 2012170251 metadata/md5-cache/app-admin/ps_mem-3.13_p20200417
-2012170251 metadata/md5-cache/app-admin/psmon-1.39-r1
 2012170251 metadata/md5-cache/app-admin/puppet-5.5.19-r1
 2012170251 metadata/md5-cache/app-admin/puppet-5.5.21
 2012170251 metadata/md5-cache/app-admin/puppet-5.5.22
 2012170251 metadata/md5-cache/app-admin/puppet-6.18.0
 2012170251 metadata/md5-cache/app-admin/puppet-6.19.1
-2012170019 metadata/md5-cache/app-admin/puppet-agent-6.15.0
-2012170019 metadata/md5-cache/app-admin/puppet-agent-6.18.0
-2012170019 metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
 2012170251 metadata/md5-cache/app-admin/puppet-lint-2.4.2
 2012170251 metadata/md5-cache/app-admin/pwman3-0.10.0-r1
 2012170251 metadata/md5-cache/app-admin/pwman3-0.11.1
@@ -31073,11 +31098,9 @@
 2012162341 metadata/md5-cache/app-admin/sshguard-99999
 2012170251 metadata/md5-cache/app-admin/sud-1.3-r1
 2012170019 metadata/md5-cache/app-admin/sudo-1.9.3_p1
-2012170019 metadata/md5-cache/app-admin/sudo-1.9.4
 2012170019 metadata/md5-cache/app-admin/sudo-9999
 2012170251 metadata/md5-cache/app-admin/supervisor-4.2.0
 2012170251 metadata/md5-cache/app-admin/supervisor-4.2.1
-2012170251 metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
 2012162341 metadata/md5-cache/app-admin/sxid-4.2-r2
 2012170019 metadata/md5-cache/app-admin/sysklogd-2.1.2
 2012170019 metadata/md5-cache/app-admin/sysklogd-9999
@@ -31109,7 +31132,36 @@
 2012170251 metadata/md5-cache/app-admin/xkcdpass-1.17.3-r1
 2012170251 metadata/md5-cache/app-admin/xstow-1.0.1
 2012170251 metadata/md5-cache/app-admin/yadm-2.4.0
-2012180739 metadata/md5-cache/app-admin/Manifest.gz
+2012210839 metadata/md5-cache/app-admin/Manifest.gz
+2012200139 metadata/md5-cache/app-admin/ansible-2.10.4
+2012200139 metadata/md5-cache/app-admin/ansible-9999
+2012210839 metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.23.1
+2012181409 metadata/md5-cache/app-admin/clsync-0.4.5
+2012191139 metadata/md5-cache/app-admin/consul-1.7.11
+2012191139 metadata/md5-cache/app-admin/consul-1.8.7
+2012191139 metadata/md5-cache/app-admin/consul-1.9.1
+2012181739 metadata/md5-cache/app-admin/cygwin-rebase-4.4.4
+2012181739 metadata/md5-cache/app-admin/cygwin-rebase-9999
+2012201939 metadata/md5-cache/app-admin/entr-4.6
+2012210839 metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
+2012202239 metadata/md5-cache/app-admin/graylog-3.3.9
+2012210239 metadata/md5-cache/app-admin/haskell-updater-1.2.12-r1
+2012210239 metadata/md5-cache/app-admin/haskell-updater-1.3.1
+2012210239 metadata/md5-cache/app-admin/haskell-updater-1.3.2
+2012210839 metadata/md5-cache/app-admin/psmon-1.39-r1
+2012200539 metadata/md5-cache/app-admin/puppet-7.1.0
+2012210839 metadata/md5-cache/app-admin/puppet-agent-6.18.0
+2012210839 metadata/md5-cache/app-admin/puppet-agent-6.19.1-r1
+2012210839 metadata/md5-cache/app-admin/puppet-agent-7.1.0
+2012200539 metadata/md5-cache/app-admin/puppetdb-7.0.1
+2012210510 metadata/md5-cache/app-admin/puppetserver-6.12.1
+2012210510 metadata/md5-cache/app-admin/puppetserver-6.13.0
+2012210510 metadata/md5-cache/app-admin/puppetserver-6.14.0
+2012210510 metadata/md5-cache/app-admin/puppetserver-7.0.1
+2012201939 metadata/md5-cache/app-admin/selint-1.1.0
+2012181509 metadata/md5-cache/app-admin/sudo-1.9.4_p1
+2012202139 metadata/md5-cache/app-admin/sudo-1.9.4_p2
+2012210839 metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
 2012170019 metadata/md5-cache/app-antivirus/clamav-0.102.4
 2012170251 metadata/md5-cache/app-antivirus/clamtk-6.06
 2012170251 metadata/md5-cache/app-antivirus/fangfrisch-1.2.0-r1
@@ -31170,7 +31222,6 @@
 2011252124 metadata/md5-cache/app-arch/zoo-2.10-r5
 2011252124 metadata/md5-cache/app-arch/zopfli-1.0.2
 2011252124 metadata/md5-cache/app-arch/zpaq-extras-3
-2012011439 metadata/md5-cache/app-arch/libarchive-3.5.0
 2012041739 metadata/md5-cache/app-arch/lzip-1.21
 2012041739 metadata/md5-cache/app-arch/lzma-19.00
 2012071739 metadata/md5-cache/app-arch/rar-6.0.0_p20201201
@@ -31205,21 +31256,17 @@
 2012162341 metadata/md5-cache/app-arch/lrzip-0.631_p20190619
 2012170251 metadata/md5-cache/app-arch/lxqt-archiver-0.2.0
 2012170251 metadata/md5-cache/app-arch/lxqt-archiver-0.3.0
-2012170251 metadata/md5-cache/app-arch/lz4-1.9.2
-2012170251 metadata/md5-cache/app-arch/makeself-2.2.0-r2
 2012170019 metadata/md5-cache/app-arch/mscompress-0.3-r1
 2012170251 metadata/md5-cache/app-arch/mt-st-1.3
 2012170251 metadata/md5-cache/app-arch/p7zip-16.02-r4
 2012170019 metadata/md5-cache/app-arch/p7zip-16.02-r5
 2012170251 metadata/md5-cache/app-arch/p7zip-16.02-r6
 2012170251 metadata/md5-cache/app-arch/patool-1.12
-2012170251 metadata/md5-cache/app-arch/pax-20161104
 2012170251 metadata/md5-cache/app-arch/pbzip2-1.1.12
 2012170251 metadata/md5-cache/app-arch/pbzip2-1.1.13
 2012162341 metadata/md5-cache/app-arch/pdv-1.5.1-r3
 2012170251 metadata/md5-cache/app-arch/pigz-2.4-r1
 2012170251 metadata/md5-cache/app-arch/pixz-1.0.6-r1
-2012170019 metadata/md5-cache/app-arch/pixz-1.0.7
 2012170019 metadata/md5-cache/app-arch/pixz-9999
 2012170251 metadata/md5-cache/app-arch/pure-sfv-0.3-r1
 2012170251 metadata/md5-cache/app-arch/pxz-9999
@@ -31260,12 +31307,18 @@
 2012170251 metadata/md5-cache/app-arch/zopfli-1.0.3
 2012170251 metadata/md5-cache/app-arch/zpaq-7.15
 2012170019 metadata/md5-cache/app-arch/zstd-1.4.4-r4
-2012170019 metadata/md5-cache/app-arch/zstd-1.4.5
-2012171339 metadata/md5-cache/app-arch/zstd-1.4.7
-2012172009 metadata/md5-cache/app-arch/Manifest.gz
-2012172009 metadata/md5-cache/app-arch/lz4-1.9.3
+2012210839 metadata/md5-cache/app-arch/Manifest.gz
+2012181539 metadata/md5-cache/app-arch/file-roller-3.38.0
+2012182139 metadata/md5-cache/app-arch/libarchive-3.5.0
+2012202009 metadata/md5-cache/app-arch/lz4-1.9.3
+2012210839 metadata/md5-cache/app-arch/makeself-2.2.0-r2
+2012210839 metadata/md5-cache/app-arch/pax-20161104
+2012202339 metadata/md5-cache/app-arch/pixz-1.0.7
+2012201509 metadata/md5-cache/app-arch/stormlib-9.23-r1
+2012201339 metadata/md5-cache/app-arch/xar-1.8-r4
+2012202339 metadata/md5-cache/app-arch/zstd-1.4.5
+2012192109 metadata/md5-cache/app-arch/zstd-1.4.8
 1806240109 metadata/md5-cache/app-backup/ccollect-0.8
-1706110808 metadata/md5-cache/app-backup/cdbkup-1.0-r2
 1906012109 metadata/md5-cache/app-backup/consul-backinator-1.6.5
 1712281839 metadata/md5-cache/app-backup/dirvish-1.2.1
 1808151104 metadata/md5-cache/app-backup/duply-1.11.3
@@ -31277,7 +31330,6 @@
 1806091639 metadata/md5-cache/app-backup/mkstage4-0.1
 1712281839 metadata/md5-cache/app-backup/mylvmbackup-0.14
 1908281239 metadata/md5-cache/app-backup/rdumpfs-0.1
-1810092039 metadata/md5-cache/app-backup/rear-2.4
 1808151104 metadata/md5-cache/app-backup/sarab-1.0.0
 1708081209 metadata/md5-cache/app-backup/simplebackup-1.8.1-r1
 1908122340 metadata/md5-cache/app-backup/vzdump-1.2
@@ -31293,13 +31345,10 @@
 2011252124 metadata/md5-cache/app-backup/btrbk-9999
 2011252124 metadata/md5-cache/app-backup/cdbackup-0.7.1-r1
 2011252124 metadata/md5-cache/app-backup/cpdup-1.18
-2011252124 metadata/md5-cache/app-backup/rear-2.6
 2011252124 metadata/md5-cache/app-backup/snapper-0.5.6-r1
 2011271909 metadata/md5-cache/app-backup/duply-2.2.2
 2012041839 metadata/md5-cache/app-backup/backintime-1.2.1
 2012041839 metadata/md5-cache/app-backup/backintime-9999
-2012170251 metadata/md5-cache/app-backup/Manifest.gz
-2012170251 metadata/md5-cache/app-backup/amanda-3.3.9
 2012162341 metadata/md5-cache/app-backup/amanda-3.4.1
 2012162341 metadata/md5-cache/app-backup/amanda-3.4.2
 2012162341 metadata/md5-cache/app-backup/amanda-3.4.3
@@ -31352,7 +31401,6 @@
 2012170251 metadata/md5-cache/app-backup/snapper-0.8.6
 2012170251 metadata/md5-cache/app-backup/snapper-0.8.7
 2012170251 metadata/md5-cache/app-backup/snapper-0.8.9-r1
-2012170251 metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
 2012170251 metadata/md5-cache/app-backup/tarsnap-1.0.37
 2012170251 metadata/md5-cache/app-backup/tarsnap-1.0.39
 2012170251 metadata/md5-cache/app-backup/tsm-8.1.6.0
@@ -31360,6 +31408,12 @@
 2012170251 metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1
 2012170251 metadata/md5-cache/app-backup/zbackup-1.4.4-r1
 2012170251 metadata/md5-cache/app-backup/zbackup-9999
+2012210839 metadata/md5-cache/app-backup/Manifest.gz
+2012210839 metadata/md5-cache/app-backup/amanda-3.3.9
+2012181209 metadata/md5-cache/app-backup/cdbkup-1.0-r2
+2012181209 metadata/md5-cache/app-backup/rear-2.4
+2012181209 metadata/md5-cache/app-backup/rear-2.6
+2012210839 metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
 1905211939 metadata/md5-cache/app-benchmarks/bonnie++-1.98
 1907151840 metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
 1910290939 metadata/md5-cache/app-benchmarks/geekbench-2.4.2
@@ -31407,63 +31461,63 @@
 2012162341 metadata/md5-cache/app-benchmarks/sysbench-1.0.15-r1
 2012162341 metadata/md5-cache/app-benchmarks/sysbench-1.0.20
 2012162341 metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r100
-1803032108 metadata/md5-cache/app-cdr/burncdda-1.8.3
 1910111840 metadata/md5-cache/app-cdr/ccd2iso-0.3
 1805212239 metadata/md5-cache/app-cdr/cdlabelgen-4.3.0
 1712122339 metadata/md5-cache/app-cdr/disc-cover-1.5.6-r1
 1709041839 metadata/md5-cache/app-cdr/mirage2iso-0.4.2
 1806030209 metadata/md5-cache/app-cdr/mkcdtoc-1.0
-1806030209 metadata/md5-cache/app-cdr/multicd-1.7.5-r1
 2002222009 metadata/md5-cache/app-cdr/cdck-0.7.0-r2
 2003261841 metadata/md5-cache/app-cdr/cue2toc-0.4
 2004230939 metadata/md5-cache/app-cdr/xfburn-0.6.2
 2005181609 metadata/md5-cache/app-cdr/geteltorito-0.6
 2006251809 metadata/md5-cache/app-cdr/iat-0.1.7-r1
-2009150109 metadata/md5-cache/app-cdr/bashburn-3.1.0-r1
 2011252124 metadata/md5-cache/app-cdr/b5i2iso-0.2-r1
 2011252124 metadata/md5-cache/app-cdr/bchunk-1.2.2
 2011252124 metadata/md5-cache/app-cdr/bin2iso-19b-r2
 2011252124 metadata/md5-cache/app-cdr/cddetect-2.1
-2011252124 metadata/md5-cache/app-cdr/cdw-0.8.1
 2011252124 metadata/md5-cache/app-cdr/cuecue-0.2.2-r3
 2011252124 metadata/md5-cache/app-cdr/daa2iso-0.1.7e
 2011252124 metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r3
-2011252124 metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
 2011252124 metadata/md5-cache/app-cdr/gaffitter-0.6.0-r1
 2011252124 metadata/md5-cache/app-cdr/isomaster-1.3.13
 2011252124 metadata/md5-cache/app-cdr/isomaster-1.3.14
 2011252124 metadata/md5-cache/app-cdr/isomaster-1.3.15
 2011252124 metadata/md5-cache/app-cdr/nrg2iso-0.4-r2
 2011252124 metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1
-2012170251 metadata/md5-cache/app-cdr/Manifest.gz
-2012170251 metadata/md5-cache/app-cdr/brasero-3.12.2-r1
 2012170251 metadata/md5-cache/app-cdr/cdemu-3.2.4
 2012170251 metadata/md5-cache/app-cdr/cdemu-daemon-3.2.4
-2012170251 metadata/md5-cache/app-cdr/cdrdao-1.2.4
 2012170251 metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09
 2012170251 metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r2
 2012170251 metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09-r3
-2012162341 metadata/md5-cache/app-cdr/cdw-0.8.1-r1
-2012170019 metadata/md5-cache/app-cdr/cdw-9999
 2012170251 metadata/md5-cache/app-cdr/cuecue-0.2.2-r2
 2012170251 metadata/md5-cache/app-cdr/cuegen-1.2.0
 2012170251 metadata/md5-cache/app-cdr/cuetools-1.4.1
 2012170251 metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.3
 2012170251 metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.12.0
 2012170251 metadata/md5-cache/app-cdr/dvdisaster-0.79.5
-2012170251 metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10
 2012170251 metadata/md5-cache/app-cdr/extract-xiso-2.7.1
 2012170251 metadata/md5-cache/app-cdr/gcdemu-3.2.4
-2012170251 metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
 2012170251 metadata/md5-cache/app-cdr/isoimagewriter-0.8
 2012170251 metadata/md5-cache/app-cdr/kcdemu-0.8.0
 2012162341 metadata/md5-cache/app-cdr/mirage2iso-9999
-2012170251 metadata/md5-cache/app-cdr/mp3burn-0.4.2
 2012170251 metadata/md5-cache/app-cdr/plextor-tool-0.5.0
-2012170251 metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1
 2012170251 metadata/md5-cache/app-cdr/xbiso-0.6.1-r2
 2012170019 metadata/md5-cache/app-cdr/xbiso-0.6.1-r3
 2012170251 metadata/md5-cache/app-cdr/xcdroast-0.98_alpha16-r3
+2012181209 metadata/md5-cache/app-cdr/Manifest.gz
+2012181209 metadata/md5-cache/app-cdr/bashburn-3.1.0-r1
+2012181209 metadata/md5-cache/app-cdr/brasero-3.12.2-r1
+2012181209 metadata/md5-cache/app-cdr/burncdda-1.8.3
+2012181209 metadata/md5-cache/app-cdr/cdrdao-1.2.4
+2012181209 metadata/md5-cache/app-cdr/cdw-0.8.1
+2012181209 metadata/md5-cache/app-cdr/cdw-0.8.1-r1
+2012181209 metadata/md5-cache/app-cdr/cdw-9999
+2012181209 metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
+2012181209 metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10
+2012181209 metadata/md5-cache/app-cdr/graveman-0.3.12_p5-r2
+2012181209 metadata/md5-cache/app-cdr/mp3burn-0.4.2
+2012181209 metadata/md5-cache/app-cdr/multicd-1.7.5-r1
+2012181209 metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1
 1904220939 metadata/md5-cache/app-crypt/bcwipe-1.9.13
 1904282339 metadata/md5-cache/app-crypt/ccrypt-1.11
 1702282308 metadata/md5-cache/app-crypt/codecrypt-1.7.2
@@ -31476,7 +31530,6 @@
 1805212239 metadata/md5-cache/app-crypt/kali-archive-keyring-2015.2
 1806030209 metadata/md5-cache/app-crypt/keylookup-2.2
 1911131109 metadata/md5-cache/app-crypt/kstart-4.2
-1805261309 metadata/md5-cache/app-crypt/libmd-1.0.0
 1809280333 metadata/md5-cache/app-crypt/mcrypt-2.6.8-r3
 1907151840 metadata/md5-cache/app-crypt/ophcrack-tables-1.0-r2
 1811071339 metadata/md5-cache/app-crypt/paperkey-1.5
@@ -31533,9 +31586,6 @@
 2011252124 metadata/md5-cache/app-crypt/ccid-1.4.33
 2011252124 metadata/md5-cache/app-crypt/chntpw-140201
 2011252124 metadata/md5-cache/app-crypt/codegroup-20080907-r1
-2011252124 metadata/md5-cache/app-crypt/debian-archive-keyring-2018.1
-2011252124 metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1
-2011252124 metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1
 2011252124 metadata/md5-cache/app-crypt/elettra-1.0
 2011252124 metadata/md5-cache/app-crypt/gifshuffle-2.0-r1
 2011252124 metadata/md5-cache/app-crypt/gpgstats-0.5-r1
@@ -31554,7 +31604,6 @@
 2011252124 metadata/md5-cache/app-crypt/keybase-4.7.2
 2011252124 metadata/md5-cache/app-crypt/keybase-5.1.1
 2011252124 metadata/md5-cache/app-crypt/keybase-9999
-2011252124 metadata/md5-cache/app-crypt/libmd-1.0.0-r1
 2011252124 metadata/md5-cache/app-crypt/libscrypt-1.21
 2011252124 metadata/md5-cache/app-crypt/libu2f-host-1.1.10
 2011252124 metadata/md5-cache/app-crypt/md4sum-0.02.03-r2
@@ -31562,11 +31611,9 @@
 2011252124 metadata/md5-cache/app-crypt/pdfcrack-0.19
 2011252124 metadata/md5-cache/app-crypt/pkcrack-1.2.2-r1
 2011252124 metadata/md5-cache/app-crypt/rhash-1.3.6-r1
-2011252124 metadata/md5-cache/app-crypt/rhash-1.4.0
 2011252124 metadata/md5-cache/app-crypt/signify-23
 2011252124 metadata/md5-cache/app-crypt/signify-24
 2011252124 metadata/md5-cache/app-crypt/signify-29
-2011252124 metadata/md5-cache/app-crypt/signify-30
 2011252124 metadata/md5-cache/app-crypt/tc-play-2.0-r1
 2011252124 metadata/md5-cache/app-crypt/xor-analyze-0.5-r1
 2011292309 metadata/md5-cache/app-crypt/cardpeek-0.8.4
@@ -31706,9 +31753,14 @@
 2012170251 metadata/md5-cache/app-crypt/zulucrypt-5.1.0
 2012170251 metadata/md5-cache/app-crypt/zulucrypt-5.4.0
 2012170251 metadata/md5-cache/app-crypt/zulucrypt-5.4.0_pre20180223
-2012172009 metadata/md5-cache/app-crypt/Manifest.gz
-2012172009 metadata/md5-cache/app-crypt/libmd-1.0.1
 2012171609 metadata/md5-cache/app-crypt/ssss-0.5.6
+2012210839 metadata/md5-cache/app-crypt/Manifest.gz
+2012210839 metadata/md5-cache/app-crypt/debian-archive-keyring-2018.1
+2012210839 metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1
+2012210839 metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1
+2012202239 metadata/md5-cache/app-crypt/libmd-1.0.1
+2012181809 metadata/md5-cache/app-crypt/rhash-1.4.0
+2012202239 metadata/md5-cache/app-crypt/signify-30
 1910181539 metadata/md5-cache/app-dicts/bookview-3.2.1
 1808151104 metadata/md5-cache/app-dicts/freedict-deu-eng-1.0
 1702282308 metadata/md5-cache/app-dicts/libydpdict-1.0.2
@@ -32100,12 +32152,10 @@
 2011131309 metadata/md5-cache/app-dicts/sword-KJVA-3.0.1
 2011131309 metadata/md5-cache/app-dicts/sword-Scofield-1.0
 2011131309 metadata/md5-cache/app-dicts/sword-StrongsGreek-1.2
-2011252124 metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
 2011280309 metadata/md5-cache/app-dicts/sword-HunKar-2.0
 2011280309 metadata/md5-cache/app-dicts/sword-HunUj-1.8
 2011280309 metadata/md5-cache/app-dicts/sword-VieRobinson-1.0
 2011280309 metadata/md5-cache/app-dicts/sword-VieStrongsGreek-1.1
-2012170251 metadata/md5-cache/app-dicts/Manifest.gz
 2012170251 metadata/md5-cache/app-dicts/aspell-af-0.50.0
 2012170251 metadata/md5-cache/app-dicts/aspell-be-0.01-r1
 2012170251 metadata/md5-cache/app-dicts/aspell-bg-4.1.0
@@ -32244,6 +32294,8 @@
 2012170251 metadata/md5-cache/app-dicts/wordnet-3.0-r5
 2012170251 metadata/md5-cache/app-dicts/wordnet-3.1
 2012162341 metadata/md5-cache/app-dicts/ydpdict-1.0.3
+2012210839 metadata/md5-cache/app-dicts/Manifest.gz
+2012210839 metadata/md5-cache/app-dicts/dictd-wn-3.0_p33
 1908281339 metadata/md5-cache/app-doc/diveintopython-2
 1801310138 metadata/md5-cache/app-doc/diveintopython-3
 1910111840 metadata/md5-cache/app-doc/elisp-manual-25.3
@@ -32358,8 +32410,6 @@
 2011290239 metadata/md5-cache/app-doc/halibut-1.2
 2012011340 metadata/md5-cache/app-doc/mathjax-docs-2.7.7
 2012051809 metadata/md5-cache/app-doc/geant-docs-4.10.7
-2012170251 metadata/md5-cache/app-doc/Manifest.gz
-2012170251 metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
 2012170251 metadata/md5-cache/app-doc/cantera-docs-2.4.0
 2012170019 metadata/md5-cache/app-doc/casting-spels-emacs-19-r2
 2012170251 metadata/md5-cache/app-doc/cppman-0.5.1
@@ -32382,6 +32432,8 @@
 2012170251 metadata/md5-cache/app-doc/psmark-2.1
 2012170251 metadata/md5-cache/app-doc/votca-csg-manual-9999
 2012170251 metadata/md5-cache/app-doc/zeal-0.6.1_p20200815
+2012210839 metadata/md5-cache/app-doc/Manifest.gz
+2012210839 metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
 1702282308 metadata/md5-cache/app-editors/jupp-3.1_p30
 1811251609 metadata/md5-cache/app-editors/jupp-3.1_p38
 1702282308 metadata/md5-cache/app-editors/le-1.16.1
@@ -32411,8 +32463,6 @@
 2011252124 metadata/md5-cache/app-editors/mg-20171014
 2011252124 metadata/md5-cache/app-editors/mg-20180408
 2011252124 metadata/md5-cache/app-editors/mg-20200215
-2011252124 metadata/md5-cache/app-editors/moe-1.10
-2011252124 metadata/md5-cache/app-editors/moe-1.9
 2011252124 metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
 2011252124 metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180117
 2011252124 metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180719
@@ -32423,7 +32473,6 @@
 2012040209 metadata/md5-cache/app-editors/scite-4.3.3
 2012040209 metadata/md5-cache/app-editors/scite-4.4.4
 2012071709 metadata/md5-cache/app-editors/scite-4.4.4-r10
-2012170251 metadata/md5-cache/app-editors/Manifest.gz
 2012170251 metadata/md5-cache/app-editors/amyedit-1.0-r2
 2012170019 metadata/md5-cache/app-editors/beaver-0.4.1-r1
 2012170251 metadata/md5-cache/app-editors/bluefish-2.2.10
@@ -32524,6 +32573,9 @@
 2012170251 metadata/md5-cache/app-editors/xemacs-21.5.34-r4
 2012170251 metadata/md5-cache/app-editors/xemacs-21.5.34-r5
 2012170251 metadata/md5-cache/app-editors/xmlcopyeditor-1.2.1.3-r1
+2012210839 metadata/md5-cache/app-editors/Manifest.gz
+2012210839 metadata/md5-cache/app-editors/moe-1.10
+2012210839 metadata/md5-cache/app-editors/moe-1.9
 2012170251 metadata/md5-cache/app-emacs/Manifest.gz
 2012170019 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2012170019 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
@@ -32824,7 +32876,6 @@
 2004132009 metadata/md5-cache/app-emulation/wine-mono-4.9.4
 2004231009 metadata/md5-cache/app-emulation/virtio-win-0.1.173.9
 2004260039 metadata/md5-cache/app-emulation/wine-mono-5.0.0
-2005140909 metadata/md5-cache/app-emulation/qemu-riscv64-bin-3.1.0-r4
 2006200709 metadata/md5-cache/app-emulation/wine-mono-5.1.0
 2006251439 metadata/md5-cache/app-emulation/virtio-win-0.1.185.1
 2007110439 metadata/md5-cache/app-emulation/qemu-riscv64-bin-5.0.0
@@ -32844,7 +32895,6 @@
 2011121909 metadata/md5-cache/app-emulation/kompose-1.22.0
 2011160239 metadata/md5-cache/app-emulation/libdsk-1.5.8
 2011252124 metadata/md5-cache/app-emulation/coldfire-0.3.1
-2011252124 metadata/md5-cache/app-emulation/crossover-bin-19.0.1-r1
 2011252124 metadata/md5-cache/app-emulation/distrobuilder-1.1
 2011252124 metadata/md5-cache/app-emulation/dlx-1.5.20
 2011252124 metadata/md5-cache/app-emulation/firecracker-bin-0.23.0
@@ -32923,10 +32973,6 @@
 2012170019 metadata/md5-cache/app-emulation/hercules-3.13
 2012162341 metadata/md5-cache/app-emulation/hyperd-0.7.0-r1
 2012152339 metadata/md5-cache/app-emulation/img-0.5.7-r1
-2012170251 metadata/md5-cache/app-emulation/libguestfs-1.36.13
-2012170251 metadata/md5-cache/app-emulation/libguestfs-1.36.15
-2012170251 metadata/md5-cache/app-emulation/libguestfs-1.38.6
-2012170251 metadata/md5-cache/app-emulation/libguestfs-1.38.6-r100
 2012170251 metadata/md5-cache/app-emulation/libguestfs-appliance-1.38.0
 2012170251 metadata/md5-cache/app-emulation/libpod-2.1.0
 2012162341 metadata/md5-cache/app-emulation/libspectrum-1.4.4
@@ -33018,14 +33064,21 @@
 2012162341 metadata/md5-cache/app-emulation/x48-0.6.4-r2
 2012170251 metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
 2012170019 metadata/md5-cache/app-emulation/xen-4.13.2-r2
-2012170019 metadata/md5-cache/app-emulation/xen-4.14.0-r6
 2012170019 metadata/md5-cache/app-emulation/xen-pvgrub-4.13.2
 2012170019 metadata/md5-cache/app-emulation/xen-pvgrub-4.14.0
 2012170251 metadata/md5-cache/app-emulation/xen-tools-4.13.2-r1
-2012170251 metadata/md5-cache/app-emulation/xen-tools-4.14.0-r4
 2012170251 metadata/md5-cache/app-emulation/xtrs-4.9d-r5
-2012172009 metadata/md5-cache/app-emulation/Manifest.gz
 2012172009 metadata/md5-cache/app-emulation/virt-manager-3.1.0
+2012210839 metadata/md5-cache/app-emulation/Manifest.gz
+2012210839 metadata/md5-cache/app-emulation/crossover-bin-19.0.1-r1
+2012181209 metadata/md5-cache/app-emulation/libguestfs-1.36.13
+2012181209 metadata/md5-cache/app-emulation/libguestfs-1.36.15
+2012181209 metadata/md5-cache/app-emulation/libguestfs-1.38.6
+2012181209 metadata/md5-cache/app-emulation/libguestfs-1.38.6-r100
+2012202239 metadata/md5-cache/app-emulation/xen-4.13.2-r3
+2012202239 metadata/md5-cache/app-emulation/xen-4.14.0-r7
+2012202239 metadata/md5-cache/app-emulation/xen-tools-4.13.2-r2
+2012202239 metadata/md5-cache/app-emulation/xen-tools-4.14.0-r5
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1-r1
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1.1
 1911131109 metadata/md5-cache/app-eselect/eselect-lcdfilter-2
@@ -33100,7 +33153,6 @@
 2011252124 metadata/md5-cache/app-forensics/radamsa-0.6
 2011252124 metadata/md5-cache/app-forensics/rifiuti-20040505_p1
 2011252124 metadata/md5-cache/app-forensics/unhide-20130526
-2012170251 metadata/md5-cache/app-forensics/Manifest.gz
 2012162341 metadata/md5-cache/app-forensics/afflib-3.7.18
 2012162341 metadata/md5-cache/app-forensics/afflib-3.7.19
 2012170019 metadata/md5-cache/app-forensics/afl-2.56b
@@ -33111,12 +33163,13 @@
 2012162341 metadata/md5-cache/app-forensics/dfxml-99999999
 2012170251 metadata/md5-cache/app-forensics/lynis-3.0.1
 2012170251 metadata/md5-cache/app-forensics/ovaldi-5.10.1.7
-2012170251 metadata/md5-cache/app-forensics/quickfuzz-0.1_p20160920
-2012170251 metadata/md5-cache/app-forensics/quickfuzz-9999
 2012170251 metadata/md5-cache/app-forensics/rkhunter-1.4.6-r1
 2012170251 metadata/md5-cache/app-forensics/sleuthkit-4.10.1
 2012170251 metadata/md5-cache/app-forensics/sleuthkit-4.9.0
 2012170251 metadata/md5-cache/app-forensics/yasat-848
+2012210239 metadata/md5-cache/app-forensics/Manifest.gz
+2012210239 metadata/md5-cache/app-forensics/quickfuzz-0.1_p20160920
+2012210239 metadata/md5-cache/app-forensics/quickfuzz-9999
 1910230639 metadata/md5-cache/app-i18n/cstools-3.42-r1
 1707181708 metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23
 1708161738 metadata/md5-cache/app-i18n/ibus-fbterm-1.0.1
@@ -33242,8 +33295,6 @@
 2012170019 metadata/md5-cache/app-i18n/ibus-table-1.9.21-r2
 2012170251 metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.2
 2012170251 metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.3
-2012170019 metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.1
-2012170019 metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.7
 2012170251 metadata/md5-cache/app-i18n/im-canna-0.3.2.2
 2012170251 metadata/md5-cache/app-i18n/im-canna-0.3.2.2-r1
 2012162341 metadata/md5-cache/app-i18n/im-chooser-1.7.0
@@ -33304,8 +33355,10 @@
 2012162341 metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r3
 2012170251 metadata/md5-cache/app-i18n/zinnia-0.06-r3
 2012162341 metadata/md5-cache/app-i18n/zinnia-tomoe-0.6.0_p20080911
-2012171709 metadata/md5-cache/app-i18n/Manifest.gz
 2012171709 metadata/md5-cache/app-i18n/transifex-client-0.14.2
+2012181709 metadata/md5-cache/app-i18n/Manifest.gz
+2012181709 metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.1
+2012181709 metadata/md5-cache/app-i18n/ibus-typing-booster-2.10.2
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2011252124 metadata/md5-cache/app-laptop/ibam-0.5.2-r4
 2011252124 metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r1
@@ -33401,7 +33454,6 @@
 1910161339 metadata/md5-cache/app-misc/astrolog-ephemeris-5.40
 1805222139 metadata/md5-cache/app-misc/cadubi-1.3
 1907151840 metadata/md5-cache/app-misc/cbview-0.06-r1
-1810041139 metadata/md5-cache/app-misc/cdcat-0.3-r1
 1702282309 metadata/md5-cache/app-misc/esekeyd-1.2.7
 1907241139 metadata/md5-cache/app-misc/gentoo-elections-0_p20190710
 1907271310 metadata/md5-cache/app-misc/grabcartoons-2.8.4_p20141112
@@ -33578,7 +33630,6 @@
 2012170251 metadata/md5-cache/app-misc/away-0.9.5-r2
 2012170251 metadata/md5-cache/app-misc/banner-1.3.3
 2012162341 metadata/md5-cache/app-misc/bb-1.3.0_rc1-r5
-2012170251 metadata/md5-cache/app-misc/beancounter-0.8.10-r1
 2012170251 metadata/md5-cache/app-misc/beanstalkd-1.10
 2012170251 metadata/md5-cache/app-misc/beanstalkd-1.11
 2012170251 metadata/md5-cache/app-misc/bfr-1.6-r3
@@ -33601,7 +33652,6 @@
 2012170251 metadata/md5-cache/app-misc/cmatrix-1.2a-r4
 2012170251 metadata/md5-cache/app-misc/cmatrix-2.0-r2
 2012170251 metadata/md5-cache/app-misc/color-1.2-r2
-2012170251 metadata/md5-cache/app-misc/conmux-0.15.1-r3
 2012170251 metadata/md5-cache/app-misc/crunch-3.6
 2012162341 metadata/md5-cache/app-misc/cstream-3.1.1-r1
 2012170251 metadata/md5-cache/app-misc/cw-1.0.16-r3
@@ -33635,9 +33685,6 @@
 2012170251 metadata/md5-cache/app-misc/figlet-2.2.5
 2012170251 metadata/md5-cache/app-misc/figlet-2.2.5-r1
 2012170251 metadata/md5-cache/app-misc/figlet-9999
-2012170251 metadata/md5-cache/app-misc/flirc-3.22.4
-2012170251 metadata/md5-cache/app-misc/flirc-3.24.0
-2012170251 metadata/md5-cache/app-misc/flirc-3.25.2
 2012170251 metadata/md5-cache/app-misc/freewvs-0.1.1
 2012162341 metadata/md5-cache/app-misc/fsniper-1.3.1-r2
 2012162341 metadata/md5-cache/app-misc/g15composer-3.2-r1
@@ -33662,7 +33709,6 @@
 2012170251 metadata/md5-cache/app-misc/glimpse-4.18.6-r1
 2012170251 metadata/md5-cache/app-misc/gnote-3.36.2
 2012170251 metadata/md5-cache/app-misc/gnuit-4.9.5-r2
-2012170251 metadata/md5-cache/app-misc/golly-3.4
 2012170251 metadata/md5-cache/app-misc/golly-4.0
 2012170251 metadata/md5-cache/app-misc/goobook-3.4-r1
 2012170251 metadata/md5-cache/app-misc/gramps-5.1.2-r1
@@ -33700,7 +33746,6 @@
 2012170019 metadata/md5-cache/app-misc/lirc-0.10.1-r4
 2012170251 metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r3
 2012170019 metadata/md5-cache/app-misc/lsx-0.1-r1
-2012170019 metadata/md5-cache/app-misc/mc-4.8.24
 2012170019 metadata/md5-cache/app-misc/mc-4.8.25
 2012170019 metadata/md5-cache/app-misc/mc-4.8.25-r1
 2012170019 metadata/md5-cache/app-misc/mc-9999
@@ -33726,7 +33771,6 @@
 2012170251 metadata/md5-cache/app-misc/nnn-3.4
 2012170251 metadata/md5-cache/app-misc/nnn-3.5
 2012152339 metadata/md5-cache/app-misc/notary-0.6.1-r1
-2012170251 metadata/md5-cache/app-misc/note-1.3.3-r1
 2012170251 metadata/md5-cache/app-misc/oneko-1.2-r2
 2012170251 metadata/md5-cache/app-misc/oneko-1.2_p5
 2012170251 metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
@@ -33734,7 +33778,6 @@
 2012170251 metadata/md5-cache/app-misc/pdfpc-4.3.0
 2012170251 metadata/md5-cache/app-misc/pdfpc-4.4.0
 2012170019 metadata/md5-cache/app-misc/physlock-13-r1
-2012170251 metadata/md5-cache/app-misc/prog-express-3.8.8
 2012170251 metadata/md5-cache/app-misc/qcma-0.4.1
 2012170251 metadata/md5-cache/app-misc/qcma-0.4.2_pre20181227
 2012170251 metadata/md5-cache/app-misc/qcma-9999
@@ -33768,7 +33811,6 @@
 2012170251 metadata/md5-cache/app-misc/skim-0.7.0
 2012170251 metadata/md5-cache/app-misc/skim-0.8.1
 2012170251 metadata/md5-cache/app-misc/slmon-0.5.13
-2012170251 metadata/md5-cache/app-misc/smtm-1.6.10-r1
 2012170251 metadata/md5-cache/app-misc/socnetv-2.2
 2012170251 metadata/md5-cache/app-misc/solaar-1.0.1-r1
 2012170251 metadata/md5-cache/app-misc/solaar-1.0.2
@@ -33802,7 +33844,6 @@
 2012170251 metadata/md5-cache/app-misc/tmuxp-1.6.2
 2012170251 metadata/md5-cache/app-misc/todo-2.11.0
 2012170251 metadata/md5-cache/app-misc/todo-2.12.0-r1
-2012170251 metadata/md5-cache/app-misc/tracker-2.3.4
 2012170019 metadata/md5-cache/app-misc/tracker-miners-2.3.3
 2012170251 metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816-r1
 2012170251 metadata/md5-cache/app-misc/trash-cli-0.20.11.23
@@ -33831,10 +33872,24 @@
 2012170251 metadata/md5-cache/app-misc/yq-2.9.2-r1
 2012170019 metadata/md5-cache/app-misc/zisofs-tools-1.0.8
 2012170251 metadata/md5-cache/app-misc/zygrib-8.0.1-r1
-2012172109 metadata/md5-cache/app-misc/Manifest.gz
 2012172109 metadata/md5-cache/app-misc/datovka-4.15.3
 2012172109 metadata/md5-cache/app-misc/khal-0.10.2
 2012171839 metadata/md5-cache/app-misc/klavaro-3.0.1
+2012210839 metadata/md5-cache/app-misc/Manifest.gz
+2012210839 metadata/md5-cache/app-misc/beancounter-0.8.10-r1
+2012181209 metadata/md5-cache/app-misc/cdcat-0.3-r1
+2012210839 metadata/md5-cache/app-misc/conmux-0.15.1-r3
+2012210839 metadata/md5-cache/app-misc/flirc-3.22.4
+2012210839 metadata/md5-cache/app-misc/flirc-3.24.0
+2012210839 metadata/md5-cache/app-misc/flirc-3.25.2
+2012210839 metadata/md5-cache/app-misc/note-1.3.3-r1
+2012200109 metadata/md5-cache/app-misc/pax-utils-1.2.7
+2012202339 metadata/md5-cache/app-misc/pax-utils-1.2.8
+2012210839 metadata/md5-cache/app-misc/prog-express-3.8.8
+2012210839 metadata/md5-cache/app-misc/smtm-1.6.10-r1
+2012191839 metadata/md5-cache/app-misc/tracker-2.3.4
+2012191839 metadata/md5-cache/app-misc/tracker-2.3.5
+2012191839 metadata/md5-cache/app-misc/tracker-miners-2.3.4
 1702282309 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1710020739 metadata/md5-cache/app-mobilephone/dfu-util-0.9
 1908291509 metadata/md5-cache/app-mobilephone/gnocky-0.0.7
@@ -33867,11 +33922,8 @@
 2011252124 metadata/md5-cache/app-office/sc-7.16-r2
 2011252124 metadata/md5-cache/app-office/unoconv-0.9
 2011252124 metadata/md5-cache/app-office/unoconv-0.9.0
-2011252124 metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
-2011252124 metadata/md5-cache/app-office/wps-office-11.1.0.9615
 2011270239 metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
 2012091109 metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
-2012100009 metadata/md5-cache/app-office/wps-office-11.1.0.9719
 2012130039 metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.7.2_p1
 2012162341 metadata/md5-cache/app-office/abiword-3.0.4
 2012170251 metadata/md5-cache/app-office/abiword-docs-3.0.2
@@ -33926,10 +33978,13 @@
 2012170251 metadata/md5-cache/app-office/texstudio-9999
 2012170251 metadata/md5-cache/app-office/unoconv-0.8.2
 2012170251 metadata/md5-cache/app-office/upwork-5.4.5.1
-2012172009 metadata/md5-cache/app-office/Manifest.gz
 2012171639 metadata/md5-cache/app-office/libreoffice-7.0.4.2
 2012171639 metadata/md5-cache/app-office/libreoffice-l10n-7.0.4.2
-2012172009 metadata/md5-cache/app-office/scribus-1.5.6.1
+2012210839 metadata/md5-cache/app-office/Manifest.gz
+2012202239 metadata/md5-cache/app-office/scribus-1.5.6.1
+2012210839 metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
+2012210839 metadata/md5-cache/app-office/wps-office-11.1.0.9615
+2012210839 metadata/md5-cache/app-office/wps-office-11.1.0.9719
 2012170251 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
 2012170019 metadata/md5-cache/app-officeext/ct2n-1.5.0
 2012170251 metadata/md5-cache/app-officeext/dmaths-3.4.9.0-r1
@@ -33942,39 +33997,29 @@
 2012172009 metadata/md5-cache/app-officeext/Manifest.gz
 2012172009 metadata/md5-cache/app-officeext/ooofbtools-2.57
 1902181039 metadata/md5-cache/app-pda/ideviceinstaller-1.1.0
-1911201439 metadata/md5-cache/app-pda/libusbmuxd-1.0.10-r1
 2007181809 metadata/md5-cache/app-pda/ifuse-1.1.3-r1
 2011252124 metadata/md5-cache/app-pda/iripdb-0.1.3b
 2012170251 metadata/md5-cache/app-pda/barry-0.18.3
 2012162341 metadata/md5-cache/app-pda/dynamite-0.1.1_p20120512
-2012170251 metadata/md5-cache/app-pda/gnupod-0.99.8-r2
 2012170019 metadata/md5-cache/app-pda/gtkpod-2.1.5-r1
 2012162341 metadata/md5-cache/app-pda/jpilot-1.8.2-r1
-2012162341 metadata/md5-cache/app-pda/libimobiledevice-1.2.0-r1
-2012162341 metadata/md5-cache/app-pda/libimobiledevice-1.2.1_pre20200220
-2012162341 metadata/md5-cache/app-pda/libplist-2.1.0
-2012162341 metadata/md5-cache/app-pda/libplist-2.2.0-r1
-2012162341 metadata/md5-cache/app-pda/libusbmuxd-2.0.1
 2012162341 metadata/md5-cache/app-pda/pilot-link-0.12.5-r3
 2012162341 metadata/md5-cache/app-pda/usbmuxd-1.1.1_pre20200121
-2012172009 metadata/md5-cache/app-pda/Manifest.gz
-2012172009 metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1
-2012172009 metadata/md5-cache/app-pda/libplist-2.2.0-r2
-2012172009 metadata/md5-cache/app-pda/libusbmuxd-2.0.2-r1
-2012172009 metadata/md5-cache/app-pda/usbmuxd-1.1.1
+2012210839 metadata/md5-cache/app-pda/Manifest.gz
+2012210839 metadata/md5-cache/app-pda/gnupod-0.99.8-r2
+2012202239 metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1
+2012202239 metadata/md5-cache/app-pda/libplist-2.2.0-r2
+2012202239 metadata/md5-cache/app-pda/libusbmuxd-2.0.2-r1
+2012202239 metadata/md5-cache/app-pda/usbmuxd-1.1.1
 1905181309 metadata/md5-cache/app-portage/epkg-0.4-r1
 2002112051 metadata/md5-cache/app-portage/euses-2.5.9
 2002112051 metadata/md5-cache/app-portage/perl-info-0.16
 2003091809 metadata/md5-cache/app-portage/prefix-toolkit-8
 2003131739 metadata/md5-cache/app-portage/prefix-toolkit-9
-2003261841 metadata/md5-cache/app-portage/elt-patches-20170826.1
 2004032241 metadata/md5-cache/app-portage/demerge-0.047-r3
 2004032241 metadata/md5-cache/app-portage/emerge-delta-webrsync-3.7.6
 2004110239 metadata/md5-cache/app-portage/g-cpan-0.16.9-r1
 2004110239 metadata/md5-cache/app-portage/g-cpan-0.17.0
-2004211009 metadata/md5-cache/app-portage/elt-patches-20170317
-2004211009 metadata/md5-cache/app-portage/elt-patches-20170422
-2004211009 metadata/md5-cache/app-portage/elt-patches-20170815
 2005172109 metadata/md5-cache/app-portage/portage-utils-0.87
 2008171839 metadata/md5-cache/app-portage/portage-utils-0.89
 2008291939 metadata/md5-cache/app-portage/repo-commit-0.4.1-r1
@@ -33990,7 +34035,6 @@
 2011252124 metadata/md5-cache/app-portage/gverify-2
 2011252124 metadata/md5-cache/app-portage/portpeek-3.1.5
 2012031439 metadata/md5-cache/app-portage/mgorny-dev-scripts-6
-2012051839 metadata/md5-cache/app-portage/elt-patches-20201205
 2012070709 metadata/md5-cache/app-portage/pram-9
 2012170251 metadata/md5-cache/app-portage/cfg-update-1.8.9
 2012170251 metadata/md5-cache/app-portage/conf-update-1.0.3-r1
@@ -33999,8 +34043,6 @@
 2012170251 metadata/md5-cache/app-portage/diffmask-0.3.3-r4
 2012170251 metadata/md5-cache/app-portage/diffmask-9999
 2012170251 metadata/md5-cache/app-portage/distpatch-0.1.2-r2
-2012170251 metadata/md5-cache/app-portage/eix-0.34.10
-2012170251 metadata/md5-cache/app-portage/eix-0.34.9
 2012170251 metadata/md5-cache/app-portage/elicense-1.0.2
 2012170251 metadata/md5-cache/app-portage/elicense-9999
 2012170251 metadata/md5-cache/app-portage/elogv-0.7.8-r3
@@ -34011,8 +34053,6 @@
 2012170251 metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r1
 2012170251 metadata/md5-cache/app-portage/flaggie-0.2.1-r1
 2012170251 metadata/md5-cache/app-portage/flaggie-9999
-2012170251 metadata/md5-cache/app-portage/fquery-0.2.3
-2012170251 metadata/md5-cache/app-portage/fquery-0.2.3-r1
 2012170251 metadata/md5-cache/app-portage/g-octave-0.4.1-r7
 2012170251 metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
 2012170251 metadata/md5-cache/app-portage/gander-0.0.1
@@ -34024,9 +34064,6 @@
 2012170251 metadata/md5-cache/app-portage/genlop-0.30.10-r2
 2012170251 metadata/md5-cache/app-portage/genlop-0.30.9-r1
 2012170251 metadata/md5-cache/app-portage/genlop-9999
-2012170251 metadata/md5-cache/app-portage/gentoolkit-0.4.6
-2012170251 metadata/md5-cache/app-portage/gentoolkit-0.4.7
-2012170251 metadata/md5-cache/app-portage/gentoolkit-0.4.8
 2012170251 metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2
 2012170251 metadata/md5-cache/app-portage/gentoolkit-9999
 2012170251 metadata/md5-cache/app-portage/gentoopm-0.3.1
@@ -34038,11 +34075,7 @@
 2012170251 metadata/md5-cache/app-portage/golop-9999
 2012170251 metadata/md5-cache/app-portage/gpyutils-0.4.5
 2012170251 metadata/md5-cache/app-portage/gpyutils-9999
-2012170251 metadata/md5-cache/app-portage/grs-0.7
-2012170251 metadata/md5-cache/app-portage/grs-9999
 2012170251 metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
-2012170019 metadata/md5-cache/app-portage/hackport-0.6.6
-2012170251 metadata/md5-cache/app-portage/hackport-9999
 2012160540 metadata/md5-cache/app-portage/java-ebuilder-0.5.1
 2012160540 metadata/md5-cache/app-portage/java-ebuilder-9999
 2012171339 metadata/md5-cache/app-portage/kuroo-1.0.0
@@ -34076,9 +34109,20 @@
 2012170251 metadata/md5-cache/app-portage/tatt-9999
 2012162341 metadata/md5-cache/app-portage/ufed-0.96
 2012162341 metadata/md5-cache/app-portage/ufed-9999
-2012172039 metadata/md5-cache/app-portage/Manifest.gz
-2012172009 metadata/md5-cache/app-portage/eix-0.34.11
 2012172009 metadata/md5-cache/app-portage/unsymlink-lib-19
+2012210239 metadata/md5-cache/app-portage/Manifest.gz
+2012202239 metadata/md5-cache/app-portage/eix-0.34.11
+2012181739 metadata/md5-cache/app-portage/elt-patches-20170317
+2012181739 metadata/md5-cache/app-portage/elt-patches-20170422
+2012181739 metadata/md5-cache/app-portage/elt-patches-20170815
+2012181739 metadata/md5-cache/app-portage/elt-patches-20170826.1
+2012181739 metadata/md5-cache/app-portage/elt-patches-20201205
+2012210239 metadata/md5-cache/app-portage/fquery-0.2.3
+2012210239 metadata/md5-cache/app-portage/fquery-0.2.3-r1
+2012181209 metadata/md5-cache/app-portage/grs-0.7
+2012181209 metadata/md5-cache/app-portage/grs-9999
+2012210239 metadata/md5-cache/app-portage/hackport-0.6.6
+2012210239 metadata/md5-cache/app-portage/hackport-9999
 1712261510 metadata/md5-cache/app-shells/dsh-0.25.10-r1
 1910170740 metadata/md5-cache/app-shells/psh-1.8.1-r3
 1907092339 metadata/md5-cache/app-shells/rush-2.0
@@ -34130,7 +34174,6 @@
 2012170251 metadata/md5-cache/app-shells/bash-completion-2.11
 2012162341 metadata/md5-cache/app-shells/bash-completion-9999
 2012162341 metadata/md5-cache/app-shells/ctypes-sh-1.2
-2012170019 metadata/md5-cache/app-shells/dash-0.5.11.2
 2012170251 metadata/md5-cache/app-shells/esh-0.8.5-r2
 2012170251 metadata/md5-cache/app-shells/fish-3.0.2
 2012170251 metadata/md5-cache/app-shells/fish-3.1.0
@@ -34169,7 +34212,9 @@
 2012170019 metadata/md5-cache/app-shells/yash-2.51
 2012170019 metadata/md5-cache/app-shells/zsh-5.8
 2012170019 metadata/md5-cache/app-shells/zsh-9999
-2012171709 metadata/md5-cache/app-shells/Manifest.gz
+2012202009 metadata/md5-cache/app-shells/Manifest.gz
+2012201339 metadata/md5-cache/app-shells/bash-5.1_p4
+2012202009 metadata/md5-cache/app-shells/dash-0.5.11.2
 1801051609 metadata/md5-cache/app-text/antixls-0.3b
 1803271139 metadata/md5-cache/app-text/convmv-2.05
 1910111840 metadata/md5-cache/app-text/dbacl-1.14
@@ -34224,7 +34269,6 @@
 2004211009 metadata/md5-cache/app-text/docbook-sgml-dtd-4.2-r3
 2004211009 metadata/md5-cache/app-text/docbook-sgml-dtd-4.3-r3
 2004211009 metadata/md5-cache/app-text/docbook-sgml-dtd-4.4-r1
-2004211009 metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r1
 2004211009 metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r7
 2004211009 metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r3
 2004211009 metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r2
@@ -34306,8 +34350,6 @@
 2011252124 metadata/md5-cache/app-text/mathtex-1.04
 2011252124 metadata/md5-cache/app-text/mpage-2.5.6-r1
 2011252124 metadata/md5-cache/app-text/o3read-0.0.4
-2011252124 metadata/md5-cache/app-text/ocrad-0.26
-2011252124 metadata/md5-cache/app-text/ocrad-0.27
 2011252124 metadata/md5-cache/app-text/odt2txt-0.5
 2011252124 metadata/md5-cache/app-text/par-1.52-r1
 2011252124 metadata/md5-cache/app-text/par-1.53.0
@@ -34317,7 +34359,6 @@
 2011252124 metadata/md5-cache/app-text/pspresent-1.3-r1
 2011252124 metadata/md5-cache/app-text/psutils-1.17-r3
 2011252124 metadata/md5-cache/app-text/q-text-as-data-2.0.10
-2011252124 metadata/md5-cache/app-text/rnv-1.7.11-r1
 2011252124 metadata/md5-cache/app-text/scdoc-1.11.0
 2011252124 metadata/md5-cache/app-text/scdoc-9999
 2011252124 metadata/md5-cache/app-text/sloccount-2.26-r3
@@ -34340,9 +34381,7 @@
 2011252124 metadata/md5-cache/app-text/zathura-pdf-poppler-9999
 2011252124 metadata/md5-cache/app-text/zathura-ps-0.2.6
 2011252124 metadata/md5-cache/app-text/zathura-ps-9999
-2011271209 metadata/md5-cache/app-text/diction-1.14
 2011270009 metadata/md5-cache/app-text/u2ps-1.2
-2011271939 metadata/md5-cache/app-text/an-1.2_p6
 2011272109 metadata/md5-cache/app-text/hnb-1.9.18-r1
 2011271909 metadata/md5-cache/app-text/pastebinit-1.5.1
 2011271909 metadata/md5-cache/app-text/u2ps-1.1
@@ -34360,9 +34399,7 @@
 2012081639 metadata/md5-cache/app-text/po4a-0.62
 2012102239 metadata/md5-cache/app-text/liblangtag-0.6.3
 2012131109 metadata/md5-cache/app-text/bdf2psf-1.155
-2012131109 metadata/md5-cache/app-text/wdiff-1.2.2-r1
 2012131509 metadata/md5-cache/app-text/xapian-omega-1.4.17
-2012140439 metadata/md5-cache/app-text/mandoc-1.14.5-r1
 2012140439 metadata/md5-cache/app-text/qpdf-10.0.4
 2012150709 metadata/md5-cache/app-text/scdoc-1.11.1
 2012170251 metadata/md5-cache/app-text/a2ps-4.14-r6
@@ -34389,7 +34426,6 @@
 2012170251 metadata/md5-cache/app-text/calibre-5.6.0
 2012170251 metadata/md5-cache/app-text/capyt-1.1.1
 2012170251 metadata/md5-cache/app-text/cb2bib-2.0.0-r1
-2012170251 metadata/md5-cache/app-text/chasen-2.4.4-r3
 2012170251 metadata/md5-cache/app-text/cherrytree-0.99.0_p20200523
 2012170251 metadata/md5-cache/app-text/cherrytree-9999
 2012170251 metadata/md5-cache/app-text/cmark-0.29.0
@@ -34418,7 +34454,6 @@
 2012162341 metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r4
 2012170251 metadata/md5-cache/app-text/docbook2X-0.8.8-r4
 2012170251 metadata/md5-cache/app-text/dvipng-1.15-r1
-2012170019 metadata/md5-cache/app-text/dvipng-1.17
 2012170251 metadata/md5-cache/app-text/dvisvgm-2.1.3
 2012170019 metadata/md5-cache/app-text/dvisvgm-2.10.1
 2012170251 metadata/md5-cache/app-text/dvisvgm-2.6.1
@@ -34431,7 +34466,6 @@
 2012170251 metadata/md5-cache/app-text/enscript-1.6.6
 2012170251 metadata/md5-cache/app-text/epspdf-0.6.0-r1
 2012170251 metadata/md5-cache/app-text/epstool-3.08-r1
-2012170251 metadata/md5-cache/app-text/epstool-3.09
 2012170251 metadata/md5-cache/app-text/evince-3.36.7
 2012170251 metadata/md5-cache/app-text/fb2edit-0.1.0
 2012170251 metadata/md5-cache/app-text/fblog-1.4.1
@@ -34446,15 +34480,12 @@
 2012170251 metadata/md5-cache/app-text/grip-4.5.2-r1
 2012170251 metadata/md5-cache/app-text/groonga-6.1.2
 2012170251 metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1
-2012170251 metadata/md5-cache/app-text/grutatxt-2.0.16-r1
-2012170251 metadata/md5-cache/app-text/gspell-1.6.1
 2012170251 metadata/md5-cache/app-text/gspell-1.8.3
 2012170019 metadata/md5-cache/app-text/gtkspell-2.0.16-r1
 2012170251 metadata/md5-cache/app-text/gtkspell-3.0.10
 2012170251 metadata/md5-cache/app-text/gtranslator-3.36.0
 2012170251 metadata/md5-cache/app-text/gv-3.7.3.90
 2012170251 metadata/md5-cache/app-text/highlight-3.57
-2012170251 metadata/md5-cache/app-text/htag-0.0.24-r1
 2012170251 metadata/md5-cache/app-text/htmlc-2.60.0
 2012170019 metadata/md5-cache/app-text/htmlinc-1.0_beta1-r2
 2012170251 metadata/md5-cache/app-text/htmlmin-0.1.12
@@ -34520,7 +34551,6 @@
 2012170251 metadata/md5-cache/app-text/opensp-1.5.2-r3
 2012170251 metadata/md5-cache/app-text/opensp-1.5.2-r6
 2012170251 metadata/md5-cache/app-text/ots-0.5.0-r1
-2012170019 metadata/md5-cache/app-text/pandoc-2.9.2.1
 2012170251 metadata/md5-cache/app-text/paperwork-1.3.1
 2012170251 metadata/md5-cache/app-text/paperwork-backend-1.3.1
 2012170251 metadata/md5-cache/app-text/paperwork-backend-1.3.1-r1
@@ -34584,11 +34614,9 @@
 2012170251 metadata/md5-cache/app-text/trang-20151127
 2012170251 metadata/md5-cache/app-text/tree-1.7.0
 2012170251 metadata/md5-cache/app-text/tree-1.7.0-r1
-2012170251 metadata/md5-cache/app-text/tree-1.8.0
 2012162341 metadata/md5-cache/app-text/ttf2pk2-2.0_p20200406
 2012170251 metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
 2012162341 metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
-2012170251 metadata/md5-cache/app-text/txt2tags-3.3
 2012162341 metadata/md5-cache/app-text/unac-1.8.0
 2012162341 metadata/md5-cache/app-text/unpaper-9999
 2012162341 metadata/md5-cache/app-text/uudeview-0.5.20-r2
@@ -34617,16 +34645,31 @@
 2012170251 metadata/md5-cache/app-text/xpdf-4.02-r4
 2012170251 metadata/md5-cache/app-text/yelp-tools-3.32.2
 2012170019 metadata/md5-cache/app-text/yodl-4.02.02-r1
-2012170251 metadata/md5-cache/app-text/zathura-djvu-0.2.8
-2012170019 metadata/md5-cache/app-text/zathura-djvu-0.2.9
 2012170019 metadata/md5-cache/app-text/zathura-djvu-9999
-2012180209 metadata/md5-cache/app-text/Manifest.gz
 2012171809 metadata/md5-cache/app-text/asciidoc-9.0.4
-2012172009 metadata/md5-cache/app-text/epspdf-0.6.3-r1
-2012172009 metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r4
-2012172009 metadata/md5-cache/app-text/highlight-3.57-r1
-2012180209 metadata/md5-cache/app-text/txt2man-1.7.1
-2012171639 metadata/md5-cache/app-text/txt2tags-3.7
+2012211309 metadata/md5-cache/app-text/Manifest.gz
+2012211309 metadata/md5-cache/app-text/an-1.2_p6
+2012210839 metadata/md5-cache/app-text/chasen-2.4.4-r3
+2012211309 metadata/md5-cache/app-text/diction-1.14
+2012201509 metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r1
+2012202139 metadata/md5-cache/app-text/dvipng-1.17
+2012211309 metadata/md5-cache/app-text/epspdf-0.6.3-r1
+2012181339 metadata/md5-cache/app-text/epstool-3.09
+2012211309 metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r4
+2012210839 metadata/md5-cache/app-text/grutatxt-2.0.16-r1
+2012191839 metadata/md5-cache/app-text/gspell-1.8.4
+2012211309 metadata/md5-cache/app-text/highlight-3.57-r1
+2012210839 metadata/md5-cache/app-text/htag-0.0.24-r1
+2012200109 metadata/md5-cache/app-text/mandoc-1.14.5-r1
+2012210839 metadata/md5-cache/app-text/ocrad-0.26
+2012210839 metadata/md5-cache/app-text/ocrad-0.27
+2012210239 metadata/md5-cache/app-text/pandoc-2.9.2.1
+2012210839 metadata/md5-cache/app-text/rnv-1.7.11-r1
+2012211309 metadata/md5-cache/app-text/tree-1.8.0
+2012201939 metadata/md5-cache/app-text/txt2man-1.7.1
+2012201939 metadata/md5-cache/app-text/txt2tags-3.7
+2012211309 metadata/md5-cache/app-text/wdiff-1.2.2-r1
+2012202239 metadata/md5-cache/app-text/zathura-djvu-0.2.9
 2012170251 metadata/md5-cache/app-vim/Manifest.gz
 2012170251 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 2012170251 metadata/md5-cache/app-vim/airline-0.11
@@ -35289,8 +35332,6 @@
 2012170251 metadata/md5-cache/dev-cpp/libglademm-2.6.7-r2
 2012170251 metadata/md5-cache/dev-cpp/libgnomecanvasmm-2.26.0-r1
 2012170251 metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.3.0
-2012162341 metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r2
-2012162341 metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r3
 2012170251 metadata/md5-cache/dev-cpp/libxmlpp-2.40.1
 2012170251 metadata/md5-cache/dev-cpp/libxmlpp-3.0.1
 2012170251 metadata/md5-cache/dev-cpp/libxsd-frontend-2.0.0
@@ -35337,8 +35378,9 @@
 2012170251 metadata/md5-cache/dev-cpp/waylandpp-9999
 2012170251 metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1
 2012170251 metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r3
-2012172009 metadata/md5-cache/dev-cpp/Manifest.gz
-2012172009 metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0
+2012202239 metadata/md5-cache/dev-cpp/Manifest.gz
+2012202239 metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0
+2012201939 metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r3
 1702282310 metadata/md5-cache/dev-db/gigabase-3.83-r2
 1910170740 metadata/md5-cache/dev-db/innotop-1.12.0
 1702282310 metadata/md5-cache/dev-db/lmdb++-0.9.14.0
@@ -35400,7 +35442,6 @@
 2012170251 metadata/md5-cache/dev-db/aerospike-server-community-4.1.0.1
 2012170251 metadata/md5-cache/dev-db/apgdiff-2.4
 2012170251 metadata/md5-cache/dev-db/barman-2.10
-2012170251 metadata/md5-cache/dev-db/bucardo-5.4.1
 2012170251 metadata/md5-cache/dev-db/cdb-0.75-r4
 2012170251 metadata/md5-cache/dev-db/cockroach-19.1.1
 2012170251 metadata/md5-cache/dev-db/cockroach-2.1.5
@@ -35450,7 +35491,6 @@
 2012170251 metadata/md5-cache/dev-db/mongodb-4.2.8
 2012170251 metadata/md5-cache/dev-db/mongodb-4.4.1
 2012170251 metadata/md5-cache/dev-db/mongodb-4.4.2
-2012170251 metadata/md5-cache/dev-db/mtop-0.6.6-r3
 2012170251 metadata/md5-cache/dev-db/mycli-1.22.2_p20201026
 2012170251 metadata/md5-cache/dev-db/mycli-9999
 2012170251 metadata/md5-cache/dev-db/mydumper-0.9.3-r1
@@ -35466,7 +35506,6 @@
 2012170251 metadata/md5-cache/dev-db/mysql-8.0.19-r2
 2012170251 metadata/md5-cache/dev-db/mysql-8.0.20-r1
 2012170251 metadata/md5-cache/dev-db/mysql-8.0.21-r1
-2012170251 metadata/md5-cache/dev-db/mysql-8.0.22
 2012170251 metadata/md5-cache/dev-db/mysql-cluster-7.2.34
 2012170251 metadata/md5-cache/dev-db/mysql-cluster-7.3.22
 2012170251 metadata/md5-cache/dev-db/mysql-cluster-7.4.21
@@ -35490,10 +35529,6 @@
 2012170019 metadata/md5-cache/dev-db/oracle-instantclient-19.5.0.0
 2012170019 metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0
 2012170019 metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1
-2012170251 metadata/md5-cache/dev-db/percona-server-5.7.27.30-r1
-2012170251 metadata/md5-cache/dev-db/percona-server-8.0.19.10-r1
-2012170251 metadata/md5-cache/dev-db/percona-server-8.0.20.11-r2
-2012170251 metadata/md5-cache/dev-db/percona-server-8.0.21.12
 2012170251 metadata/md5-cache/dev-db/percona-xtrabackup-2.4.15
 2012170251 metadata/md5-cache/dev-db/percona-xtrabackup-2.4.20
 2012170251 metadata/md5-cache/dev-db/percona-xtrabackup-8.0.13
@@ -35527,8 +35562,6 @@
 2012162341 metadata/md5-cache/dev-db/postgis-3.0.0-r1
 2012162341 metadata/md5-cache/dev-db/postgis-3.0.1
 2012162341 metadata/md5-cache/dev-db/postgis-3.0.2
-2012162341 metadata/md5-cache/dev-db/postgis-3.0.3
-2012162341 metadata/md5-cache/dev-db/postgis-3.1.0_alpha3
 2012162341 metadata/md5-cache/dev-db/postgis-9999
 2012170019 metadata/md5-cache/dev-db/postgresql-10.15
 2012170019 metadata/md5-cache/dev-db/postgresql-11.10
@@ -35566,7 +35599,16 @@
 2012170251 metadata/md5-cache/dev-db/tora-9999
 2012170251 metadata/md5-cache/dev-db/vsqlite++-0.3.13-r1
 2012170251 metadata/md5-cache/dev-db/wxsqlite3-3.2.1-r1
-2012180009 metadata/md5-cache/dev-db/Manifest.gz
+2012211409 metadata/md5-cache/dev-db/Manifest.gz
+2012210839 metadata/md5-cache/dev-db/bucardo-5.4.1
+2012210839 metadata/md5-cache/dev-db/mtop-0.6.6-r3
+2012210009 metadata/md5-cache/dev-db/mysql-8.0.22
+2012210009 metadata/md5-cache/dev-db/percona-server-8.0.21.12
+2012210209 metadata/md5-cache/dev-db/percona-server-8.0.22.13
+2012181809 metadata/md5-cache/dev-db/pgadmin4-4.29
+2012211409 metadata/md5-cache/dev-db/pgrouting-3.1.2
+2012190239 metadata/md5-cache/dev-db/postgis-3.0.3-r1
+2012190239 metadata/md5-cache/dev-db/postgis-3.1.0_alpha3-r1
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2011252124 metadata/md5-cache/dev-dotnet/pe-format-2.1.2-r1
@@ -35743,7 +35785,6 @@
 2011252124 metadata/md5-cache/dev-games/hdl_dump-0.9.2.20180722
 2011252124 metadata/md5-cache/dev-games/libnw-1.30.02
 2011252124 metadata/md5-cache/dev-games/paklib-0.3
-2011252124 metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
 2012170251 metadata/md5-cache/dev-games/KXL-1.1.7-r2
 2012170251 metadata/md5-cache/dev-games/aseprite-1.1.6
 2012170251 metadata/md5-cache/dev-games/aseprite-1.1.7-r1
@@ -35755,7 +35796,6 @@
 2012162341 metadata/md5-cache/dev-games/clanlib-4.0.0
 2012170251 metadata/md5-cache/dev-games/flatzebra-0.1.6
 2012170251 metadata/md5-cache/dev-games/freecell-solver-6.2.0
-2012170251 metadata/md5-cache/dev-games/goatee-0.3.1.2
 2012170251 metadata/md5-cache/dev-games/guichan-0.8.2
 2012170251 metadata/md5-cache/dev-games/hdl_dump-0.8.6.20060901
 2012170251 metadata/md5-cache/dev-games/higan-ananke-094
@@ -35782,14 +35822,16 @@
 2012170251 metadata/md5-cache/dev-games/physfs-9999
 2012170251 metadata/md5-cache/dev-games/poker-eval-138.0
 2012170251 metadata/md5-cache/dev-games/ps2-packer-0.4.4
-2012170251 metadata/md5-cache/dev-games/quake4-sdk-1.4.2
 2012170251 metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20200511
 2012170251 metadata/md5-cache/dev-games/simgear-2020.1.2
 2012170251 metadata/md5-cache/dev-games/simgear-9999
 2012162341 metadata/md5-cache/dev-games/t4k-common-0.1.1
 2012170251 metadata/md5-cache/dev-games/tiled-1.4.3-r1
 2012170251 metadata/md5-cache/dev-games/wfmath-1.0.2
-2012180709 metadata/md5-cache/dev-games/Manifest.gz
+2012210839 metadata/md5-cache/dev-games/Manifest.gz
+2012210239 metadata/md5-cache/dev-games/goatee-0.3.1.2
+2012210839 metadata/md5-cache/dev-games/quake4-sdk-1.4.2
+2012210839 metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
 2009141809 metadata/md5-cache/dev-go/delve-1.3.0
 2009141809 metadata/md5-cache/dev-go/delve-1.3.2
 2009141809 metadata/md5-cache/dev-go/get-ego-vendor-0.2.0
@@ -35839,832 +35881,832 @@
 2012152339 metadata/md5-cache/dev-go/twofactor-0_p20180418
 2008011139 metadata/md5-cache/dev-haskell/stack-bin-2.3.1
 2010181339 metadata/md5-cache/dev-haskell/haskell-platform-2014.2.0.0-r1
-2012170019 metadata/md5-cache/dev-haskell/abstract-deque-0.3
-2012170019 metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
-2012170019 metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
-2012170251 metadata/md5-cache/dev-haskell/ac-ppm-1.1.1
-2012170251 metadata/md5-cache/dev-haskell/adjunctions-4.4
-2012170019 metadata/md5-cache/dev-haskell/aeson-1.4.7.1
-2012170019 metadata/md5-cache/dev-haskell/aeson-compat-0.3.9-r2
-2012170019 metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.8
-2012170019 metadata/md5-cache/dev-haskell/aeson-pretty-0.8.8
-2012170019 metadata/md5-cache/dev-haskell/aeson-qq-0.8.3
-2012170019 metadata/md5-cache/dev-haskell/alex-3.2.5
-2012170019 metadata/md5-cache/dev-haskell/alex-tools-0.4
-2012170019 metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
-2012170019 metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0
-2012170019 metadata/md5-cache/dev-haskell/alut-2.4.0.3
-2012170251 metadata/md5-cache/dev-haskell/annotated-wl-pprint-0.7.0
-2012170019 metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
-2012170019 metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.8.2-r1
-2012170019 metadata/md5-cache/dev-haskell/appar-0.1.8
-2012170251 metadata/md5-cache/dev-haskell/argparser-0.3.4
-2012170019 metadata/md5-cache/dev-haskell/arithmoi-0.11.0.1
-2012170251 metadata/md5-cache/dev-haskell/arrows-0.4.4.2
-2012170251 metadata/md5-cache/dev-haskell/ascii-progress-0.3.3.0
-2012170019 metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6
-2012170019 metadata/md5-cache/dev-haskell/asn1-parse-0.9.5
-2012170019 metadata/md5-cache/dev-haskell/asn1-types-0.3.3
-2012170019 metadata/md5-cache/dev-haskell/async-2.2.2
-2012170019 metadata/md5-cache/dev-haskell/atomic-primops-0.8.3
-2012170019 metadata/md5-cache/dev-haskell/attoparsec-0.13.2.3
-2012170019 metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0
-2012170019 metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
-2012170019 metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.1.0-r1
-2012170019 metadata/md5-cache/dev-haskell/authenticate-1.3.5
-2012170019 metadata/md5-cache/dev-haskell/authenticate-oauth-1.6.0.1
-2012170019 metadata/md5-cache/dev-haskell/auto-update-0.1.6
-2012170019 metadata/md5-cache/dev-haskell/aws-0.22-r1
-2012170019 metadata/md5-cache/dev-haskell/base-compat-0.11.1
-2012170019 metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
-2012170019 metadata/md5-cache/dev-haskell/base-noprelude-4.13.0.0
-2012170019 metadata/md5-cache/dev-haskell/base-orphans-0.8.4
-2012170251 metadata/md5-cache/dev-haskell/base-prelude-1.3
-2012170019 metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.4.2
-2012170019 metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7
-2012170019 metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3
-2012170019 metadata/md5-cache/dev-haskell/basement-0.0.11
-2012170251 metadata/md5-cache/dev-haskell/basic-prelude-0.7.0
-2012170019 metadata/md5-cache/dev-haskell/bencode-0.6.1.1
-2012170019 metadata/md5-cache/dev-haskell/bifunctors-5.5.6
-2012170019 metadata/md5-cache/dev-haskell/binary-0.8.7.0
-2012170019 metadata/md5-cache/dev-haskell/binary-instances-1.0.0.1
-2012170019 metadata/md5-cache/dev-haskell/binary-orphans-1.0.1
-2012170019 metadata/md5-cache/dev-haskell/binary-tagged-0.2
-2012170251 metadata/md5-cache/dev-haskell/biocore-0.3.1
-2012170019 metadata/md5-cache/dev-haskell/biofasta-0.0.3
-2012170019 metadata/md5-cache/dev-haskell/biosff-0.3.7.1
-2012170251 metadata/md5-cache/dev-haskell/bitarray-0.0.1.1
-2012170019 metadata/md5-cache/dev-haskell/bits-atomic-0.1.3-r1
-2012170019 metadata/md5-cache/dev-haskell/bitwise-1.0.0.1
-2012170251 metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0
-2012170019 metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.1.0
-2012170019 metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2
-2012170019 metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4
-2012170019 metadata/md5-cache/dev-haskell/blaze-textual-0.2.1.0
-2012170019 metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0
-2012170251 metadata/md5-cache/dev-haskell/boolean-0.2.4
-2012170019 metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0
-2012170251 metadata/md5-cache/dev-haskell/boxes-0.1.5
-2012170251 metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4
-2012170019 metadata/md5-cache/dev-haskell/byteable-0.1.1
-2012170251 metadata/md5-cache/dev-haskell/bytedump-1.0
-2012170019 metadata/md5-cache/dev-haskell/byteorder-1.0.4
-2012170019 metadata/md5-cache/dev-haskell/bytes-0.17
-2012170019 metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0
-2012170019 metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.6
-2012170019 metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
-2012170019 metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.6-r1
-2012170019 metadata/md5-cache/dev-haskell/bzlib-0.5.1.0
-2012170251 metadata/md5-cache/dev-haskell/c2hs-0.28.6
-2012170251 metadata/md5-cache/dev-haskell/cabal-1.18.1.2
-2012170019 metadata/md5-cache/dev-haskell/cabal-1.18.1.3
-2012170019 metadata/md5-cache/dev-haskell/cabal-1.18.1.5
-2012170019 metadata/md5-cache/dev-haskell/cabal-1.20.0.2
-2012170019 metadata/md5-cache/dev-haskell/cabal-1.22.8.0
-2012170251 metadata/md5-cache/dev-haskell/cabal-1.24.2.0
-2012170251 metadata/md5-cache/dev-haskell/cabal-2.0.0.2
-2012170019 metadata/md5-cache/dev-haskell/cabal-2.4.0.1
-2012170019 metadata/md5-cache/dev-haskell/cabal-3.0.1.0
-2012170019 metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8
-2012170019 metadata/md5-cache/dev-haskell/cabal-install-3.0.0.0
-2012170019 metadata/md5-cache/dev-haskell/cairo-0.13.6.1
-2012170019 metadata/md5-cache/dev-haskell/call-stack-0.2.0
-2012170019 metadata/md5-cache/dev-haskell/casa-client-0.0.1
-2012170019 metadata/md5-cache/dev-haskell/casa-types-0.0.1
-2012170019 metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0
-2012170019 metadata/md5-cache/dev-haskell/cassava-0.5.2.0
-2012170019 metadata/md5-cache/dev-haskell/cereal-0.5.8.1
-2012170251 metadata/md5-cache/dev-haskell/cereal-vector-0.2.0.1
-2012170019 metadata/md5-cache/dev-haskell/cgi-3001.5.0.0
-2012170251 metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1
-2012170019 metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5
-2012170019 metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9
-2012170251 metadata/md5-cache/dev-haskell/chell-0.4.0.2
-2012170019 metadata/md5-cache/dev-haskell/chimera-0.3.1.0
-2012170251 metadata/md5-cache/dev-haskell/chunked-data-0.3.0
-2012170019 metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
-2012170019 metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r1
-2012170019 metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2
-2012170019 metadata/md5-cache/dev-haskell/cipher-des-0.0.6
-2012170019 metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4
-2012170251 metadata/md5-cache/dev-haskell/classy-prelude-1.5.0
-2012170251 metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
-2012170251 metadata/md5-cache/dev-haskell/clock-0.7.2
-2012170019 metadata/md5-cache/dev-haskell/cmark-0.6
-2012170019 metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1
-2012170251 metadata/md5-cache/dev-haskell/cmdargs-0.10.20
-2012170251 metadata/md5-cache/dev-haskell/code-page-0.1.3
-2012170019 metadata/md5-cache/dev-haskell/colour-2.3.5
-2012171039 metadata/md5-cache/dev-haskell/comonad-5.0.7
-2012170019 metadata/md5-cache/dev-haskell/comonad-transformers-4.0
-2012170019 metadata/md5-cache/dev-haskell/comonads-fd-4.0
-2012170251 metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.12
-2012170019 metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
-2012170019 metadata/md5-cache/dev-haskell/conduit-1.3.4
-2012170251 metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
-2012170019 metadata/md5-cache/dev-haskell/conduit-extra-1.3.4
-2012170019 metadata/md5-cache/dev-haskell/configfile-1.1.4
-2012170251 metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1
-2012170019 metadata/md5-cache/dev-haskell/connection-0.3.1
-2012170019 metadata/md5-cache/dev-haskell/constraints-0.11.2
-2012170019 metadata/md5-cache/dev-haskell/contravariant-1.5.2
-2012170019 metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2
-2012170019 metadata/md5-cache/dev-haskell/control-monad-loop-0.1
-2012170019 metadata/md5-cache/dev-haskell/convertible-1.1.1.0
-2012170019 metadata/md5-cache/dev-haskell/cookie-0.4.4
-2012170251 metadata/md5-cache/dev-haskell/cpphs-1.20.8
-2012171039 metadata/md5-cache/dev-haskell/cpphs-1.20.9.1
-2012170019 metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
-2012170019 metadata/md5-cache/dev-haskell/cpu-0.1.2
-2012170019 metadata/md5-cache/dev-haskell/criterion-1.5.6.2
-2012170019 metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
-2012170019 metadata/md5-cache/dev-haskell/crypto-4.2.5.1-r1
-2012170019 metadata/md5-cache/dev-haskell/crypto-api-0.13.3
-2012170019 metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
-2012170019 metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
-2012170019 metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
-2012170019 metadata/md5-cache/dev-haskell/crypto-numbers-0.2.7
-2012170019 metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.8
-2012170019 metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.3
-2012170019 metadata/md5-cache/dev-haskell/crypto-random-0.0.9
-2012170019 metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0
-2012170019 metadata/md5-cache/dev-haskell/cryptohash-0.11.9
-2012170019 metadata/md5-cache/dev-haskell/cryptohash-conduit-0.1.1
-2012170019 metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.4
-2012170251 metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
-2012170251 metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
-2012170251 metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
-2012170019 metadata/md5-cache/dev-haskell/cryptonite-0.26-r1
-2012170251 metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
-2012170251 metadata/md5-cache/dev-haskell/css-text-0.1.3.0
-2012170019 metadata/md5-cache/dev-haskell/curl-1.3.8
-2012170019 metadata/md5-cache/dev-haskell/data-accessor-0.2.3
-2012170019 metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
-2012170019 metadata/md5-cache/dev-haskell/data-default-0.7.1.1
-2012170251 metadata/md5-cache/dev-haskell/data-default-class-0.1.2.0
-2012170251 metadata/md5-cache/dev-haskell/data-default-instances-base-0.1.0.1
-2012170019 metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
-2012170019 metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
-2012170019 metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
-2012170251 metadata/md5-cache/dev-haskell/data-endian-0.1.1
-2012170019 metadata/md5-cache/dev-haskell/data-hash-0.2.0.1
-2012170019 metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
-2012170019 metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
-2012170019 metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
-2012170019 metadata/md5-cache/dev-haskell/dav-1.3.4
-2012170019 metadata/md5-cache/dev-haskell/dbus-1.2.16
-2012170019 metadata/md5-cache/dev-haskell/dec-0.0.3
-2012170019 metadata/md5-cache/dev-haskell/deepseq-generics-0.2.0.0
-2012170019 metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
-2012170251 metadata/md5-cache/dev-haskell/derive-2.5.26
-2012170019 metadata/md5-cache/dev-haskell/deriving-compat-0.5.8
-2012170019 metadata/md5-cache/dev-haskell/dictionary-sharing-0.1.0.0
-2012170019 metadata/md5-cache/dev-haskell/diff-0.4.0
-2012170019 metadata/md5-cache/dev-haskell/digest-0.0.1.2
-2012170019 metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
-2012170019 metadata/md5-cache/dev-haskell/distributive-0.6.1
-2012170019 metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3
-2012170251 metadata/md5-cache/dev-haskell/djinn-lib-0.0.1.3
-2012170019 metadata/md5-cache/dev-haskell/dlist-0.8.0.7
-2012170251 metadata/md5-cache/dev-haskell/dlist-instances-0.1.1.1
-2012170019 metadata/md5-cache/dev-haskell/dns-4.0.1
-2012170019 metadata/md5-cache/dev-haskell/doclayout-0.3
-2012170019 metadata/md5-cache/dev-haskell/doctemplates-0.8.2
-2012170019 metadata/md5-cache/dev-haskell/doctest-0.16.3
-2012170251 metadata/md5-cache/dev-haskell/double-conversion-2.0.2.0
-2012170019 metadata/md5-cache/dev-haskell/drbg-0.5.5
-2012170019 metadata/md5-cache/dev-haskell/easy-file-0.2.2
-2012170251 metadata/md5-cache/dev-haskell/echo-0.1.3
-2012170251 metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
-2012170019 metadata/md5-cache/dev-haskell/edisonapi-1.3.1-r1
-2012170019 metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1
-2012170019 metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
-2012170019 metadata/md5-cache/dev-haskell/edit-distance-vector-1.0.0.4
-2012170019 metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1
-2012170019 metadata/md5-cache/dev-haskell/either-5.0.1.1
-2012170019 metadata/md5-cache/dev-haskell/ekg-0.4.0.15-r7
-2012170019 metadata/md5-cache/dev-haskell/ekg-core-0.1.1.6
-2012170251 metadata/md5-cache/dev-haskell/ekg-json-0.1.0.6-r1
-2012170019 metadata/md5-cache/dev-haskell/email-validate-2.3.2.13
-2012170019 metadata/md5-cache/dev-haskell/emojis-0.1
-2012170251 metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3
-2012170019 metadata/md5-cache/dev-haskell/encoding-0.8.5
-2012170019 metadata/md5-cache/dev-haskell/entropy-0.4.1.6
-2012170019 metadata/md5-cache/dev-haskell/enumerator-0.4.20
-2012170019 metadata/md5-cache/dev-haskell/equivalence-0.3.5
-2012170251 metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1
-2012170019 metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
-2012170019 metadata/md5-cache/dev-haskell/errors-2.3.0
-2012170019 metadata/md5-cache/dev-haskell/esqueleto-3.3.4.0
-2012170019 metadata/md5-cache/dev-haskell/exact-pi-0.5.0.1
-2012170019 metadata/md5-cache/dev-haskell/exceptions-0.10.4
-2012170251 metadata/md5-cache/dev-haskell/executable-path-0.0.3.1
-2012170019 metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
-2012170019 metadata/md5-cache/dev-haskell/extra-1.7.8
-2012170019 metadata/md5-cache/dev-haskell/fail-4.9.0.0
-2012170019 metadata/md5-cache/dev-haskell/failure-0.2.0.3
-2012170019 metadata/md5-cache/dev-haskell/fast-logger-3.0.1
-2012170251 metadata/md5-cache/dev-haskell/fclabels-2.0.3.3
-2012170019 metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
-2012170019 metadata/md5-cache/dev-haskell/feed-1.3.0.1
-2012170019 metadata/md5-cache/dev-haskell/fgl-5.7.0.2
-2012170251 metadata/md5-cache/dev-haskell/fgl-arbitrary-0.2.0.3-r1
-2012170019 metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
-2012170251 metadata/md5-cache/dev-haskell/file-location-0.4.9.1
-2012170019 metadata/md5-cache/dev-haskell/filelock-0.1.1.5
-2012170019 metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
-2012170019 metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
-2012170019 metadata/md5-cache/dev-haskell/filestore-0.6.5
-2012170019 metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
-2012170019 metadata/md5-cache/dev-haskell/fingertree-0.1.4.2
-2012170019 metadata/md5-cache/dev-haskell/fixed-0.3
-2012170019 metadata/md5-cache/dev-haskell/fmlist-0.9.3
-2012170019 metadata/md5-cache/dev-haskell/foldl-1.4.7
-2012170019 metadata/md5-cache/dev-haskell/foundation-0.0.25
-2012170019 metadata/md5-cache/dev-haskell/free-5.1.3
-2012170019 metadata/md5-cache/dev-haskell/fsnotify-0.3.0.1
-2012170019 metadata/md5-cache/dev-haskell/generic-deriving-1.13.1
-2012170019 metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
-2012170019 metadata/md5-cache/dev-haskell/geniplate-0.6.0.5
-2012170019 metadata/md5-cache/dev-haskell/geniplate-mirror-0.7.7
-2012170019 metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
-2012170019 metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4
-2012170019 metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1
-2012170019 metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4
-2012170019 metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
-2012170019 metadata/md5-cache/dev-haskell/gio-0.13.8.1
-2012170019 metadata/md5-cache/dev-haskell/git-0.3.0
-2012170019 metadata/md5-cache/dev-haskell/git-lfs-1.1.0
-2012170019 metadata/md5-cache/dev-haskell/githash-0.1.3.3
-2012170251 metadata/md5-cache/dev-haskell/gitrev-1.3.1
-2012170019 metadata/md5-cache/dev-haskell/glib-0.13.8.1
-2012170251 metadata/md5-cache/dev-haskell/glob-0.9.3
-2012170251 metadata/md5-cache/dev-haskell/gluraw-2.0.0.4
-2012170019 metadata/md5-cache/dev-haskell/glut-2.7.0.15
-2012170019 metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1
-2012170019 metadata/md5-cache/dev-haskell/gnutls-0.2
-2012170019 metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4
-2012170019 metadata/md5-cache/dev-haskell/groupoids-4.0
-2012170019 metadata/md5-cache/dev-haskell/gsasl-0.3.7
-2012170019 metadata/md5-cache/dev-haskell/gtk-0.14.10-r3
-2012170019 metadata/md5-cache/dev-haskell/gtk-0.15.5-r1
-2012170019 metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0
-2012170019 metadata/md5-cache/dev-haskell/gtk3-0.15.5
-2012170019 metadata/md5-cache/dev-haskell/hackage-security-0.5.3.0-r3
-2012170019 metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3
-2012170019 metadata/md5-cache/dev-haskell/haddock-2.16.1
-2012170251 metadata/md5-cache/dev-haskell/haddock-2.17.2
-2012170019 metadata/md5-cache/dev-haskell/haddock-2.23.1
-2012170019 metadata/md5-cache/dev-haskell/haddock-api-2.16.1
-2012170251 metadata/md5-cache/dev-haskell/haddock-api-2.17.3
-2012170019 metadata/md5-cache/dev-haskell/haddock-api-2.23.1
-2012170019 metadata/md5-cache/dev-haskell/haddock-library-1.1.1
-2012170019 metadata/md5-cache/dev-haskell/haddock-library-1.2.1
-2012170251 metadata/md5-cache/dev-haskell/haddock-library-1.4.2
-2012170019 metadata/md5-cache/dev-haskell/haddock-library-1.8.0
-2012170019 metadata/md5-cache/dev-haskell/hakyll-4.13.4.0
-2012170019 metadata/md5-cache/dev-haskell/half-0.3-r1
-2012170019 metadata/md5-cache/dev-haskell/hamlet-1.2.0
-2012170019 metadata/md5-cache/dev-haskell/happstack-server-7.6.0
-2012170019 metadata/md5-cache/dev-haskell/happy-1.19.12
-2012170019 metadata/md5-cache/dev-haskell/harp-0.4.3.2
-2012170251 metadata/md5-cache/dev-haskell/hashable-1.2.7.0
-2012170019 metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1
-2012170019 metadata/md5-cache/dev-haskell/hashtables-1.2.4.1
-2012170019 metadata/md5-cache/dev-haskell/haskeline-0.7.5.0
-2012170019 metadata/md5-cache/dev-haskell/haskell-lexer-1.0.2
-2012170019 metadata/md5-cache/dev-haskell/haskell-src-1.0.3.0
-2012170019 metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1
-2012170019 metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1
-2012170019 metadata/md5-cache/dev-haskell/haskell-src-exts-util-0.2.5
-2012170019 metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1
-2012170019 metadata/md5-cache/dev-haskell/haxml-1.25.5-r1
-2012170251 metadata/md5-cache/dev-haskell/hcg-minus-0.15
-2012170019 metadata/md5-cache/dev-haskell/hcodecs-0.5.2
-2012170019 metadata/md5-cache/dev-haskell/hdbc-2.4.0.3
-2012170251 metadata/md5-cache/dev-haskell/hdbc-mysql-0.7.1.0-r1
-2012170019 metadata/md5-cache/dev-haskell/hdbc-odbc-2.6.0.0
-2012170019 metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.7
-2012170019 metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
-2012170019 metadata/md5-cache/dev-haskell/heaps-0.3.6.1
-2012170019 metadata/md5-cache/dev-haskell/hedgehog-1.0.4
-2012170019 metadata/md5-cache/dev-haskell/hex-0.1.2
-2012170251 metadata/md5-cache/dev-haskell/hexpat-0.20.13
-2012170019 metadata/md5-cache/dev-haskell/hgettext-0.1.30
-2012170019 metadata/md5-cache/dev-haskell/hi-file-parser-0.1.0.0
-2012170251 metadata/md5-cache/dev-haskell/highlighting-kate-0.6.4
-2012170251 metadata/md5-cache/dev-haskell/hinotify-0.3.10
-2012170019 metadata/md5-cache/dev-haskell/hit-0.7.0
-2012170019 metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
-2012170019 metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
-2012170019 metadata/md5-cache/dev-haskell/hoauth2-1.11.0
-2012170019 metadata/md5-cache/dev-haskell/hostname-1.0-r1
-2012170019 metadata/md5-cache/dev-haskell/hourglass-0.2.12
-2012170019 metadata/md5-cache/dev-haskell/hpack-0.33.0
-2012170251 metadata/md5-cache/dev-haskell/hps-0.15
-2012170019 metadata/md5-cache/dev-haskell/hs-bibutils-6.8.0.0
-2012170019 metadata/md5-cache/dev-haskell/hs3-0.5.9
-2012170019 metadata/md5-cache/dev-haskell/hsb2hs-0.3.1
-2012170251 metadata/md5-cache/dev-haskell/hscolour-1.24.4
-2012170019 metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1
-2012170251 metadata/md5-cache/dev-haskell/hslua-1.0.3.1
-2012170019 metadata/md5-cache/dev-haskell/hslua-module-system-0.2.1
-2012170019 metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1
-2012170019 metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17
-2012170019 metadata/md5-cache/dev-haskell/hspec-2.7.1
-2012170019 metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1
-2012170019 metadata/md5-cache/dev-haskell/hspec-core-2.7.1
-2012170019 metadata/md5-cache/dev-haskell/hspec-discover-2.7.1
-2012170251 metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2
-2012170019 metadata/md5-cache/dev-haskell/hspec-meta-2.6.0
-2012170251 metadata/md5-cache/dev-haskell/hspec-smallcheck-0.5.2
-2012170251 metadata/md5-cache/dev-haskell/hsql-1.8.2-r1
-2012170251 metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2-r1
-2012170251 metadata/md5-cache/dev-haskell/hsql-mysql-1.8.3
-2012170251 metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
-2012170251 metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
-2012170019 metadata/md5-cache/dev-haskell/hstringtemplate-0.8.7
-2012170019 metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
-2012170019 metadata/md5-cache/dev-haskell/hsyaml-aeson-0.2.0.0
-2012170019 metadata/md5-cache/dev-haskell/htf-0.14.0.3
-2012170019 metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
-2012170019 metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
-2012170019 metadata/md5-cache/dev-haskell/http-4000.3.14
-2012170019 metadata/md5-cache/dev-haskell/http-api-data-0.4.1.1
-2012170019 metadata/md5-cache/dev-haskell/http-attoparsec-0.1.1-r3
-2012170019 metadata/md5-cache/dev-haskell/http-client-0.6.4.1
-2012170019 metadata/md5-cache/dev-haskell/http-client-conduit-0.3.0
-2012170019 metadata/md5-cache/dev-haskell/http-client-multipart-0.3.0.0
-2012170019 metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3
-2012170251 metadata/md5-cache/dev-haskell/http-client-tls-0.3.5.3
-2012170019 metadata/md5-cache/dev-haskell/http-common-0.8.2.1
-2012170019 metadata/md5-cache/dev-haskell/http-conduit-2.3.7.3
-2012170019 metadata/md5-cache/dev-haskell/http-date-0.0.8
-2012170019 metadata/md5-cache/dev-haskell/http-download-0.2.0.0
-2012170251 metadata/md5-cache/dev-haskell/http-reverse-proxy-0.4.3.2
-2012170019 metadata/md5-cache/dev-haskell/http-streams-0.8.7.1
-2012170019 metadata/md5-cache/dev-haskell/http-types-0.12.3
-2012170019 metadata/md5-cache/dev-haskell/http2-2.0.3
-2012170019 metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
-2012170019 metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
-2012170251 metadata/md5-cache/dev-haskell/hunit-1.6.0.0
-2012170019 metadata/md5-cache/dev-haskell/hxt-9.3.1.18
-2012170019 metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.0.0
-2012170251 metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.2.0.3
-2012170019 metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4
-2012170019 metadata/md5-cache/dev-haskell/icalendar-0.4.0.5-r1
-2012170019 metadata/md5-cache/dev-haskell/iconv-0.4.1.3
-2012170251 metadata/md5-cache/dev-haskell/idiii-0.1.3.3
-2012170019 metadata/md5-cache/dev-haskell/idna-0.3.0
-2012170019 metadata/md5-cache/dev-haskell/ieee754-0.7.8
-2012170019 metadata/md5-cache/dev-haskell/ifelse-0.85-r1
-2012171039 metadata/md5-cache/dev-haskell/indexed-traversable-0.1
-2012170251 metadata/md5-cache/dev-haskell/infer-license-0.2.0
-2012170019 metadata/md5-cache/dev-haskell/inspection-testing-0.4.2.4
-2012170019 metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3
-2012170019 metadata/md5-cache/dev-haskell/integer-roots-1.0
-2012170251 metadata/md5-cache/dev-haskell/interpolate-0.2.0
-2012170019 metadata/md5-cache/dev-haskell/invariant-0.5.3
-2012170019 metadata/md5-cache/dev-haskell/io-streams-1.5.2.0
-2012170019 metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1
-2012170019 metadata/md5-cache/dev-haskell/iproute-1.7.8
-2012170019 metadata/md5-cache/dev-haskell/ipynb-0.1
-2012170251 metadata/md5-cache/dev-haskell/iwlib-0.1.0
-2012170019 metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4
-2012170019 metadata/md5-cache/dev-haskell/js-flot-0.8.3
-2012170019 metadata/md5-cache/dev-haskell/js-jquery-3.3.1
-2012170019 metadata/md5-cache/dev-haskell/json-0.10
-2012170019 metadata/md5-cache/dev-haskell/juicypixels-3.3.5
-2012170251 metadata/md5-cache/dev-haskell/kan-extensions-5.2
-2012170019 metadata/md5-cache/dev-haskell/keys-3.12.3
-2012170019 metadata/md5-cache/dev-haskell/language-bash-0.9.0
-2012170019 metadata/md5-cache/dev-haskell/language-c-0.4.7
-2012170251 metadata/md5-cache/dev-haskell/language-c-0.7.1
-2012170019 metadata/md5-cache/dev-haskell/language-c-0.8.3
-2012170019 metadata/md5-cache/dev-haskell/language-css-0.0.3
-2012170019 metadata/md5-cache/dev-haskell/language-dot-0.1.1
-2012170019 metadata/md5-cache/dev-haskell/language-ecmascript-0.19.1.0
-2012170019 metadata/md5-cache/dev-haskell/language-glsl-0.3.0
-2012170019 metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
-2012170019 metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
-2012170019 metadata/md5-cache/dev-haskell/language-lua-0.11.0.1
-2012170019 metadata/md5-cache/dev-haskell/language-python-0.5.8
-2012170019 metadata/md5-cache/dev-haskell/lazysmallcheck-0.6-r1
-2012170019 metadata/md5-cache/dev-haskell/lcs-0.2-r1
-2012170019 metadata/md5-cache/dev-haskell/leancheck-0.9.3
-2012170019 metadata/md5-cache/dev-haskell/lens-4.19.1
-2012170019 metadata/md5-cache/dev-haskell/lens-aeson-1.1
-2012170019 metadata/md5-cache/dev-haskell/lens-family-1.2.3
-2012170251 metadata/md5-cache/dev-haskell/lens-family-core-1.2.3
-2012170019 metadata/md5-cache/dev-haskell/lens-family-th-0.5.1.0
-2012170251 metadata/md5-cache/dev-haskell/lens-simple-0.1.0.9
-2012170019 metadata/md5-cache/dev-haskell/lhs2tex-1.24
-2012170019 metadata/md5-cache/dev-haskell/libmpd-0.9.1.0
-2012170019 metadata/md5-cache/dev-haskell/libxml-0.1.1
-2012170019 metadata/md5-cache/dev-haskell/libxml-sax-0.7.5
-2012170019 metadata/md5-cache/dev-haskell/libyaml-0.1.2
-2012170019 metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6
-2012170251 metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12
-2012170019 metadata/md5-cache/dev-haskell/linear-1.20.9
-2012170251 metadata/md5-cache/dev-haskell/list-0.6.2
-2012170019 metadata/md5-cache/dev-haskell/listlike-4.6.3
-2012170019 metadata/md5-cache/dev-haskell/logging-facade-0.3.0
-2012170019 metadata/md5-cache/dev-haskell/logict-0.7.0.3
-2012170019 metadata/md5-cache/dev-haskell/logict-state-0.1.0.5
-2012170019 metadata/md5-cache/dev-haskell/lrucache-1.2.0.1
-2012170019 metadata/md5-cache/dev-haskell/lukko-0.1.1.2
-2012170251 metadata/md5-cache/dev-haskell/maccatcher-2.1.5-r1
-2012170019 metadata/md5-cache/dev-haskell/magic-1.1
-2012170019 metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
-2012170019 metadata/md5-cache/dev-haskell/math-functions-0.3.3.0
-2012170019 metadata/md5-cache/dev-haskell/megaparsec-8.0.0
-2012170019 metadata/md5-cache/dev-haskell/memory-0.15.0
-2012170019 metadata/md5-cache/dev-haskell/memotrie-0.6.10
-2012170251 metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.2.0
-2012170019 metadata/md5-cache/dev-haskell/microlens-0.4.11.2
-2012170019 metadata/md5-cache/dev-haskell/microlens-aeson-2.3.0.4
-2012170019 metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
-2012170019 metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4
-2012170251 metadata/md5-cache/dev-haskell/microstache-1.0.1.1
-2012170019 metadata/md5-cache/dev-haskell/mime-0.4.0.2
-2012170019 metadata/md5-cache/dev-haskell/mime-mail-0.5.0
-2012170019 metadata/md5-cache/dev-haskell/mime-types-0.1.0.9
-2012170019 metadata/md5-cache/dev-haskell/minisat-0.1.2
-2012170251 metadata/md5-cache/dev-haskell/mintty-0.1.2
-2012170019 metadata/md5-cache/dev-haskell/missingh-1.4.3.0
-2012170019 metadata/md5-cache/dev-haskell/mmap-0.5.9
-2012170019 metadata/md5-cache/dev-haskell/mmorph-1.1.3
-2012170251 metadata/md5-cache/dev-haskell/mockery-0.3.5
-2012170019 metadata/md5-cache/dev-haskell/mod-0.1.1.0
-2012170251 metadata/md5-cache/dev-haskell/monad-control-1.0.2.3
-2012170251 metadata/md5-cache/dev-haskell/monad-journal-0.8.1
-2012170019 metadata/md5-cache/dev-haskell/monad-logger-0.3.32
-2012170019 metadata/md5-cache/dev-haskell/monad-loops-0.4.3
-2012170019 metadata/md5-cache/dev-haskell/monad-par-0.3.5
-2012170019 metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
-2012170251 metadata/md5-cache/dev-haskell/monad-unlift-0.2.0
-2012170019 metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.1.0-r2
-2012170019 metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.3-r1
-2012170019 metadata/md5-cache/dev-haskell/monadlib-3.10
-2012170251 metadata/md5-cache/dev-haskell/monadplus-1.4.2-r1
-2012170019 metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2
-2012170251 metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
-2012170019 metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1
-2012170251 metadata/md5-cache/dev-haskell/mono-traversable-instances-0.1.0.0
-2012170019 metadata/md5-cache/dev-haskell/mountpoints-1.0.2
-2012170019 metadata/md5-cache/dev-haskell/mtl-2.2.2
-2012170019 metadata/md5-cache/dev-haskell/mtl-compat-0.2.2
-2012170019 metadata/md5-cache/dev-haskell/multipart-0.2.0
-2012170251 metadata/md5-cache/dev-haskell/murmur-hash-0.1.0.9
-2012170019 metadata/md5-cache/dev-haskell/mustache-2.3.1
-2012170251 metadata/md5-cache/dev-haskell/mutable-containers-0.3.4
-2012170019 metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0
-2012170019 metadata/md5-cache/dev-haskell/mysql-0.1.7
-2012170019 metadata/md5-cache/dev-haskell/mysql-simple-0.4.5
-2012170251 metadata/md5-cache/dev-haskell/nanospec-0.2.2
-2012170251 metadata/md5-cache/dev-haskell/nats-1.1.2
-2012170019 metadata/md5-cache/dev-haskell/neat-interpolation-0.5.1.2
-2012170251 metadata/md5-cache/dev-haskell/netlink-1.1.1.0
-2012170019 metadata/md5-cache/dev-haskell/network-2.4.1.2
-2012170019 metadata/md5-cache/dev-haskell/network-2.4.2.2
-2012170019 metadata/md5-cache/dev-haskell/network-2.5.0.0
-2012170019 metadata/md5-cache/dev-haskell/network-2.6.2.1
-2012170019 metadata/md5-cache/dev-haskell/network-2.6.3.1-r1
-2012170019 metadata/md5-cache/dev-haskell/network-3.0.1.1
-2012170019 metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0
-2012170019 metadata/md5-cache/dev-haskell/network-byte-order-0.1.4.0
-2012170019 metadata/md5-cache/dev-haskell/network-conduit-1.1.0
-2012170019 metadata/md5-cache/dev-haskell/network-data-0.5.3
-2012170251 metadata/md5-cache/dev-haskell/network-info-0.2.0.10
-2012170019 metadata/md5-cache/dev-haskell/network-multicast-0.3.2
-2012170019 metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.9
-2012170019 metadata/md5-cache/dev-haskell/network-uri-2.5.0.0
-2012170019 metadata/md5-cache/dev-haskell/network-uri-2.6.3.0
-2012170019 metadata/md5-cache/dev-haskell/newtype-0.2.2.0
-2012170019 metadata/md5-cache/dev-haskell/newtype-generics-0.5.4
-2012170251 metadata/md5-cache/dev-haskell/nonce-1.0.7
-2012170019 metadata/md5-cache/dev-haskell/numinstances-1.4
-2012170251 metadata/md5-cache/dev-haskell/numtype-dk-0.5.0.2
-2012170019 metadata/md5-cache/dev-haskell/objectname-1.1.0.1
-2012170019 metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
-2012170019 metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
-2012170019 metadata/md5-cache/dev-haskell/only-0.1
-2012170251 metadata/md5-cache/dev-haskell/open-browser-0.2.1.0-r1
-2012170019 metadata/md5-cache/dev-haskell/openal-1.7.0.5
-2012170019 metadata/md5-cache/dev-haskell/opengl-3.0.3.0-r1
-2012170019 metadata/md5-cache/dev-haskell/openglraw-3.3.4.0
-2012170019 metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0
-2012170019 metadata/md5-cache/dev-haskell/options-1.2.1.1
-2012170019 metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0
-2012170019 metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.3
-2012170019 metadata/md5-cache/dev-haskell/pandoc-citeproc-0.17.0.1
-2012170019 metadata/md5-cache/dev-haskell/pandoc-types-1.20
-2012170019 metadata/md5-cache/dev-haskell/pango-0.13.8.1
-2012170019 metadata/md5-cache/dev-haskell/pantry-0.4.0.2
-2012170251 metadata/md5-cache/dev-haskell/parallel-3.2.2.0
-2012170251 metadata/md5-cache/dev-haskell/parallel-io-0.3.3-r3
-2012170019 metadata/md5-cache/dev-haskell/parsec-3.1.13.0-r1
-2012170019 metadata/md5-cache/dev-haskell/parsec-3.1.14.0
-2012170251 metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0
-2012170019 metadata/md5-cache/dev-haskell/parsec1-1.0.0.7
-2012170251 metadata/md5-cache/dev-haskell/parser-combinators-1.0.0
-2012170019 metadata/md5-cache/dev-haskell/parsers-0.12.10
-2012170019 metadata/md5-cache/dev-haskell/path-0.7.0
-2012170019 metadata/md5-cache/dev-haskell/path-io-1.6.0-r1
-2012170019 metadata/md5-cache/dev-haskell/path-pieces-0.2.1
-2012170251 metadata/md5-cache/dev-haskell/patience-0.1.1-r1
-2012170019 metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1
-2012170019 metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0
-2012170019 metadata/md5-cache/dev-haskell/pem-0.2.4
-2012170019 metadata/md5-cache/dev-haskell/persistent-2.10.5.2
-2012170019 metadata/md5-cache/dev-haskell/persistent-mysql-2.10.2.3
-2012170019 metadata/md5-cache/dev-haskell/persistent-postgresql-2.10.1.2
-2012170019 metadata/md5-cache/dev-haskell/persistent-qq-2.9.2
-2012170019 metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2
-2012170019 metadata/md5-cache/dev-haskell/persistent-template-2.8.2.3
-2012170019 metadata/md5-cache/dev-haskell/persistent-test-2.0.3.0
-2012170019 metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3
-2012170251 metadata/md5-cache/dev-haskell/pid1-0.1.2.0
-2012170019 metadata/md5-cache/dev-haskell/pipes-4.3.14
-2012170251 metadata/md5-cache/dev-haskell/pointed-5.0.1-r1
-2012170019 metadata/md5-cache/dev-haskell/polyparse-1.13
-2012170019 metadata/md5-cache/dev-haskell/postgresql-libpq-0.9.4.2-r2
-2012170019 metadata/md5-cache/dev-haskell/postgresql-simple-0.6.2
-2012170019 metadata/md5-cache/dev-haskell/pqueue-1.4.1.3
-2012170019 metadata/md5-cache/dev-haskell/prelude-extras-0.4.0.3
-2012170019 metadata/md5-cache/dev-haskell/preprocessor-tools-2.0.2
-2012170251 metadata/md5-cache/dev-haskell/pretty-hex-1.0
-2012170019 metadata/md5-cache/dev-haskell/pretty-show-1.9.5
-2012170019 metadata/md5-cache/dev-haskell/prettyclass-1.0.0.0
-2012170019 metadata/md5-cache/dev-haskell/prettyprinter-1.6.1
-2012170251 metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.1.2
-2012170019 metadata/md5-cache/dev-haskell/primitive-0.7.1.0
-2012170019 metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2
-2012170251 metadata/md5-cache/dev-haskell/process-extras-0.7.4
-2012170019 metadata/md5-cache/dev-haskell/profunctor-extras-4.0
-2012170019 metadata/md5-cache/dev-haskell/profunctors-5.5.1
-2012170251 metadata/md5-cache/dev-haskell/project-template-0.2.0.1
-2012170019 metadata/md5-cache/dev-haskell/psqueue-1.1.0.1
-2012170019 metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
-2012170019 metadata/md5-cache/dev-haskell/publicsuffixlist-0.1
-2012170019 metadata/md5-cache/dev-haskell/punycode-2.0
-2012170251 metadata/md5-cache/dev-haskell/puremd5-2.1.3
-2012170019 metadata/md5-cache/dev-haskell/pwstore-fast-2.4.4
-2012170019 metadata/md5-cache/dev-haskell/quickcheck-2.13.2
-2012170019 metadata/md5-cache/dev-haskell/quickcheck-2.6
-2012170019 metadata/md5-cache/dev-haskell/quickcheck-2.7.6
-2012170019 metadata/md5-cache/dev-haskell/quickcheck-2.8.1
-2012170019 metadata/md5-cache/dev-haskell/quickcheck-2.8.2
-2012170251 metadata/md5-cache/dev-haskell/quickcheck-2.9.2
-2012170019 metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0
-2012170019 metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.0.0
-2012170019 metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22
-2012170251 metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0
-2012170251 metadata/md5-cache/dev-haskell/quickcheck-unicode-1.0.1.0
-2012170019 metadata/md5-cache/dev-haskell/random-1.1
-2012170251 metadata/md5-cache/dev-haskell/ranges-0.2.4-r1
-2012170019 metadata/md5-cache/dev-haskell/raw-strings-qq-1.1
-2012170251 metadata/md5-cache/dev-haskell/readable-0.3.1
-2012170251 metadata/md5-cache/dev-haskell/readargs-1.2.3
-2012170019 metadata/md5-cache/dev-haskell/readline-1.0.3.0-r1
-2012170019 metadata/md5-cache/dev-haskell/rebase-1.4.1
-2012170251 metadata/md5-cache/dev-haskell/recaptcha-0.1.0.4
-2012170251 metadata/md5-cache/dev-haskell/reducers-3.12.3
-2012170019 metadata/md5-cache/dev-haskell/refact-0.3.0.2
-2012170251 metadata/md5-cache/dev-haskell/reflection-2.1.4
-2012170019 metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1
-2012170251 metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1
-2012170019 metadata/md5-cache/dev-haskell/regex-base-0.94.0.0
-2012170019 metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
-2012170019 metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
-2012170019 metadata/md5-cache/dev-haskell/regex-pcre-0.95.0.0
-2012170019 metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.95.1.3.8.43
-2012170019 metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
-2012170251 metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2
-2012170019 metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0
-2012170019 metadata/md5-cache/dev-haskell/rerebase-1.4.1
-2012170019 metadata/md5-cache/dev-haskell/resolv-0.1.2.0
-2012170019 metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
-2012170019 metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
-2012170019 metadata/md5-cache/dev-haskell/retry-0.8.1.1
-2012170019 metadata/md5-cache/dev-haskell/rfc5051-0.1.0.4
-2012170251 metadata/md5-cache/dev-haskell/riff-0.3.0.1
-2012170019 metadata/md5-cache/dev-haskell/rio-0.1.18.0
-2012170019 metadata/md5-cache/dev-haskell/rio-orphans-0.1.1.0
-2012170019 metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.1.0
-2012170019 metadata/md5-cache/dev-haskell/rsa-2.3.1
-2012170019 metadata/md5-cache/dev-haskell/safe-0.3.17
-2012170251 metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0
-2012170019 metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
-2012170019 metadata/md5-cache/dev-haskell/sandi-0.5
-2012170251 metadata/md5-cache/dev-haskell/say-0.1.0.0
-2012170019 metadata/md5-cache/dev-haskell/scientific-0.3.6.2
-2012170251 metadata/md5-cache/dev-haskell/securemem-0.1.10
-2012170019 metadata/md5-cache/dev-haskell/selective-0.3
-2012170019 metadata/md5-cache/dev-haskell/semigroupoid-extras-5
-2012170019 metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
-2012170251 metadata/md5-cache/dev-haskell/semigroups-0.18.5
-2012170019 metadata/md5-cache/dev-haskell/semirings-0.5.3
-2012170019 metadata/md5-cache/dev-haskell/sendfile-0.7.11.1
-2012170019 metadata/md5-cache/dev-haskell/setenv-0.1.1.3
-2012170019 metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
-2012170251 metadata/md5-cache/dev-haskell/sha-1.6.4.4
-2012170019 metadata/md5-cache/dev-haskell/shakespeare-2.0.21
-2012170019 metadata/md5-cache/dev-haskell/shakespeare-css-1.1.0
-2012170019 metadata/md5-cache/dev-haskell/shakespeare-i18n-1.1.0
-2012170019 metadata/md5-cache/dev-haskell/shakespeare-js-1.3.0
-2012170019 metadata/md5-cache/dev-haskell/shakespeare-text-1.1.0
-2012170251 metadata/md5-cache/dev-haskell/shell-escape-0.2.0
-2012170019 metadata/md5-cache/dev-haskell/shelly-1.9.0
-2012170019 metadata/md5-cache/dev-haskell/silently-1.2.5.1
-2012170251 metadata/md5-cache/dev-haskell/simple-reflect-0.3.3
-2012170019 metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28
-2012170019 metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1
-2012170019 metadata/md5-cache/dev-haskell/size-based-0.1.2.0
-2012170019 metadata/md5-cache/dev-haskell/skein-1.0.9.4
-2012170019 metadata/md5-cache/dev-haskell/skylighting-0.8.5
-2012170019 metadata/md5-cache/dev-haskell/skylighting-core-0.8.5
-2012170019 metadata/md5-cache/dev-haskell/smallcheck-1.2.0
-2012170019 metadata/md5-cache/dev-haskell/snap-core-1.0.4.2
-2012170019 metadata/md5-cache/dev-haskell/snap-server-1.1.1.2
-2012170019 metadata/md5-cache/dev-haskell/socks-0.6.1
-2012170019 metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
-2012170019 metadata/md5-cache/dev-haskell/split-0.2.3.4
-2012170019 metadata/md5-cache/dev-haskell/splitmix-0.0.4
-2012170019 metadata/md5-cache/dev-haskell/stack-2.3.3
-2012170251 metadata/md5-cache/dev-haskell/statevar-1.1.1.1
-2012170019 metadata/md5-cache/dev-haskell/statistics-0.15.2.0
-2012170019 metadata/md5-cache/dev-haskell/stm-2.5.0.0
-2012170019 metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
-2012170019 metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4
-2012170019 metadata/md5-cache/dev-haskell/store-0.7.6
-2012170019 metadata/md5-cache/dev-haskell/store-core-0.4.4.3
-2012170019 metadata/md5-cache/dev-haskell/stream-0.4.7.2
-2012170019 metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2
-2012170019 metadata/md5-cache/dev-haskell/strict-0.3.2-r1
-2012170019 metadata/md5-cache/dev-haskell/string-qq-0.0.4
-2012170019 metadata/md5-cache/dev-haskell/stringable-0.1.3
-2012170019 metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
-2012170019 metadata/md5-cache/dev-haskell/stringprep-1.0.0
-2012170251 metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6-r1
-2012170019 metadata/md5-cache/dev-haskell/syb-0.7.1
-2012170019 metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.11
-2012170251 metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
-2012170251 metadata/md5-cache/dev-haskell/system-filepath-0.4.14
-2012170019 metadata/md5-cache/dev-haskell/system-posix-redirect-1.1.0.1
-2012170019 metadata/md5-cache/dev-haskell/tagged-0.8.6
-2012170019 metadata/md5-cache/dev-haskell/tagshare-0.0
-2012170019 metadata/md5-cache/dev-haskell/tagsoup-0.14.8
-2012170019 metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.6
-2012170019 metadata/md5-cache/dev-haskell/tar-0.5.1.1
-2012170019 metadata/md5-cache/dev-haskell/tar-conduit-0.3.2-r1
-2012170019 metadata/md5-cache/dev-haskell/tasty-1.2.3
-2012170019 metadata/md5-cache/dev-haskell/tasty-ant-xml-1.1.6
-2012170019 metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2
-2012170251 metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1
-2012170019 metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2-r1
-2012170019 metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2
-2012170019 metadata/md5-cache/dev-haskell/tasty-kat-0.0.3
-2012170019 metadata/md5-cache/dev-haskell/tasty-lua-0.2.0.1
-2012170019 metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1
-2012170019 metadata/md5-cache/dev-haskell/tasty-rerun-1.1.17
-2012170019 metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1
-2012170251 metadata/md5-cache/dev-haskell/tasty-th-0.1.7
-2012170019 metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4
-2012170019 metadata/md5-cache/dev-haskell/temporary-1.3
-2012170019 metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3
-2012170251 metadata/md5-cache/dev-haskell/tensor-1.1.0.1
-2012170019 metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1
-2012170019 metadata/md5-cache/dev-haskell/terminfo-0.4.1.4
-2012170019 metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r2
-2012170019 metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1
-2012170019 metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1
-2012170019 metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r1
-2012170019 metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
-2012170251 metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.9
-2012170019 metadata/md5-cache/dev-haskell/testing-feat-1.1.0.0
-2012170019 metadata/md5-cache/dev-haskell/testing-type-modifiers-0.1.0.1
-2012170019 metadata/md5-cache/dev-haskell/texmath-0.12.0.3
-2012170019 metadata/md5-cache/dev-haskell/text-1.2.4.0
-2012170251 metadata/md5-cache/dev-haskell/text-binary-0.2.1.1
-2012170019 metadata/md5-cache/dev-haskell/text-conversions-0.3.0
-2012170019 metadata/md5-cache/dev-haskell/text-icu-0.7.0.1
-2012170251 metadata/md5-cache/dev-haskell/text-metrics-0.3.0
-2012170019 metadata/md5-cache/dev-haskell/text-short-0.1.3
-2012170019 metadata/md5-cache/dev-haskell/text-show-3.8.5
-2012170019 metadata/md5-cache/dev-haskell/text-stream-decode-0.1.0.5
-2012170019 metadata/md5-cache/dev-haskell/tf-random-0.5
-2012170019 metadata/md5-cache/dev-haskell/th-abstraction-0.3.2.0
-2012170019 metadata/md5-cache/dev-haskell/th-expand-syns-0.4.5.0
-2012170019 metadata/md5-cache/dev-haskell/th-lift-0.8.1
-2012170019 metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14
-2012170251 metadata/md5-cache/dev-haskell/th-orphans-0.13.3
-2012170019 metadata/md5-cache/dev-haskell/th-reify-many-0.1.9
-2012170019 metadata/md5-cache/dev-haskell/th-utilities-0.2.3.0
-2012170251 metadata/md5-cache/dev-haskell/threads-0.5.1.6
-2012170019 metadata/md5-cache/dev-haskell/thyme-0.3.5.5
-2012170019 metadata/md5-cache/dev-haskell/time-compat-1.9.3
-2012170251 metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5
-2012170019 metadata/md5-cache/dev-haskell/time-manager-0.0.0
-2012170251 metadata/md5-cache/dev-haskell/timezone-olson-0.1.9
-2012170251 metadata/md5-cache/dev-haskell/timezone-series-0.1.9
-2012170019 metadata/md5-cache/dev-haskell/tls-1.5.4
-2012170019 metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
-2012170019 metadata/md5-cache/dev-haskell/top-1.7
-2012170251 metadata/md5-cache/dev-haskell/torrent-10000.1.1
-2012170019 metadata/md5-cache/dev-haskell/transformers-0.5.6.2
-2012170251 metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2
-2012171039 metadata/md5-cache/dev-haskell/transformers-compat-0.6.6
-2012170019 metadata/md5-cache/dev-haskell/tree-diff-0.1
-2012170019 metadata/md5-cache/dev-haskell/trifecta-2.1
-2012170019 metadata/md5-cache/dev-haskell/type-equality-1
-2012170019 metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
-2012170251 metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.0
-2012170019 metadata/md5-cache/dev-haskell/unexceptionalio-0.5.1
-2012170019 metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7
-2012170019 metadata/md5-cache/dev-haskell/uniplate-1.6.12
-2012170019 metadata/md5-cache/dev-haskell/uniqueid-0.1.1
-2012170019 metadata/md5-cache/dev-haskell/unix-compat-0.5.2
-2012170019 metadata/md5-cache/dev-haskell/unix-time-0.4.7
-2012170019 metadata/md5-cache/dev-haskell/unixutils-1.54.1
-2012170019 metadata/md5-cache/dev-haskell/unliftio-0.2.12.1
-2012170251 metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0
-2012170019 metadata/md5-cache/dev-haskell/unordered-containers-0.2.12.0
-2012170019 metadata/md5-cache/dev-haskell/uri-0.1.6.4
-2012170019 metadata/md5-cache/dev-haskell/uri-bytestring-0.3.3.0
-2012170019 metadata/md5-cache/dev-haskell/uri-bytestring-aeson-0.1.0.7
-2012171039 metadata/md5-cache/dev-haskell/uri-encode-1.5.0.5
-2012170019 metadata/md5-cache/dev-haskell/url-2.1.3-r1
-2012170019 metadata/md5-cache/dev-haskell/utf8-light-0.4.2
-2012170019 metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
-2012170019 metadata/md5-cache/dev-haskell/uuagc-0.9.53.1
-2012170019 metadata/md5-cache/dev-haskell/uuagc-cabal-1.2.0.0
-2012170251 metadata/md5-cache/dev-haskell/uuid-1.3.13-r1
-2012170019 metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1
-2012170019 metadata/md5-cache/dev-haskell/uulib-0.9.24
-2012170019 metadata/md5-cache/dev-haskell/validity-0.9.0.3
-2012170019 metadata/md5-cache/dev-haskell/vault-0.3.1.3
-2012170019 metadata/md5-cache/dev-haskell/vector-0.12.1.2
-2012170019 metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3
-2012170019 metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
-2012170019 metadata/md5-cache/dev-haskell/vector-builder-0.3.8
-2012170251 metadata/md5-cache/dev-haskell/vector-instances-3.4
-2012170019 metadata/md5-cache/dev-haskell/vector-space-0.16
-2012170019 metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
-2012170019 metadata/md5-cache/dev-haskell/void-0.7.3
-2012170019 metadata/md5-cache/dev-haskell/wai-3.2.2.1
-2012170019 metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
-2012170019 metadata/md5-cache/dev-haskell/wai-conduit-3.0.0.4
-2012170019 metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1
-2012170019 metadata/md5-cache/dev-haskell/wai-logger-2.3.6
-2012170019 metadata/md5-cache/dev-haskell/wai-test-3.0.0
-2012170019 metadata/md5-cache/dev-haskell/warp-3.3.13
-2012170019 metadata/md5-cache/dev-haskell/warp-tls-3.2.12
-2012170251 metadata/md5-cache/dev-haskell/wavy-0.1.0.0
-2012170251 metadata/md5-cache/dev-haskell/wcwidth-0.0.2
-2012170019 metadata/md5-cache/dev-haskell/weigh-0.0.16
-2012170019 metadata/md5-cache/dev-haskell/with-location-0.1.0
-2012170251 metadata/md5-cache/dev-haskell/wl-pprint-1.2.1
-2012170251 metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1
-2012170019 metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1
-2012170251 metadata/md5-cache/dev-haskell/word8-0.1.3
-2012170019 metadata/md5-cache/dev-haskell/wreq-0.5.3.2
-2012170019 metadata/md5-cache/dev-haskell/wx-0.92.2.0
-2012170251 metadata/md5-cache/dev-haskell/wxc-0.92.3.0
-2012170251 metadata/md5-cache/dev-haskell/wxcore-0.92.3.0
-2012170019 metadata/md5-cache/dev-haskell/wxdirect-0.92.3.0-r1
-2012170019 metadata/md5-cache/dev-haskell/x11-1.9.2
-2012170019 metadata/md5-cache/dev-haskell/x11-xft-0.3.1-r1
-2012170019 metadata/md5-cache/dev-haskell/x509-1.7.5
-2012170019 metadata/md5-cache/dev-haskell/x509-store-1.6.7
-2012170251 metadata/md5-cache/dev-haskell/x509-system-1.6.6
-2012170019 metadata/md5-cache/dev-haskell/x509-validation-1.6.11
-2012170019 metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1
-2012170019 metadata/md5-cache/dev-haskell/xml-1.3.14
-2012170019 metadata/md5-cache/dev-haskell/xml-conduit-1.9.0.0
-2012170019 metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
-2012170019 metadata/md5-cache/dev-haskell/xml-types-0.3.8
-2012170251 metadata/md5-cache/dev-haskell/xmlgen-0.6.2.2
-2012170251 metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
-2012170019 metadata/md5-cache/dev-haskell/yaml-0.11.5.0
-2012170019 metadata/md5-cache/dev-haskell/yesod-1.6.1.0
-2012170019 metadata/md5-cache/dev-haskell/yesod-auth-1.6.9
-2012170019 metadata/md5-cache/dev-haskell/yesod-auth-hashdb-1.7.1.2
-2012170019 metadata/md5-cache/dev-haskell/yesod-core-1.6.18.8
-2012170019 metadata/md5-cache/dev-haskell/yesod-default-1.2.0
-2012170019 metadata/md5-cache/dev-haskell/yesod-form-1.6.7
-2012170019 metadata/md5-cache/dev-haskell/yesod-json-1.2.0
-2012170019 metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.4
-2012171039 metadata/md5-cache/dev-haskell/yesod-test-1.6.12
-2012170019 metadata/md5-cache/dev-haskell/zip-archive-0.4.1
-2012170019 metadata/md5-cache/dev-haskell/zlib-0.5.4.2
-2012170019 metadata/md5-cache/dev-haskell/zlib-0.6.2.2
-2012170019 metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
-2012170019 metadata/md5-cache/dev-haskell/zlib-conduit-1.1.0
-2012170019 metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
-2012180109 metadata/md5-cache/dev-haskell/Manifest.gz
-2012180109 metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
+2012211239 metadata/md5-cache/dev-haskell/Manifest.gz
+2012210239 metadata/md5-cache/dev-haskell/abstract-deque-0.3
+2012210239 metadata/md5-cache/dev-haskell/abstract-deque-tests-0.3
+2012210239 metadata/md5-cache/dev-haskell/abstract-par-0.3.3-r1
+2012210239 metadata/md5-cache/dev-haskell/ac-ppm-1.1.1
+2012210239 metadata/md5-cache/dev-haskell/adjunctions-4.4
+2012210239 metadata/md5-cache/dev-haskell/aeson-1.4.7.1
+2012210239 metadata/md5-cache/dev-haskell/aeson-compat-0.3.9-r2
+2012210239 metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.8
+2012210239 metadata/md5-cache/dev-haskell/aeson-pretty-0.8.8
+2012210239 metadata/md5-cache/dev-haskell/aeson-qq-0.8.3
+2012210239 metadata/md5-cache/dev-haskell/alex-3.2.5
+2012210239 metadata/md5-cache/dev-haskell/alex-tools-0.4
+2012210239 metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
+2012210239 metadata/md5-cache/dev-haskell/alsa-mixer-0.3.0
+2012210239 metadata/md5-cache/dev-haskell/alut-2.4.0.3
+2012210239 metadata/md5-cache/dev-haskell/annotated-wl-pprint-0.7.0
+2012210239 metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
+2012210239 metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.8.2-r1
+2012210239 metadata/md5-cache/dev-haskell/appar-0.1.8
+2012210239 metadata/md5-cache/dev-haskell/argparser-0.3.4
+2012210239 metadata/md5-cache/dev-haskell/arithmoi-0.11.0.1
+2012210239 metadata/md5-cache/dev-haskell/arrows-0.4.4.2
+2012210239 metadata/md5-cache/dev-haskell/ascii-progress-0.3.3.0
+2012210239 metadata/md5-cache/dev-haskell/asn1-encoding-0.9.6
+2012210239 metadata/md5-cache/dev-haskell/asn1-parse-0.9.5
+2012210239 metadata/md5-cache/dev-haskell/asn1-types-0.3.3
+2012210239 metadata/md5-cache/dev-haskell/async-2.2.2
+2012210239 metadata/md5-cache/dev-haskell/atomic-primops-0.8.3
+2012210239 metadata/md5-cache/dev-haskell/attoparsec-0.13.2.3
+2012210239 metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0
+2012210239 metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
+2012210239 metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.1.0-r1
+2012210239 metadata/md5-cache/dev-haskell/authenticate-1.3.5
+2012210239 metadata/md5-cache/dev-haskell/authenticate-oauth-1.6.0.1
+2012210239 metadata/md5-cache/dev-haskell/auto-update-0.1.6
+2012210239 metadata/md5-cache/dev-haskell/aws-0.22-r1
+2012210239 metadata/md5-cache/dev-haskell/base-compat-0.11.1
+2012210239 metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
+2012210239 metadata/md5-cache/dev-haskell/base-noprelude-4.13.0.0
+2012210239 metadata/md5-cache/dev-haskell/base-orphans-0.8.4
+2012210239 metadata/md5-cache/dev-haskell/base-prelude-1.3
+2012210239 metadata/md5-cache/dev-haskell/base-unicode-symbols-0.2.4.2
+2012210239 metadata/md5-cache/dev-haskell/base16-bytestring-0.1.1.7
+2012210239 metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3
+2012210239 metadata/md5-cache/dev-haskell/basement-0.0.11
+2012210239 metadata/md5-cache/dev-haskell/basic-prelude-0.7.0
+2012210239 metadata/md5-cache/dev-haskell/bencode-0.6.1.1
+2012210239 metadata/md5-cache/dev-haskell/bifunctors-5.5.6
+2012211239 metadata/md5-cache/dev-haskell/binary-0.8.7.0
+2012210239 metadata/md5-cache/dev-haskell/binary-instances-1.0.0.1
+2012210239 metadata/md5-cache/dev-haskell/binary-orphans-1.0.1
+2012210239 metadata/md5-cache/dev-haskell/binary-tagged-0.2
+2012210239 metadata/md5-cache/dev-haskell/biocore-0.3.1
+2012210239 metadata/md5-cache/dev-haskell/biofasta-0.0.3
+2012210239 metadata/md5-cache/dev-haskell/biosff-0.3.7.1
+2012210239 metadata/md5-cache/dev-haskell/bitarray-0.0.1.1
+2012210239 metadata/md5-cache/dev-haskell/bits-atomic-0.1.3-r1
+2012210239 metadata/md5-cache/dev-haskell/bitwise-1.0.0.1
+2012210239 metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0
+2012210239 metadata/md5-cache/dev-haskell/blaze-builder-conduit-1.1.0
+2012210239 metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2
+2012210239 metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4
+2012210239 metadata/md5-cache/dev-haskell/blaze-textual-0.2.1.0
+2012210239 metadata/md5-cache/dev-haskell/bloomfilter-2.0.1.0
+2012210239 metadata/md5-cache/dev-haskell/boolean-0.2.4
+2012210239 metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0
+2012210239 metadata/md5-cache/dev-haskell/boxes-0.1.5
+2012210239 metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4
+2012210239 metadata/md5-cache/dev-haskell/byteable-0.1.1
+2012210239 metadata/md5-cache/dev-haskell/bytedump-1.0
+2012210239 metadata/md5-cache/dev-haskell/byteorder-1.0.4
+2012210239 metadata/md5-cache/dev-haskell/bytes-0.17
+2012210239 metadata/md5-cache/dev-haskell/bytestring-builder-0.10.8.2.0
+2012210239 metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.6
+2012210239 metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
+2012210239 metadata/md5-cache/dev-haskell/bytestring-show-0.3.5.6-r1
+2012210239 metadata/md5-cache/dev-haskell/bzlib-0.5.1.0
+2012210239 metadata/md5-cache/dev-haskell/c2hs-0.28.6
+2012210239 metadata/md5-cache/dev-haskell/cabal-1.18.1.2
+2012210239 metadata/md5-cache/dev-haskell/cabal-1.18.1.3
+2012210239 metadata/md5-cache/dev-haskell/cabal-1.18.1.5
+2012210239 metadata/md5-cache/dev-haskell/cabal-1.20.0.2
+2012210239 metadata/md5-cache/dev-haskell/cabal-1.22.8.0
+2012210239 metadata/md5-cache/dev-haskell/cabal-1.24.2.0
+2012210239 metadata/md5-cache/dev-haskell/cabal-2.0.0.2
+2012210239 metadata/md5-cache/dev-haskell/cabal-2.4.0.1
+2012210239 metadata/md5-cache/dev-haskell/cabal-3.0.1.0
+2012210239 metadata/md5-cache/dev-haskell/cabal-doctest-1.0.8
+2012210239 metadata/md5-cache/dev-haskell/cabal-install-3.0.0.0
+2012210239 metadata/md5-cache/dev-haskell/cairo-0.13.6.1
+2012210239 metadata/md5-cache/dev-haskell/call-stack-0.2.0
+2012210239 metadata/md5-cache/dev-haskell/casa-client-0.0.1
+2012210239 metadata/md5-cache/dev-haskell/casa-types-0.0.1
+2012210239 metadata/md5-cache/dev-haskell/case-insensitive-1.2.1.0
+2012210239 metadata/md5-cache/dev-haskell/cassava-0.5.2.0
+2012210239 metadata/md5-cache/dev-haskell/cereal-0.5.8.1
+2012210239 metadata/md5-cache/dev-haskell/cereal-vector-0.2.0.1
+2012210239 metadata/md5-cache/dev-haskell/cgi-3001.5.0.0
+2012210239 metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1
+2012210239 metadata/md5-cache/dev-haskell/chaselev-deque-0.5.0.5
+2012210239 metadata/md5-cache/dev-haskell/chasingbottoms-1.3.1.9
+2012210239 metadata/md5-cache/dev-haskell/chell-0.4.0.2
+2012210239 metadata/md5-cache/dev-haskell/chimera-0.3.1.0
+2012210239 metadata/md5-cache/dev-haskell/chunked-data-0.3.0
+2012210239 metadata/md5-cache/dev-haskell/cipher-aes-0.2.11
+2012210239 metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r1
+2012210239 metadata/md5-cache/dev-haskell/cipher-camellia-0.0.2
+2012210239 metadata/md5-cache/dev-haskell/cipher-des-0.0.6
+2012210239 metadata/md5-cache/dev-haskell/cipher-rc4-0.1.4
+2012210239 metadata/md5-cache/dev-haskell/classy-prelude-1.5.0
+2012210239 metadata/md5-cache/dev-haskell/clientsession-0.9.1.2
+2012210239 metadata/md5-cache/dev-haskell/clock-0.7.2
+2012210239 metadata/md5-cache/dev-haskell/cmark-0.6
+2012210239 metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1
+2012210239 metadata/md5-cache/dev-haskell/cmdargs-0.10.20
+2012210239 metadata/md5-cache/dev-haskell/code-page-0.1.3
+2012210239 metadata/md5-cache/dev-haskell/colour-2.3.5
+2012210239 metadata/md5-cache/dev-haskell/comonad-5.0.7
+2012210239 metadata/md5-cache/dev-haskell/comonad-transformers-4.0
+2012210239 metadata/md5-cache/dev-haskell/comonads-fd-4.0
+2012210239 metadata/md5-cache/dev-haskell/concurrent-extra-0.7.0.12
+2012210239 metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
+2012210239 metadata/md5-cache/dev-haskell/conduit-1.3.4
+2012210239 metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
+2012210239 metadata/md5-cache/dev-haskell/conduit-extra-1.3.4
+2012210239 metadata/md5-cache/dev-haskell/configfile-1.1.4
+2012210239 metadata/md5-cache/dev-haskell/configurator-0.3.0.0-r1
+2012210239 metadata/md5-cache/dev-haskell/connection-0.3.1
+2012210239 metadata/md5-cache/dev-haskell/constraints-0.11.2
+2012210239 metadata/md5-cache/dev-haskell/contravariant-1.5.2
+2012210239 metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.2
+2012210239 metadata/md5-cache/dev-haskell/control-monad-loop-0.1
+2012210239 metadata/md5-cache/dev-haskell/convertible-1.1.1.0
+2012210239 metadata/md5-cache/dev-haskell/cookie-0.4.4
+2012210239 metadata/md5-cache/dev-haskell/cpphs-1.20.8
+2012210239 metadata/md5-cache/dev-haskell/cpphs-1.20.9.1
+2012210239 metadata/md5-cache/dev-haskell/cprng-aes-0.6.1
+2012210239 metadata/md5-cache/dev-haskell/cpu-0.1.2
+2012210239 metadata/md5-cache/dev-haskell/criterion-1.5.6.2
+2012210239 metadata/md5-cache/dev-haskell/criterion-measurement-0.1.2.0
+2012210239 metadata/md5-cache/dev-haskell/crypto-4.2.5.1-r1
+2012210239 metadata/md5-cache/dev-haskell/crypto-api-0.13.3
+2012210239 metadata/md5-cache/dev-haskell/crypto-api-tests-0.3-r1
+2012210239 metadata/md5-cache/dev-haskell/crypto-cipher-tests-0.0.11-r1
+2012210239 metadata/md5-cache/dev-haskell/crypto-cipher-types-0.0.9
+2012210239 metadata/md5-cache/dev-haskell/crypto-numbers-0.2.7
+2012210239 metadata/md5-cache/dev-haskell/crypto-pubkey-0.2.8
+2012210239 metadata/md5-cache/dev-haskell/crypto-pubkey-types-0.4.3
+2012210239 metadata/md5-cache/dev-haskell/crypto-random-0.0.9
+2012210239 metadata/md5-cache/dev-haskell/crypto-random-api-0.2.0
+2012210239 metadata/md5-cache/dev-haskell/cryptohash-0.11.9
+2012210239 metadata/md5-cache/dev-haskell/cryptohash-conduit-0.1.1
+2012210239 metadata/md5-cache/dev-haskell/cryptohash-cryptoapi-0.1.4
+2012210239 metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
+2012210239 metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
+2012210239 metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
+2012210239 metadata/md5-cache/dev-haskell/cryptonite-0.26-r1
+2012210239 metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
+2012210239 metadata/md5-cache/dev-haskell/css-text-0.1.3.0
+2012210239 metadata/md5-cache/dev-haskell/curl-1.3.8
+2012210239 metadata/md5-cache/dev-haskell/data-accessor-0.2.3
+2012210239 metadata/md5-cache/dev-haskell/data-binary-ieee754-0.4.4
+2012210239 metadata/md5-cache/dev-haskell/data-default-0.7.1.1
+2012210239 metadata/md5-cache/dev-haskell/data-default-class-0.1.2.0
+2012210239 metadata/md5-cache/dev-haskell/data-default-instances-base-0.1.0.1
+2012210239 metadata/md5-cache/dev-haskell/data-default-instances-containers-0.0.1
+2012210239 metadata/md5-cache/dev-haskell/data-default-instances-dlist-0.0.1
+2012210239 metadata/md5-cache/dev-haskell/data-default-instances-old-locale-0.0.1
+2012210239 metadata/md5-cache/dev-haskell/data-endian-0.1.1
+2012210239 metadata/md5-cache/dev-haskell/data-hash-0.2.0.1
+2012210239 metadata/md5-cache/dev-haskell/data-ordlist-0.4.7.0
+2012210239 metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
+2012210239 metadata/md5-cache/dev-haskell/date-cache-0.3.0-r1
+2012210239 metadata/md5-cache/dev-haskell/dav-1.3.4
+2012210239 metadata/md5-cache/dev-haskell/dbus-1.2.16
+2012210239 metadata/md5-cache/dev-haskell/dec-0.0.3
+2012210239 metadata/md5-cache/dev-haskell/deepseq-generics-0.2.0.0
+2012210239 metadata/md5-cache/dev-haskell/dense-linear-algebra-0.1.0.0
+2012210239 metadata/md5-cache/dev-haskell/derive-2.5.26
+2012210239 metadata/md5-cache/dev-haskell/deriving-compat-0.5.8
+2012210239 metadata/md5-cache/dev-haskell/dictionary-sharing-0.1.0.0
+2012210239 metadata/md5-cache/dev-haskell/diff-0.4.0
+2012210239 metadata/md5-cache/dev-haskell/digest-0.0.1.2
+2012210239 metadata/md5-cache/dev-haskell/disk-free-space-0.1.0.1
+2012210239 metadata/md5-cache/dev-haskell/distributive-0.6.1
+2012210239 metadata/md5-cache/dev-haskell/djinn-ghc-0.0.2.3
+2012210239 metadata/md5-cache/dev-haskell/djinn-lib-0.0.1.3
+2012210239 metadata/md5-cache/dev-haskell/dlist-0.8.0.7
+2012210239 metadata/md5-cache/dev-haskell/dlist-instances-0.1.1.1
+2012210239 metadata/md5-cache/dev-haskell/dns-4.0.1
+2012210239 metadata/md5-cache/dev-haskell/doclayout-0.3
+2012210239 metadata/md5-cache/dev-haskell/doctemplates-0.8.2
+2012210239 metadata/md5-cache/dev-haskell/doctest-0.16.3
+2012210239 metadata/md5-cache/dev-haskell/double-conversion-2.0.2.0
+2012210239 metadata/md5-cache/dev-haskell/drbg-0.5.5
+2012210239 metadata/md5-cache/dev-haskell/easy-file-0.2.2
+2012210239 metadata/md5-cache/dev-haskell/echo-0.1.3
+2012210239 metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
+2012210239 metadata/md5-cache/dev-haskell/edisonapi-1.3.1-r1
+2012210239 metadata/md5-cache/dev-haskell/edisoncore-1.3.2.1-r1
+2012210239 metadata/md5-cache/dev-haskell/edit-distance-0.2.2.1-r1
+2012210239 metadata/md5-cache/dev-haskell/edit-distance-vector-1.0.0.4
+2012210239 metadata/md5-cache/dev-haskell/editline-0.2.1.1-r1
+2012210239 metadata/md5-cache/dev-haskell/either-5.0.1.1
+2012210239 metadata/md5-cache/dev-haskell/ekg-0.4.0.15-r7
+2012210239 metadata/md5-cache/dev-haskell/ekg-core-0.1.1.6
+2012210239 metadata/md5-cache/dev-haskell/ekg-json-0.1.0.6-r1
+2012210239 metadata/md5-cache/dev-haskell/email-validate-2.3.2.13
+2012210239 metadata/md5-cache/dev-haskell/emojis-0.1
+2012210239 metadata/md5-cache/dev-haskell/enclosed-exceptions-1.0.3
+2012210239 metadata/md5-cache/dev-haskell/encoding-0.8.5
+2012210239 metadata/md5-cache/dev-haskell/entropy-0.4.1.6
+2012210239 metadata/md5-cache/dev-haskell/enumerator-0.4.20
+2012210239 metadata/md5-cache/dev-haskell/equivalence-0.3.5
+2012210239 metadata/md5-cache/dev-haskell/erf-2.0.0.0-r1
+2012210239 metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
+2012210239 metadata/md5-cache/dev-haskell/errors-2.3.0
+2012210239 metadata/md5-cache/dev-haskell/esqueleto-3.3.4.0
+2012210239 metadata/md5-cache/dev-haskell/exact-pi-0.5.0.1
+2012210239 metadata/md5-cache/dev-haskell/exceptions-0.10.4
+2012210239 metadata/md5-cache/dev-haskell/executable-path-0.0.3.1
+2012210239 metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
+2012210239 metadata/md5-cache/dev-haskell/extra-1.7.8
+2012210239 metadata/md5-cache/dev-haskell/fail-4.9.0.0
+2012210239 metadata/md5-cache/dev-haskell/failure-0.2.0.3
+2012210239 metadata/md5-cache/dev-haskell/fast-logger-3.0.1
+2012210239 metadata/md5-cache/dev-haskell/fclabels-2.0.3.3
+2012210239 metadata/md5-cache/dev-haskell/fdo-notify-0.3.1
+2012210239 metadata/md5-cache/dev-haskell/feed-1.3.0.1
+2012210239 metadata/md5-cache/dev-haskell/fgl-5.7.0.2
+2012210239 metadata/md5-cache/dev-haskell/fgl-arbitrary-0.2.0.3-r1
+2012210239 metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
+2012210239 metadata/md5-cache/dev-haskell/file-location-0.4.9.1
+2012210239 metadata/md5-cache/dev-haskell/filelock-0.1.1.5
+2012210239 metadata/md5-cache/dev-haskell/filemanip-0.3.6.3
+2012210239 metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
+2012210239 metadata/md5-cache/dev-haskell/filestore-0.6.5
+2012210239 metadata/md5-cache/dev-haskell/findbin-0.0.5-r1
+2012210239 metadata/md5-cache/dev-haskell/fingertree-0.1.4.2
+2012210239 metadata/md5-cache/dev-haskell/fixed-0.3
+2012210239 metadata/md5-cache/dev-haskell/fmlist-0.9.3
+2012210239 metadata/md5-cache/dev-haskell/foldl-1.4.7
+2012210239 metadata/md5-cache/dev-haskell/foundation-0.0.25
+2012210239 metadata/md5-cache/dev-haskell/free-5.1.3
+2012210239 metadata/md5-cache/dev-haskell/fsnotify-0.3.0.1
+2012210239 metadata/md5-cache/dev-haskell/generic-deriving-1.13.1
+2012210239 metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
+2012210239 metadata/md5-cache/dev-haskell/geniplate-0.6.0.5
+2012210239 metadata/md5-cache/dev-haskell/geniplate-mirror-0.7.7
+2012210239 metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
+2012210239 metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4
+2012210239 metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1
+2012210239 metadata/md5-cache/dev-haskell/getopt-generics-0.13.0.4
+2012210239 metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
+2012210239 metadata/md5-cache/dev-haskell/gio-0.13.8.1
+2012210239 metadata/md5-cache/dev-haskell/git-0.3.0
+2012210239 metadata/md5-cache/dev-haskell/git-lfs-1.1.0
+2012210239 metadata/md5-cache/dev-haskell/githash-0.1.3.3
+2012210239 metadata/md5-cache/dev-haskell/gitrev-1.3.1
+2012210239 metadata/md5-cache/dev-haskell/glib-0.13.8.1
+2012210239 metadata/md5-cache/dev-haskell/glob-0.9.3
+2012210239 metadata/md5-cache/dev-haskell/gluraw-2.0.0.4
+2012210239 metadata/md5-cache/dev-haskell/glut-2.7.0.15
+2012210239 metadata/md5-cache/dev-haskell/gnuidn-0.2.2-r1
+2012210239 metadata/md5-cache/dev-haskell/gnutls-0.2
+2012210239 metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4
+2012210239 metadata/md5-cache/dev-haskell/groupoids-4.0
+2012210239 metadata/md5-cache/dev-haskell/gsasl-0.3.7
+2012210239 metadata/md5-cache/dev-haskell/gtk-0.14.10-r3
+2012210239 metadata/md5-cache/dev-haskell/gtk-0.15.5-r1
+2012210239 metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0
+2012210239 metadata/md5-cache/dev-haskell/gtk3-0.15.5
+2012210239 metadata/md5-cache/dev-haskell/hackage-security-0.5.3.0-r3
+2012210239 metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3
+2012210239 metadata/md5-cache/dev-haskell/haddock-2.16.1
+2012210239 metadata/md5-cache/dev-haskell/haddock-2.17.2
+2012210239 metadata/md5-cache/dev-haskell/haddock-2.23.1
+2012210239 metadata/md5-cache/dev-haskell/haddock-api-2.16.1
+2012210239 metadata/md5-cache/dev-haskell/haddock-api-2.17.3
+2012210239 metadata/md5-cache/dev-haskell/haddock-api-2.23.1
+2012210239 metadata/md5-cache/dev-haskell/haddock-library-1.1.1
+2012210239 metadata/md5-cache/dev-haskell/haddock-library-1.2.1
+2012210239 metadata/md5-cache/dev-haskell/haddock-library-1.4.2
+2012210239 metadata/md5-cache/dev-haskell/haddock-library-1.8.0
+2012210239 metadata/md5-cache/dev-haskell/hakyll-4.13.4.0
+2012210239 metadata/md5-cache/dev-haskell/half-0.3-r1
+2012210239 metadata/md5-cache/dev-haskell/hamlet-1.2.0
+2012210239 metadata/md5-cache/dev-haskell/happstack-server-7.6.0
+2012210239 metadata/md5-cache/dev-haskell/happy-1.19.12
+2012210239 metadata/md5-cache/dev-haskell/harp-0.4.3.2
+2012210239 metadata/md5-cache/dev-haskell/hashable-1.2.7.0
+2012210239 metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1
+2012210239 metadata/md5-cache/dev-haskell/hashtables-1.2.4.1
+2012210239 metadata/md5-cache/dev-haskell/haskeline-0.7.5.0
+2012210239 metadata/md5-cache/dev-haskell/haskell-lexer-1.0.2
+2012210239 metadata/md5-cache/dev-haskell/haskell-src-1.0.3.0
+2012210239 metadata/md5-cache/dev-haskell/haskell-src-exts-1.17.1
+2012210239 metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1
+2012210239 metadata/md5-cache/dev-haskell/haskell-src-exts-util-0.2.5
+2012210239 metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1
+2012210239 metadata/md5-cache/dev-haskell/haxml-1.25.5-r1
+2012210239 metadata/md5-cache/dev-haskell/hcg-minus-0.15
+2012210239 metadata/md5-cache/dev-haskell/hcodecs-0.5.2
+2012210239 metadata/md5-cache/dev-haskell/hdbc-2.4.0.3
+2012210239 metadata/md5-cache/dev-haskell/hdbc-mysql-0.7.1.0-r1
+2012210239 metadata/md5-cache/dev-haskell/hdbc-odbc-2.6.0.0
+2012210239 metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.7
+2012210239 metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
+2012210239 metadata/md5-cache/dev-haskell/heaps-0.3.6.1
+2012210239 metadata/md5-cache/dev-haskell/hedgehog-1.0.4
+2012210239 metadata/md5-cache/dev-haskell/hex-0.1.2
+2012210239 metadata/md5-cache/dev-haskell/hexpat-0.20.13
+2012210239 metadata/md5-cache/dev-haskell/hgettext-0.1.30
+2012210239 metadata/md5-cache/dev-haskell/hi-file-parser-0.1.0.0
+2012210239 metadata/md5-cache/dev-haskell/highlighting-kate-0.6.4
+2012210239 metadata/md5-cache/dev-haskell/hinotify-0.3.10
+2012210239 metadata/md5-cache/dev-haskell/hit-0.7.0
+2012210239 metadata/md5-cache/dev-haskell/hjsmin-0.2.0.4
+2012210239 metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
+2012210239 metadata/md5-cache/dev-haskell/hoauth2-1.11.0
+2012210239 metadata/md5-cache/dev-haskell/hostname-1.0-r1
+2012210239 metadata/md5-cache/dev-haskell/hourglass-0.2.12
+2012210239 metadata/md5-cache/dev-haskell/hpack-0.33.0
+2012210239 metadata/md5-cache/dev-haskell/hps-0.15
+2012210239 metadata/md5-cache/dev-haskell/hs-bibutils-6.8.0.0
+2012210239 metadata/md5-cache/dev-haskell/hs3-0.5.9
+2012210239 metadata/md5-cache/dev-haskell/hsb2hs-0.3.1
+2012210239 metadata/md5-cache/dev-haskell/hscolour-1.24.4
+2012210239 metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1
+2012210239 metadata/md5-cache/dev-haskell/hslua-1.0.3.1
+2012210239 metadata/md5-cache/dev-haskell/hslua-module-system-0.2.1
+2012210239 metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1
+2012210239 metadata/md5-cache/dev-haskell/hsopenssl-0.11.4.17
+2012210239 metadata/md5-cache/dev-haskell/hspec-2.7.1
+2012210239 metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1
+2012210239 metadata/md5-cache/dev-haskell/hspec-core-2.7.1
+2012210239 metadata/md5-cache/dev-haskell/hspec-discover-2.7.1
+2012210239 metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2
+2012210239 metadata/md5-cache/dev-haskell/hspec-meta-2.6.0
+2012210239 metadata/md5-cache/dev-haskell/hspec-smallcheck-0.5.2
+2012210239 metadata/md5-cache/dev-haskell/hsql-1.8.2-r1
+2012210239 metadata/md5-cache/dev-haskell/hsql-mysql-1.8.2-r1
+2012210239 metadata/md5-cache/dev-haskell/hsql-mysql-1.8.3
+2012210239 metadata/md5-cache/dev-haskell/hsql-odbc-1.8.2
+2012210239 metadata/md5-cache/dev-haskell/hsql-sqlite3-1.8.2-r1
+2012210239 metadata/md5-cache/dev-haskell/hstringtemplate-0.8.7
+2012210239 metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
+2012210239 metadata/md5-cache/dev-haskell/hsyaml-aeson-0.2.0.0
+2012210239 metadata/md5-cache/dev-haskell/htf-0.14.0.3
+2012210239 metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
+2012210239 metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
+2012210239 metadata/md5-cache/dev-haskell/http-4000.3.14
+2012210239 metadata/md5-cache/dev-haskell/http-api-data-0.4.1.1
+2012210239 metadata/md5-cache/dev-haskell/http-attoparsec-0.1.1-r3
+2012210239 metadata/md5-cache/dev-haskell/http-client-0.6.4.1
+2012210239 metadata/md5-cache/dev-haskell/http-client-conduit-0.3.0
+2012210239 metadata/md5-cache/dev-haskell/http-client-multipart-0.3.0.0
+2012210239 metadata/md5-cache/dev-haskell/http-client-restricted-0.0.3
+2012210239 metadata/md5-cache/dev-haskell/http-client-tls-0.3.5.3
+2012210239 metadata/md5-cache/dev-haskell/http-common-0.8.2.1
+2012210239 metadata/md5-cache/dev-haskell/http-conduit-2.3.7.3
+2012210239 metadata/md5-cache/dev-haskell/http-date-0.0.8
+2012210239 metadata/md5-cache/dev-haskell/http-download-0.2.0.0
+2012210239 metadata/md5-cache/dev-haskell/http-reverse-proxy-0.4.3.2
+2012210239 metadata/md5-cache/dev-haskell/http-streams-0.8.7.1
+2012210239 metadata/md5-cache/dev-haskell/http-types-0.12.3
+2012210239 metadata/md5-cache/dev-haskell/http2-2.0.3
+2012210239 metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
+2012210239 metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
+2012210239 metadata/md5-cache/dev-haskell/hunit-1.6.0.0
+2012210239 metadata/md5-cache/dev-haskell/hxt-9.3.1.18
+2012210239 metadata/md5-cache/dev-haskell/hxt-charproperties-9.4.0.0
+2012210239 metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.2.0.3
+2012210239 metadata/md5-cache/dev-haskell/hxt-unicode-9.0.2.4
+2012210239 metadata/md5-cache/dev-haskell/icalendar-0.4.0.5-r1
+2012210239 metadata/md5-cache/dev-haskell/iconv-0.4.1.3
+2012210239 metadata/md5-cache/dev-haskell/idiii-0.1.3.3
+2012210239 metadata/md5-cache/dev-haskell/idna-0.3.0
+2012210239 metadata/md5-cache/dev-haskell/ieee754-0.7.8
+2012210239 metadata/md5-cache/dev-haskell/ifelse-0.85-r1
+2012210239 metadata/md5-cache/dev-haskell/indexed-traversable-0.1
+2012210239 metadata/md5-cache/dev-haskell/infer-license-0.2.0
+2012210239 metadata/md5-cache/dev-haskell/inspection-testing-0.4.2.4
+2012210239 metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3
+2012210239 metadata/md5-cache/dev-haskell/integer-roots-1.0
+2012210239 metadata/md5-cache/dev-haskell/interpolate-0.2.0
+2012210239 metadata/md5-cache/dev-haskell/invariant-0.5.3
+2012210239 metadata/md5-cache/dev-haskell/io-streams-1.5.2.0
+2012210239 metadata/md5-cache/dev-haskell/io-streams-haproxy-1.0.1.0-r1
+2012210239 metadata/md5-cache/dev-haskell/iproute-1.7.8
+2012210239 metadata/md5-cache/dev-haskell/ipynb-0.1
+2012210239 metadata/md5-cache/dev-haskell/iwlib-0.1.0
+2012210239 metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4
+2012210239 metadata/md5-cache/dev-haskell/js-flot-0.8.3
+2012210239 metadata/md5-cache/dev-haskell/js-jquery-3.3.1
+2012210239 metadata/md5-cache/dev-haskell/json-0.10
+2012210239 metadata/md5-cache/dev-haskell/juicypixels-3.3.5
+2012210239 metadata/md5-cache/dev-haskell/kan-extensions-5.2
+2012210239 metadata/md5-cache/dev-haskell/keys-3.12.3
+2012210239 metadata/md5-cache/dev-haskell/language-bash-0.9.0
+2012210239 metadata/md5-cache/dev-haskell/language-c-0.4.7
+2012210239 metadata/md5-cache/dev-haskell/language-c-0.7.1
+2012210239 metadata/md5-cache/dev-haskell/language-c-0.8.3
+2012210239 metadata/md5-cache/dev-haskell/language-css-0.0.3
+2012210239 metadata/md5-cache/dev-haskell/language-dot-0.1.1
+2012210239 metadata/md5-cache/dev-haskell/language-ecmascript-0.19.1.0
+2012210239 metadata/md5-cache/dev-haskell/language-glsl-0.3.0
+2012210239 metadata/md5-cache/dev-haskell/language-haskell-extract-0.2.4-r1
+2012210239 metadata/md5-cache/dev-haskell/language-javascript-0.6.0.14
+2012210239 metadata/md5-cache/dev-haskell/language-lua-0.11.0.1
+2012210239 metadata/md5-cache/dev-haskell/language-python-0.5.8
+2012210239 metadata/md5-cache/dev-haskell/lazysmallcheck-0.6-r1
+2012210239 metadata/md5-cache/dev-haskell/lcs-0.2-r1
+2012210239 metadata/md5-cache/dev-haskell/leancheck-0.9.3
+2012210239 metadata/md5-cache/dev-haskell/lens-4.19.1
+2012210239 metadata/md5-cache/dev-haskell/lens-aeson-1.1
+2012210239 metadata/md5-cache/dev-haskell/lens-family-1.2.3
+2012210239 metadata/md5-cache/dev-haskell/lens-family-core-1.2.3
+2012210239 metadata/md5-cache/dev-haskell/lens-family-th-0.5.1.0
+2012210239 metadata/md5-cache/dev-haskell/lens-simple-0.1.0.9
+2012210239 metadata/md5-cache/dev-haskell/lhs2tex-1.24
+2012210239 metadata/md5-cache/dev-haskell/libmpd-0.9.1.0
+2012210239 metadata/md5-cache/dev-haskell/libxml-0.1.1
+2012210239 metadata/md5-cache/dev-haskell/libxml-sax-0.7.5
+2012210239 metadata/md5-cache/dev-haskell/libyaml-0.1.2
+2012210239 metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6
+2012210239 metadata/md5-cache/dev-haskell/lifted-base-0.2.3.12
+2012210239 metadata/md5-cache/dev-haskell/linear-1.20.9
+2012210239 metadata/md5-cache/dev-haskell/list-0.6.2
+2012210239 metadata/md5-cache/dev-haskell/listlike-4.6.3
+2012210239 metadata/md5-cache/dev-haskell/logging-facade-0.3.0
+2012210239 metadata/md5-cache/dev-haskell/logict-0.7.0.3
+2012210239 metadata/md5-cache/dev-haskell/logict-state-0.1.0.5
+2012210239 metadata/md5-cache/dev-haskell/lrucache-1.2.0.1
+2012210239 metadata/md5-cache/dev-haskell/lukko-0.1.1.2
+2012210239 metadata/md5-cache/dev-haskell/maccatcher-2.1.5-r1
+2012210239 metadata/md5-cache/dev-haskell/magic-1.1
+2012210239 metadata/md5-cache/dev-haskell/markdown-unlit-0.5.0
+2012210239 metadata/md5-cache/dev-haskell/math-functions-0.3.3.0
+2012210239 metadata/md5-cache/dev-haskell/megaparsec-8.0.0
+2012210239 metadata/md5-cache/dev-haskell/memory-0.15.0
+2012210239 metadata/md5-cache/dev-haskell/memotrie-0.6.10
+2012210239 metadata/md5-cache/dev-haskell/mersenne-random-pure64-0.2.2.0
+2012210239 metadata/md5-cache/dev-haskell/microlens-0.4.11.2
+2012210239 metadata/md5-cache/dev-haskell/microlens-aeson-2.3.0.4
+2012210239 metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
+2012210239 metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4
+2012210239 metadata/md5-cache/dev-haskell/microstache-1.0.1.1
+2012210239 metadata/md5-cache/dev-haskell/mime-0.4.0.2
+2012210239 metadata/md5-cache/dev-haskell/mime-mail-0.5.0
+2012210239 metadata/md5-cache/dev-haskell/mime-types-0.1.0.9
+2012210239 metadata/md5-cache/dev-haskell/minisat-0.1.2
+2012210239 metadata/md5-cache/dev-haskell/mintty-0.1.2
+2012210239 metadata/md5-cache/dev-haskell/missingh-1.4.3.0
+2012210239 metadata/md5-cache/dev-haskell/mmap-0.5.9
+2012210239 metadata/md5-cache/dev-haskell/mmorph-1.1.3
+2012210239 metadata/md5-cache/dev-haskell/mockery-0.3.5
+2012210239 metadata/md5-cache/dev-haskell/mod-0.1.1.0
+2012210239 metadata/md5-cache/dev-haskell/monad-control-1.0.2.3
+2012210239 metadata/md5-cache/dev-haskell/monad-journal-0.8.1
+2012210239 metadata/md5-cache/dev-haskell/monad-logger-0.3.32
+2012210239 metadata/md5-cache/dev-haskell/monad-loops-0.4.3
+2012210239 metadata/md5-cache/dev-haskell/monad-par-0.3.5
+2012210239 metadata/md5-cache/dev-haskell/monad-par-extras-0.3.3-r1
+2012210239 metadata/md5-cache/dev-haskell/monad-unlift-0.2.0
+2012210239 metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.1.0-r2
+2012210239 metadata/md5-cache/dev-haskell/monadcatchio-transformers-0.3.1.3-r1
+2012210239 metadata/md5-cache/dev-haskell/monadlib-3.10
+2012210239 metadata/md5-cache/dev-haskell/monadplus-1.4.2-r1
+2012210239 metadata/md5-cache/dev-haskell/monadrandom-0.5.1.2
+2012210239 metadata/md5-cache/dev-haskell/monads-tf-0.1.0.3
+2012210239 metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1
+2012210239 metadata/md5-cache/dev-haskell/mono-traversable-instances-0.1.0.0
+2012210239 metadata/md5-cache/dev-haskell/mountpoints-1.0.2
+2012210239 metadata/md5-cache/dev-haskell/mtl-2.2.2
+2012210239 metadata/md5-cache/dev-haskell/mtl-compat-0.2.2
+2012210239 metadata/md5-cache/dev-haskell/multipart-0.2.0
+2012210239 metadata/md5-cache/dev-haskell/murmur-hash-0.1.0.9
+2012210239 metadata/md5-cache/dev-haskell/mustache-2.3.1
+2012210239 metadata/md5-cache/dev-haskell/mutable-containers-0.3.4
+2012210239 metadata/md5-cache/dev-haskell/mwc-random-0.14.0.0
+2012210239 metadata/md5-cache/dev-haskell/mysql-0.1.7
+2012210239 metadata/md5-cache/dev-haskell/mysql-simple-0.4.5
+2012210239 metadata/md5-cache/dev-haskell/nanospec-0.2.2
+2012210239 metadata/md5-cache/dev-haskell/nats-1.1.2
+2012210239 metadata/md5-cache/dev-haskell/neat-interpolation-0.5.1.2
+2012210239 metadata/md5-cache/dev-haskell/netlink-1.1.1.0
+2012210239 metadata/md5-cache/dev-haskell/network-2.4.1.2
+2012210239 metadata/md5-cache/dev-haskell/network-2.4.2.2
+2012210239 metadata/md5-cache/dev-haskell/network-2.5.0.0
+2012210239 metadata/md5-cache/dev-haskell/network-2.6.2.1
+2012210239 metadata/md5-cache/dev-haskell/network-2.6.3.1-r1
+2012210239 metadata/md5-cache/dev-haskell/network-3.0.1.1
+2012210239 metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0
+2012210239 metadata/md5-cache/dev-haskell/network-byte-order-0.1.4.0
+2012210239 metadata/md5-cache/dev-haskell/network-conduit-1.1.0
+2012210239 metadata/md5-cache/dev-haskell/network-data-0.5.3
+2012210239 metadata/md5-cache/dev-haskell/network-info-0.2.0.10
+2012210239 metadata/md5-cache/dev-haskell/network-multicast-0.3.2
+2012210239 metadata/md5-cache/dev-haskell/network-protocol-xmpp-0.4.9
+2012210239 metadata/md5-cache/dev-haskell/network-uri-2.5.0.0
+2012210239 metadata/md5-cache/dev-haskell/network-uri-2.6.3.0
+2012210239 metadata/md5-cache/dev-haskell/newtype-0.2.2.0
+2012210239 metadata/md5-cache/dev-haskell/newtype-generics-0.5.4
+2012210239 metadata/md5-cache/dev-haskell/nonce-1.0.7
+2012210239 metadata/md5-cache/dev-haskell/numinstances-1.4
+2012210239 metadata/md5-cache/dev-haskell/numtype-dk-0.5.0.2
+2012210239 metadata/md5-cache/dev-haskell/objectname-1.1.0.1
+2012210239 metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
+2012210239 metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
+2012210239 metadata/md5-cache/dev-haskell/only-0.1
+2012210239 metadata/md5-cache/dev-haskell/open-browser-0.2.1.0-r1
+2012210239 metadata/md5-cache/dev-haskell/openal-1.7.0.5
+2012210239 metadata/md5-cache/dev-haskell/opengl-3.0.3.0-r1
+2012210239 metadata/md5-cache/dev-haskell/openglraw-3.3.4.0
+2012210239 metadata/md5-cache/dev-haskell/openssl-streams-1.2.3.0
+2012210239 metadata/md5-cache/dev-haskell/options-1.2.1.1
+2012210239 metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0
+2012210239 metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.3
+2012210239 metadata/md5-cache/dev-haskell/pandoc-citeproc-0.17.0.1
+2012210239 metadata/md5-cache/dev-haskell/pandoc-types-1.20
+2012210239 metadata/md5-cache/dev-haskell/pango-0.13.8.1
+2012210239 metadata/md5-cache/dev-haskell/pantry-0.4.0.2
+2012210239 metadata/md5-cache/dev-haskell/parallel-3.2.2.0
+2012210239 metadata/md5-cache/dev-haskell/parallel-io-0.3.3-r3
+2012210239 metadata/md5-cache/dev-haskell/parsec-3.1.13.0-r1
+2012210239 metadata/md5-cache/dev-haskell/parsec-3.1.14.0
+2012210239 metadata/md5-cache/dev-haskell/parsec-numbers-0.1.0
+2012210239 metadata/md5-cache/dev-haskell/parsec1-1.0.0.7
+2012210239 metadata/md5-cache/dev-haskell/parser-combinators-1.0.0
+2012210239 metadata/md5-cache/dev-haskell/parsers-0.12.10
+2012210239 metadata/md5-cache/dev-haskell/path-0.7.0
+2012210239 metadata/md5-cache/dev-haskell/path-io-1.6.0-r1
+2012210239 metadata/md5-cache/dev-haskell/path-pieces-0.2.1
+2012210239 metadata/md5-cache/dev-haskell/patience-0.1.1-r1
+2012210239 metadata/md5-cache/dev-haskell/pcap-0.4.5.2-r1
+2012210239 metadata/md5-cache/dev-haskell/pcre-light-0.4.1.0
+2012210239 metadata/md5-cache/dev-haskell/pem-0.2.4
+2012210239 metadata/md5-cache/dev-haskell/persistent-2.10.5.2
+2012210239 metadata/md5-cache/dev-haskell/persistent-mysql-2.10.2.3
+2012210239 metadata/md5-cache/dev-haskell/persistent-postgresql-2.10.1.2
+2012210239 metadata/md5-cache/dev-haskell/persistent-qq-2.9.2
+2012210239 metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2
+2012210239 metadata/md5-cache/dev-haskell/persistent-template-2.8.2.3
+2012210239 metadata/md5-cache/dev-haskell/persistent-test-2.0.3.0
+2012210239 metadata/md5-cache/dev-haskell/pgp-wordlist-0.1.0.3
+2012210239 metadata/md5-cache/dev-haskell/pid1-0.1.2.0
+2012210239 metadata/md5-cache/dev-haskell/pipes-4.3.14
+2012210239 metadata/md5-cache/dev-haskell/pointed-5.0.1-r1
+2012210239 metadata/md5-cache/dev-haskell/polyparse-1.13
+2012210239 metadata/md5-cache/dev-haskell/postgresql-libpq-0.9.4.2-r2
+2012210239 metadata/md5-cache/dev-haskell/postgresql-simple-0.6.2
+2012210239 metadata/md5-cache/dev-haskell/pqueue-1.4.1.3
+2012210239 metadata/md5-cache/dev-haskell/prelude-extras-0.4.0.3
+2012210239 metadata/md5-cache/dev-haskell/preprocessor-tools-2.0.2
+2012210239 metadata/md5-cache/dev-haskell/pretty-hex-1.0
+2012210239 metadata/md5-cache/dev-haskell/pretty-show-1.9.5
+2012210239 metadata/md5-cache/dev-haskell/prettyclass-1.0.0.0
+2012210239 metadata/md5-cache/dev-haskell/prettyprinter-1.6.1
+2012210239 metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.1.2
+2012210239 metadata/md5-cache/dev-haskell/primitive-0.7.1.0
+2012210239 metadata/md5-cache/dev-haskell/primitive-addr-0.1.0.2
+2012210239 metadata/md5-cache/dev-haskell/process-extras-0.7.4
+2012210239 metadata/md5-cache/dev-haskell/profunctor-extras-4.0
+2012210239 metadata/md5-cache/dev-haskell/profunctors-5.5.1
+2012210239 metadata/md5-cache/dev-haskell/project-template-0.2.0.1
+2012210239 metadata/md5-cache/dev-haskell/psqueue-1.1.0.1
+2012210239 metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
+2012210239 metadata/md5-cache/dev-haskell/publicsuffixlist-0.1
+2012210239 metadata/md5-cache/dev-haskell/punycode-2.0
+2012210239 metadata/md5-cache/dev-haskell/puremd5-2.1.3
+2012210239 metadata/md5-cache/dev-haskell/pwstore-fast-2.4.4
+2012210239 metadata/md5-cache/dev-haskell/quickcheck-2.13.2
+2012210239 metadata/md5-cache/dev-haskell/quickcheck-2.6
+2012210239 metadata/md5-cache/dev-haskell/quickcheck-2.7.6
+2012210239 metadata/md5-cache/dev-haskell/quickcheck-2.8.1
+2012210239 metadata/md5-cache/dev-haskell/quickcheck-2.8.2
+2012210239 metadata/md5-cache/dev-haskell/quickcheck-2.9.2
+2012210239 metadata/md5-cache/dev-haskell/quickcheck-classes-0.6.4.0
+2012210239 metadata/md5-cache/dev-haskell/quickcheck-classes-base-0.6.0.0
+2012210239 metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22
+2012210239 metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0
+2012210239 metadata/md5-cache/dev-haskell/quickcheck-unicode-1.0.1.0
+2012210239 metadata/md5-cache/dev-haskell/random-1.1
+2012210239 metadata/md5-cache/dev-haskell/ranges-0.2.4-r1
+2012210239 metadata/md5-cache/dev-haskell/raw-strings-qq-1.1
+2012210239 metadata/md5-cache/dev-haskell/readable-0.3.1
+2012210239 metadata/md5-cache/dev-haskell/readargs-1.2.3
+2012210239 metadata/md5-cache/dev-haskell/readline-1.0.3.0-r1
+2012210239 metadata/md5-cache/dev-haskell/rebase-1.4.1
+2012210239 metadata/md5-cache/dev-haskell/recaptcha-0.1.0.4
+2012210239 metadata/md5-cache/dev-haskell/reducers-3.12.3
+2012210239 metadata/md5-cache/dev-haskell/refact-0.3.0.2
+2012210239 metadata/md5-cache/dev-haskell/reflection-2.1.4
+2012210239 metadata/md5-cache/dev-haskell/regex-applicative-0.3.3.1
+2012210239 metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1
+2012210239 metadata/md5-cache/dev-haskell/regex-base-0.94.0.0
+2012210239 metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
+2012210239 metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
+2012210239 metadata/md5-cache/dev-haskell/regex-pcre-0.95.0.0
+2012210239 metadata/md5-cache/dev-haskell/regex-pcre-builtin-0.95.1.3.8.43
+2012210239 metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
+2012210239 metadata/md5-cache/dev-haskell/regex-tdfa-1.2.2
+2012210239 metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0
+2012210239 metadata/md5-cache/dev-haskell/rerebase-1.4.1
+2012210239 metadata/md5-cache/dev-haskell/resolv-0.1.2.0
+2012210239 metadata/md5-cache/dev-haskell/resource-pool-0.2.3.2
+2012210239 metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
+2012210239 metadata/md5-cache/dev-haskell/retry-0.8.1.1
+2012210239 metadata/md5-cache/dev-haskell/rfc5051-0.1.0.4
+2012210239 metadata/md5-cache/dev-haskell/riff-0.3.0.1
+2012210239 metadata/md5-cache/dev-haskell/rio-0.1.18.0
+2012210239 metadata/md5-cache/dev-haskell/rio-orphans-0.1.1.0
+2012210239 metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.1.0
+2012210239 metadata/md5-cache/dev-haskell/rsa-2.3.1
+2012210239 metadata/md5-cache/dev-haskell/safe-0.3.17
+2012210239 metadata/md5-cache/dev-haskell/safe-exceptions-0.1.7.0
+2012210239 metadata/md5-cache/dev-haskell/safesemaphore-0.10.1
+2012210239 metadata/md5-cache/dev-haskell/sandi-0.5
+2012210239 metadata/md5-cache/dev-haskell/say-0.1.0.0
+2012210239 metadata/md5-cache/dev-haskell/scientific-0.3.6.2
+2012210239 metadata/md5-cache/dev-haskell/securemem-0.1.10
+2012210239 metadata/md5-cache/dev-haskell/selective-0.3
+2012210239 metadata/md5-cache/dev-haskell/semigroupoid-extras-5
+2012210239 metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
+2012210239 metadata/md5-cache/dev-haskell/semigroups-0.18.5
+2012210239 metadata/md5-cache/dev-haskell/semirings-0.5.3
+2012210239 metadata/md5-cache/dev-haskell/sendfile-0.7.11.1
+2012210239 metadata/md5-cache/dev-haskell/setenv-0.1.1.3
+2012210239 metadata/md5-cache/dev-haskell/setlocale-1.0.0.9
+2012210239 metadata/md5-cache/dev-haskell/sha-1.6.4.4
+2012210239 metadata/md5-cache/dev-haskell/shakespeare-2.0.21
+2012210239 metadata/md5-cache/dev-haskell/shakespeare-css-1.1.0
+2012210239 metadata/md5-cache/dev-haskell/shakespeare-i18n-1.1.0
+2012210239 metadata/md5-cache/dev-haskell/shakespeare-js-1.3.0
+2012210239 metadata/md5-cache/dev-haskell/shakespeare-text-1.1.0
+2012210239 metadata/md5-cache/dev-haskell/shell-escape-0.2.0
+2012210239 metadata/md5-cache/dev-haskell/shelly-1.9.0
+2012210239 metadata/md5-cache/dev-haskell/silently-1.2.5.1
+2012210239 metadata/md5-cache/dev-haskell/simple-reflect-0.3.3
+2012210239 metadata/md5-cache/dev-haskell/simple-sendfile-0.2.28
+2012210239 metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1
+2012210239 metadata/md5-cache/dev-haskell/size-based-0.1.2.0
+2012210239 metadata/md5-cache/dev-haskell/skein-1.0.9.4
+2012210239 metadata/md5-cache/dev-haskell/skylighting-0.8.5
+2012210239 metadata/md5-cache/dev-haskell/skylighting-core-0.8.5
+2012210239 metadata/md5-cache/dev-haskell/smallcheck-1.2.0
+2012210239 metadata/md5-cache/dev-haskell/snap-core-1.0.4.2
+2012210239 metadata/md5-cache/dev-haskell/snap-server-1.1.1.2
+2012210239 metadata/md5-cache/dev-haskell/socks-0.6.1
+2012210239 metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
+2012210239 metadata/md5-cache/dev-haskell/split-0.2.3.4
+2012210239 metadata/md5-cache/dev-haskell/splitmix-0.0.4
+2012210239 metadata/md5-cache/dev-haskell/stack-2.3.3
+2012210239 metadata/md5-cache/dev-haskell/statevar-1.1.1.1
+2012210239 metadata/md5-cache/dev-haskell/statistics-0.15.2.0
+2012210239 metadata/md5-cache/dev-haskell/stm-2.5.0.0
+2012210239 metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
+2012210239 metadata/md5-cache/dev-haskell/stmonadtrans-0.4.4
+2012210239 metadata/md5-cache/dev-haskell/store-0.7.6
+2012210239 metadata/md5-cache/dev-haskell/store-core-0.4.4.3
+2012210239 metadata/md5-cache/dev-haskell/stream-0.4.7.2
+2012210239 metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2
+2012210239 metadata/md5-cache/dev-haskell/strict-0.3.2-r1
+2012210239 metadata/md5-cache/dev-haskell/string-qq-0.0.4
+2012210239 metadata/md5-cache/dev-haskell/stringable-0.1.3
+2012210239 metadata/md5-cache/dev-haskell/stringbuilder-0.5.1
+2012210239 metadata/md5-cache/dev-haskell/stringprep-1.0.0
+2012210239 metadata/md5-cache/dev-haskell/stringsearch-0.3.6.6-r1
+2012210239 metadata/md5-cache/dev-haskell/syb-0.7.1
+2012210239 metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.11
+2012210239 metadata/md5-cache/dev-haskell/system-fileio-0.3.16.4
+2012210239 metadata/md5-cache/dev-haskell/system-filepath-0.4.14
+2012210239 metadata/md5-cache/dev-haskell/system-posix-redirect-1.1.0.1
+2012210239 metadata/md5-cache/dev-haskell/tagged-0.8.6
+2012210239 metadata/md5-cache/dev-haskell/tagshare-0.0
+2012210239 metadata/md5-cache/dev-haskell/tagsoup-0.14.8
+2012210239 metadata/md5-cache/dev-haskell/tagstream-conduit-0.5.6
+2012210239 metadata/md5-cache/dev-haskell/tar-0.5.1.1
+2012210239 metadata/md5-cache/dev-haskell/tar-conduit-0.3.2-r1
+2012210239 metadata/md5-cache/dev-haskell/tasty-1.2.3
+2012210239 metadata/md5-cache/dev-haskell/tasty-ant-xml-1.1.6
+2012210239 metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2
+2012210239 metadata/md5-cache/dev-haskell/tasty-golden-2.3.1.1
+2012210239 metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2-r1
+2012210239 metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2
+2012210239 metadata/md5-cache/dev-haskell/tasty-kat-0.0.3
+2012210239 metadata/md5-cache/dev-haskell/tasty-lua-0.2.0.1
+2012210239 metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1
+2012210239 metadata/md5-cache/dev-haskell/tasty-rerun-1.1.17
+2012210239 metadata/md5-cache/dev-haskell/tasty-smallcheck-0.8.1
+2012210239 metadata/md5-cache/dev-haskell/tasty-th-0.1.7
+2012210239 metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.4
+2012210239 metadata/md5-cache/dev-haskell/temporary-1.3
+2012210239 metadata/md5-cache/dev-haskell/temporary-rc-1.2.0.3
+2012210239 metadata/md5-cache/dev-haskell/tensor-1.1.0.1
+2012210239 metadata/md5-cache/dev-haskell/terminal-size-0.3.2.1
+2012210239 metadata/md5-cache/dev-haskell/terminfo-0.4.1.4
+2012210239 metadata/md5-cache/dev-haskell/test-framework-0.8.2.0-r2
+2012210239 metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2-r1
+2012210239 metadata/md5-cache/dev-haskell/test-framework-leancheck-0.0.1
+2012210239 metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.5-r1
+2012210239 metadata/md5-cache/dev-haskell/test-framework-th-0.2.4
+2012210239 metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.9
+2012210239 metadata/md5-cache/dev-haskell/testing-feat-1.1.0.0
+2012210239 metadata/md5-cache/dev-haskell/testing-type-modifiers-0.1.0.1
+2012210239 metadata/md5-cache/dev-haskell/texmath-0.12.0.3
+2012210239 metadata/md5-cache/dev-haskell/text-1.2.4.0
+2012210239 metadata/md5-cache/dev-haskell/text-binary-0.2.1.1
+2012210239 metadata/md5-cache/dev-haskell/text-conversions-0.3.0
+2012210239 metadata/md5-cache/dev-haskell/text-icu-0.7.0.1
+2012210239 metadata/md5-cache/dev-haskell/text-metrics-0.3.0
+2012210239 metadata/md5-cache/dev-haskell/text-short-0.1.3
+2012210239 metadata/md5-cache/dev-haskell/text-show-3.8.5
+2012210239 metadata/md5-cache/dev-haskell/text-stream-decode-0.1.0.5
+2012210239 metadata/md5-cache/dev-haskell/tf-random-0.5
+2012210239 metadata/md5-cache/dev-haskell/th-abstraction-0.3.2.0
+2012210239 metadata/md5-cache/dev-haskell/th-expand-syns-0.4.5.0
+2012210239 metadata/md5-cache/dev-haskell/th-lift-0.8.1
+2012210239 metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14
+2012210239 metadata/md5-cache/dev-haskell/th-orphans-0.13.3
+2012210239 metadata/md5-cache/dev-haskell/th-reify-many-0.1.9
+2012210239 metadata/md5-cache/dev-haskell/th-utilities-0.2.3.0
+2012210239 metadata/md5-cache/dev-haskell/threads-0.5.1.6
+2012210239 metadata/md5-cache/dev-haskell/thyme-0.3.5.5
+2012210239 metadata/md5-cache/dev-haskell/time-compat-1.9.3
+2012210239 metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.5
+2012210239 metadata/md5-cache/dev-haskell/time-manager-0.0.0
+2012210239 metadata/md5-cache/dev-haskell/timezone-olson-0.1.9
+2012210239 metadata/md5-cache/dev-haskell/timezone-series-0.1.9
+2012210239 metadata/md5-cache/dev-haskell/tls-1.5.4
+2012210239 metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
+2012210239 metadata/md5-cache/dev-haskell/top-1.7
+2012210239 metadata/md5-cache/dev-haskell/torrent-10000.1.1
+2012210239 metadata/md5-cache/dev-haskell/transformers-0.5.6.2
+2012210239 metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2
+2012210239 metadata/md5-cache/dev-haskell/transformers-compat-0.6.6
+2012210239 metadata/md5-cache/dev-haskell/tree-diff-0.1
+2012210239 metadata/md5-cache/dev-haskell/trifecta-2.1
+2012210239 metadata/md5-cache/dev-haskell/type-equality-1
+2012210239 metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
+2012210239 metadata/md5-cache/dev-haskell/unbounded-delays-0.1.1.0
+2012210239 metadata/md5-cache/dev-haskell/unexceptionalio-0.5.1
+2012210239 metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7
+2012210239 metadata/md5-cache/dev-haskell/uniplate-1.6.12
+2012210239 metadata/md5-cache/dev-haskell/uniqueid-0.1.1
+2012210239 metadata/md5-cache/dev-haskell/unix-compat-0.5.2
+2012210239 metadata/md5-cache/dev-haskell/unix-time-0.4.7
+2012210239 metadata/md5-cache/dev-haskell/unixutils-1.54.1
+2012210239 metadata/md5-cache/dev-haskell/unliftio-0.2.12.1
+2012210239 metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0
+2012210239 metadata/md5-cache/dev-haskell/unordered-containers-0.2.12.0
+2012210239 metadata/md5-cache/dev-haskell/uri-0.1.6.4
+2012210239 metadata/md5-cache/dev-haskell/uri-bytestring-0.3.3.0
+2012210239 metadata/md5-cache/dev-haskell/uri-bytestring-aeson-0.1.0.7
+2012210239 metadata/md5-cache/dev-haskell/uri-encode-1.5.0.5
+2012210239 metadata/md5-cache/dev-haskell/url-2.1.3-r1
+2012210239 metadata/md5-cache/dev-haskell/utf8-light-0.4.2
+2012210239 metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
+2012210239 metadata/md5-cache/dev-haskell/uuagc-0.9.53.1
+2012210239 metadata/md5-cache/dev-haskell/uuagc-cabal-1.2.0.0
+2012210239 metadata/md5-cache/dev-haskell/uuid-1.3.13-r1
+2012210239 metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1
+2012210239 metadata/md5-cache/dev-haskell/uulib-0.9.24
+2012210239 metadata/md5-cache/dev-haskell/validity-0.9.0.3
+2012210239 metadata/md5-cache/dev-haskell/vault-0.3.1.3
+2012210239 metadata/md5-cache/dev-haskell/vector-0.12.1.2
+2012210239 metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3
+2012210239 metadata/md5-cache/dev-haskell/vector-binary-instances-0.2.5.1
+2012210239 metadata/md5-cache/dev-haskell/vector-builder-0.3.8
+2012210239 metadata/md5-cache/dev-haskell/vector-instances-3.4
+2012210239 metadata/md5-cache/dev-haskell/vector-space-0.16
+2012210239 metadata/md5-cache/dev-haskell/vector-th-unbox-0.2.1.7
+2012210239 metadata/md5-cache/dev-haskell/void-0.7.3
+2012210239 metadata/md5-cache/dev-haskell/wai-3.2.2.1
+2012210239 metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
+2012210239 metadata/md5-cache/dev-haskell/wai-conduit-3.0.0.4
+2012210239 metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1
+2012210239 metadata/md5-cache/dev-haskell/wai-logger-2.3.6
+2012210239 metadata/md5-cache/dev-haskell/wai-test-3.0.0
+2012210239 metadata/md5-cache/dev-haskell/warp-3.3.13
+2012210239 metadata/md5-cache/dev-haskell/warp-tls-3.2.12
+2012210239 metadata/md5-cache/dev-haskell/wavy-0.1.0.0
+2012210239 metadata/md5-cache/dev-haskell/wcwidth-0.0.2
+2012210239 metadata/md5-cache/dev-haskell/weigh-0.0.16
+2012210239 metadata/md5-cache/dev-haskell/with-location-0.1.0
+2012210239 metadata/md5-cache/dev-haskell/wl-pprint-1.2.1
+2012210239 metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1
+2012210239 metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1
+2012210239 metadata/md5-cache/dev-haskell/word8-0.1.3
+2012210239 metadata/md5-cache/dev-haskell/wreq-0.5.3.2
+2012210239 metadata/md5-cache/dev-haskell/wx-0.92.2.0
+2012210239 metadata/md5-cache/dev-haskell/wxc-0.92.3.0
+2012210239 metadata/md5-cache/dev-haskell/wxcore-0.92.3.0
+2012210239 metadata/md5-cache/dev-haskell/wxdirect-0.92.3.0-r1
+2012210239 metadata/md5-cache/dev-haskell/x11-1.9.2
+2012210239 metadata/md5-cache/dev-haskell/x11-xft-0.3.1-r1
+2012210239 metadata/md5-cache/dev-haskell/x509-1.7.5
+2012210239 metadata/md5-cache/dev-haskell/x509-store-1.6.7
+2012210239 metadata/md5-cache/dev-haskell/x509-system-1.6.6
+2012210239 metadata/md5-cache/dev-haskell/x509-validation-1.6.11
+2012210239 metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1
+2012210239 metadata/md5-cache/dev-haskell/xml-1.3.14
+2012210239 metadata/md5-cache/dev-haskell/xml-conduit-1.9.0.0
+2012210239 metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
+2012210239 metadata/md5-cache/dev-haskell/xml-types-0.3.8
+2012210239 metadata/md5-cache/dev-haskell/xmlgen-0.6.2.2
+2012210239 metadata/md5-cache/dev-haskell/xss-sanitize-0.3.6
+2012210239 metadata/md5-cache/dev-haskell/yaml-0.11.5.0
+2012210239 metadata/md5-cache/dev-haskell/yesod-1.6.1.0
+2012210239 metadata/md5-cache/dev-haskell/yesod-auth-1.6.9
+2012210239 metadata/md5-cache/dev-haskell/yesod-auth-hashdb-1.7.1.2
+2012210239 metadata/md5-cache/dev-haskell/yesod-core-1.6.18.8
+2012210239 metadata/md5-cache/dev-haskell/yesod-default-1.2.0
+2012210239 metadata/md5-cache/dev-haskell/yesod-form-1.6.7
+2012210239 metadata/md5-cache/dev-haskell/yesod-json-1.2.0
+2012210239 metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.4
+2012210239 metadata/md5-cache/dev-haskell/yesod-static-1.6.1.0
+2012210239 metadata/md5-cache/dev-haskell/yesod-test-1.6.12
+2012210239 metadata/md5-cache/dev-haskell/zip-archive-0.4.1
+2012210239 metadata/md5-cache/dev-haskell/zlib-0.5.4.2
+2012210239 metadata/md5-cache/dev-haskell/zlib-0.6.2.2
+2012210239 metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
+2012210239 metadata/md5-cache/dev-haskell/zlib-conduit-1.1.0
+2012210239 metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
 1702282312 metadata/md5-cache/dev-java/java-apicheck-0_p20150907
 2010142239 metadata/md5-cache/dev-java/ant-1.10.9
 2010200709 metadata/md5-cache/dev-java/offo-hyphenation-2.0
@@ -36985,11 +37027,9 @@
 2012170251 metadata/md5-cache/dev-java/javassist-2.6-r2
 2012170251 metadata/md5-cache/dev-java/javassist-3.18.2
 2012170251 metadata/md5-cache/dev-java/javatoolkit-0.6.3
-2012170251 metadata/md5-cache/dev-java/javatoolkit-0.6.5
 2012170251 metadata/md5-cache/dev-java/javax-inject-1-r2
 2012170251 metadata/md5-cache/dev-java/javax-inject-1-r3
 2012170251 metadata/md5-cache/dev-java/javolution-4.0.2-r1
-2012170251 metadata/md5-cache/dev-java/javolution-6.0.0
 2012170251 metadata/md5-cache/dev-java/jaxen-1.1.4-r1
 2012170251 metadata/md5-cache/dev-java/jaxen-1.1.6
 2012170251 metadata/md5-cache/dev-java/jaxen-1.1.6-r1
@@ -37320,7 +37360,6 @@
 2012170019 metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.106
 2012170019 metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.107
 2012170019 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.59
-2012170019 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.60
 2012170019 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.61
 2012170019 metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.38
 2012170019 metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.40
@@ -37375,8 +37414,11 @@
 2012170251 metadata/md5-cache/dev-java/xz-java-1.8
 2012170251 metadata/md5-cache/dev-java/yanfs-1.0
 2012170251 metadata/md5-cache/dev-java/zeus-jscl-1.64-r1
-2012172039 metadata/md5-cache/dev-java/Manifest.gz
 2012172009 metadata/md5-cache/dev-java/dnsjava-2.1.8
+2012211309 metadata/md5-cache/dev-java/Manifest.gz
+2012211309 metadata/md5-cache/dev-java/javatoolkit-0.6.5
+2012210839 metadata/md5-cache/dev-java/javolution-6.0.0
+2012211309 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.60
 1702282312 metadata/md5-cache/dev-lang/ats-0.2.9
 1910152339 metadata/md5-cache/dev-lang/duktape-2.4.0
 1702282312 metadata/md5-cache/dev-lang/esco-0.512
@@ -37537,8 +37579,6 @@
 2012170251 metadata/md5-cache/dev-lang/mono-6.6.0.161
 2012170019 metadata/md5-cache/dev-lang/mozart-2.0.1
 2012170019 metadata/md5-cache/dev-lang/mozart-stdlib-2.0.1
-2012170019 metadata/md5-cache/dev-lang/mujs-1.0.6
-2012170019 metadata/md5-cache/dev-lang/mujs-1.0.7
 2012170019 metadata/md5-cache/dev-lang/mujs-1.0.9
 2012170019 metadata/md5-cache/dev-lang/nasm-2.15.05
 2012170251 metadata/md5-cache/dev-lang/nim-1.4.2
@@ -37562,14 +37602,12 @@
 2012170019 metadata/md5-cache/dev-lang/perl-5.30.3-r2
 2012170251 metadata/md5-cache/dev-lang/perl-5.32.0
 2012170019 metadata/md5-cache/dev-lang/perl-5.32.0-r1
-2012170019 metadata/md5-cache/dev-lang/php-7.2.34
 2012170019 metadata/md5-cache/dev-lang/php-7.3.25
 2012170019 metadata/md5-cache/dev-lang/php-7.4.13
 2012170019 metadata/md5-cache/dev-lang/php-8.0.0
 2012162341 metadata/md5-cache/dev-lang/polyml-5.6
 2012162341 metadata/md5-cache/dev-lang/polyml-5.8
 2012170019 metadata/md5-cache/dev-lang/python-2.7.18-r4
-2012170251 metadata/md5-cache/dev-lang/python-2.7.18-r5
 2012170251 metadata/md5-cache/dev-lang/python-3.10.0_alpha1
 2012170251 metadata/md5-cache/dev-lang/python-3.10.0_alpha3
 2012170019 metadata/md5-cache/dev-lang/python-3.6.11-r2
@@ -37651,15 +37689,19 @@
 2012170251 metadata/md5-cache/dev-lang/vala-0.48.11
 2012170251 metadata/md5-cache/dev-lang/vala-0.48.6
 2012170251 metadata/md5-cache/dev-lang/vala-0.48.9
-2012170251 metadata/md5-cache/dev-lang/vala-0.50.1
-2012170251 metadata/md5-cache/dev-lang/whitespace-0.4
 2012162341 metadata/md5-cache/dev-lang/xsb-3.8.0
 2012170251 metadata/md5-cache/dev-lang/yap-6.3.3-r1
 2012170019 metadata/md5-cache/dev-lang/yap-6.3.4
 2012170251 metadata/md5-cache/dev-lang/zig-0.5.0
 2012170251 metadata/md5-cache/dev-lang/zig-9999
-2012180239 metadata/md5-cache/dev-lang/Manifest.gz
 2012180239 metadata/md5-cache/dev-lang/erlang-23.2
+2012210239 metadata/md5-cache/dev-lang/Manifest.gz
+2012210139 metadata/md5-cache/dev-lang/ghc-8.10.2
+2012210139 metadata/md5-cache/dev-lang/php-7.2.34
+2012201539 metadata/md5-cache/dev-lang/python-2.7.18-r5
+2012191839 metadata/md5-cache/dev-lang/vala-0.48.12
+2012191839 metadata/md5-cache/dev-lang/vala-0.50.2
+2012210239 metadata/md5-cache/dev-lang/whitespace-0.4
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 1806262009 metadata/md5-cache/dev-libs/cudnn-7.1.4
 1811301839 metadata/md5-cache/dev-libs/cudnn-7.4.1.5
@@ -37739,7 +37781,6 @@
 2007042139 metadata/md5-cache/dev-libs/bemenu-0.5.0
 2007102209 metadata/md5-cache/dev-libs/xmlrpc-c-1.39.11-r1
 2007171109 metadata/md5-cache/dev-libs/freexl-1.0.5
-2008131939 metadata/md5-cache/dev-libs/libpipeline-1.5.3
 2009021410 metadata/md5-cache/dev-libs/bemenu-9999
 2009021410 metadata/md5-cache/dev-libs/gnulib-9999-r1
 2009021410 metadata/md5-cache/dev-libs/go-fuse-9999
@@ -37753,7 +37794,6 @@
 2009301009 metadata/md5-cache/dev-libs/libstrophe-0.9.3
 2010112109 metadata/md5-cache/dev-libs/skalibs-2.9.3.0
 2010120039 metadata/md5-cache/dev-libs/vala-common-0.48.11
-2010120109 metadata/md5-cache/dev-libs/vala-common-0.50.1
 2010121409 metadata/md5-cache/dev-libs/libp11-0.4.11
 2010121339 metadata/md5-cache/dev-libs/libstrophe-0.10.0
 2010181839 metadata/md5-cache/dev-libs/softhsm-2.6.1
@@ -37771,9 +37811,6 @@
 2011191309 metadata/md5-cache/dev-libs/libksba-1.5.0
 2011220139 metadata/md5-cache/dev-libs/tree-sitter-0.17.3
 2011220139 metadata/md5-cache/dev-libs/tree-sitter-9999
-2011252124 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
-2011252124 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629
-2011252124 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-20.40.1147286
 2011252124 metadata/md5-cache/dev-libs/angelscript-2.34.0
 2011252124 metadata/md5-cache/dev-libs/appstream-glib-0.7.16
 2011252124 metadata/md5-cache/dev-libs/appstream-glib-0.7.17
@@ -37785,7 +37822,6 @@
 2011252124 metadata/md5-cache/dev-libs/bglibs-2.04-r2
 2011252124 metadata/md5-cache/dev-libs/boehm-gc-8.0.4
 2011252124 metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205
-2011252124 metadata/md5-cache/dev-libs/botan-2.15.0
 2011252124 metadata/md5-cache/dev-libs/botan-2.16.0
 2011252124 metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110
 2011252124 metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200902
@@ -37810,7 +37846,6 @@
 2011252124 metadata/md5-cache/dev-libs/gobject-introspection-1.66.1
 2011252124 metadata/md5-cache/dev-libs/gom-0.4
 2011252124 metadata/md5-cache/dev-libs/inih-51
-2011252124 metadata/md5-cache/dev-libs/isl-0.23-r1
 2011252124 metadata/md5-cache/dev-libs/jansson-2.12
 2011252124 metadata/md5-cache/dev-libs/jemalloc-4.4.0
 2011252124 metadata/md5-cache/dev-libs/json-glib-1.6.0
@@ -37837,7 +37872,6 @@
 2011252124 metadata/md5-cache/dev-libs/libevent-2.1.11
 2011252124 metadata/md5-cache/dev-libs/libevent-2.1.12
 2011252124 metadata/md5-cache/dev-libs/libezV24-0.1.1-r1
-2011252124 metadata/md5-cache/dev-libs/libffi-3.3-r2
 2011252124 metadata/md5-cache/dev-libs/libgnt-2.14.0
 2011252124 metadata/md5-cache/dev-libs/libgpiod-1.1.1
 2011252124 metadata/md5-cache/dev-libs/libiconv-1.15
@@ -37845,10 +37879,6 @@
 2011252124 metadata/md5-cache/dev-libs/libintl-0.20.1
 2011252124 metadata/md5-cache/dev-libs/libintl-0.20.2
 2011252124 metadata/md5-cache/dev-libs/libksba-1.3.5-r1
-2011252124 metadata/md5-cache/dev-libs/liblinear-210-r1
-2011252124 metadata/md5-cache/dev-libs/liblinear-221
-2011252124 metadata/md5-cache/dev-libs/liblinear-230
-2011252124 metadata/md5-cache/dev-libs/liblinear-240-r1
 2011252124 metadata/md5-cache/dev-libs/libltdl-2.4.6
 2011252124 metadata/md5-cache/dev-libs/libmaxminddb-1.4.3
 2011252124 metadata/md5-cache/dev-libs/libmoe-1.5.8-r3
@@ -37927,8 +37957,6 @@
 2011252124 metadata/md5-cache/dev-libs/totem-pl-parser-3.26.5
 2011252124 metadata/md5-cache/dev-libs/tre-0.8.0-r2
 2011252124 metadata/md5-cache/dev-libs/ustr-1.0.4-r9
-2011252124 metadata/md5-cache/dev-libs/uthash-2.0.2
-2011252124 metadata/md5-cache/dev-libs/uthash-2.1.0
 2011252124 metadata/md5-cache/dev-libs/voikko-fi-2.3
 2011252124 metadata/md5-cache/dev-libs/volume_key-0.3.11
 2011252124 metadata/md5-cache/dev-libs/weston-8.0.0
@@ -37938,7 +37966,6 @@
 2011252124 metadata/md5-cache/dev-libs/xxhash-0.8.0
 2011252124 metadata/md5-cache/dev-libs/zlog-1.2.14-r1
 2011260239 metadata/md5-cache/dev-libs/hiredis-0.14.1
-2011260239 metadata/md5-cache/dev-libs/hiredis-1.0.0
 2011261139 metadata/md5-cache/dev-libs/volume_key-0.3.12-r2
 2011262039 metadata/md5-cache/dev-libs/libressl-3.3.0
 2011281509 metadata/md5-cache/dev-libs/jansson-2.13.1
@@ -37952,14 +37979,12 @@
 2012041739 metadata/md5-cache/dev-libs/fribidi-1.0.9
 2012041739 metadata/md5-cache/dev-libs/gobject-introspection-common-1.66.1
 2012041739 metadata/md5-cache/dev-libs/libinput-1.16.3
-2012041739 metadata/md5-cache/dev-libs/libpfm-4.10.1-r1
 2012041739 metadata/md5-cache/dev-libs/wayland-protocols-1.20
 2012060009 metadata/md5-cache/dev-libs/libmpack-1.0.5
 2012070609 metadata/md5-cache/dev-libs/redland-1.0.17-r2
 2012051839 metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06
 2012081409 metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06-r1
 2012090809 metadata/md5-cache/dev-libs/libressl-3.2.3
-2012091539 metadata/md5-cache/dev-libs/jsoncpp-1.9.4
 2012092209 metadata/md5-cache/dev-libs/libressl-3.3.1
 2012102109 metadata/md5-cache/dev-libs/gjs-1.66.1
 2012101609 metadata/md5-cache/dev-libs/libb64-2.0.0.1
@@ -37968,8 +37993,6 @@
 2012111139 metadata/md5-cache/dev-libs/libusb-1.0.23-r1
 2012131409 metadata/md5-cache/dev-libs/jansson-2.13.1-r1
 2012131539 metadata/md5-cache/dev-libs/liblinear-241
-2012140439 metadata/md5-cache/dev-libs/libevdev-1.10.0
-2012140439 metadata/md5-cache/dev-libs/libinput-1.16.4
 2012140539 metadata/md5-cache/dev-libs/libusb-1.0.24-r1
 2012140439 metadata/md5-cache/dev-libs/volume_key-0.3.12-r1
 2012162341 metadata/md5-cache/dev-libs/9libs-1.0-r4
@@ -37980,13 +38003,11 @@
 2012170251 metadata/md5-cache/dev-libs/OpenNI-9999
 2012170251 metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2
 2012170251 metadata/md5-cache/dev-libs/OpenNI2-9999
-2012170251 metadata/md5-cache/dev-libs/OpenSRF-2.1.1
 2012170251 metadata/md5-cache/dev-libs/antlr-c-3.5.2
 2012170019 metadata/md5-cache/dev-libs/antlr-c-3.5.2-r1
 2012162309 metadata/md5-cache/dev-libs/appstream-0.12.11-r1
 2012162341 metadata/md5-cache/dev-libs/apr-1.6.3-r4
 2012162341 metadata/md5-cache/dev-libs/apr-1.6.5-r1
-2012162341 metadata/md5-cache/dev-libs/apr-1.7.0-r1
 2012162341 metadata/md5-cache/dev-libs/apr-util-1.6.1-r6
 2012170251 metadata/md5-cache/dev-libs/argtable-2.13-r1
 2012170251 metadata/md5-cache/dev-libs/atcore-1.0.0
@@ -38076,21 +38097,15 @@
 2012170019 metadata/md5-cache/dev-libs/folks-0.14.0
 2012170019 metadata/md5-cache/dev-libs/foma-0.9.18
 2012162341 metadata/md5-cache/dev-libs/fstrm-0.3.0
-2012162341 metadata/md5-cache/dev-libs/fstrm-0.6.0
 2012170251 metadata/md5-cache/dev-libs/gdl-3.34.0
 2012170251 metadata/md5-cache/dev-libs/geoip-1.6.10
 2012170251 metadata/md5-cache/dev-libs/geoip-1.6.11
 2012170251 metadata/md5-cache/dev-libs/geoip-1.6.12
 2012170251 metadata/md5-cache/dev-libs/geoip-1.6.9-r1
 2012162341 metadata/md5-cache/dev-libs/gf2x-1.3.0
-2012170019 metadata/md5-cache/dev-libs/glib-2.62.6
-2012170019 metadata/md5-cache/dev-libs/glib-2.64.5
-2012170019 metadata/md5-cache/dev-libs/glib-2.66.2
-2012170019 metadata/md5-cache/dev-libs/glib-2.66.3
 2012170251 metadata/md5-cache/dev-libs/gmime-2.6.23-r1
 2012170251 metadata/md5-cache/dev-libs/gmime-3.2.7
 2012170019 metadata/md5-cache/dev-libs/gmp-6.2.0-r1
-2012170019 metadata/md5-cache/dev-libs/gmp-6.2.1
 2012170251 metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1
 2012170251 metadata/md5-cache/dev-libs/go-fuse-0_p20150422
 2012170251 metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r1
@@ -38121,7 +38136,6 @@
 2012162341 metadata/md5-cache/dev-libs/input-pad-1.0.99_pre20140916
 2012170251 metadata/md5-cache/dev-libs/intel-neo-20.16.16582
 2012170251 metadata/md5-cache/dev-libs/intel-neo-20.37.17906
-2012170019 metadata/md5-cache/dev-libs/isl-0.22.1
 2012162341 metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
 2012162341 metadata/md5-cache/dev-libs/ivykis-0.42.4
 2012170251 metadata/md5-cache/dev-libs/jemalloc-3.6.0
@@ -38207,13 +38221,11 @@
 2012170251 metadata/md5-cache/dev-libs/libcharon-4.8.0
 2012170251 metadata/md5-cache/dev-libs/libclangformat-ide-10.0.0
 2012170251 metadata/md5-cache/dev-libs/libclangformat-ide-9.0.1
-2012170251 metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001
 2012162341 metadata/md5-cache/dev-libs/libclsync-0.4.4-r1
 2012170251 metadata/md5-cache/dev-libs/libconfig-1.5
 2012170251 metadata/md5-cache/dev-libs/libconfig-1.7.1
 2012170251 metadata/md5-cache/dev-libs/libconfig-1.7.2
 2012170251 metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r2
-2012170251 metadata/md5-cache/dev-libs/libcroco-0.6.13
 2012170019 metadata/md5-cache/dev-libs/libdazzle-3.36.0
 2012170019 metadata/md5-cache/dev-libs/libdazzle-3.38.0
 2012170251 metadata/md5-cache/dev-libs/libdbh-5.0.19
@@ -38248,7 +38260,6 @@
 2012170251 metadata/md5-cache/dev-libs/libfido2-1.5.0-r1
 2012170019 metadata/md5-cache/dev-libs/libfilezilla-0.20.2
 2012170019 metadata/md5-cache/dev-libs/libfilezilla-0.24.1
-2012170019 metadata/md5-cache/dev-libs/libfilezilla-0.25.0
 2012170251 metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20201009
 2012170251 metadata/md5-cache/dev-libs/libfmt-7.0.3
 2012170251 metadata/md5-cache/dev-libs/libfmt-7.1.2
@@ -38264,7 +38275,6 @@
 2012170019 metadata/md5-cache/dev-libs/libgdata-0.17.12
 2012170019 metadata/md5-cache/dev-libs/libgdata-0.17.13
 2012170251 metadata/md5-cache/dev-libs/libgee-0.20.3
-2012170251 metadata/md5-cache/dev-libs/libgit2-1.0.1-r1
 2012170019 metadata/md5-cache/dev-libs/libgit2-glib-0.99.0.1-r2
 2012170019 metadata/md5-cache/dev-libs/libgnome-games-support-1.6.1
 2012162341 metadata/md5-cache/dev-libs/libgpg-error-1.38
@@ -38382,7 +38392,6 @@
 2012170251 metadata/md5-cache/dev-libs/libtermkey-0.20
 2012170251 metadata/md5-cache/dev-libs/libtermkey-0.22
 2012170139 metadata/md5-cache/dev-libs/libtimezonemap-0.4.6
-2012162341 metadata/md5-cache/dev-libs/libtommath-1.1.0
 2012162341 metadata/md5-cache/dev-libs/libtommath-1.2.0
 2012162341 metadata/md5-cache/dev-libs/libtpms-0.7.4
 2012170251 metadata/md5-cache/dev-libs/libtsm-4.0.1
@@ -38396,11 +38405,9 @@
 2012170251 metadata/md5-cache/dev-libs/libunique-1.1.6-r2
 2012170251 metadata/md5-cache/dev-libs/libunique-3.0.2-r1
 2012170251 metadata/md5-cache/dev-libs/libunistring-0.9.10
-2012162341 metadata/md5-cache/dev-libs/libuv-1.40.0
 2012162341 metadata/md5-cache/dev-libs/libuv-9999
 2012170251 metadata/md5-cache/dev-libs/libverto-0.2.5-r1
 2012162341 metadata/md5-cache/dev-libs/libverto-0.3.0
-2012162341 metadata/md5-cache/dev-libs/libverto-0.3.1
 2012170251 metadata/md5-cache/dev-libs/libvformat-1.13-r2
 2012170251 metadata/md5-cache/dev-libs/libvterm-0.0_pre20181126
 2012170019 metadata/md5-cache/dev-libs/libvterm-0.1.1
@@ -38415,7 +38422,6 @@
 2012170251 metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
 2012162341 metadata/md5-cache/dev-libs/libxdiff-0.23-r2
 2012170019 metadata/md5-cache/dev-libs/libxls-1.6.1
-2012170019 metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
 2012162341 metadata/md5-cache/dev-libs/libyaml-0.2.2
 2012162341 metadata/md5-cache/dev-libs/libyaml-0.2.5
 2012162341 metadata/md5-cache/dev-libs/libzia-4.21
@@ -38425,7 +38431,6 @@
 2012170251 metadata/md5-cache/dev-libs/libzip-1.7.3
 2012170019 metadata/md5-cache/dev-libs/light-1.2.2
 2012162341 metadata/md5-cache/dev-libs/link-grammar-5.8.0
-2012170251 metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
 2012170251 metadata/md5-cache/dev-libs/log4cplus-1.2.0
 2012162341 metadata/md5-cache/dev-libs/log4cpp-1.1
 2012162341 metadata/md5-cache/dev-libs/log4cpp-1.1.3
@@ -38530,7 +38535,6 @@
 2012162341 metadata/md5-cache/dev-libs/protobuf-c-1.3.3
 2012162341 metadata/md5-cache/dev-libs/pslib-0.4.5
 2012170251 metadata/md5-cache/dev-libs/pugixml-1.10
-2012170251 metadata/md5-cache/dev-libs/pugixml-1.11.2
 2012170251 metadata/md5-cache/dev-libs/pugixml-9999
 2012170251 metadata/md5-cache/dev-libs/qcustomplot-2.0.1
 2012170251 metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3
@@ -38662,7 +38666,6 @@
 2012170251 metadata/md5-cache/dev-libs/zthread-2.3.2-r4
 2012170251 metadata/md5-cache/dev-libs/zziplib-0.13.71-r2
 2012170251 metadata/md5-cache/dev-libs/zziplib-0.13.71_p20201021
-2012180009 metadata/md5-cache/dev-libs/Manifest.gz
 2012171809 metadata/md5-cache/dev-libs/aws-c-event-stream-0.2.5-r1
 2012172009 metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
 2012171739 metadata/md5-cache/dev-libs/glib-2.66.4
@@ -38670,9 +38673,48 @@
 2012180009 metadata/md5-cache/dev-libs/judy-1.0.5-r3
 2012172209 metadata/md5-cache/dev-libs/libgcrypt-1.8.6
 2012172209 metadata/md5-cache/dev-libs/libgcrypt-1.8.7
-2012172009 metadata/md5-cache/dev-libs/libgit2-1.1.0-r2
 2012171939 metadata/md5-cache/dev-libs/openssl-1.1.1i
 2012171809 metadata/md5-cache/dev-libs/s2n-0.10.21-r1
+2012211309 metadata/md5-cache/dev-libs/Manifest.gz
+2012210839 metadata/md5-cache/dev-libs/OpenSRF-2.1.1
+2012210839 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
+2012210839 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629
+2012210839 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-20.40.1147286
+2012191739 metadata/md5-cache/dev-libs/apr-1.7.0-r1
+2012202239 metadata/md5-cache/dev-libs/fstrm-0.6.0
+2012190109 metadata/md5-cache/dev-libs/glib-2.62.6
+2012190109 metadata/md5-cache/dev-libs/glib-2.64.5
+2012190109 metadata/md5-cache/dev-libs/glib-2.66.2
+2012190109 metadata/md5-cache/dev-libs/glib-2.66.3
+2012211309 metadata/md5-cache/dev-libs/gmp-6.2.1
+2012181739 metadata/md5-cache/dev-libs/hiredis-1.0.0
+2012182139 metadata/md5-cache/dev-libs/icu-68.2
+2012182139 metadata/md5-cache/dev-libs/icu-layoutex-68.2
+2012190009 metadata/md5-cache/dev-libs/isl-0.22.1
+2012211309 metadata/md5-cache/dev-libs/isl-0.23-r1
+2012191339 metadata/md5-cache/dev-libs/jsoncpp-1.9.4
+2012202239 metadata/md5-cache/dev-libs/libclc-0.2.0_pre20201001
+2012190109 metadata/md5-cache/dev-libs/libcroco-0.6.13
+2012202239 metadata/md5-cache/dev-libs/libevdev-1.10.0
+2012181609 metadata/md5-cache/dev-libs/libffi-3.3-r2
+2012210339 metadata/md5-cache/dev-libs/libfilezilla-0.25.0
+2012202009 metadata/md5-cache/dev-libs/libgit2-1.1.0-r2
+2012191839 metadata/md5-cache/dev-libs/libgudev-234
+2012202239 metadata/md5-cache/dev-libs/libinput-1.16.4
+2012181339 metadata/md5-cache/dev-libs/libpfm-4.10.1-r1
+2012210510 metadata/md5-cache/dev-libs/libpipeline-1.5.3
+2012181809 metadata/md5-cache/dev-libs/libpqxx-7.3.0
+2012201509 metadata/md5-cache/dev-libs/libtomcrypt-1.18.2
+2012182309 metadata/md5-cache/dev-libs/libuv-1.40.0
+2012202239 metadata/md5-cache/dev-libs/libverto-0.3.1
+2012182309 metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
+2012210839 metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
+2012192339 metadata/md5-cache/dev-libs/pugixml-1.11.3
+2012201509 metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1
+2012201939 metadata/md5-cache/dev-libs/uthash-2.1.0
+2012191839 metadata/md5-cache/dev-libs/vala-common-0.48.12
+2012191839 metadata/md5-cache/dev-libs/vala-common-0.50.2
+2012201039 metadata/md5-cache/dev-libs/voikko-fi-2.4
 1910111840 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2012170251 metadata/md5-cache/dev-lisp/Manifest.gz
 2012170251 metadata/md5-cache/dev-lisp/abcl-1.5.0
@@ -38786,8 +38828,6 @@
 2012031639 metadata/md5-cache/dev-lua/penlight-1.9.2
 2012031639 metadata/md5-cache/dev-lua/say-1.3_p1
 2012031639 metadata/md5-cache/dev-lua/say-1.3_p1-r1
-2012050239 metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r100
-2012050239 metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r2
 2012142109 metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
 2012142109 metadata/md5-cache/dev-lua/luaexpat-1.3.0-r102
 2012142109 metadata/md5-cache/dev-lua/luaexpat-1.3.3-r102
@@ -38808,16 +38848,18 @@
 2012170019 metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r5
 2012170019 metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r1
 2012170019 metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
-2012170251 metadata/md5-cache/dev-lua/luv-1.32.0.0
-2012170251 metadata/md5-cache/dev-lua/luv-1.32.0.0-r101
 2012170019 metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r1
 2012170251 metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
 2012170251 metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r2
-2012171739 metadata/md5-cache/dev-lua/Manifest.gz
 2012171609 metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1
 2012171609 metadata/md5-cache/dev-lua/lua-utf8-0.1.3
 2012171709 metadata/md5-cache/dev-lua/luacheck-0.20.0-r1
 2012171739 metadata/md5-cache/dev-lua/luacheck-0.23.0-r1
+2012210839 metadata/md5-cache/dev-lua/Manifest.gz
+2012210209 metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r101
+2012210209 metadata/md5-cache/dev-lua/lua-openssl-0.7.8_p0-r3
+2012210839 metadata/md5-cache/dev-lua/luv-1.32.0.0
+2012210839 metadata/md5-cache/dev-lua/luv-1.32.0.0-r101
 1704021208 metadata/md5-cache/dev-ml/async_extra-0.9.0
 1704021208 metadata/md5-cache/dev-ml/async_kernel-0.9.0
 1704021208 metadata/md5-cache/dev-ml/async_rpc_kernel-0.9.0
@@ -39124,8 +39166,9 @@
 2012171539 metadata/md5-cache/dev-ml/cppo-1.6.6
 2012171539 metadata/md5-cache/dev-ml/dune-2.7.1
 2012171539 metadata/md5-cache/dev-ml/extlib-1.7.7
-2012171539 metadata/md5-cache/dev-ml/findlib-1.8.1-r1
-2012171809 metadata/md5-cache/dev-ml/Manifest.gz
+2012202209 metadata/md5-cache/dev-ml/Manifest.gz
+2012202209 metadata/md5-cache/dev-ml/findlib-1.8.1-r2
+2012191239 metadata/md5-cache/dev-ml/llvm-ocaml-11.0.1_rc2
 1910170740 metadata/md5-cache/dev-perl/Alien-Gnuplot-1.33.0
 1910170740 metadata/md5-cache/dev-perl/Apache-CGI-Builder-1.300.0-r2
 1910170740 metadata/md5-cache/dev-perl/Apache2-AuthenNTLM-0.20.0-r2
@@ -39583,7 +39626,6 @@
 1912110241 metadata/md5-cache/dev-perl/Test-Version-2.70.0
 1912110241 metadata/md5-cache/dev-perl/Text-Aligner-0.130.0
 1912110241 metadata/md5-cache/dev-perl/Text-BibTeX-0.850.0
-1912110241 metadata/md5-cache/dev-perl/Text-BibTeX-0.880.0
 1912110241 metadata/md5-cache/dev-perl/Text-FindIndent-0.110.0
 1912110241 metadata/md5-cache/dev-perl/Text-Format-0.600.0
 1912110241 metadata/md5-cache/dev-perl/Text-Table-1.133.0
@@ -40715,440 +40757,441 @@
 2012140439 metadata/md5-cache/dev-perl/File-ShareDir-1.116.0
 2012141139 metadata/md5-cache/dev-perl/Mozilla-CA-20999999
 2012170251 metadata/md5-cache/dev-perl/Alien-wxWidgets-0.690.0-r1
-2012170251 metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
 2012170251 metadata/md5-cache/dev-perl/Apache-Test-1.420.0
 2012171209 metadata/md5-cache/dev-perl/App-cpanminus-1.704.400
-2012170251 metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
-2012170251 metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0
-2012170251 metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
-2012170251 metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
-2012170251 metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1
-2012170251 metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
-2012170251 metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
-2012170251 metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1
-2012170251 metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1
-2012170251 metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1
-2012170251 metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2
-2012170251 metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
-2012170251 metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
 2012170251 metadata/md5-cache/dev-perl/Crypt-Curve25519-0.60.0
-2012170251 metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1
-2012170251 metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
-2012170251 metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2
-2012170251 metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3
-2012170251 metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0
-2012170251 metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1
-2012170251 metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1
-2012170251 metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1
-2012170251 metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
-2012170251 metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1
-2012170251 metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
 2012170251 metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r1
 2012170251 metadata/md5-cache/dev-perl/DBD-mysql-4.50.0
-2012170251 metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
-2012170251 metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
 2012170251 metadata/md5-cache/dev-perl/DBIx-Safe-1.2.5-r1
-2012170251 metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1
-2012170251 metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
-2012170251 metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/Data-Compare-1.250.0
-2012170251 metadata/md5-cache/dev-perl/Data-Diver-1.010.1
-2012170251 metadata/md5-cache/dev-perl/Data-Dump-1.230.0
-2012170251 metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1
-2012170251 metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1
-2012170251 metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
-2012170251 metadata/md5-cache/dev-perl/Data-ICal-0.220.0
-2012170251 metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
-2012170251 metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0
-2012170251 metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1
-2012170251 metadata/md5-cache/dev-perl/Data-Types-0.90.0
-2012170251 metadata/md5-cache/dev-perl/Data-UUID-1.221.0
-2012170251 metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1
-2012170251 metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/Date-Calc-6.400.0
-2012170251 metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1
-2012170251 metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1
-2012170251 metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1
-2012170251 metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1
-2012170251 metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1
-2012170251 metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1
-2012170251 metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
-2012170251 metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
-2012170251 metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
-2012170251 metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
-2012170251 metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
-2012170251 metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
-2012170251 metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
 2012170251 metadata/md5-cache/dev-perl/Devel-Symdump-2.180.0
-2012170251 metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
-2012170251 metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
-2012170251 metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
-2012170251 metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0
-2012170251 metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
 2012170019 metadata/md5-cache/dev-perl/Emacs-PDE-0.2.17
-2012170251 metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
-2012170251 metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
-2012170251 metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
-2012170251 metadata/md5-cache/dev-perl/Email-Send-2.201.0
-2012170251 metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
-2012170251 metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1
-2012170251 metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0
-2012170251 metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0
-2012170251 metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1
-2012170251 metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1
-2012170251 metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1
-2012170251 metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
-2012170251 metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
-2012170251 metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
-2012170251 metadata/md5-cache/dev-perl/File-Flock-2014.10.0
-2012170251 metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1
-2012170251 metadata/md5-cache/dev-perl/File-Map-0.640.0
-2012170251 metadata/md5-cache/dev-perl/File-NFSLock-1.270.0
-2012170251 metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1
-2012170251 metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1
-2012170251 metadata/md5-cache/dev-perl/File-RsyncP-0.740.0
-2012170251 metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
-2012170251 metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1
-2012170251 metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1
-2012170251 metadata/md5-cache/dev-perl/File-Sync-0.110.0
-2012170251 metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1
-2012170251 metadata/md5-cache/dev-perl/File-Type-0.220.0-r1
-2012170251 metadata/md5-cache/dev-perl/File-chmod-0.420.0
-2012170251 metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
-2012170251 metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
 2012162341 metadata/md5-cache/dev-perl/Filesys-SmbClient-3.200.0-r4
-2012170251 metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1
-2012170251 metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
-2012170251 metadata/md5-cache/dev-perl/Fuse-0.16.1
-2012170251 metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
-2012170251 metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
-2012170251 metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
-2012170251 metadata/md5-cache/dev-perl/GDGraph-1.490.0
-2012170251 metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
-2012170251 metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
-2012170251 metadata/md5-cache/dev-perl/Geo-IP-1.510.0
-2012170251 metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
-2012170251 metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
-2012170251 metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
-2012170251 metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1
-2012170251 metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
-2012170251 metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
-2012170251 metadata/md5-cache/dev-perl/Guard-1.23.0
-2012170251 metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
-2012170251 metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
-2012170251 metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
-2012170251 metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1
-2012170251 metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0
-2012170251 metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
-2012170251 metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
-2012170251 metadata/md5-cache/dev-perl/HTML-Object-2.29-r2
-2012170251 metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
-2012170251 metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
-2012170251 metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
-2012170251 metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
-2012170251 metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
-2012170251 metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
-2012170251 metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
-2012170251 metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
-2012170251 metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
-2012170251 metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
-2012170251 metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
-2012170251 metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1
-2012170251 metadata/md5-cache/dev-perl/Hash-Merge-0.200.0
-2012170251 metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
-2012170251 metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
-2012170251 metadata/md5-cache/dev-perl/IO-HTML-1.1.0
-2012170251 metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1
-2012170251 metadata/md5-cache/dev-perl/IO-String-1.80.0-r1
-2012170251 metadata/md5-cache/dev-perl/IO-Stty-0.30.0
-2012170251 metadata/md5-cache/dev-perl/IO-Tty-1.120.0
-2012170251 metadata/md5-cache/dev-perl/IO-stringy-2.111.0
-2012170251 metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
-2012170251 metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1
-2012170251 metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
-2012170251 metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1
-2012170251 metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
-2012170251 metadata/md5-cache/dev-perl/Image-Size-3.300.0
-2012170251 metadata/md5-cache/dev-perl/Inline-0.800.0
-2012170251 metadata/md5-cache/dev-perl/Inline-Files-0.690.0
-2012170251 metadata/md5-cache/dev-perl/JSON-Any-1.390.0
-2012170251 metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
-2012170251 metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
-2012170251 metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
-2012170251 metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1
-2012170251 metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
-2012170251 metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1
-2012170251 metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1
-2012170251 metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1
-2012170251 metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1
-2012170251 metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1
-2012170251 metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
-2012170251 metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
-2012170251 metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
-2012170251 metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
-2012170251 metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
-2012170251 metadata/md5-cache/dev-perl/Locale-PO-0.270.0
-2012170251 metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
-2012170251 metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
-2012170251 metadata/md5-cache/dev-perl/MD5-2.30.0-r1
-2012170251 metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
-2012170251 metadata/md5-cache/dev-perl/MP4-Info-1.130.0
-2012170251 metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0
-2012170251 metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
-2012170251 metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
-2012170251 metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0
-2012170251 metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1
-2012170251 metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
-2012171209 metadata/md5-cache/dev-perl/Manifest.gz
-2012170251 metadata/md5-cache/dev-perl/Math-Base36-0.140.0
-2012170251 metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1
-2012170251 metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1
-2012170251 metadata/md5-cache/dev-perl/Math-Random-0.720.0
-2012170251 metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
-2012170251 metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
-2012170251 metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
-2012170251 metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
-2012170251 metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1
-2012170251 metadata/md5-cache/dev-perl/Mo-0.400.0
-2012170251 metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
-2012170251 metadata/md5-cache/dev-perl/Module-Find-0.130.0
-2012170251 metadata/md5-cache/dev-perl/Module-Locate-1.800.0
-2012170251 metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
-2012170251 metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
-2012170251 metadata/md5-cache/dev-perl/Module-Util-1.90.0
-2012170251 metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1
-2012170251 metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
-2012170251 metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
-2012170251 metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
-2012170251 metadata/md5-cache/dev-perl/Net-Amazon-0.620.0
-2012170251 metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1
-2012170251 metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1
-2012170251 metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
-2012170251 metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0
-2012170251 metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0
-2012170251 metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1
-2012170251 metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1
-2012170251 metadata/md5-cache/dev-perl/Net-Netmask-1.902.200
-2012170251 metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
 2012170251 metadata/md5-cache/dev-perl/Net-Pcap-0.180.0
-2012170251 metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2
-2012170251 metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1
 2012170251 metadata/md5-cache/dev-perl/Net-Server-2.9.0
-2012170251 metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
-2012170251 metadata/md5-cache/dev-perl/NetPacket-1.6.0
-2012170251 metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
-2012170251 metadata/md5-cache/dev-perl/Number-Format-1.750.0
-2012170251 metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1
-2012170251 metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
-2012170251 metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
 2012170251 metadata/md5-cache/dev-perl/OpenGL-0.700.0
-2012170251 metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1
 2012170251 metadata/md5-cache/dev-perl/PDL-2.17.0-r1
-2012170251 metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1
-2012170251 metadata/md5-cache/dev-perl/POE-1.367
-2012170251 metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1
-2012170251 metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0
-2012170251 metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0
-2012170251 metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0
-2012170251 metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0
-2012170251 metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
-2012170251 metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
-2012170251 metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
-2012170251 metadata/md5-cache/dev-perl/Package-Constants-0.60.0
-2012170251 metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
 2012170251 metadata/md5-cache/dev-perl/Panotools-Script-0.280.0-r3
 2012171209 metadata/md5-cache/dev-perl/Parallel-ForkManager-1.190.0
-2012170251 metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1
-2012170251 metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1
-2012170251 metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1
 2012170019 metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
-2012170251 metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
-2012170251 metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
-2012170251 metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0
-2012170251 metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
-2012170251 metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
-2012170251 metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
-2012170251 metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
-2012170251 metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
-2012170251 metadata/md5-cache/dev-perl/Pod-POM-2.10.0
-2012170251 metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
-2012170251 metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
-2012170251 metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
-2012170251 metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
-2012170251 metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1
-2012170251 metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1
 2012170251 metadata/md5-cache/dev-perl/Quota-1.7.2-r1
-2012170251 metadata/md5-cache/dev-perl/RPC-XML-0.790.0
-2012170251 metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
-2012170251 metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1
 2012170251 metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0
-2012170251 metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1
-2012170251 metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1
-2012170251 metadata/md5-cache/dev-perl/Role-Basic-0.130.0
-2012170251 metadata/md5-cache/dev-perl/Roman-1.240.0
-2012170251 metadata/md5-cache/dev-perl/SDL-2.546
-2012170251 metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2
 2012170251 metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
-2012170251 metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
-2012170251 metadata/md5-cache/dev-perl/SRU-1.10.0
-2012170251 metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1
-2012170251 metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1
-2012170251 metadata/md5-cache/dev-perl/Sane-0.50.0-r1
-2012170251 metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
 2012170251 metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.0
 2012170251 metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.2
 2012170251 metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.4
-2012170251 metadata/md5-cache/dev-perl/Set-Crontab-1.30.0
-2012170251 metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
-2012170251 metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1
-2012170251 metadata/md5-cache/dev-perl/Set-Scalar-1.290.0
-2012170251 metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2
-2012170251 metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1
-2012170251 metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1
-2012170251 metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
-2012170251 metadata/md5-cache/dev-perl/Socket6-0.270.0
-2012170251 metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1
-2012170251 metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1
-2012170251 metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1
-2012170251 metadata/md5-cache/dev-perl/Spiffy-0.460.0
-2012170251 metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
-2012170251 metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
-2012170251 metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1
-2012170251 metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
-2012170251 metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1
-2012170251 metadata/md5-cache/dev-perl/String-Format-1.170.0-r1
-2012170251 metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
-2012170251 metadata/md5-cache/dev-perl/Sub-Install-0.928.0
-2012170251 metadata/md5-cache/dev-perl/Sub-Override-0.90.0
-2012170251 metadata/md5-cache/dev-perl/Switch-2.170.0
-2012170251 metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
-2012170251 metadata/md5-cache/dev-perl/Sys-CPU-0.610.0
-2012170251 metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
-2012170251 metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2
-2012170251 metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
-2012170251 metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
-2012170251 metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
-2012170251 metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
 2012170251 metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.120.0
-2012170251 metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
-2012170251 metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1
-2012170251 metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1
-2012170251 metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1
-2012170251 metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1
-2012170251 metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1
-2012170251 metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1
-2012170251 metadata/md5-cache/dev-perl/Test-Base-0.880.0
-2012170251 metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
-2012170251 metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
-2012170251 metadata/md5-cache/dev-perl/Test-Class-0.500.0
-2012170251 metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
-2012170251 metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
-2012170251 metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1
-2012170251 metadata/md5-cache/dev-perl/Test-LongString-0.170.0
-2012170251 metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
-2012170251 metadata/md5-cache/dev-perl/Test-Most-0.340.0
-2012170251 metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
-2012170251 metadata/md5-cache/dev-perl/Test-Pod-1.510.0
 2012170251 metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0
-2012170251 metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
-2012170251 metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1
-2012170251 metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
-2012170251 metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/Text-German-0.60.0-r1
-2012170251 metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1
-2012170251 metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
-2012170251 metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1
-2012170251 metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
-2012170251 metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1
-2012170251 metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
-2012170251 metadata/md5-cache/dev-perl/Text-Roman-3.500.0
-2012170251 metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
-2012170251 metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1
-2012170251 metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
-2012170251 metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
-2012170251 metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
-2012170251 metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
-2012170251 metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
-2012170251 metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
-2012170251 metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1
-2012170251 metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1
-2012170251 metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
-2012170251 metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
-2012170251 metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1
-2012170251 metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1
-2012170251 metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
-2012170251 metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
-2012170251 metadata/md5-cache/dev-perl/Time-Period-1.250.0
-2012170251 metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1
-2012170251 metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
-2012170251 metadata/md5-cache/dev-perl/TimeDate-2.300.0
-2012170251 metadata/md5-cache/dev-perl/Tk-804.33.0
-2012170251 metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
 2012170251 metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3
-2012170251 metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1
-2012170251 metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
-2012170251 metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
-2012170251 metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
-2012170251 metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
-2012170251 metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0
-2012170251 metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
-2012171109 metadata/md5-cache/dev-perl/Unicode-LineBreak-2019.1.0
-2012170251 metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
-2012170251 metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
-2012170251 metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0
-2012170251 metadata/md5-cache/dev-perl/WWW-Curl-4.170.0
-2012170251 metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1
-2012170251 metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1
-2012170251 metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
 2012170251 metadata/md5-cache/dev-perl/Wx-0.993.200-r1
 2012170251 metadata/md5-cache/dev-perl/Wx-Perl-ProcessStream-0.320.0-r3
 2012170251 metadata/md5-cache/dev-perl/Wx-Scintilla-0.390.0-r3
-2012170251 metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1
-2012170251 metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2
-2012170251 metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-Parser-2.440.0
-2012170251 metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1
-2012170251 metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
 2012170251 metadata/md5-cache/dev-perl/XML-SAX-1.0.0
-2012170251 metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
-2012170251 metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-Smart-1.790.0
-2012170251 metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0
-2012170251 metadata/md5-cache/dev-perl/XML-Writer-0.625.0
-2012170251 metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1
-2012170251 metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1
-2012170251 metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0
-2012170251 metadata/md5-cache/dev-perl/YAML-1.150.0
-2012170251 metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
-2012170251 metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
-2012170251 metadata/md5-cache/dev-perl/capitalization-0.30.0-r1
-2012170251 metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1
-2012170251 metadata/md5-cache/dev-perl/maybe-0.20.200-r1
 2012170251 metadata/md5-cache/dev-perl/perl-headers-0.0.1
-2012170251 metadata/md5-cache/dev-perl/prefork-1.40.0-r2
-2012170251 metadata/md5-cache/dev-perl/rename-1.900.0
-2012170251 metadata/md5-cache/dev-perl/txt2html-2.520.100
+2012210839 metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
+2012210839 metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
+2012210839 metadata/md5-cache/dev-perl/Bio-Graphics-2.390.0
+2012210839 metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
+2012210839 metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
+2012210839 metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1
+2012210839 metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
+2012210839 metadata/md5-cache/dev-perl/Const-Fast-0.14.0-r1
+2012210839 metadata/md5-cache/dev-perl/Convert-ASCII-Armour-1.400.0-r1
+2012210839 metadata/md5-cache/dev-perl/Convert-BER-1.320.0-r1
+2012210839 metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1
+2012210839 metadata/md5-cache/dev-perl/Convert-TNEF-0.180.0-r2
+2012210839 metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0-r1
+2012210839 metadata/md5-cache/dev-perl/Crypt-CAST5_PP-1.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
+2012210839 metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1
+2012210839 metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
+2012210839 metadata/md5-cache/dev-perl/Crypt-Eksblowfish-0.9.0-r2
+2012210839 metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3
+2012210839 metadata/md5-cache/dev-perl/Crypt-PasswdMD5-1.400.0
+2012210839 metadata/md5-cache/dev-perl/Crypt-Primes-0.500.0-r1
+2012210839 metadata/md5-cache/dev-perl/Crypt-RC4-2.020.0-r1
+2012210839 metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1
+2012210839 metadata/md5-cache/dev-perl/Crypt-Simple-0.60.0-r1
+2012210839 metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r1
+2012210839 metadata/md5-cache/dev-perl/Crypt-X509-0.510.0
+2012210839 metadata/md5-cache/dev-perl/DBIx-ContextualFetch-1.30.0-r1
+2012210839 metadata/md5-cache/dev-perl/DBIx-DBSchema-0.450.0
+2012210839 metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1
+2012210839 metadata/md5-cache/dev-perl/Data-AMF-0.90.0-r1
+2012210839 metadata/md5-cache/dev-perl/Data-Buffer-0.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/Data-Compare-1.250.0
+2012210839 metadata/md5-cache/dev-perl/Data-Diver-1.010.1
+2012210839 metadata/md5-cache/dev-perl/Data-Dump-1.230.0
+2012210839 metadata/md5-cache/dev-perl/Data-DumpXML-1.60.0-r1
+2012210839 metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r1
+2012210839 metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r1
+2012210839 metadata/md5-cache/dev-perl/Data-ICal-0.220.0
+2012210839 metadata/md5-cache/dev-perl/Data-Page-2.20.0-r1
+2012210839 metadata/md5-cache/dev-perl/Data-ShowTable-4.600.0
+2012210839 metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1
+2012210839 metadata/md5-cache/dev-perl/Data-Types-0.90.0
+2012210839 metadata/md5-cache/dev-perl/Data-UUID-1.221.0
+2012210839 metadata/md5-cache/dev-perl/Data-Uniqid-0.120.0-r1
+2012210839 metadata/md5-cache/dev-perl/Data-Utilities-0.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/Date-Calc-6.400.0
+2012210839 metadata/md5-cache/dev-perl/Date-ICal-2.678.0-r1
+2012210839 metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1
+2012210839 metadata/md5-cache/dev-perl/Date-Pcalc-6.100.0-r1
+2012210839 metadata/md5-cache/dev-perl/Date-Simple-3.30.0-r1
+2012210839 metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1
+2012210839 metadata/md5-cache/dev-perl/DateTime-Format-DateParse-0.50.0-r1
+2012210839 metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
+2012210839 metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
+2012210839 metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
+2012210839 metadata/md5-cache/dev-perl/Devel-Caller-2.60.0
+2012210839 metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0
+2012210839 metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
+2012210839 metadata/md5-cache/dev-perl/Devel-LexAlias-0.50.0
+2012210839 metadata/md5-cache/dev-perl/Digest-BubbleBabble-0.20.0-r1
+2012210839 metadata/md5-cache/dev-perl/Digest-HMAC-1.30.0-r1
+2012210839 metadata/md5-cache/dev-perl/Digest-MD4-1.900.0-r1
+2012210839 metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0
+2012210839 metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r1
+2012210839 metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
+2012210839 metadata/md5-cache/dev-perl/Email-MIME-Attachment-Stripper-1.317.0-r1
+2012210839 metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
+2012210839 metadata/md5-cache/dev-perl/Email-Send-2.201.0
+2012210839 metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
+2012210839 metadata/md5-cache/dev-perl/Encode-Detect-1.10.0-r1
+2012210839 metadata/md5-cache/dev-perl/Encode-JIS2K-0.30.0
+2012210839 metadata/md5-cache/dev-perl/Eval-LineNumbers-0.340.0
+2012210839 metadata/md5-cache/dev-perl/Event-ExecFlow-0.640.0-r1
+2012210839 metadata/md5-cache/dev-perl/Exporter-Cluster-0.310.0-r1
+2012210839 metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1
+2012210839 metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.180.0
+2012210839 metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
+2012210839 metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
+2012210839 metadata/md5-cache/dev-perl/File-Flock-2014.10.0
+2012210839 metadata/md5-cache/dev-perl/File-Listing-6.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/File-MMagic-1.300.0-r1
+2012210839 metadata/md5-cache/dev-perl/File-Map-0.640.0
+2012210839 metadata/md5-cache/dev-perl/File-NFSLock-1.270.0
+2012210839 metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r1
+2012210839 metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r1
+2012210839 metadata/md5-cache/dev-perl/File-RsyncP-0.740.0
+2012210839 metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0
+2012210839 metadata/md5-cache/dev-perl/File-Sort-1.10.0-r1
+2012210839 metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r1
+2012210839 metadata/md5-cache/dev-perl/File-Sync-0.110.0
+2012210839 metadata/md5-cache/dev-perl/File-Tempdir-0.20.0-r1
+2012210839 metadata/md5-cache/dev-perl/File-Type-0.220.0-r1
+2012210839 metadata/md5-cache/dev-perl/File-chmod-0.420.0
+2012210839 metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.800
+2012210839 metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.120.0
+2012210839 metadata/md5-cache/dev-perl/Font-AFM-1.200.0-r1
+2012210839 metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
+2012210839 metadata/md5-cache/dev-perl/Fuse-0.16.1
+2012210839 metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
+2012210839 metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
+2012210839 metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
+2012210839 metadata/md5-cache/dev-perl/GDGraph-1.490.0
+2012210839 metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
+2012210839 metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
+2012210839 metadata/md5-cache/dev-perl/Geo-IP-1.510.0
+2012210839 metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
+2012210839 metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
+2012210839 metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
+2012210839 metadata/md5-cache/dev-perl/Graphics-ColorNames-2.110.0-r1
+2012210839 metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.130.0
+2012210839 metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
+2012210839 metadata/md5-cache/dev-perl/Guard-1.23.0
+2012210839 metadata/md5-cache/dev-perl/HTML-Element-Extended-1.180.0-r1
+2012210839 metadata/md5-cache/dev-perl/HTML-FillInForm-2.210.0
+2012210839 metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
+2012210839 metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.100.0-r1
+2012210839 metadata/md5-cache/dev-perl/HTML-Highlight-0.200.0
+2012210839 metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
+2012210839 metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
+2012210839 metadata/md5-cache/dev-perl/HTML-Object-2.29-r2
+2012210839 metadata/md5-cache/dev-perl/HTML-Table-2.08a-r1
+2012210839 metadata/md5-cache/dev-perl/HTML-TableContentParser-0.130.0
+2012210839 metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
+2012210839 metadata/md5-cache/dev-perl/HTML-Tagset-3.200.0-r1
+2012210839 metadata/md5-cache/dev-perl/HTML-Template-Expr-0.70.0-r1
+2012210839 metadata/md5-cache/dev-perl/HTML-Template-Pro-0.951.0
+2012210839 metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
+2012210839 metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
+2012210839 metadata/md5-cache/dev-perl/HTTP-DAV-0.480.0
+2012210839 metadata/md5-cache/dev-perl/HTTP-Date-6.20.0-r1
+2012210839 metadata/md5-cache/dev-perl/HTTP-Response-Encoding-0.60.0-r1
+2012210839 metadata/md5-cache/dev-perl/HTTPD-User-Manage-1.660.0-r1
+2012210839 metadata/md5-cache/dev-perl/Hash-Merge-0.200.0
+2012210839 metadata/md5-cache/dev-perl/Hash-MultiValue-0.160.0
+2012210839 metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
+2012210839 metadata/md5-cache/dev-perl/IO-HTML-1.1.0
+2012210839 metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1
+2012210839 metadata/md5-cache/dev-perl/IO-String-1.80.0-r1
+2012210839 metadata/md5-cache/dev-perl/IO-Stty-0.30.0
+2012210839 metadata/md5-cache/dev-perl/IO-Tty-1.120.0
+2012210839 metadata/md5-cache/dev-perl/IO-stringy-2.111.0
+2012210839 metadata/md5-cache/dev-perl/IP-Anonymous-0.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/IPC-ShareLite-0.170.0-r1
+2012210839 metadata/md5-cache/dev-perl/IPC-Shareable-0.610.0-r1
+2012210839 metadata/md5-cache/dev-perl/IPC-System-Simple-1.250.0
+2012210839 metadata/md5-cache/dev-perl/Ima-DBI-0.350.0-r1
+2012210839 metadata/md5-cache/dev-perl/Image-Imlib2-2.30.0-r1
+2012210839 metadata/md5-cache/dev-perl/Image-Size-3.300.0
+2012210839 metadata/md5-cache/dev-perl/Inline-0.800.0
+2012210839 metadata/md5-cache/dev-perl/Inline-Files-0.690.0
+2012210839 metadata/md5-cache/dev-perl/JSON-Any-1.390.0
+2012210839 metadata/md5-cache/dev-perl/JSON-XS-VersionOneAndTwo-0.310.0-r1
+2012210839 metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
+2012210839 metadata/md5-cache/dev-perl/Jcode-2.70.0-r1
+2012210839 metadata/md5-cache/dev-perl/LWP-MediaTypes-6.20.0-r1
+2012210839 metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
+2012210839 metadata/md5-cache/dev-perl/Lingua-Stem-0.840.0-r1
+2012210839 metadata/md5-cache/dev-perl/Lingua-Stem-Fr-0.20.0-r1
+2012210839 metadata/md5-cache/dev-perl/Lingua-Stem-It-0.20.0-r1
+2012210839 metadata/md5-cache/dev-perl/Lingua-Stem-Snowball-Da-1.10.0-r1
+2012210839 metadata/md5-cache/dev-perl/Linux-Inotify2-1.220.0-r1
+2012210839 metadata/md5-cache/dev-perl/Linux-Pid-0.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/Linux-Smaps-0.130.0
+2012210839 metadata/md5-cache/dev-perl/Lirc-Client-2.20.0
+2012210839 metadata/md5-cache/dev-perl/List-AllUtils-0.90.0
+2012210839 metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
+2012210839 metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0
+2012210839 metadata/md5-cache/dev-perl/Locale-PO-0.270.0
+2012210839 metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
+2012210839 metadata/md5-cache/dev-perl/MARC-Charset-1.350.0-r1
+2012210839 metadata/md5-cache/dev-perl/MD5-2.30.0-r1
+2012210839 metadata/md5-cache/dev-perl/MLDBM-Sync-0.300.0-r1
+2012210839 metadata/md5-cache/dev-perl/MP4-Info-1.130.0
+2012210839 metadata/md5-cache/dev-perl/Mac-Pasteboard-0.3.0
+2012210839 metadata/md5-cache/dev-perl/Mail-Builder-Simple-0.160.0-r1
+2012210839 metadata/md5-cache/dev-perl/Mail-DomainKeys-1.0.0-r1
+2012210839 metadata/md5-cache/dev-perl/Mail-ListDetector-1.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/Mail-POP3Client-2.190.0
+2012210839 metadata/md5-cache/dev-perl/Mail-Procmail-1.80.0-r1
+2012210839 metadata/md5-cache/dev-perl/Mail-SRS-0.310.0-r2
+2012211309 metadata/md5-cache/dev-perl/Manifest.gz
+2012210839 metadata/md5-cache/dev-perl/Math-Base36-0.140.0
+2012210839 metadata/md5-cache/dev-perl/Math-Bezier-0.10.0-r1
+2012210839 metadata/md5-cache/dev-perl/Math-Calc-Units-1.70.0-r1
+2012210839 metadata/md5-cache/dev-perl/Math-Random-0.720.0
+2012210839 metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
+2012210839 metadata/md5-cache/dev-perl/Math-Random-ISAAC-XS-1.4.0-r1
+2012210839 metadata/md5-cache/dev-perl/Math-Random-MT-1.170.0
+2012210839 metadata/md5-cache/dev-perl/Math-Vec-1.10.0-r1
+2012210839 metadata/md5-cache/dev-perl/Math-VecStat-0.80.0-r1
+2012210839 metadata/md5-cache/dev-perl/Mo-0.400.0
+2012210839 metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
+2012210839 metadata/md5-cache/dev-perl/Module-Find-0.130.0
+2012210839 metadata/md5-cache/dev-perl/Module-Locate-1.800.0
+2012210839 metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0
+2012210839 metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
+2012210839 metadata/md5-cache/dev-perl/Module-Util-1.90.0
+2012210839 metadata/md5-cache/dev-perl/Module-Versions-Report-1.60.0-r1
+2012210839 metadata/md5-cache/dev-perl/MooseX-Aliases-0.110.0-r1
+2012210839 metadata/md5-cache/dev-perl/MooseX-GlobRef-0.70.100
+2012210839 metadata/md5-cache/dev-perl/MooseX-MultiInitArg-0.20.0
+2012210839 metadata/md5-cache/dev-perl/Net-Amazon-0.620.0
+2012210839 metadata/md5-cache/dev-perl/Net-DNS-Async-1.70.0-r1
+2012210839 metadata/md5-cache/dev-perl/Net-IMAP-Simple-SSL-1.300.0-r1
+2012210839 metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
+2012210839 metadata/md5-cache/dev-perl/Net-IP-Minimal-0.60.0
+2012210839 metadata/md5-cache/dev-perl/Net-IPv4Addr-0.100.0
+2012210839 metadata/md5-cache/dev-perl/Net-IRC-0.790.0-r1
+2012210839 metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r1
+2012210839 metadata/md5-cache/dev-perl/Net-Netmask-1.902.200
+2012210839 metadata/md5-cache/dev-perl/Net-OAuth-0.280.0-r1
+2012210839 metadata/md5-cache/dev-perl/Net-SMTP-TLS-0.120.0-r2
+2012210839 metadata/md5-cache/dev-perl/Net-SMTP-TLS-ButMaintained-0.240.0-r1
+2012210839 metadata/md5-cache/dev-perl/NetAddr-IP-4.78.0
+2012210839 metadata/md5-cache/dev-perl/NetPacket-1.6.0
+2012210839 metadata/md5-cache/dev-perl/Number-Compare-0.30.0-r1
+2012210839 metadata/md5-cache/dev-perl/Number-Format-1.750.0
+2012210839 metadata/md5-cache/dev-perl/OLE-StorageLite-0.190.0-r1
+2012210839 metadata/md5-cache/dev-perl/Object-MultiType-0.50.0
+2012210839 metadata/md5-cache/dev-perl/Object-Realize-Later-0.190.0
+2012210839 metadata/md5-cache/dev-perl/PAR-Dist-0.490.0-r1
+2012210839 metadata/md5-cache/dev-perl/PHP-Serialization-0.340.0-r1
+2012210839 metadata/md5-cache/dev-perl/POE-1.367
+2012210839 metadata/md5-cache/dev-perl/POE-API-Peek-2.200.0-r1
+2012210839 metadata/md5-cache/dev-perl/POE-Component-Client-Keepalive-0.272.0
+2012210839 metadata/md5-cache/dev-perl/POE-Component-Resolver-0.921.0
+2012210839 metadata/md5-cache/dev-perl/POE-Test-Loops-1.360.0
+2012210839 metadata/md5-cache/dev-perl/POE-XS-Loop-EPoll-1.3.0
+2012210839 metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
+2012210839 metadata/md5-cache/dev-perl/POE-XS-Queue-Array-0.6.0-r1
+2012210839 metadata/md5-cache/dev-perl/PPIx-Utilities-1.1.0-r1
+2012210839 metadata/md5-cache/dev-perl/Package-Constants-0.60.0
+2012210839 metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
+2012210839 metadata/md5-cache/dev-perl/Parse-ExuberantCTags-1.20.0-r1
+2012210839 metadata/md5-cache/dev-perl/Parse-Syslog-1.100.0-r1
+2012210839 metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1
+2012210839 metadata/md5-cache/dev-perl/Perl-Critic-Nits-1.0.0-r1
+2012210839 metadata/md5-cache/dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect-0.60.0-r1
+2012210839 metadata/md5-cache/dev-perl/Perl6-Junction-1.600.0
+2012210839 metadata/md5-cache/dev-perl/PerlIO-Layers-0.11.0
+2012210839 metadata/md5-cache/dev-perl/Perlbal-XS-HTTPHeaders-0.200.0-r1
+2012210839 metadata/md5-cache/dev-perl/Plucene-1.250.0-r2
+2012210839 metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0-r1
+2012210839 metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
+2012210839 metadata/md5-cache/dev-perl/Pod-POM-2.10.0
+2012210839 metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
+2012210839 metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
+2012210839 metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
+2012210839 metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
+2012210839 metadata/md5-cache/dev-perl/Proc-Background-1.100.0-r1
+2012210839 metadata/md5-cache/dev-perl/Proc-WaitStat-1.0.0-r1
+2012210839 metadata/md5-cache/dev-perl/RPC-XML-0.790.0
+2012210839 metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
+2012210839 metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1
+2012210839 metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1
+2012210839 metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1
+2012210839 metadata/md5-cache/dev-perl/Role-Basic-0.130.0
+2012210839 metadata/md5-cache/dev-perl/Roman-1.240.0
+2012210839 metadata/md5-cache/dev-perl/SDL-2.546
+2012210839 metadata/md5-cache/dev-perl/SNMP_Session-1.13-r2
+2012210839 metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
+2012210839 metadata/md5-cache/dev-perl/SRU-1.10.0
+2012210839 metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1
+2012210839 metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1
+2012210839 metadata/md5-cache/dev-perl/Sane-0.50.0-r1
+2012210839 metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
+2012210839 metadata/md5-cache/dev-perl/Set-Crontab-1.30.0
+2012210839 metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
+2012210839 metadata/md5-cache/dev-perl/Set-IntSpan-1.190.0-r1
+2012210839 metadata/md5-cache/dev-perl/Set-Scalar-1.290.0
+2012210839 metadata/md5-cache/dev-perl/Shell-EnvImporter-1.70.0-r2
+2012210839 metadata/md5-cache/dev-perl/Snowball-Norwegian-1.200.0-r1
+2012210839 metadata/md5-cache/dev-perl/Snowball-Swedish-1.200.0-r1
+2012210839 metadata/md5-cache/dev-perl/Socket-GetAddrInfo-0.220.0
+2012210839 metadata/md5-cache/dev-perl/Socket6-0.270.0
+2012210839 metadata/md5-cache/dev-perl/Sort-Naturally-1.30.0-r1
+2012210839 metadata/md5-cache/dev-perl/Sort-Tree-1.90.0-r1
+2012210839 metadata/md5-cache/dev-perl/Speech-Recognizer-SPX-0.80.100-r1
+2012210839 metadata/md5-cache/dev-perl/Spiffy-0.460.0
+2012210839 metadata/md5-cache/dev-perl/Spreadsheet-ParseExcel-0.650.0
+2012210839 metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0
+2012210839 metadata/md5-cache/dev-perl/Stat-lsMode-0.500.0-r1
+2012210839 metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
+2012210839 metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r1
+2012210839 metadata/md5-cache/dev-perl/String-Format-1.170.0-r1
+2012210839 metadata/md5-cache/dev-perl/String-ShellQuote-1.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/Sub-Exporter-0.987.0
+2012210839 metadata/md5-cache/dev-perl/Sub-Install-0.928.0
+2012210839 metadata/md5-cache/dev-perl/Sub-Override-0.90.0
+2012210839 metadata/md5-cache/dev-perl/Switch-2.170.0
+2012210839 metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
+2012210839 metadata/md5-cache/dev-perl/Sys-CPU-0.610.0
+2012210839 metadata/md5-cache/dev-perl/Sys-Statistics-Linux-0.660.0-r1
+2012210839 metadata/md5-cache/dev-perl/Sys-Syscall-0.250.0-r2
+2012210839 metadata/md5-cache/dev-perl/Sys-Virt-1.1.2
+2012210839 metadata/md5-cache/dev-perl/Sys-Virt-1.2.9
+2012210839 metadata/md5-cache/dev-perl/Taint-Runtime-0.30.0-r1
+2012210839 metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
+2012210839 metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
+2012210839 metadata/md5-cache/dev-perl/Template-Tiny-1.120.0-r1
+2012210839 metadata/md5-cache/dev-perl/Template-XML-2.170.0-r1
+2012210839 metadata/md5-cache/dev-perl/Term-ANSIScreen-1.500.0-r1
+2012210839 metadata/md5-cache/dev-perl/Term-ScreenColor-1.200.0-r1
+2012210839 metadata/md5-cache/dev-perl/Term-ShellUI-0.920.0-r1
+2012210839 metadata/md5-cache/dev-perl/Test-Assert-0.50.400-r1
+2012210839 metadata/md5-cache/dev-perl/Test-Base-0.880.0
+2012210839 metadata/md5-cache/dev-perl/Test-CPAN-Meta-0.250.0
+2012210839 metadata/md5-cache/dev-perl/Test-CheckDeps-0.10.0
+2012210839 metadata/md5-cache/dev-perl/Test-Class-0.500.0
+2012210839 metadata/md5-cache/dev-perl/Test-Command-Simple-0.50.0
+2012210839 metadata/md5-cache/dev-perl/Test-DistManifest-1.14.0
+2012210839 metadata/md5-cache/dev-perl/Test-Distribution-2.0.0-r1
+2012210839 metadata/md5-cache/dev-perl/Test-LongString-0.170.0
+2012210839 metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
+2012210839 metadata/md5-cache/dev-perl/Test-Most-0.340.0
+2012210839 metadata/md5-cache/dev-perl/Test-NoWarnings-1.40.0-r3
+2012210839 metadata/md5-cache/dev-perl/Test-Pod-1.510.0
+2012210839 metadata/md5-cache/dev-perl/Test-Taint-1.60.0-r1
+2012210839 metadata/md5-cache/dev-perl/Test-Unit-Lite-0.120.200-r1
+2012201939 metadata/md5-cache/dev-perl/Text-BibTeX-0.880.0
+2012210839 metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r1
+2012210839 metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/Text-German-0.60.0-r1
+2012210839 metadata/md5-cache/dev-perl/Text-Glob-0.90.0-r1
+2012210839 metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
+2012210839 metadata/md5-cache/dev-perl/Text-Netstring-0.70.0-r1
+2012210839 metadata/md5-cache/dev-perl/Text-Password-Pronounceable-0.300.0-r1
+2012210839 metadata/md5-cache/dev-perl/Text-Patch-1.800.0-r1
+2012210839 metadata/md5-cache/dev-perl/Text-Reform-1.200.0-r1
+2012210839 metadata/md5-cache/dev-perl/Text-Roman-3.500.0
+2012210839 metadata/md5-cache/dev-perl/Text-Shellwords-1.80.0-r1
+2012210839 metadata/md5-cache/dev-perl/Text-Unaccent-1.80.0-r1
+2012210839 metadata/md5-cache/dev-perl/Text-WikiFormat-0.810.0
+2012210839 metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
+2012210839 metadata/md5-cache/dev-perl/Text-vFile-asData-0.80.0
+2012210839 metadata/md5-cache/dev-perl/Tie-Array-Sorted-1.410.0-r1
+2012210839 metadata/md5-cache/dev-perl/Tie-CPHash-2.0.0
+2012210839 metadata/md5-cache/dev-perl/Tie-Cache-LRU-20150301.0.0
+2012210839 metadata/md5-cache/dev-perl/Tie-Cache-LRU-Expires-0.550.0-r1
+2012210839 metadata/md5-cache/dev-perl/Tie-EncryptedHash-1.240.0-r1
+2012210839 metadata/md5-cache/dev-perl/Tie-Hash-Method-0.20.0
+2012210839 metadata/md5-cache/dev-perl/Tie-IxHash-1.230.0
+2012210839 metadata/md5-cache/dev-perl/Tie-ShadowHash-1.0.0-r1
+2012210839 metadata/md5-cache/dev-perl/Tie-StrictHash-1.0.0-r1
+2012210839 metadata/md5-cache/dev-perl/Tie-Sub-1.1.0-r1
+2012210839 metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
+2012210839 metadata/md5-cache/dev-perl/Time-Period-1.250.0
+2012210839 metadata/md5-cache/dev-perl/Time-Piece-MySQL-0.60.0-r1
+2012210839 metadata/md5-cache/dev-perl/Time-Stopwatch-1.0.0
+2012210839 metadata/md5-cache/dev-perl/TimeDate-2.300.0
+2012210839 metadata/md5-cache/dev-perl/Tk-804.33.0
+2012210839 metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
+2012210839 metadata/md5-cache/dev-perl/Tk-JPEG-Lite-2.14.30-r1
+2012210839 metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
+2012210839 metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
+2012210839 metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
+2012210839 metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
+2012210839 metadata/md5-cache/dev-perl/UUID-Tiny-1.40.0
+2012210839 metadata/md5-cache/dev-perl/Unicode-EastAsianWidth-1.330.0-r1
+2012211309 metadata/md5-cache/dev-perl/Unicode-LineBreak-2019.1.0
+2012210839 metadata/md5-cache/dev-perl/Unicode-Map-0.112.0-r1
+2012210839 metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0
+2012210839 metadata/md5-cache/dev-perl/Unicode-UTF8simple-1.60.0
+2012210839 metadata/md5-cache/dev-perl/WWW-Curl-4.170.0
+2012210839 metadata/md5-cache/dev-perl/WattsUp-Daemon-0.4-r1
+2012210839 metadata/md5-cache/dev-perl/WeakRef-0.10.0-r1
+2012210839 metadata/md5-cache/dev-perl/WebService-Linode-0.28.0
+2012210839 metadata/md5-cache/dev-perl/X11-FreeDesktop-DesktopEntry-0.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/X11-Protocol-0.560.0-r1
+2012210839 metadata/md5-cache/dev-perl/X500-DN-0.290.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-DTDParser-2.10.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-Dumper-0.810.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-Elemental-2.110.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-Filter-BufferText-1.10.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-Generator-1.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2
+2012210839 metadata/md5-cache/dev-perl/XML-LibXML-Iterator-1.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-Mini-1.380.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-NodeFilter-0.10.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-Parser-2.440.0
+2012210839 metadata/md5-cache/dev-perl/XML-RAI-1.303.100-r1
+2012210839 metadata/md5-cache/dev-perl/XML-RSS-Feed-2.400.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-RSS-Parser-4.0.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-SAX-Expat-0.510.0
+2012210839 metadata/md5-cache/dev-perl/XML-Simple-DTDReader-0.40.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-SimpleObject-0.530.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-Smart-1.790.0
+2012210839 metadata/md5-cache/dev-perl/XML-Validator-Schema-1.100.0
+2012210839 metadata/md5-cache/dev-perl/XML-Writer-0.625.0
+2012210839 metadata/md5-cache/dev-perl/XML-XPathEngine-0.140.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-XQL-0.680.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-XSLT-0.480.0-r1
+2012210839 metadata/md5-cache/dev-perl/XML-XUpdate-LibXML-0.6.0-r1
+2012210839 metadata/md5-cache/dev-perl/XMLRPC-Lite-0.717.0
+2012210839 metadata/md5-cache/dev-perl/YAML-1.150.0
+2012210839 metadata/md5-cache/dev-perl/YAML-Syck-1.300.0
+2012210839 metadata/md5-cache/dev-perl/YAML-Tiny-1.690.0
+2012210839 metadata/md5-cache/dev-perl/capitalization-0.30.0-r1
+2012210839 metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1
+2012210839 metadata/md5-cache/dev-perl/maybe-0.20.200-r1
+2012210839 metadata/md5-cache/dev-perl/prefork-1.40.0-r2
+2012210839 metadata/md5-cache/dev-perl/rename-1.900.0
+2012210839 metadata/md5-cache/dev-perl/txt2html-2.520.100
 1903202339 metadata/md5-cache/dev-php/PEAR-HTTP_Header-1.2.1-r2
 1809192309 metadata/md5-cache/dev-php/PEAR-Net_LDAP3-1.0.5_pre20160405
 1908161739 metadata/md5-cache/dev-php/ca-bundle-1.1.3
@@ -41614,7 +41657,6 @@
 2011252124 metadata/md5-cache/dev-python/quex-0.71.0-r1
 2011252124 metadata/md5-cache/dev-python/sip-4.19.24
 2011291209 metadata/md5-cache/dev-python/clang-python-12.0.0.9999
-2011281139 metadata/md5-cache/dev-python/namespace-jaraco-2-r2
 2011281709 metadata/md5-cache/dev-python/namespace-paste-1-r1
 2011290109 metadata/md5-cache/dev-python/python-docs-3.8.6
 2011291409 metadata/md5-cache/dev-python/clang-python-11.0.1.9999
@@ -41624,7 +41666,6 @@
 2012170251 metadata/md5-cache/dev-python/3to2-1.1.1-r1
 2012170251 metadata/md5-cache/dev-python/APScheduler-3.6.3
 2012170251 metadata/md5-cache/dev-python/Babel-2.8.1
-2012170251 metadata/md5-cache/dev-python/Babel-2.9.0
 2012170251 metadata/md5-cache/dev-python/BitVector-3.4.9
 2012170251 metadata/md5-cache/dev-python/GitPython-3.1.11
 2012170251 metadata/md5-cache/dev-python/GridDataFormats-0.4.0-r1
@@ -41658,7 +41699,6 @@
 2012170251 metadata/md5-cache/dev-python/aiohttp-3.6.2-r1
 2012170251 metadata/md5-cache/dev-python/aiohttp-3.7.1-r1
 2012170251 metadata/md5-cache/dev-python/aiohttp-3.7.2-r1
-2012170251 metadata/md5-cache/dev-python/aiohttp-3.7.3
 2012170251 metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
 2012170251 metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
 2012170251 metadata/md5-cache/dev-python/aiohttp-socks-0.5.5
@@ -41725,10 +41765,8 @@
 2012170251 metadata/md5-cache/dev-python/babelfish-0.5.5-r1
 2012170251 metadata/md5-cache/dev-python/babelfish-9999
 2012170251 metadata/md5-cache/dev-python/backcall-0.2.0
-2012170251 metadata/md5-cache/dev-python/backports-1.0-r1
 2012170251 metadata/md5-cache/dev-python/backports-tempfile-1.0-r1
 2012170251 metadata/md5-cache/dev-python/backports-weakref-1.0_p1-r1
-2012170251 metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1
 2012170251 metadata/md5-cache/dev-python/backrefs-4.5.0
 2012170251 metadata/md5-cache/dev-python/bandit-1.6.2-r1
 2012170251 metadata/md5-cache/dev-python/bareos-19.2.8
@@ -41779,8 +41817,6 @@
 2012170251 metadata/md5-cache/dev-python/breathe-4.22.1
 2012170251 metadata/md5-cache/dev-python/breathe-4.25.0
 2012170251 metadata/md5-cache/dev-python/breathe-4.25.1
-2012170251 metadata/md5-cache/dev-python/brotlicffi-0.8.0
-2012170251 metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
 2012170251 metadata/md5-cache/dev-python/bsddb3-6.2.7
 2012170251 metadata/md5-cache/dev-python/cached-property-1.5.2
 2012170251 metadata/md5-cache/dev-python/cachelib-0.1
@@ -41906,7 +41942,6 @@
 2012170251 metadata/md5-cache/dev-python/deprecation-2.1.0
 2012170251 metadata/md5-cache/dev-python/dicttoxml-1.7.4-r1
 2012170251 metadata/md5-cache/dev-python/diff-match-patch-20181111
-2012170251 metadata/md5-cache/dev-python/diff-match-patch-20200713
 2012170251 metadata/md5-cache/dev-python/dill-0.3.3
 2012170251 metadata/md5-cache/dev-python/discogs-client-2.2.2
 2012170251 metadata/md5-cache/dev-python/diskcache-5.0.3
@@ -42075,7 +42110,6 @@
 2012170251 metadata/md5-cache/dev-python/fudge-1.1.1
 2012170251 metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
 2012170251 metadata/md5-cache/dev-python/funcy-1.10.1
-2012170251 metadata/md5-cache/dev-python/funcy-1.14
 2012170251 metadata/md5-cache/dev-python/fuse-python-1.0.0
 2012170251 metadata/md5-cache/dev-python/fusepy-3.0.1
 2012170251 metadata/md5-cache/dev-python/future-0.18.2-r1
@@ -42125,8 +42159,6 @@
 2012170251 metadata/md5-cache/dev-python/hacking-2.0.0
 2012170251 metadata/md5-cache/dev-python/helpdev-0.7.1
 2012170251 metadata/md5-cache/dev-python/hgdistver-0.25
-2012170251 metadata/md5-cache/dev-python/hiredis-1.0.1
-2012170251 metadata/md5-cache/dev-python/hiredis-1.0.1-r1
 2012170251 metadata/md5-cache/dev-python/hpack-3.0.0
 2012170251 metadata/md5-cache/dev-python/hpack-4.0.0
 2012170251 metadata/md5-cache/dev-python/html2text-2020.1.16-r1
@@ -42239,7 +42271,6 @@
 2012170251 metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
 2012170251 metadata/md5-cache/dev-python/jmespath-0.10.0
 2012170251 metadata/md5-cache/dev-python/joblib-0.17.0
-2012170251 metadata/md5-cache/dev-python/joblib-1.0.0
 2012170251 metadata/md5-cache/dev-python/josepy-1.4.0
 2012170251 metadata/md5-cache/dev-python/josepy-1.5.0
 2012170251 metadata/md5-cache/dev-python/jsmin-2.2.2
@@ -42298,8 +42329,6 @@
 2012170251 metadata/md5-cache/dev-python/libpillowfight-0.3.0
 2012170251 metadata/md5-cache/dev-python/libpy_simdjson-0.4.0
 2012170251 metadata/md5-cache/dev-python/libsass-0.20.1
-2012170251 metadata/md5-cache/dev-python/libtmux-0.8.3
-2012170251 metadata/md5-cache/dev-python/libtmux-0.8.5
 2012170251 metadata/md5-cache/dev-python/libvirt-python-6.10.0
 2012170251 metadata/md5-cache/dev-python/libvirt-python-6.7.0
 2012170251 metadata/md5-cache/dev-python/libvirt-python-6.8.0
@@ -42326,7 +42355,6 @@
 2012170251 metadata/md5-cache/dev-python/logfury-0.1.2-r1
 2012170251 metadata/md5-cache/dev-python/loguru-0.5.3
 2012170251 metadata/md5-cache/dev-python/logutils-0.3.5
-2012170251 metadata/md5-cache/dev-python/loky-2.9.0
 2012170251 metadata/md5-cache/dev-python/lunr-0.5.6
 2012170251 metadata/md5-cache/dev-python/lunr-0.5.8
 2012170251 metadata/md5-cache/dev-python/lxml-4.6.1
@@ -42367,7 +42395,6 @@
 2012170251 metadata/md5-cache/dev-python/mimerender-0.6.0
 2012170251 metadata/md5-cache/dev-python/minidb-2.0.4
 2012170251 metadata/md5-cache/dev-python/minimock-1.2.8-r1
-2012170251 metadata/md5-cache/dev-python/miniupnpc-2.1.20201016
 2012170251 metadata/md5-cache/dev-python/misaka-2.1.1
 2012170251 metadata/md5-cache/dev-python/mistune-0.8.4-r1
 2012170251 metadata/md5-cache/dev-python/mkautodoc-0.1.0
@@ -42503,8 +42530,6 @@
 2012170251 metadata/md5-cache/dev-python/osc-lib-2.2.1
 2012170251 metadata/md5-cache/dev-python/oslo-cache-2.6.1
 2012170251 metadata/md5-cache/dev-python/oslo-concurrency-4.3.1
-2012170251 metadata/md5-cache/dev-python/oslo-config-8.3.2
-2012170251 metadata/md5-cache/dev-python/oslo-config-8.3.3
 2012170251 metadata/md5-cache/dev-python/oslo-context-3.1.1
 2012170251 metadata/md5-cache/dev-python/oslo-db-8.4.0
 2012170251 metadata/md5-cache/dev-python/oslo-i18n-5.0.1
@@ -42536,7 +42561,6 @@
 2012170251 metadata/md5-cache/dev-python/packaging-20.4-r1
 2012170251 metadata/md5-cache/dev-python/packaging-20.5
 2012170251 metadata/md5-cache/dev-python/packaging-20.7
-2012170251 metadata/md5-cache/dev-python/packaging-20.8
 2012170251 metadata/md5-cache/dev-python/pafy-0.5.5
 2012170251 metadata/md5-cache/dev-python/pafy-9999
 2012170251 metadata/md5-cache/dev-python/paho-mqtt-1.5.0
@@ -42718,10 +42742,6 @@
 2012170251 metadata/md5-cache/dev-python/pyelftools-0.26
 2012170251 metadata/md5-cache/dev-python/pyenchant-3.1.0
 2012170251 metadata/md5-cache/dev-python/pyenchant-3.2.0
-2012170251 metadata/md5-cache/dev-python/pyfakefs-4.2.1
-2012170251 metadata/md5-cache/dev-python/pyfakefs-4.3.0
-2012170251 metadata/md5-cache/dev-python/pyfakefs-4.3.1
-2012170251 metadata/md5-cache/dev-python/pyfakefs-4.3.2
 2012170251 metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
 2012170251 metadata/md5-cache/dev-python/pyflakes-2.2.0
 2012170251 metadata/md5-cache/dev-python/pyfltk-1.3.3
@@ -42737,8 +42757,6 @@
 2012170251 metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1
 2012170251 metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
 2012170251 metadata/md5-cache/dev-python/pyghmi-1.5.5
-2012170251 metadata/md5-cache/dev-python/pygit2-1.3.0
-2012170251 metadata/md5-cache/dev-python/pyglet-1.5.10
 2012170251 metadata/md5-cache/dev-python/pyglet-1.5.11
 2012170251 metadata/md5-cache/dev-python/pyglet-1.5.7-r1
 2012170251 metadata/md5-cache/dev-python/pygments-2.7.2
@@ -42768,8 +42786,6 @@
 2012170251 metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
 2012170251 metadata/md5-cache/dev-python/pylint-2.6.0
 2012170251 metadata/md5-cache/dev-python/pylru-1.2.0
-2012170251 metadata/md5-cache/dev-python/pyls-black-0.4.6
-2012170251 metadata/md5-cache/dev-python/pyls-spyder-0.1.1
 2012170339 metadata/md5-cache/dev-python/pyls-spyder-0.3.0
 2012170251 metadata/md5-cache/dev-python/pymad-0.10
 2012170251 metadata/md5-cache/dev-python/pymdown-extensions-8.0.1
@@ -42819,7 +42835,6 @@
 2012170251 metadata/md5-cache/dev-python/pyprof2calltree-1.4.4
 2012170251 metadata/md5-cache/dev-python/pyproj-2.6.1_p1
 2012170251 metadata/md5-cache/dev-python/pyproject2setuppy-8
-2012170251 metadata/md5-cache/dev-python/pyproject2setuppy-9
 2012170251 metadata/md5-cache/dev-python/pypugjs-5.9.5
 2012170251 metadata/md5-cache/dev-python/pypy-exe-7.3.1
 2012170251 metadata/md5-cache/dev-python/pypy-exe-7.3.2
@@ -42849,7 +42864,6 @@
 2012170251 metadata/md5-cache/dev-python/pyserial-3.4
 2012170251 metadata/md5-cache/dev-python/pyserial-3.5
 2012170251 metadata/md5-cache/dev-python/pyside2-5.15.1
-2012170251 metadata/md5-cache/dev-python/pysimdjson-3.1.1
 2012170251 metadata/md5-cache/dev-python/pysmi-0.3.4
 2012170251 metadata/md5-cache/dev-python/pysnmp-4.4.12-r1
 2012170251 metadata/md5-cache/dev-python/pysnmp-999999
@@ -42863,7 +42877,6 @@
 2012170251 metadata/md5-cache/dev-python/pysvg-0.2.2_p3
 2012170251 metadata/md5-cache/dev-python/pysvn-1.9.11
 2012170251 metadata/md5-cache/dev-python/pytables-3.6.1
-2012170251 metadata/md5-cache/dev-python/pytaglib-1.4.6
 2012170251 metadata/md5-cache/dev-python/pyte-0.8.0-r1
 2012170251 metadata/md5-cache/dev-python/pytest-4.6.11-r1
 2012170251 metadata/md5-cache/dev-python/pytest-5.4.3
@@ -42873,15 +42886,12 @@
 2012170251 metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
 2012170251 metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
 2012170251 metadata/md5-cache/dev-python/pytest-cache-1.0-r2
-2012170251 metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
 2012170251 metadata/md5-cache/dev-python/pytest-cov-2.10.1
 2012170251 metadata/md5-cache/dev-python/pytest-cov-2.8.1
 2012170251 metadata/md5-cache/dev-python/pytest-datadir-1.3.1
 2012170251 metadata/md5-cache/dev-python/pytest-describe-1.0.0
 2012170251 metadata/md5-cache/dev-python/pytest-django-4.1.0
 2012170251 metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
-2012170251 metadata/md5-cache/dev-python/pytest-faulthandler-1.6.0
-2012170251 metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
 2012170251 metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
 2012170251 metadata/md5-cache/dev-python/pytest-flake8-0.9.1
 2012170251 metadata/md5-cache/dev-python/pytest-flakes-4.0.0
@@ -42959,8 +42969,6 @@
 2012170251 metadata/md5-cache/dev-python/python-jose-3.2.0-r1
 2012170251 metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
 2012170251 metadata/md5-cache/dev-python/python-keystoneclient-4.1.1
-2012170251 metadata/md5-cache/dev-python/python-language-server-0.35.1-r1
-2012170251 metadata/md5-cache/dev-python/python-language-server-0.36.1
 2012170339 metadata/md5-cache/dev-python/python-language-server-0.36.2
 2012170251 metadata/md5-cache/dev-python/python-ldap-3.3.1
 2012170251 metadata/md5-cache/dev-python/python-ldap-9999
@@ -43071,7 +43079,6 @@
 2012170251 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.1
 2012170251 metadata/md5-cache/dev-python/rebulk-2.0.1
 2012170251 metadata/md5-cache/dev-python/recommonmark-0.6.0
-2012170251 metadata/md5-cache/dev-python/redis-py-3.3.11
 2012170251 metadata/md5-cache/dev-python/redis-py-3.5.3
 2012170251 metadata/md5-cache/dev-python/rednose-0.4.3
 2012170251 metadata/md5-cache/dev-python/reedsolomon-1.5.4
@@ -43146,7 +43153,6 @@
 2012170251 metadata/md5-cache/dev-python/scrypt-0.8.16
 2012170251 metadata/md5-cache/dev-python/seaborn-0.10.1
 2012170251 metadata/md5-cache/dev-python/secretstorage-3.2.0
-2012170251 metadata/md5-cache/dev-python/secretstorage-3.3.0
 2012170251 metadata/md5-cache/dev-python/selenium-3.141.0-r1
 2012170251 metadata/md5-cache/dev-python/semantic_version-2.8.5
 2012170251 metadata/md5-cache/dev-python/semver-2.13.0
@@ -43299,7 +43305,6 @@
 2012170251 metadata/md5-cache/dev-python/sybil-2.0.1
 2012170251 metadata/md5-cache/dev-python/symengine-0.6.1-r1
 2012170251 metadata/md5-cache/dev-python/sympy-1.6.2
-2012170251 metadata/md5-cache/dev-python/sympy-1.7
 2012170251 metadata/md5-cache/dev-python/sympy-1.7.1
 2012170251 metadata/md5-cache/dev-python/tabulate-0.8.7
 2012170251 metadata/md5-cache/dev-python/tagpy-2018.1-r1
@@ -43330,8 +43335,6 @@
 2012170251 metadata/md5-cache/dev-python/texttable-1.6.3
 2012170251 metadata/md5-cache/dev-python/textx-1.4
 2012170251 metadata/md5-cache/dev-python/theano-1.0.5
-2012170251 metadata/md5-cache/dev-python/threadpoolctl-2.1.0
-2012170251 metadata/md5-cache/dev-python/three-merge-0.1.1
 2012170251 metadata/md5-cache/dev-python/thrift-0.11.0
 2012170339 metadata/md5-cache/dev-python/tikzplotlib-0.9.6
 2012170251 metadata/md5-cache/dev-python/tinycss-0.4
@@ -43359,7 +43362,6 @@
 2012170251 metadata/md5-cache/dev-python/translate-toolkit-3.2.0
 2012170251 metadata/md5-cache/dev-python/tree-sitter-0.2.0
 2012170251 metadata/md5-cache/dev-python/treq-20.9.0
-2012170251 metadata/md5-cache/dev-python/trustme-0.6.0-r1
 2012170251 metadata/md5-cache/dev-python/tubes-0.2.0-r1
 2012170251 metadata/md5-cache/dev-python/tvdb_api-2.0-r1
 2012170251 metadata/md5-cache/dev-python/twine-3.2.0
@@ -43379,7 +43381,6 @@
 2012170251 metadata/md5-cache/dev-python/ujson-4.0.1
 2012170251 metadata/md5-cache/dev-python/uncertainties-3.1.4-r1
 2012170251 metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
-2012170251 metadata/md5-cache/dev-python/unidecode-0.04.21
 2012170251 metadata/md5-cache/dev-python/unidecode-1.1.1
 2012170251 metadata/md5-cache/dev-python/unittest-mixins-1.6-r1
 2012170251 metadata/md5-cache/dev-python/unittest2-1.1.0-r1
@@ -43393,7 +43394,6 @@
 2012170251 metadata/md5-cache/dev-python/urllib3-1.26.0
 2012170251 metadata/md5-cache/dev-python/urllib3-1.26.1
 2012170251 metadata/md5-cache/dev-python/urllib3-1.26.2
-2012170251 metadata/md5-cache/dev-python/urllib3-1.26.2-r1
 2012170251 metadata/md5-cache/dev-python/urwid-2.1.1
 2012170251 metadata/md5-cache/dev-python/urwidtrees-1.0.3
 2012170251 metadata/md5-cache/dev-python/utidylib-0.6-r1
@@ -43409,7 +43409,6 @@
 2012170251 metadata/md5-cache/dev-python/vine-1.3.0
 2012170251 metadata/md5-cache/dev-python/virtualenv-16.7.10-r1
 2012170251 metadata/md5-cache/dev-python/virtualenv-20.1.0
-2012170251 metadata/md5-cache/dev-python/virtualenv-20.2.1
 2012170251 metadata/md5-cache/dev-python/virtualenv-clone-0.5.3
 2012170251 metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1
 2012170251 metadata/md5-cache/dev-python/visitor-0.1.3-r1
@@ -43436,7 +43435,6 @@
 2012170251 metadata/md5-cache/dev-python/webencodings-0.5.1-r1
 2012170251 metadata/md5-cache/dev-python/webob-1.8.6
 2012170251 metadata/md5-cache/dev-python/websocket-client-0.57.0
-2012170251 metadata/md5-cache/dev-python/websockets-8.1
 2012170251 metadata/md5-cache/dev-python/websockify-0.9.0
 2012170251 metadata/md5-cache/dev-python/websockify-0.9.0-r1
 2012170251 metadata/md5-cache/dev-python/webtest-2.0.35
@@ -43510,10 +43508,8 @@
 2012170251 metadata/md5-cache/dev-python/zstandard-0.14.0-r1
 2012170251 metadata/md5-cache/dev-python/zstandard-0.14.1
 2012170251 metadata/md5-cache/dev-python/zstandard-0.8.1-r1
-2012170251 metadata/md5-cache/dev-python/zstd-1.4.5.1
 2012170251 metadata/md5-cache/dev-python/zxcvbn-4.4.28
 2012171539 metadata/md5-cache/dev-python/aws-sam-translator-1.29.0
-2012180239 metadata/md5-cache/dev-python/Manifest.gz
 2012171609 metadata/md5-cache/dev-python/aws-sam-translator-1.32.0-r1
 2012180239 metadata/md5-cache/dev-python/aws-sam-translator-1.33.0
 2012172009 metadata/md5-cache/dev-python/boto3-1.16.16
@@ -43528,20 +43524,74 @@
 2012172009 metadata/md5-cache/dev-python/graphviz-0.15
 2012172009 metadata/md5-cache/dev-python/grpcio-1.32.0-r1
 2012172009 metadata/md5-cache/dev-python/hcloud-python-1.10.0
-2012172009 metadata/md5-cache/dev-python/hiredis-1.1.0
 2012172039 metadata/md5-cache/dev-python/ldap3-2.8.1
 2012180239 metadata/md5-cache/dev-python/micawber-0.5.2
-2012172009 metadata/md5-cache/dev-python/miniupnpc-2.2.0
 2012180109 metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
 2012172039 metadata/md5-cache/dev-python/nest_asyncio-1.4.3
 2012172009 metadata/md5-cache/dev-python/notebook-6.1.5
 2012172009 metadata/md5-cache/dev-python/pid-3.0.4
 2012172009 metadata/md5-cache/dev-python/prometheus_client-0.9.0
-2012172009 metadata/md5-cache/dev-python/pygit2-1.4.0
-2012172009 metadata/md5-cache/dev-python/pyparted-3.11.7
-2012172009 metadata/md5-cache/dev-python/python-bugzilla-3.0.2
-2012180239 metadata/md5-cache/dev-python/sphinx-gallery-0.8.2
 2012180239 metadata/md5-cache/dev-python/sqlalchemy-1.3.21
+2012201509 metadata/md5-cache/dev-python/Babel-2.9.0
+2012211239 metadata/md5-cache/dev-python/Manifest.gz
+2012200109 metadata/md5-cache/dev-python/aiohttp-3.7.3
+2012211239 metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r1
+2012191209 metadata/md5-cache/dev-python/boto3-1.16.40
+2012191209 metadata/md5-cache/dev-python/botocore-1.19.40
+2012201309 metadata/md5-cache/dev-python/brotlicffi-0.8.0
+2012201309 metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
+2012191209 metadata/md5-cache/dev-python/cfn-python-lint-0.44.1
+2012191239 metadata/md5-cache/dev-python/clang-python-11.0.1_rc2
+2012201139 metadata/md5-cache/dev-python/coverage-5.3.1
+2012200139 metadata/md5-cache/dev-python/dbusmock-0.20.0
+2012211239 metadata/md5-cache/dev-python/denonavr-0.9.9
+2012201939 metadata/md5-cache/dev-python/diff-match-patch-20200713
+2012201809 metadata/md5-cache/dev-python/funcy-1.14
+2012201809 metadata/md5-cache/dev-python/funcy-1.14-r1
+2012202339 metadata/md5-cache/dev-python/hiredis-1.1.0
+2012210039 metadata/md5-cache/dev-python/joblib-1.0.0
+2012192309 metadata/md5-cache/dev-python/libtmux-0.8.5
+2012191239 metadata/md5-cache/dev-python/lit-11.0.1_rc2
+2012210039 metadata/md5-cache/dev-python/loky-2.9.0
+2012200139 metadata/md5-cache/dev-python/marshmallow-3.10.0
+2012202339 metadata/md5-cache/dev-python/miniupnpc-2.2.0
+2012211239 metadata/md5-cache/dev-python/miniupnpc-2.2.1
+2012191209 metadata/md5-cache/dev-python/msgpack-1.0.2
+2012200109 metadata/md5-cache/dev-python/oslo-config-8.3.3
+2012201509 metadata/md5-cache/dev-python/packaging-20.8
+2012202339 metadata/md5-cache/dev-python/pyfakefs-4.3.2
+2012202339 metadata/md5-cache/dev-python/pyfakefs-4.3.3
+2012202009 metadata/md5-cache/dev-python/pygit2-1.4.0
+2012202239 metadata/md5-cache/dev-python/pyglet-1.5.10
+2012181209 metadata/md5-cache/dev-python/pyglet-1.5.13
+2012181539 metadata/md5-cache/dev-python/pygresql-5.2.2
+2012201939 metadata/md5-cache/dev-python/pyls-black-0.4.6
+2012201939 metadata/md5-cache/dev-python/pyls-spyder-0.1.1
+2012202239 metadata/md5-cache/dev-python/pyparted-3.11.7
+2012201509 metadata/md5-cache/dev-python/pyproject2setuppy-9
+2012190539 metadata/md5-cache/dev-python/pysimdjson-3.1.1-r1
+2012181339 metadata/md5-cache/dev-python/pytaglib-1.4.6
+2012202009 metadata/md5-cache/dev-python/pytest-faulthandler-1.6.0
+2012202009 metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
+2012181439 metadata/md5-cache/dev-python/pytest-xdist-2.2.0-r1
+2012201509 metadata/md5-cache/dev-python/python-bugzilla-3.0.2
+2012201939 metadata/md5-cache/dev-python/python-language-server-0.36.1
+2012181339 metadata/md5-cache/dev-python/secretstorage-3.3.0
+2012202339 metadata/md5-cache/dev-python/sphinx-3.4.0
+2012210039 metadata/md5-cache/dev-python/sphinx-gallery-0.8.2
+2012181209 metadata/md5-cache/dev-python/spyder-kernels-1.10.1
+2012191209 metadata/md5-cache/dev-python/sqlalchemy-1.3.22
+2012210039 metadata/md5-cache/dev-python/threadpoolctl-2.1.0
+2012201939 metadata/md5-cache/dev-python/three-merge-0.1.1
+2012201309 metadata/md5-cache/dev-python/trustme-0.6.0-r1
+2012200139 metadata/md5-cache/dev-python/txaio-20.12.1
+2012202339 metadata/md5-cache/dev-python/unidecode-1.1.2
+2012201309 metadata/md5-cache/dev-python/urllib3-1.26.2-r1
+2012201509 metadata/md5-cache/dev-python/virtualenv-20.2.1
+2012191209 metadata/md5-cache/dev-python/watchdog-1.0.2
+2012202039 metadata/md5-cache/dev-python/websockets-8.1
+2012191909 metadata/md5-cache/dev-python/whatever-0.6
+2012200109 metadata/md5-cache/dev-python/zstd-1.4.5.1
 2010181809 metadata/md5-cache/dev-qt/qt-docs-5.15.1_p202009071124
 2011260209 metadata/md5-cache/dev-qt/qt-docs-5.15.2_p202011130614
 2012170251 metadata/md5-cache/dev-qt/Manifest.gz
@@ -44613,52 +44663,38 @@
 2012170251 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
 2012170251 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.9
 2012170251 metadata/md5-cache/dev-ros/xmlrpcpp-9999
-2011252124 metadata/md5-cache/dev-ruby/puppetdb-termini-6.12.0
-2011252124 metadata/md5-cache/dev-ruby/puppetdb-termini-6.13.0
 2012170251 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
 2012170251 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
-2012171109 metadata/md5-cache/dev-ruby/Manifest.gz
 2012170251 metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
 2012170251 metadata/md5-cache/dev-ruby/acme-client-2.0.6
 2012170251 metadata/md5-cache/dev-ruby/acme-client-2.0.7
 2012170251 metadata/md5-cache/dev-ruby/actioncable-5.2.4.3
 2012170251 metadata/md5-cache/dev-ruby/actioncable-5.2.4.4
-2012170251 metadata/md5-cache/dev-ruby/actioncable-6.0.3.4
-2012170251 metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.4
 2012170251 metadata/md5-cache/dev-ruby/actionmailer-5.2.4.3
 2012170251 metadata/md5-cache/dev-ruby/actionmailer-5.2.4.4
-2012170251 metadata/md5-cache/dev-ruby/actionmailer-6.0.3.4
 2012170251 metadata/md5-cache/dev-ruby/actionpack-5.2.4.3-r1
 2012170251 metadata/md5-cache/dev-ruby/actionpack-5.2.4.4
-2012170251 metadata/md5-cache/dev-ruby/actionpack-6.0.3.4
 2012170251 metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.1
 2012170251 metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
-2012170251 metadata/md5-cache/dev-ruby/actiontext-6.0.3.4
 2012170251 metadata/md5-cache/dev-ruby/actionview-5.2.4.3
 2012170251 metadata/md5-cache/dev-ruby/actionview-5.2.4.3-r1
 2012170251 metadata/md5-cache/dev-ruby/actionview-5.2.4.4
-2012170251 metadata/md5-cache/dev-ruby/actionview-6.0.3.4
 2012170251 metadata/md5-cache/dev-ruby/activejob-5.2.4.3
 2012170251 metadata/md5-cache/dev-ruby/activejob-5.2.4.4
-2012170251 metadata/md5-cache/dev-ruby/activejob-6.0.3.4
 2012170251 metadata/md5-cache/dev-ruby/activeldap-5.2.4
 2012170251 metadata/md5-cache/dev-ruby/activeldap-6.0.2
 2012170251 metadata/md5-cache/dev-ruby/activeldap-6.0.3
 2012170251 metadata/md5-cache/dev-ruby/activeldap-6.0.4
 2012170251 metadata/md5-cache/dev-ruby/activemodel-5.2.4.3
 2012170251 metadata/md5-cache/dev-ruby/activemodel-5.2.4.4
-2012170251 metadata/md5-cache/dev-ruby/activemodel-6.0.3.4
 2012170251 metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2
 2012170251 metadata/md5-cache/dev-ruby/activerecord-5.2.4.3
 2012170251 metadata/md5-cache/dev-ruby/activerecord-5.2.4.4
-2012170251 metadata/md5-cache/dev-ruby/activerecord-6.0.3.4
 2012170251 metadata/md5-cache/dev-ruby/activestorage-5.2.4.3
 2012170251 metadata/md5-cache/dev-ruby/activestorage-5.2.4.4
-2012170251 metadata/md5-cache/dev-ruby/activestorage-6.0.3.4
 2012170251 metadata/md5-cache/dev-ruby/activesupport-5.2.4.3
 2012170251 metadata/md5-cache/dev-ruby/activesupport-5.2.4.4
 2012170251 metadata/md5-cache/dev-ruby/activesupport-6.0.3.4
-2012170251 metadata/md5-cache/dev-ruby/activesupport-6.0.3.4-r1
 2012170251 metadata/md5-cache/dev-ruby/acts_as_list-1.0.1
 2012170251 metadata/md5-cache/dev-ruby/addressable-2.6.0
 2012170251 metadata/md5-cache/dev-ruby/addressable-2.7.0
@@ -44764,7 +44800,6 @@
 2012170251 metadata/md5-cache/dev-ruby/capybara-3.31.0
 2012170251 metadata/md5-cache/dev-ruby/capybara-3.32.2
 2012170251 metadata/md5-cache/dev-ruby/capybara-3.33.0
-2012170251 metadata/md5-cache/dev-ruby/capybara-3.34.0
 2012170251 metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r2
 2012170251 metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
 2012170251 metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7
@@ -44826,7 +44861,6 @@
 2012170251 metadata/md5-cache/dev-ruby/daemons-1.3.1
 2012170251 metadata/md5-cache/dev-ruby/dalli-2.7.10
 2012170251 metadata/md5-cache/dev-ruby/dalli-2.7.10-r1
-2012170251 metadata/md5-cache/dev-ruby/dalli-2.7.11
 2012170251 metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
 2012170251 metadata/md5-cache/dev-ruby/date_validator-0.10.0
 2012170251 metadata/md5-cache/dev-ruby/dbf-4.1.2
@@ -44886,7 +44920,6 @@
 2012170251 metadata/md5-cache/dev-ruby/execjs-2.7.0-r1
 2012170251 metadata/md5-cache/dev-ruby/exifr-1.3.8
 2012170251 metadata/md5-cache/dev-ruby/exifr-1.3.9
-2012170251 metadata/md5-cache/dev-ruby/facter-3.14.13
 2012170251 metadata/md5-cache/dev-ruby/facter-3.14.14
 2012170251 metadata/md5-cache/dev-ruby/facter-9999
 2012170251 metadata/md5-cache/dev-ruby/factory_girl-4.8.1
@@ -44935,7 +44968,6 @@
 2012170251 metadata/md5-cache/dev-ruby/forgery-0.8.1
 2012170251 metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
 2012170251 metadata/md5-cache/dev-ruby/fuubar-2.5.0
-2012170251 metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
 2012170251 metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
 2012170251 metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1
 2012170251 metadata/md5-cache/dev-ruby/gh-0.18.0
@@ -44943,7 +44975,6 @@
 2012170251 metadata/md5-cache/dev-ruby/gist-5.1.0
 2012170251 metadata/md5-cache/dev-ruby/git-1.7.0
 2012170251 metadata/md5-cache/dev-ruby/globalid-0.4.2
-2012170251 metadata/md5-cache/dev-ruby/globalid-0.4.2-r1
 2012170251 metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
 2012170251 metadata/md5-cache/dev-ruby/google-protobuf-3.10.1
 2012170251 metadata/md5-cache/dev-ruby/google-protobuf-3.11.4
@@ -44964,7 +44995,6 @@
 2012170251 metadata/md5-cache/dev-ruby/hashie-3.6.0
 2012170251 metadata/md5-cache/dev-ruby/hashie-4.0.0
 2012170251 metadata/md5-cache/dev-ruby/hashie-4.1.0
-2012170251 metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
 2012170251 metadata/md5-cache/dev-ruby/hashr-2.0.1
 2012170251 metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
 2012170251 metadata/md5-cache/dev-ruby/hiera-3.6.0
@@ -44997,13 +45027,11 @@
 2012170251 metadata/md5-cache/dev-ruby/i18n-0.7.0-r3
 2012170251 metadata/md5-cache/dev-ruby/i18n-1.7.1
 2012170251 metadata/md5-cache/dev-ruby/i18n-1.8.2
-2012170251 metadata/md5-cache/dev-ruby/i18n-1.8.5
 2012170251 metadata/md5-cache/dev-ruby/ice_nine-0.11.2
 2012170251 metadata/md5-cache/dev-ruby/idn-ruby-0.1.0
 2012170251 metadata/md5-cache/dev-ruby/image_processing-1.10.3
 2012170251 metadata/md5-cache/dev-ruby/image_processing-1.11.0
 2012170251 metadata/md5-cache/dev-ruby/image_processing-1.12.0
-2012170251 metadata/md5-cache/dev-ruby/image_processing-1.12.1
 2012170251 metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
 2012170251 metadata/md5-cache/dev-ruby/inflecto-0.0.2
 2012170251 metadata/md5-cache/dev-ruby/instance_storage-1.0.0
@@ -45029,7 +45057,6 @@
 2012170251 metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
 2012170251 metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
 2012170251 metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
-2012170251 metadata/md5-cache/dev-ruby/launchy-2.5.0
 2012170251 metadata/md5-cache/dev-ruby/lemon-0.9.1
 2012170251 metadata/md5-cache/dev-ruby/letter_opener-1.7.0
 2012170251 metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
@@ -45092,7 +45119,6 @@
 2012170251 metadata/md5-cache/dev-ruby/mini_magick-4.11.0
 2012170251 metadata/md5-cache/dev-ruby/mini_mime-1.0.1
 2012170251 metadata/md5-cache/dev-ruby/mini_mime-1.0.2
-2012170251 metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
 2012170251 metadata/md5-cache/dev-ruby/minitar-0.9
 2012170251 metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
 2012170251 metadata/md5-cache/dev-ruby/minitest-5.11.3
@@ -45116,7 +45142,6 @@
 2012170251 metadata/md5-cache/dev-ruby/moneta-1.4.0
 2012170251 metadata/md5-cache/dev-ruby/mqtt-0.5.0
 2012170251 metadata/md5-cache/dev-ruby/msgpack-1.3.3
-2012170251 metadata/md5-cache/dev-ruby/multi_json-1.13.1
 2012171109 metadata/md5-cache/dev-ruby/multi_json-1.14.1
 2012170251 metadata/md5-cache/dev-ruby/multi_json-1.15.0
 2012170251 metadata/md5-cache/dev-ruby/multi_test-0.1.2
@@ -45255,13 +45280,10 @@
 2012170251 metadata/md5-cache/dev-ruby/rails-5.2.4.4
 2012170251 metadata/md5-cache/dev-ruby/rails-6.0.3.4
 2012170251 metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3
-2012170251 metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
 2012170251 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.2.0
 2012170251 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0
-2012170251 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
 2012170251 metadata/md5-cache/dev-ruby/railties-5.2.4.3
 2012170251 metadata/md5-cache/dev-ruby/railties-5.2.4.4
-2012170251 metadata/md5-cache/dev-ruby/railties-6.0.3.4
 2012170251 metadata/md5-cache/dev-ruby/rainbow-3.0.0
 2012170251 metadata/md5-cache/dev-ruby/rake-12.3.3
 2012170251 metadata/md5-cache/dev-ruby/rake-13.0.0
@@ -45303,9 +45325,7 @@
 2012170251 metadata/md5-cache/dev-ruby/ref-2.0.0
 2012170251 metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
 2012170251 metadata/md5-cache/dev-ruby/regexp_parser-1.7.1
-2012170251 metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
 2012170251 metadata/md5-cache/dev-ruby/regexp_parser-2.0.0
-2012170251 metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
 2012170251 metadata/md5-cache/dev-ruby/request_store-1.5.0
 2012170251 metadata/md5-cache/dev-ruby/rest-client-2.1.0
 2012170251 metadata/md5-cache/dev-ruby/rexical-1.0.7
@@ -45371,7 +45391,6 @@
 2012170251 metadata/md5-cache/dev-ruby/rspec-support-3.9.2
 2012170251 metadata/md5-cache/dev-ruby/rspec-support-3.9.4
 2012170251 metadata/md5-cache/dev-ruby/rspectacular-0.70.8
-2012170251 metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
 2012170251 metadata/md5-cache/dev-ruby/ruby-atk-3.3.2
 2012170251 metadata/md5-cache/dev-ruby/ruby-atk-3.3.6
 2012170251 metadata/md5-cache/dev-ruby/ruby-atk-3.3.7
@@ -45483,7 +45502,6 @@
 2012170251 metadata/md5-cache/dev-ruby/ruby-prof-1.4.1
 2012170251 metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
 2012170251 metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1
-2012170251 metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
 2012170251 metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
 2012170251 metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
 2012170251 metadata/md5-cache/dev-ruby/ruby-rsvg-3.3.2
@@ -45555,7 +45573,6 @@
 2012170251 metadata/md5-cache/dev-ruby/seed-fu-2.3.9
 2012170251 metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.6
 2012170251 metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7
-2012170251 metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
 2012170251 metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
 2012170251 metadata/md5-cache/dev-ruby/semver2-3.4.2
 2012170251 metadata/md5-cache/dev-ruby/serialport-1.3.1
@@ -45574,10 +45591,8 @@
 2012170251 metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
 2012170251 metadata/md5-cache/dev-ruby/shoulda-context-1.2.2
 2012170251 metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3
-2012170251 metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1
 2012170251 metadata/md5-cache/dev-ruby/shoulda-matchers-4.3.0
 2012170251 metadata/md5-cache/dev-ruby/shoulda-matchers-4.3.0-r1
-2012170251 metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
 2012170251 metadata/md5-cache/dev-ruby/sigar-0.7.3
 2012170251 metadata/md5-cache/dev-ruby/sigdump-0.2.4
 2012170251 metadata/md5-cache/dev-ruby/simple-rss-1.3.3
@@ -45593,7 +45608,6 @@
 2012170251 metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
 2012170251 metadata/md5-cache/dev-ruby/sinatra-2.0.8.1
 2012170251 metadata/md5-cache/dev-ruby/sinatra-2.0.8.1-r1
-2012170251 metadata/md5-cache/dev-ruby/sinatra-2.1.0
 2012170251 metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1
 2012170251 metadata/md5-cache/dev-ruby/six-0.2.0
 2012170251 metadata/md5-cache/dev-ruby/slim-3.0.9
@@ -45762,15 +45776,51 @@
 2012170251 metadata/md5-cache/dev-ruby/xml-simple-1.1.5
 2012170251 metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
 2012170251 metadata/md5-cache/dev-ruby/xmlrpc-0.3.1
-2012170251 metadata/md5-cache/dev-ruby/xpath-3.2.0
 2012171109 metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1
 2012170251 metadata/md5-cache/dev-ruby/yard-0.9.20
 2012170251 metadata/md5-cache/dev-ruby/yard-0.9.25
 2012170251 metadata/md5-cache/dev-ruby/zeitwerk-2.3.1
 2012170251 metadata/md5-cache/dev-ruby/zeitwerk-2.4.0
 2012170251 metadata/md5-cache/dev-ruby/zeitwerk-2.4.1
-2012170251 metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
 2012170251 metadata/md5-cache/dev-ruby/zentest-4.12.0
+2012210939 metadata/md5-cache/dev-ruby/Manifest.gz
+2012202239 metadata/md5-cache/dev-ruby/actioncable-6.0.3.4
+2012202239 metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.4
+2012202239 metadata/md5-cache/dev-ruby/actionmailer-6.0.3.4
+2012202239 metadata/md5-cache/dev-ruby/actionpack-6.0.3.4
+2012202239 metadata/md5-cache/dev-ruby/actiontext-6.0.3.4
+2012202239 metadata/md5-cache/dev-ruby/actionview-6.0.3.4
+2012202239 metadata/md5-cache/dev-ruby/activejob-6.0.3.4
+2012202239 metadata/md5-cache/dev-ruby/activemodel-6.0.3.4
+2012202239 metadata/md5-cache/dev-ruby/activerecord-6.0.3.4
+2012202239 metadata/md5-cache/dev-ruby/activestorage-6.0.3.4
+2012202039 metadata/md5-cache/dev-ruby/activesupport-6.0.3.4-r1
+2012202239 metadata/md5-cache/dev-ruby/capybara-3.34.0
+2012202039 metadata/md5-cache/dev-ruby/dalli-2.7.11
+2012190939 metadata/md5-cache/dev-ruby/docile-1.3.3
+2012202239 metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
+2012202239 metadata/md5-cache/dev-ruby/globalid-0.4.2-r1
+2012202239 metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
+2012202039 metadata/md5-cache/dev-ruby/i18n-1.8.5
+2012202239 metadata/md5-cache/dev-ruby/image_processing-1.12.1
+2012202239 metadata/md5-cache/dev-ruby/launchy-2.5.0
+2012202239 metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
+2012210839 metadata/md5-cache/dev-ruby/puppetdb-termini-6.12.0
+2012210839 metadata/md5-cache/dev-ruby/puppetdb-termini-6.13.0
+2012210839 metadata/md5-cache/dev-ruby/puppetdb-termini-7.0.1
+2012202239 metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
+2012202239 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
+2012202239 metadata/md5-cache/dev-ruby/railties-6.0.3.4
+2012202239 metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
+2012202239 metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
+2012202239 metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
+2012202239 metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
+2012202239 metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
+2012202239 metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1
+2012202239 metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
+2012202239 metadata/md5-cache/dev-ruby/sinatra-2.1.0
+2012202239 metadata/md5-cache/dev-ruby/xpath-3.2.0
+2012202039 metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
 1807201639 metadata/md5-cache/dev-scheme/gauche-gl-0.6
 1807201639 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
@@ -45827,7 +45877,6 @@
 2007051209 metadata/md5-cache/dev-tcltk/togl-2.0-r3
 2011071809 metadata/md5-cache/dev-tcltk/tcllib-1.19
 2011071809 metadata/md5-cache/dev-tcltk/tktreectrl-2.4.1
-2011172239 metadata/md5-cache/dev-tcltk/tcllib-1.20
 2011252124 metadata/md5-cache/dev-tcltk/iwidgets-4.1.1
 2011252124 metadata/md5-cache/dev-tcltk/tablelist-5.8
 2011252124 metadata/md5-cache/dev-tcltk/tablelist-6.3
@@ -45836,7 +45885,6 @@
 2011252124 metadata/md5-cache/dev-tcltk/tklib-0.6-r1
 2011252124 metadata/md5-cache/dev-tcltk/tklib-0.6-r2
 2011252124 metadata/md5-cache/dev-tcltk/tkpiechart-6.5-r2
-2012170251 metadata/md5-cache/dev-tcltk/Manifest.gz
 2012170251 metadata/md5-cache/dev-tcltk/blt-2.4z-r13
 2012170251 metadata/md5-cache/dev-tcltk/blt-2.4z-r14
 2012170251 metadata/md5-cache/dev-tcltk/bwidget-1.9.12
@@ -45868,6 +45916,8 @@
 2012162341 metadata/md5-cache/dev-tcltk/tkzinc-3.3.6
 2012170251 metadata/md5-cache/dev-tcltk/tls-1.7.16
 2012170251 metadata/md5-cache/dev-tcltk/tls-1.7.22
+2012181739 metadata/md5-cache/dev-tcltk/Manifest.gz
+2012181739 metadata/md5-cache/dev-tcltk/tcllib-1.20
 1702282321 metadata/md5-cache/dev-tex/cpp2latex-2.3-r2
 1912110241 metadata/md5-cache/dev-tex/biber-2.12
 1912151409 metadata/md5-cache/dev-tex/style-check-0.14
@@ -45888,8 +45938,6 @@
 2004032241 metadata/md5-cache/dev-tex/latex-beamer-3.56-r1
 2004032241 metadata/md5-cache/dev-tex/pgf-3.1.4b-r2
 2004121609 metadata/md5-cache/dev-tex/latexdiff-1.3.0
-2005041739 metadata/md5-cache/dev-tex/biber-2.14
-2005041739 metadata/md5-cache/dev-tex/biblatex-3.14
 2005311939 metadata/md5-cache/dev-tex/bibtexu-3.71_p20200406
 2006241539 metadata/md5-cache/dev-tex/glossaries-4.46
 2006280009 metadata/md5-cache/dev-tex/latex2html-2015
@@ -45907,9 +45955,6 @@
 2012031209 metadata/md5-cache/dev-tex/pythontex-0.17
 2012170019 metadata/md5-cache/dev-tex/catdvi-0.14-r2
 2012170251 metadata/md5-cache/dev-tex/dot2tex-2.11.3
-2012170251 metadata/md5-cache/dev-tex/hevea-2.29
-2012170251 metadata/md5-cache/dev-tex/hevea-2.30
-2012170251 metadata/md5-cache/dev-tex/html2latex-1.1-r1
 2012170251 metadata/md5-cache/dev-tex/latexmk-456
 2012170251 metadata/md5-cache/dev-tex/latexmk-465
 2012170251 metadata/md5-cache/dev-tex/latexmk-469
@@ -45919,9 +45964,12 @@
 2012170019 metadata/md5-cache/dev-tex/sketch-0.3.7
 2012170019 metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r11
 2012170019 metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8
-2012172009 metadata/md5-cache/dev-tex/Manifest.gz
-2012172009 metadata/md5-cache/dev-tex/hevea-2.31
-2012172009 metadata/md5-cache/dev-tex/latexdiff-1.3.1.1
+2012210839 metadata/md5-cache/dev-tex/Manifest.gz
+2012192309 metadata/md5-cache/dev-tex/biber-2.14
+2012192309 metadata/md5-cache/dev-tex/biblatex-3.14
+2012202239 metadata/md5-cache/dev-tex/hevea-2.31
+2012210839 metadata/md5-cache/dev-tex/html2latex-1.1-r1
+2012202209 metadata/md5-cache/dev-tex/latexdiff-1.3.1.1
 2008121539 metadata/md5-cache/dev-texlive/texlive-basic-2020-r1
 2008121539 metadata/md5-cache/dev-texlive/texlive-bibtexextra-2020
 2008121539 metadata/md5-cache/dev-texlive/texlive-context-2020
@@ -46131,7 +46179,6 @@
 2011252124 metadata/md5-cache/dev-util/lttng-tools-2.11.0
 2011252124 metadata/md5-cache/dev-util/makeheaders-0_p4
 2011252124 metadata/md5-cache/dev-util/ninka-2.0_pre1_p20170402
-2011252124 metadata/md5-cache/dev-util/objconv-2.51
 2011252124 metadata/md5-cache/dev-util/peg-0.1.18
 2011252124 metadata/md5-cache/dev-util/pkgconf-1.6.3
 2011252124 metadata/md5-cache/dev-util/pkgconf-1.7.2
@@ -46181,10 +46228,7 @@
 2012081909 metadata/md5-cache/dev-util/sysprof-capture-3.38.1-r1
 2012100539 metadata/md5-cache/dev-util/colm-0.13.0.7
 2012140439 metadata/md5-cache/dev-util/patchutils-0.3.4
-2012140439 metadata/md5-cache/dev-util/shflags-1.2.3
 2012140439 metadata/md5-cache/dev-util/umockdev-0.12.1
-2012150209 metadata/md5-cache/dev-util/itstool-2.0.6-r1
-2012170251 metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
 2012162341 metadata/md5-cache/dev-util/ald-0.1.7-r2
 2012170251 metadata/md5-cache/dev-util/amtterm-1.6
 2012170251 metadata/md5-cache/dev-util/android-ndk-11c
@@ -46235,8 +46279,6 @@
 2012170251 metadata/md5-cache/dev-util/bless-0.6.2-r1
 2012170251 metadata/md5-cache/dev-util/bloaty-1.1
 2012170251 metadata/md5-cache/dev-util/bloaty-9999
-2012170251 metadata/md5-cache/dev-util/bnfc-2.8.1
-2012170019 metadata/md5-cache/dev-util/bnfc-2.8.3
 2012170019 metadata/md5-cache/dev-util/boost-build-1.72.0
 2012170019 metadata/md5-cache/dev-util/boost-build-1.74.0
 2012170251 metadata/md5-cache/dev-util/bpftrace-0.11.4
@@ -46263,15 +46305,12 @@
 2012170251 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4
 2012170251 metadata/md5-cache/dev-util/buildbot-www-2.8.2
 2012170251 metadata/md5-cache/dev-util/buildbot-www-2.8.4
-2012170251 metadata/md5-cache/dev-util/bustle-0.5.4
 2012170251 metadata/md5-cache/dev-util/cargo-audit-0.13.1
 2012170251 metadata/md5-cache/dev-util/cargo-c-0.6.2
 2012170251 metadata/md5-cache/dev-util/cargo-ebuild-0.2.0
 2012170251 metadata/md5-cache/dev-util/cargo-ebuild-0.3.0
 2012170251 metadata/md5-cache/dev-util/cargo-ebuild-0.3.1
 2012170251 metadata/md5-cache/dev-util/cargo-license-0.3.0
-2012170251 metadata/md5-cache/dev-util/catalyst-3.0.14
-2012170251 metadata/md5-cache/dev-util/catalyst-9999
 2012170251 metadata/md5-cache/dev-util/catfish-1.4.13
 2012170251 metadata/md5-cache/dev-util/catfish-4.15.0
 2012170251 metadata/md5-cache/dev-util/catkin-0.8.8-r1
@@ -46341,28 +46380,21 @@
 2012170251 metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
 2012170019 metadata/md5-cache/dev-util/cunit-2.1_p3
 2012170251 metadata/md5-cache/dev-util/cutter-1.12.0
-2012170251 metadata/md5-cache/dev-util/cvise-1.6.0
-2012170251 metadata/md5-cache/dev-util/cvise-1.7.0-r1
-2012170251 metadata/md5-cache/dev-util/cvise-1.8.0
 2012170251 metadata/md5-cache/dev-util/cvise-2.0.0
 2012170251 metadata/md5-cache/dev-util/d-feet-0.3.14-r1
 2012170019 metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r1
 2012170251 metadata/md5-cache/dev-util/ddd-3.3.12-r4
 2012170019 metadata/md5-cache/dev-util/debhelper-13.1
 2012170019 metadata/md5-cache/dev-util/debhelper-13.2
-2012170019 metadata/md5-cache/dev-util/debhelper-13.2.1
 2012170251 metadata/md5-cache/dev-util/debhelper-9.20160814
 2012170019 metadata/md5-cache/dev-util/debootstrap-1.0.123
 2012170019 metadata/md5-cache/dev-util/debugedit-4.16.0
 2012170019 metadata/md5-cache/dev-util/debugedit-4.16.1
 2012170019 metadata/md5-cache/dev-util/debugedit-4.16.1.2
 2012170019 metadata/md5-cache/dev-util/desktop-file-utils-0.24
-2012170709 metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
 2012170019 metadata/md5-cache/dev-util/devhelp-3.36.2
 2012170251 metadata/md5-cache/dev-util/dialog-1.3.20170131
 2012170019 metadata/md5-cache/dev-util/diffball-1.0.1-r2
-2012170251 metadata/md5-cache/dev-util/diffoscope-162
-2012170251 metadata/md5-cache/dev-util/diffoscope-163
 2012170251 metadata/md5-cache/dev-util/dirdiff-2.1-r3
 2012170251 metadata/md5-cache/dev-util/distro-info-0.22
 2012152339 metadata/md5-cache/dev-util/docker-distribution-pruner-0_p20170401
@@ -46380,10 +46412,8 @@
 2012170251 metadata/md5-cache/dev-util/dwdiff-2.1.1
 2012170251 metadata/md5-cache/dev-util/dwdiff-2.1.2
 2012170251 metadata/md5-cache/dev-util/dwdiff-2.1.3
-2012170251 metadata/md5-cache/dev-util/edb-debugger-1.2.0
 2012170251 metadata/md5-cache/dev-util/edb-debugger-1.3.0
 2012170251 metadata/md5-cache/dev-util/edb-debugger-9999
-2012170251 metadata/md5-cache/dev-util/egypt-1.10
 2012170251 metadata/md5-cache/dev-util/emilpro-3-r3
 2012170251 metadata/md5-cache/dev-util/emilpro-9999
 2012170251 metadata/md5-cache/dev-util/findbugs-3.0.1
@@ -46416,7 +46446,6 @@
 2012170019 metadata/md5-cache/dev-util/gnome-builder-3.38.1
 2012170251 metadata/md5-cache/dev-util/gnome-devel-docs-3.32.1
 2012170251 metadata/md5-cache/dev-util/gob-2.0.20
-2012170251 metadata/md5-cache/dev-util/goland-2020.2.3
 2012170251 metadata/md5-cache/dev-util/google-perftools-2.7-r1
 2012170019 metadata/md5-cache/dev-util/google-perftools-2.8
 2012170019 metadata/md5-cache/dev-util/gource-0.51
@@ -46441,7 +46470,6 @@
 2012170251 metadata/md5-cache/dev-util/include-what-you-use-11.0
 2012170251 metadata/md5-cache/dev-util/indent-2.2.11-r1
 2012170251 metadata/md5-cache/dev-util/indent-2.2.11_p5
-2012170251 metadata/md5-cache/dev-util/indent-2.2.12
 2012170251 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4111
 2012170251 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4944
 2012170251 metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r3
@@ -46501,31 +46529,6 @@
 2012170251 metadata/md5-cache/dev-util/ninja-1.10.2
 2012170251 metadata/md5-cache/dev-util/ninja-9999
 2012162341 metadata/md5-cache/dev-util/numdiff-5.9.0
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.1.243
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r3
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168-r2
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.243-r3
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r2
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.0.3
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.0
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85
-2012170251 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88
 2012170251 metadata/md5-cache/dev-util/omake-0.10.2
 2012170251 metadata/md5-cache/dev-util/omake-0.10.3
 2012170251 metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1
@@ -46543,7 +46546,6 @@
 2012170251 metadata/md5-cache/dev-util/perf-5.4.20
 2012170251 metadata/md5-cache/dev-util/perf-5.7-r1
 2012170251 metadata/md5-cache/dev-util/perf-5.8
-2012170251 metadata/md5-cache/dev-util/perf-5.9.9
 2012170251 metadata/md5-cache/dev-util/pkgcheck-0.7.7
 2012170251 metadata/md5-cache/dev-util/pkgcheck-0.7.9
 2012170251 metadata/md5-cache/dev-util/pkgcheck-9999
@@ -46618,8 +46620,6 @@
 2012170251 metadata/md5-cache/dev-util/scons-4.0.1
 2012170251 metadata/md5-cache/dev-util/serialtalk-1.2-r1
 2012170251 metadata/md5-cache/dev-util/serialtalk-9999
-2012170019 metadata/md5-cache/dev-util/shellcheck-0.7.1
-2012170251 metadata/md5-cache/dev-util/shelltestrunner-1.9
 2012170251 metadata/md5-cache/dev-util/source-highlight-3.1.9
 2012170019 metadata/md5-cache/dev-util/spirv-headers-1.5.4
 2012170609 metadata/md5-cache/dev-util/spirv-headers-1.5.4.1
@@ -46680,13 +46680,59 @@
 2012170251 metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
 2012170251 metadata/md5-cache/dev-util/ydiff-1.2
 2012170251 metadata/md5-cache/dev-util/yuicompressor-2.4.8-r2
-2012180739 metadata/md5-cache/dev-util/Manifest.gz
-2012171739 metadata/md5-cache/dev-util/catalyst-3.0.15
-2012171639 metadata/md5-cache/dev-util/cmake-3.19.2
-2012172009 metadata/md5-cache/dev-util/cvise-1.9.0
 2012171739 metadata/md5-cache/dev-util/gdbus-codegen-2.66.4
 2012171739 metadata/md5-cache/dev-util/glib-utils-2.66.4
 2012180739 metadata/md5-cache/dev-util/howdoi-2.0.8
+2012210839 metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
+2012211309 metadata/md5-cache/dev-util/Manifest.gz
+2012210239 metadata/md5-cache/dev-util/bnfc-2.8.1
+2012210239 metadata/md5-cache/dev-util/bnfc-2.8.3
+2012210239 metadata/md5-cache/dev-util/bustle-0.5.4
+2012181209 metadata/md5-cache/dev-util/catalyst-3.0.14
+2012181209 metadata/md5-cache/dev-util/catalyst-3.0.15
+2012200639 metadata/md5-cache/dev-util/catalyst-9999
+2012210309 metadata/md5-cache/dev-util/checkbashisms-2.20.5
+2012182339 metadata/md5-cache/dev-util/cmake-3.19.2
+2012202239 metadata/md5-cache/dev-util/cvise-1.9.0
+2012211309 metadata/md5-cache/dev-util/debhelper-13.2.1
+2012211309 metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
+2012181209 metadata/md5-cache/dev-util/diffoscope-163
+2012210839 metadata/md5-cache/dev-util/egypt-1.10
+2012182139 metadata/md5-cache/dev-util/goland-2020.3
+2012211309 metadata/md5-cache/dev-util/indent-2.2.12
+2012191139 metadata/md5-cache/dev-util/itstool-2.0.6-r1
+2012191239 metadata/md5-cache/dev-util/lldb-11.0.1_rc2
+2012201909 metadata/md5-cache/dev-util/ninja-1.10.2-r1
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.1.243
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-sdk-10.2.89
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-sdk-6.5.19
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.0.176
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.1.85
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r3
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168-r2
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.243-r3
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r2
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.0.3
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.0
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19-r1
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.61
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.1.85
+2012210839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88
+2012210839 metadata/md5-cache/dev-util/objconv-2.51
+2012181339 metadata/md5-cache/dev-util/perf-5.9.9
+2012210239 metadata/md5-cache/dev-util/shellcheck-0.7.1
+2012210239 metadata/md5-cache/dev-util/shelltestrunner-1.9
+2012211309 metadata/md5-cache/dev-util/shflags-1.2.3
 1910111911 metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1809152309 metadata/md5-cache/dev-vcs/cvsutils-0.2.5-r1
@@ -46727,8 +46773,6 @@
 2012170019 metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1
 2012170019 metadata/md5-cache/dev-vcs/cvsps-3.13-r2
 2012170251 metadata/md5-cache/dev-vcs/cvsspam-0.2.12
-2012170019 metadata/md5-cache/dev-vcs/darcs-2.14.5
-2012170019 metadata/md5-cache/dev-vcs/darcs-2.16.3
 2012170251 metadata/md5-cache/dev-vcs/git-2.23.3
 2012170251 metadata/md5-cache/dev-vcs/git-2.24.3
 2012170251 metadata/md5-cache/dev-vcs/git-2.25.4
@@ -46736,22 +46780,17 @@
 2012170251 metadata/md5-cache/dev-vcs/git-2.27.0
 2012170251 metadata/md5-cache/dev-vcs/git-2.28.0
 2012170251 metadata/md5-cache/dev-vcs/git-2.29.2
-2012170251 metadata/md5-cache/dev-vcs/git-2.30.0_rc0
 2012170251 metadata/md5-cache/dev-vcs/git-9999
 2012170251 metadata/md5-cache/dev-vcs/git-9999-r1
 2012170251 metadata/md5-cache/dev-vcs/git-9999-r2
 2012170251 metadata/md5-cache/dev-vcs/git-9999-r3
-2012170251 metadata/md5-cache/dev-vcs/git-annex-8.20200810
-2012171209 metadata/md5-cache/dev-vcs/git-cola-3.5-r1
 2012170251 metadata/md5-cache/dev-vcs/git-cola-3.8
 2012170251 metadata/md5-cache/dev-vcs/git-flow-1.12.3
 2012170251 metadata/md5-cache/dev-vcs/git-mailz-0.14
 2012170251 metadata/md5-cache/dev-vcs/git-num-2.0.1
 2012170019 metadata/md5-cache/dev-vcs/gitg-3.32.1-r1
 2012170251 metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
-2012170251 metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1
 2012170251 metadata/md5-cache/dev-vcs/gitolite-3.6.11
-2012170251 metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
 2012170251 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1-r1
 2012170251 metadata/md5-cache/dev-vcs/gitsh-0.11.2
 2012170251 metadata/md5-cache/dev-vcs/hg-evolve-10.0.2-r1
@@ -46800,20 +46839,23 @@
 2012170251 metadata/md5-cache/dev-vcs/tortoisehg-9999
 2012170251 metadata/md5-cache/dev-vcs/vcsh-1.20151229.1
 2012171539 metadata/md5-cache/dev-vcs/cssc-1.4.1
-2012171809 metadata/md5-cache/dev-vcs/Manifest.gz
 2012171709 metadata/md5-cache/dev-vcs/tortoisehg-5.6.1
+2012210839 metadata/md5-cache/dev-vcs/Manifest.gz
+2012210239 metadata/md5-cache/dev-vcs/darcs-2.16.3
+2012192139 metadata/md5-cache/dev-vcs/git-2.30.0_rc1
+2012210239 metadata/md5-cache/dev-vcs/git-annex-8.20200810
+2012181009 metadata/md5-cache/dev-vcs/git-cola-3.5-r1
+2012210839 metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1
+2012210839 metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
 1707090139 metadata/md5-cache/games-action/nighthawk-2.2-r1
 1702282322 metadata/md5-cache/games-action/tuxkart-0.4.0-r1
 1707090139 metadata/md5-cache/games-action/xbomber-101-r1
 2009060239 metadata/md5-cache/games-action/descent2-demodata-1.0-r1
 2011252124 metadata/md5-cache/games-action/battalion-1.4b-r1
-2011252124 metadata/md5-cache/games-action/descent1-demodata-1.4-r1
 2011301909 metadata/md5-cache/games-action/descent1-freedata-1
 2011301909 metadata/md5-cache/games-action/descent2-freedata-1
 2012162341 metadata/md5-cache/games-action/0verkill-0.16-r4
-2012170251 metadata/md5-cache/games-action/Manifest.gz
 2012170251 metadata/md5-cache/games-action/abuse-0.9_p20181213-r1
-2012170251 metadata/md5-cache/games-action/apotheon-1.26v
 2012170251 metadata/md5-cache/games-action/armagetronad-0.2.8.3.3-r1
 2012170251 metadata/md5-cache/games-action/assault-android-cactus+-200507
 2012170251 metadata/md5-cache/games-action/astromenace-1.4.1-r1
@@ -46821,9 +46863,7 @@
 2012170251 metadata/md5-cache/games-action/atanks-6.5
 2012170251 metadata/md5-cache/games-action/badland-121-r1
 2012170251 metadata/md5-cache/games-action/barrage-1.0.4-r1
-2012170251 metadata/md5-cache/games-action/beathazardultra-20130308-r2
 2012170251 metadata/md5-cache/games-action/bomberclone-0.11.9
-2012170251 metadata/md5-cache/games-action/brutal-legend-20130615-r2
 2012170251 metadata/md5-cache/games-action/bzflag-2.4.12
 2012170251 metadata/md5-cache/games-action/bzflag-2.4.14
 2012170251 metadata/md5-cache/games-action/bzflag-2.4.16
@@ -46837,8 +46877,6 @@
 2012170251 metadata/md5-cache/games-action/descent1-data-1.4a
 2012170251 metadata/md5-cache/games-action/descent2-data-1.2
 2012170251 metadata/md5-cache/games-action/descent2-vertigo-1.0
-2012170251 metadata/md5-cache/games-action/descent3-1.4.0b-r2
-2012170251 metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
 2012170251 metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20200615
 2012170251 metadata/md5-cache/games-action/dxx-rebirth-9999
 2012170251 metadata/md5-cache/games-action/extreme-tuxracer-0.7.4
@@ -46849,9 +46887,6 @@
 2012170251 metadata/md5-cache/games-action/geki2-KXL-2.0.3-r3
 2012170251 metadata/md5-cache/games-action/geki3-KXL-1.0.3-r3
 2012170251 metadata/md5-cache/games-action/gltron-0.70-r2
-2012170251 metadata/md5-cache/games-action/guacamelee-20140222
-2012170251 metadata/md5-cache/games-action/heretic2-1.06c-r1
-2012170251 metadata/md5-cache/games-action/heretic2-demo-1.06a
 2012162341 metadata/md5-cache/games-action/heroes-0.21-r2
 2012170251 metadata/md5-cache/games-action/hotline-miami-1.0.9a_p20140221-r1
 2012170251 metadata/md5-cache/games-action/intrusion2-1.024
@@ -46866,15 +46901,11 @@
 2012170251 metadata/md5-cache/games-action/orbital-eunuchs-sniper-1.30-r1
 2012170251 metadata/md5-cache/games-action/postalplus-1-r1
 2012170251 metadata/md5-cache/games-action/powermanga-0.93.1-r1
-2012170251 metadata/md5-cache/games-action/rive-1.15
 2012170251 metadata/md5-cache/games-action/rrootage-0.23a-r1
-2012170251 metadata/md5-cache/games-action/shadowgrounds-bin-0_p1
-2012170251 metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1
 2012170251 metadata/md5-cache/games-action/shootingstar-1.2.0-r1
 2012170251 metadata/md5-cache/games-action/snipes-1.0.4-r1
 2012170251 metadata/md5-cache/games-action/solar2-1.10
 2012170251 metadata/md5-cache/games-action/spacearyarya-kxl-1.0.2-r2
-2012170251 metadata/md5-cache/games-action/super-hexagon-20160217
 2012170251 metadata/md5-cache/games-action/supermariowar-2.0_beta1-r1
 2012170251 metadata/md5-cache/games-action/supertuxkart-1.1
 2012170251 metadata/md5-cache/games-action/supertuxkart-1.2
@@ -46882,7 +46913,6 @@
 2012170251 metadata/md5-cache/games-action/teeworlds-0.7.5
 2012170251 metadata/md5-cache/games-action/towbowl-tactics-0.5
 2012170251 metadata/md5-cache/games-action/transcend-0.3-r1
-2012170251 metadata/md5-cache/games-action/trine-1.08-r3
 2012170251 metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508-r3
 2012170251 metadata/md5-cache/games-action/trine2-2.01.425-r2
 2012170251 metadata/md5-cache/games-action/trosh-20-r1
@@ -46891,6 +46921,21 @@
 2012170251 metadata/md5-cache/games-action/wordwarvi-1.00-r1
 2012162341 metadata/md5-cache/games-action/xblast-2.10.4-r1
 2012170251 metadata/md5-cache/games-action/xpilot-4.5.5-r1
+2012210839 metadata/md5-cache/games-action/Manifest.gz
+2012210839 metadata/md5-cache/games-action/apotheon-1.26v
+2012210839 metadata/md5-cache/games-action/beathazardultra-20130308-r2
+2012210839 metadata/md5-cache/games-action/brutal-legend-20130615-r2
+2012210839 metadata/md5-cache/games-action/descent1-demodata-1.4-r1
+2012210839 metadata/md5-cache/games-action/descent3-1.4.0b-r2
+2012210839 metadata/md5-cache/games-action/descent3-demo-1.4.0a-r1
+2012210839 metadata/md5-cache/games-action/guacamelee-20140222
+2012210839 metadata/md5-cache/games-action/heretic2-1.06c-r1
+2012210839 metadata/md5-cache/games-action/heretic2-demo-1.06a
+2012210839 metadata/md5-cache/games-action/rive-1.15
+2012210839 metadata/md5-cache/games-action/shadowgrounds-bin-0_p1
+2012210839 metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1
+2012210839 metadata/md5-cache/games-action/super-hexagon-20160217
+2012210839 metadata/md5-cache/games-action/trine-1.08-r3
 1910111911 metadata/md5-cache/games-arcade/aop-0.6-r1
 1910111911 metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r1
 1910111911 metadata/md5-cache/games-arcade/gnake-0.94b-r1
@@ -46902,12 +46947,10 @@
 2011252124 metadata/md5-cache/games-arcade/stardork-0.7-r1
 2011252124 metadata/md5-cache/games-arcade/trailblazer-0.9-r1
 2011252124 metadata/md5-cache/games-arcade/tuxdash-0.8-r1
-2012170251 metadata/md5-cache/games-arcade/Manifest.gz
 2012170251 metadata/md5-cache/games-arcade/abe-1.1-r1
 2012162341 metadata/md5-cache/games-arcade/afternoonstalker-1.1.5-r1
 2012170251 metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1
 2012170251 metadata/md5-cache/games-arcade/apricots-0.2.6-r2
-2012170251 metadata/md5-cache/games-arcade/aquaria-1.1.3-r1
 2012170251 metadata/md5-cache/games-arcade/asteroid-1.2.1
 2012170251 metadata/md5-cache/games-arcade/balloonchase-0.9.6-r1
 2012170251 metadata/md5-cache/games-arcade/barbarian-bin-1.01-r1
@@ -46947,7 +46990,6 @@
 2012170019 metadata/md5-cache/games-arcade/gnome-robots-3.36.1
 2012170251 metadata/md5-cache/games-arcade/gnujump-1.0.8-r1
 2012170251 metadata/md5-cache/games-arcade/grande-KXL-0.6-r1
-2012170251 metadata/md5-cache/games-arcade/gunocide2ex-1.0
 2012170251 metadata/md5-cache/games-arcade/holotz-castle-1.3.14-r1
 2012170251 metadata/md5-cache/games-arcade/insaneodyssey-000311-r1
 2012170251 metadata/md5-cache/games-arcade/jardinains-2.0-r1
@@ -46995,7 +47037,6 @@
 2012170251 metadata/md5-cache/games-arcade/sdl-sopwith-1.7.5-r2
 2012170251 metadata/md5-cache/games-arcade/sdlroids-1.3.4-r4
 2012170251 metadata/md5-cache/games-arcade/sdlsasteroids-3.0.1-r1
-2012170251 metadata/md5-cache/games-arcade/shovel-knight-3.3
 2012170251 metadata/md5-cache/games-arcade/slimevolley-2.4.2-r1
 2012170251 metadata/md5-cache/games-arcade/solarwolf-1.5-r2
 2012170251 metadata/md5-cache/games-arcade/spacerider-0.13-r1
@@ -47005,7 +47046,6 @@
 2012170251 metadata/md5-cache/games-arcade/supertux-0.6.2
 2012170251 metadata/md5-cache/games-arcade/syobon-1.0.1-r1
 2012170251 metadata/md5-cache/games-arcade/tecnoballz-0.92
-2012170251 metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3
 2012170251 metadata/md5-cache/games-arcade/tomatoes-1.55-r2
 2012170251 metadata/md5-cache/games-arcade/tuxanci-20110429-r1
 2012170251 metadata/md5-cache/games-arcade/tuxanci-99999999
@@ -47023,6 +47063,11 @@
 2012170251 metadata/md5-cache/games-arcade/xsfcave-0.5-r1
 2012170251 metadata/md5-cache/games-arcade/xtux-20030306-r1
 2012170251 metadata/md5-cache/games-arcade/yarsrevenge-0.99-r1
+2012210839 metadata/md5-cache/games-arcade/Manifest.gz
+2012210839 metadata/md5-cache/games-arcade/aquaria-1.1.3-r1
+2012210839 metadata/md5-cache/games-arcade/gunocide2ex-1.0
+2012210839 metadata/md5-cache/games-arcade/shovel-knight-3.3
+2012210839 metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r3
 1711182338 metadata/md5-cache/games-board/gnuchess-book-1.02-r1
 1702282322 metadata/md5-cache/games-board/maitretarot-0.1.98-r1
 1702282322 metadata/md5-cache/games-board/mt_dolphin_ia-0.1.98-r1
@@ -47033,7 +47078,6 @@
 2011252124 metadata/md5-cache/games-board/stockfish-10
 2011252124 metadata/md5-cache/games-board/stockfish-11
 2011252124 metadata/md5-cache/games-board/xgammon-0.98-r2
-2012170251 metadata/md5-cache/games-board/Manifest.gz
 2012170251 metadata/md5-cache/games-board/ace-1.4-r2
 2012170251 metadata/md5-cache/games-board/ascal-0.1.1-r1
 2012170251 metadata/md5-cache/games-board/atakks-1.0-r1
@@ -47060,7 +47104,6 @@
 2012170251 metadata/md5-cache/games-board/gnubg-1.06.002-r1
 2012162341 metadata/md5-cache/games-board/gnugo-3.9.1-r2
 2012170251 metadata/md5-cache/games-board/gnushogi-1.4.1-r1
-2012170251 metadata/md5-cache/games-board/goatee-gtk-0.3.1.1
 2012170251 metadata/md5-cache/games-board/grhino-0.16.1-r2
 2012162341 metadata/md5-cache/games-board/gtkatlantic-0.6.3
 2012170251 metadata/md5-cache/games-board/gtkboard-0.11_pre0-r2
@@ -47091,6 +47134,8 @@
 2012170251 metadata/md5-cache/games-board/xmille-2.0-r3
 2012170251 metadata/md5-cache/games-board/xscrabble-2.10-r2
 2012170251 metadata/md5-cache/games-board/xskat-4.0-r1
+2012210239 metadata/md5-cache/games-board/Manifest.gz
+2012210239 metadata/md5-cache/games-board/goatee-gtk-0.3.1.1
 1911021809 metadata/md5-cache/games-emulation/desmume-0.9.11-r2
 1911110109 metadata/md5-cache/games-emulation/emutos-0.9.12
 1808150339 metadata/md5-cache/games-emulation/libretro-info-0.0.1_pre20180723
@@ -47106,14 +47151,12 @@
 2011252124 metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5.9
 2011252124 metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r2
 2011252124 metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r2
-2012170251 metadata/md5-cache/games-emulation/Manifest.gz
 2012170019 metadata/md5-cache/games-emulation/advancemame-3.9
 2012170251 metadata/md5-cache/games-emulation/advancescan-1.16-r1
 2012170251 metadata/md5-cache/games-emulation/atari800-4.2.0
 2012170251 metadata/md5-cache/games-emulation/caps-20071115
 2012162341 metadata/md5-cache/games-emulation/dgen-sdl-1.33-r1
 2012170251 metadata/md5-cache/games-emulation/dolphin-5.0_p20200705
-2012170251 metadata/md5-cache/games-emulation/dolphin-9999
 2012170251 metadata/md5-cache/games-emulation/dosbox-0.74.3
 2012170251 metadata/md5-cache/games-emulation/dosbox-0.75_pre4302
 2012170251 metadata/md5-cache/games-emulation/dosbox-9999
@@ -47174,6 +47217,8 @@
 2012170251 metadata/md5-cache/games-emulation/yabause-0.9.15
 2012170251 metadata/md5-cache/games-emulation/zsnes-1.51-r8
 2012170251 metadata/md5-cache/games-emulation/zsnes-1.51-r9
+2012190009 metadata/md5-cache/games-emulation/Manifest.gz
+2012190009 metadata/md5-cache/games-emulation/dolphin-9999
 1707090139 metadata/md5-cache/games-engines/xzip-1.8.2-r3
 2004101409 metadata/md5-cache/games-engines/zoom-1.1.5-r1
 2010132009 metadata/md5-cache/games-engines/love-0.7.2-r2
@@ -47189,7 +47234,6 @@
 2011252124 metadata/md5-cache/games-engines/love-0.8.0-r100
 2011252124 metadata/md5-cache/games-engines/love-11.3-r100
 2011281509 metadata/md5-cache/games-engines/dMagnetic-0.28
-2012170251 metadata/md5-cache/games-engines/Manifest.gz
 2012170251 metadata/md5-cache/games-engines/devilutionx-1.0.1
 2012170251 metadata/md5-cache/games-engines/devilutionx-1.0.3
 2012170251 metadata/md5-cache/games-engines/devilutionx-1.1.0
@@ -47219,6 +47263,8 @@
 2012170251 metadata/md5-cache/games-engines/stratagus-2.4.1
 2012170251 metadata/md5-cache/games-engines/stratagus-2.4.3
 2012170251 metadata/md5-cache/games-engines/stratagus-2.4.3-r100
+2012201409 metadata/md5-cache/games-engines/Manifest.gz
+2012201409 metadata/md5-cache/games-engines/stratagus-3.0.0-r1
 1911080039 metadata/md5-cache/games-fps/freedoom-0.12.1
 1910280309 metadata/md5-cache/games-fps/ut2004-bonuspack-ece-1-r4
 1910280309 metadata/md5-cache/games-fps/ut2004-bonuspack-mega-1-r3
@@ -47228,24 +47274,19 @@
 2011090239 metadata/md5-cache/games-fps/ut2004-bonuspack-cbp2-1-r3
 2011252124 metadata/md5-cache/games-fps/freedm-data-0.12.1
 2011252124 metadata/md5-cache/games-fps/freedoom-data-0.12.1
-2012170251 metadata/md5-cache/games-fps/Manifest.gz
 2012170251 metadata/md5-cache/games-fps/alienarena-7.66
 2012170251 metadata/md5-cache/games-fps/avp-20150214-r1
 2012170251 metadata/md5-cache/games-fps/blackshades-20070723-r1
 2012162341 metadata/md5-cache/games-fps/chocolate-doom-3.0.1
-2012170251 metadata/md5-cache/games-fps/darkplaces-20140513-r1
 2012170251 metadata/md5-cache/games-fps/doomsday-2.1.1-r1
-2012170251 metadata/md5-cache/games-fps/duke3d-data-1.0-r4
 2012170251 metadata/md5-cache/games-fps/duke3d-demodata-1.3
 2012170251 metadata/md5-cache/games-fps/eduke32-20201214.9286
 2012170251 metadata/md5-cache/games-fps/etqw-bin-1.5-r2
 2012170251 metadata/md5-cache/games-fps/etqw-data-1.0-r1
-2012170251 metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2
 2012170251 metadata/md5-cache/games-fps/ezquake-bin-2.2
 2012170251 metadata/md5-cache/games-fps/glxquake-bin-0-r2
 2012170251 metadata/md5-cache/games-fps/gzdoom-4.5.0
 2012170251 metadata/md5-cache/games-fps/industri-1.01
-2012170251 metadata/md5-cache/games-fps/legends-0.4.1.43-r2
 2012170251 metadata/md5-cache/games-fps/nexuiz-2.5.2-r1
 2012170251 metadata/md5-cache/games-fps/prboom-plus-2.5.1.7.82
 2012170251 metadata/md5-cache/games-fps/quake1-data-2.40
@@ -47254,8 +47295,6 @@
 2012170251 metadata/md5-cache/games-fps/quake1-rally-1.2
 2012170251 metadata/md5-cache/games-fps/quake1-teamfortress-2.9
 2012170251 metadata/md5-cache/games-fps/quake1-textures-20050820
-2012170251 metadata/md5-cache/games-fps/quake2-data-3.20
-2012170251 metadata/md5-cache/games-fps/quake2-demodata-3.14
 2012170251 metadata/md5-cache/games-fps/quake2-icculus-0.16.1-r1
 2012170251 metadata/md5-cache/games-fps/quake2-textures-0_beta8
 2012170251 metadata/md5-cache/games-fps/quakeforge-0.7.2-r1
@@ -47265,28 +47304,35 @@
 2012170251 metadata/md5-cache/games-fps/redeclipse-2.0.0
 2012170251 metadata/md5-cache/games-fps/rott-1.1.2-r1
 2012170251 metadata/md5-cache/games-fps/sauerbraten-2013.02.03
-2012170251 metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1
-2012170251 metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
 2012170251 metadata/md5-cache/games-fps/tenebrae-1.04-r1
 2012170251 metadata/md5-cache/games-fps/transfusion-bin-1.01-r1
-2012170251 metadata/md5-cache/games-fps/tribes2-25034
 2012170251 metadata/md5-cache/games-fps/turtlearena-0.6.1-r1
 2012170251 metadata/md5-cache/games-fps/urbanterror-4.3.4_p20200519
 2012170251 metadata/md5-cache/games-fps/urbanterror-data-4.3.4
 2012170251 metadata/md5-cache/games-fps/ut2003-2225-r6
-2012170251 metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1
 2012170251 metadata/md5-cache/games-fps/ut2003-bonuspack-de-1
 2012170251 metadata/md5-cache/games-fps/ut2003-bonuspack-epic-1
-2012170251 metadata/md5-cache/games-fps/ut2003-data-2107
-2012170251 metadata/md5-cache/games-fps/ut2003-demo-2206-r4
 2012170251 metadata/md5-cache/games-fps/ut2004-3369.3-r3
-2012170251 metadata/md5-cache/games-fps/ut2004-data-3186-r5
-2012170251 metadata/md5-cache/games-fps/ut2004-demo-3334-r1
 2012170251 metadata/md5-cache/games-fps/wolfgl-0.93-r2
 2012170251 metadata/md5-cache/games-fps/worldofpadman-1.6-r1
 2012170251 metadata/md5-cache/games-fps/xonotic-0.8.2
 2012170251 metadata/md5-cache/games-fps/yamagi-quake2-7.43
 2012170251 metadata/md5-cache/games-fps/yamagi-quake2-7.45
+2012210839 metadata/md5-cache/games-fps/Manifest.gz
+2012210839 metadata/md5-cache/games-fps/darkplaces-20140513-r1
+2012210839 metadata/md5-cache/games-fps/duke3d-data-1.0-r4
+2012210839 metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2
+2012210839 metadata/md5-cache/games-fps/legends-0.4.1.43-r2
+2012210839 metadata/md5-cache/games-fps/quake2-data-3.20
+2012210839 metadata/md5-cache/games-fps/quake2-demodata-3.14
+2012210839 metadata/md5-cache/games-fps/serious-sam-tse-1_beta1-r1
+2012210839 metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
+2012210839 metadata/md5-cache/games-fps/tribes2-25034
+2012210839 metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1
+2012210839 metadata/md5-cache/games-fps/ut2003-data-2107
+2012210839 metadata/md5-cache/games-fps/ut2003-demo-2206-r4
+2012210839 metadata/md5-cache/games-fps/ut2004-data-3186-r5
+2012210839 metadata/md5-cache/games-fps/ut2004-demo-3334-r1
 2012170251 metadata/md5-cache/games-kids/Manifest.gz
 2012170251 metadata/md5-cache/games-kids/gcompris-0.97-r1
 2012170251 metadata/md5-cache/games-kids/gmult-8.0-r1
@@ -47325,7 +47371,6 @@
 2011252124 metadata/md5-cache/games-misc/wumpus-1.4-r1
 2011252124 metadata/md5-cache/games-misc/xcruiser-0.30-r1
 2011270039 metadata/md5-cache/games-misc/opengfx-0.6.0
-2012170251 metadata/md5-cache/games-misc/Manifest.gz
 2012170251 metadata/md5-cache/games-misc/asr-manpages-1.3_rc6
 2012170251 metadata/md5-cache/games-misc/ballerburg-1.2.0-r1
 2012170251 metadata/md5-cache/games-misc/bsd-games-2.17-r5
@@ -47339,7 +47384,6 @@
 2012170251 metadata/md5-cache/games-misc/games-envd-0
 2012170251 metadata/md5-cache/games-misc/gtklife-5.2
 2012170251 metadata/md5-cache/games-misc/katawa-shoujo-1.3.1-r2
-2012170251 metadata/md5-cache/games-misc/little-inferno-20130509
 2012170251 metadata/md5-cache/games-misc/lolcat-100.0.1
 2012170251 metadata/md5-cache/games-misc/lolcat-100.0.1-r1
 2012170251 metadata/md5-cache/games-misc/lolcat-90.8.8-r1
@@ -47351,6 +47395,8 @@
 2012162341 metadata/md5-cache/games-misc/typespeed-0.6.5-r2
 2012170251 metadata/md5-cache/games-misc/usolitaire-0.2.1
 2012162341 metadata/md5-cache/games-misc/xcowsay-1.5.1
+2012210839 metadata/md5-cache/games-misc/Manifest.gz
+2012210839 metadata/md5-cache/games-misc/little-inferno-20130509
 1807151809 metadata/md5-cache/games-mud/trebuchet-1.075-r1
 2002230040 metadata/md5-cache/games-mud/tintin-2.01.8
 2012170251 metadata/md5-cache/games-mud/Manifest.gz
@@ -47374,7 +47420,6 @@
 2011252124 metadata/md5-cache/games-puzzle/freesweep-1.0.1
 2011252124 metadata/md5-cache/games-puzzle/galaxis-1.8-r1
 2011252124 metadata/md5-cache/games-puzzle/tint-0.03b-r1
-2012170251 metadata/md5-cache/games-puzzle/Manifest.gz
 2012162341 metadata/md5-cache/games-puzzle/amoebax-0.2.1-r1
 2012170251 metadata/md5-cache/games-puzzle/anagramarama-0.2-r1
 2012170251 metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13-r1
@@ -47463,8 +47508,6 @@
 2012170251 metadata/md5-cache/games-puzzle/wizznic-369-r1
 2012170251 metadata/md5-cache/games-puzzle/wmpuzzle-0.5.2-r1
 2012170251 metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r3
-2012170251 metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337
-2012170251 metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53
 2012170251 metadata/md5-cache/games-puzzle/xblockout-1.1.6-r2
 2012170251 metadata/md5-cache/games-puzzle/xbomb-2.2b
 2012170251 metadata/md5-cache/games-puzzle/xlogical-1.0.7
@@ -47473,9 +47516,10 @@
 2012170251 metadata/md5-cache/games-puzzle/xwelltris-1.0.1
 2012162341 metadata/md5-cache/games-puzzle/xye-0.12.2
 2012170251 metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
+2012210839 metadata/md5-cache/games-puzzle/Manifest.gz
+2012210839 metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337
+2012210839 metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53
 2012170251 metadata/md5-cache/games-roguelike/FTL-1.5.13
-2012170251 metadata/md5-cache/games-roguelike/FTL-gog-1.6.9.25330
-2012170251 metadata/md5-cache/games-roguelike/Manifest.gz
 2012170251 metadata/md5-cache/games-roguelike/adom-1.1.1-r1
 2012170251 metadata/md5-cache/games-roguelike/angband-4.1.3
 2012170251 metadata/md5-cache/games-roguelike/angband-4.2.1
@@ -47495,35 +47539,28 @@
 2012170251 metadata/md5-cache/games-roguelike/tomenet-4.7.3
 2012170251 metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r1
 2012170251 metadata/md5-cache/games-roguelike/zangband-2.7.4c
+2012210839 metadata/md5-cache/games-roguelike/FTL-gog-1.6.9.25330
+2012210839 metadata/md5-cache/games-roguelike/Manifest.gz
 1805012309 metadata/md5-cache/games-rpg/freedink-data-1.08.20140901-r1
 1806081339 metadata/md5-cache/games-rpg/freedink-data-1.08.20170409
-2012170251 metadata/md5-cache/games-rpg/Manifest.gz
 2012162341 metadata/md5-cache/games-rpg/adonthell-0.3.8
 2012170251 metadata/md5-cache/games-rpg/asphyxia-1.0
-2012170251 metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
-2012170251 metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
-2012170251 metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
 2012170251 metadata/md5-cache/games-rpg/bass-1.3
 2012170251 metadata/md5-cache/games-rpg/bass-1.3-r1
-2012170251 metadata/md5-cache/games-rpg/bastion-20161016
 2012170251 metadata/md5-cache/games-rpg/broken-age-2.4.800398
 2012170251 metadata/md5-cache/games-rpg/coe2-2007-r1
 2012170251 metadata/md5-cache/games-rpg/comi-1
-2012170251 metadata/md5-cache/games-rpg/costume-quest-2.0.0.3
 2012170251 metadata/md5-cache/games-rpg/daimonin-client-0.10.8
-2012170251 metadata/md5-cache/games-rpg/dear-esther-20130608
 2012170251 metadata/md5-cache/games-rpg/deponia-tcj-3.3.0156
 2012170251 metadata/md5-cache/games-rpg/draci-historie-2012-r1
 2012170251 metadata/md5-cache/games-rpg/drascula-1.0-r3
 2012170251 metadata/md5-cache/games-rpg/dreamweb-1.1-r1
-2012170251 metadata/md5-cache/games-rpg/dungeon-defenders-20130305-r1
 2012170251 metadata/md5-cache/games-rpg/egoboo-2.8.1-r1
 2012170251 metadata/md5-cache/games-rpg/eschalon-book-1-demo-106-r1
 2012170251 metadata/md5-cache/games-rpg/eternal-lands-1.9.5.8
 2012170251 metadata/md5-cache/games-rpg/freedink-108.4-r1
 2012170251 metadata/md5-cache/games-rpg/freedroid-1.0.2-r1
 2012170251 metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc2
-2012170251 metadata/md5-cache/games-rpg/grimrock-20150707
 2012170251 metadata/md5-cache/games-rpg/gwiz-0.8-r1
 2012170251 metadata/md5-cache/games-rpg/hatoful-boyfriend-0-r1
 2012170251 metadata/md5-cache/games-rpg/hatoful-boyfriend-holiday-star-20151218
@@ -47540,13 +47577,22 @@
 2012170251 metadata/md5-cache/games-rpg/sumwars-0.5.8-r1
 2012170251 metadata/md5-cache/games-rpg/sumwars-0.5.8-r100
 2012170251 metadata/md5-cache/games-rpg/the-royal-trap-1.2
-2012170251 metadata/md5-cache/games-rpg/to-the-moon-0
-2012170251 metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1
 2012170251 metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
 2012162341 metadata/md5-cache/games-rpg/wastesedge-0.3.8
 2012170251 metadata/md5-cache/games-rpg/xu4-0.9-r1
 2012170251 metadata/md5-cache/games-rpg/zsdx-1.9.0-r1
 2012170251 metadata/md5-cache/games-rpg/zsxd-1.9.0-r1
+2012210839 metadata/md5-cache/games-rpg/Manifest.gz
+2012210839 metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
+2012210839 metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
+2012210839 metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
+2012210839 metadata/md5-cache/games-rpg/bastion-20161016
+2012210839 metadata/md5-cache/games-rpg/costume-quest-2.0.0.3
+2012210839 metadata/md5-cache/games-rpg/dear-esther-20130608
+2012210839 metadata/md5-cache/games-rpg/dungeon-defenders-20130305-r1
+2012210839 metadata/md5-cache/games-rpg/grimrock-20150707
+2012210839 metadata/md5-cache/games-rpg/to-the-moon-0
+2012210839 metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1
 1805012309 metadata/md5-cache/games-server/crossfire-server-1.71.0-r1
 1702282323 metadata/md5-cache/games-server/mednafen-server-0.5.2-r1
 2010091139 metadata/md5-cache/games-server/steamcmd-1.0-r3
@@ -47564,8 +47610,6 @@
 2011252124 metadata/md5-cache/games-simulation/openttd-1.10.3
 2011252124 metadata/md5-cache/games-simulation/openttd-9999
 2011252124 metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
-2012170409 metadata/md5-cache/games-simulation/Manifest.gz
-2012170251 metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
 2012170251 metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r1
 2012170251 metadata/md5-cache/games-simulation/corsix-th-0.63
 2012170251 metadata/md5-cache/games-simulation/corsix-th-0.64
@@ -47585,8 +47629,10 @@
 2012170251 metadata/md5-cache/games-simulation/simutrans-0.122.0-r1
 2012170251 metadata/md5-cache/games-simulation/singularity-1.0_alpha1-r1
 2012170251 metadata/md5-cache/games-simulation/sky-rogue-1.3
-2012170251 metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
-2012170251 metadata/md5-cache/games-simulation/train-valley-1.3.31403
+2012210839 metadata/md5-cache/games-simulation/Manifest.gz
+2012210839 metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
+2012210839 metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
+2012210839 metadata/md5-cache/games-simulation/train-valley-1.3.31403
 2010031709 metadata/md5-cache/games-sports/gracer-0.1.5-r2
 2012170251 metadata/md5-cache/games-sports/Manifest.gz
 2012170251 metadata/md5-cache/games-sports/billardgl-1.75-r2
@@ -47610,13 +47656,10 @@
 2012020439 metadata/md5-cache/games-strategy/openra-20190314-r100
 2012170251 metadata/md5-cache/games-strategy/0ad-0.0.23_alpha
 2012170251 metadata/md5-cache/games-strategy/0ad-0.0.23b_alpha
-2012171209 metadata/md5-cache/games-strategy/Manifest.gz
 2012170251 metadata/md5-cache/games-strategy/colobot-0.1.12
 2012170251 metadata/md5-cache/games-strategy/colobot-9999
 2012170251 metadata/md5-cache/games-strategy/colobot-data-0.1.12
 2012170251 metadata/md5-cache/games-strategy/crimson-0.5.3-r1
-2012170251 metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r1
-2012170251 metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r2
 2012170251 metadata/md5-cache/games-strategy/defcon-demo-1.60-r1
 2012170251 metadata/md5-cache/games-strategy/dominions2-2.16
 2012170251 metadata/md5-cache/games-strategy/dopewars-1.5.12-r3
@@ -47633,10 +47676,8 @@
 2012170251 metadata/md5-cache/games-strategy/ja2-stracciatella-0.12.1_p7072
 2012170251 metadata/md5-cache/games-strategy/ja2-stracciatella-data-1
 2012171209 metadata/md5-cache/games-strategy/julius-1.4.1
-2012170251 metadata/md5-cache/games-strategy/knights-demo-1.32-r2
 2012170251 metadata/md5-cache/games-strategy/lgeneral-1.4.3
 2012170251 metadata/md5-cache/games-strategy/liquidwar-5.6.5
-2012170251 metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
 2012170251 metadata/md5-cache/games-strategy/maxr-0.2.9
 2012170251 metadata/md5-cache/games-strategy/megaglest-3.11.1-r1
 2012170251 metadata/md5-cache/games-strategy/megaglest-data-3.11.1
@@ -47648,7 +47689,6 @@
 2012170251 metadata/md5-cache/games-strategy/scorched3d-44-r2
 2012170251 metadata/md5-cache/games-strategy/settlers-2-gold-data-0
 2012170251 metadata/md5-cache/games-strategy/seven-kingdoms-2.15.4_p1
-2012170251 metadata/md5-cache/games-strategy/spaz-1.605-r1
 2012170251 metadata/md5-cache/games-strategy/triplea-1.8.0.9-r1
 2012170251 metadata/md5-cache/games-strategy/ufoai-2.5.0_p20180603-r1
 2012170251 metadata/md5-cache/games-strategy/uqm-0.7.0.1
@@ -47664,6 +47704,14 @@
 2012170251 metadata/md5-cache/games-strategy/widelands-0.20-r1
 2012170251 metadata/md5-cache/games-strategy/widelands-9999
 2012170251 metadata/md5-cache/games-strategy/xbattleai-1.2.2-r2
+2012210839 metadata/md5-cache/games-strategy/Manifest.gz
+2012210839 metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9-r1
+2012210839 metadata/md5-cache/games-strategy/darwinia-demo-1.3.0-r2
+2012210839 metadata/md5-cache/games-strategy/knights-demo-1.32-r2
+2012210839 metadata/md5-cache/games-strategy/majesty-demo-1.0.0-r1
+2012210839 metadata/md5-cache/games-strategy/spaz-1.605-r1
+2012191839 metadata/md5-cache/games-strategy/war1gus-3.0.0
+2012201409 metadata/md5-cache/games-strategy/wargus-3.0.0-r1
 1909100139 metadata/md5-cache/games-util/deutex-5.2.0
 1702282323 metadata/md5-cache/games-util/gslist-0.8.11a-r1
 1707090139 metadata/md5-cache/games-util/qstat-2.11
@@ -47732,7 +47780,6 @@
 2008302139 metadata/md5-cache/gnome-base/gnome-core-libs-3.36.5
 2008302139 metadata/md5-cache/gnome-base/gnome-extra-apps-3.36.5
 2008302139 metadata/md5-cache/gnome-base/gnome-light-3.36.5
-2012170251 metadata/md5-cache/gnome-base/Manifest.gz
 2012170251 metadata/md5-cache/gnome-base/dconf-0.34.0
 2012170251 metadata/md5-cache/gnome-base/dconf-0.36.0
 2012170019 metadata/md5-cache/gnome-base/dconf-editor-3.36.4
@@ -47743,8 +47790,6 @@
 2012170251 metadata/md5-cache/gnome-base/gnome-common-3.18.0-r1
 2012170019 metadata/md5-cache/gnome-base/gnome-control-center-3.36.4
 2012170019 metadata/md5-cache/gnome-base/gnome-desktop-3.36.5
-2012170019 metadata/md5-cache/gnome-base/gnome-desktop-3.36.7
-2012170019 metadata/md5-cache/gnome-base/gnome-desktop-3.38.1
 2012170019 metadata/md5-cache/gnome-base/gnome-desktop-3.38.2
 2012170251 metadata/md5-cache/gnome-base/gnome-flashback-3.36.4
 2012170251 metadata/md5-cache/gnome-base/gnome-keyring-3.36.0
@@ -47766,10 +47811,12 @@
 2012170251 metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1
 2012170251 metadata/md5-cache/gnome-base/libgnomekbd-3.26.1
 2012170251 metadata/md5-cache/gnome-base/libgtop-2.40.0-r1
-2012170251 metadata/md5-cache/gnome-base/librsvg-2.40.21
 2012170251 metadata/md5-cache/gnome-base/librsvg-2.48.8
 2012170251 metadata/md5-cache/gnome-base/librsvg-2.48.9
 2012170019 metadata/md5-cache/gnome-base/nautilus-3.36.3
+2012190109 metadata/md5-cache/gnome-base/Manifest.gz
+2012181609 metadata/md5-cache/gnome-base/gnome-desktop-3.36.8
+2012190109 metadata/md5-cache/gnome-base/librsvg-2.40.21
 2003261841 metadata/md5-cache/gnome-extra/gnome-utils-3.8.0
 2004032241 metadata/md5-cache/gnome-extra/polkit-gnome-0.105-r2
 2004202139 metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.34.2
@@ -47787,7 +47834,6 @@
 2011252124 metadata/md5-cache/gnome-extra/sushi-3.34.0
 2012020139 metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-34
 2012052209 metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.38.2
-2012170251 metadata/md5-cache/gnome-extra/Manifest.gz
 2012170251 metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r3
 2012170019 metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r4
 2012170251 metadata/md5-cache/gnome-extra/cinnamon-4.4.8
@@ -47814,14 +47860,12 @@
 2012170251 metadata/md5-cache/gnome-extra/filemanager-actions-3.2.4
 2012170251 metadata/md5-cache/gnome-extra/filemanager-actions-3.4
 2012170251 metadata/md5-cache/gnome-extra/gconf-editor-3.0.1-r1
-2012170019 metadata/md5-cache/gnome-extra/gnome-boxes-3.36.6
 2012170019 metadata/md5-cache/gnome-extra/gnome-calculator-3.36.0
 2012170019 metadata/md5-cache/gnome-extra/gnome-calendar-3.36.2
 2012170019 metadata/md5-cache/gnome-extra/gnome-calendar-3.38.1
 2012170019 metadata/md5-cache/gnome-extra/gnome-characters-3.34.0
 2012170019 metadata/md5-cache/gnome-extra/gnome-clocks-3.36.2
 2012170251 metadata/md5-cache/gnome-extra/gnome-commander-1.10.3
-2012170019 metadata/md5-cache/gnome-extra/gnome-contacts-3.36.2
 2012170251 metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.11
 2012170251 metadata/md5-cache/gnome-extra/gnome-documents-3.34.0
 2012170251 metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90-r1
@@ -47873,6 +47917,13 @@
 2012170251 metadata/md5-cache/gnome-extra/yelp-xsl-3.34.2
 2012170251 metadata/md5-cache/gnome-extra/yelp-xsl-3.36.0
 2012170251 metadata/md5-cache/gnome-extra/zenity-3.32.0
+2012202209 metadata/md5-cache/gnome-extra/Manifest.gz
+2012181209 metadata/md5-cache/gnome-extra/gnome-boxes-3.36.6
+2012202209 metadata/md5-cache/gnome-extra/gnome-calendar-3.38.2
+2012191509 metadata/md5-cache/gnome-extra/gnome-contacts-3.36.2
+2012191509 metadata/md5-cache/gnome-extra/gnome-contacts-3.38.1
+2012191839 metadata/md5-cache/gnome-extra/gnome-user-docs-3.36.6
+2012191839 metadata/md5-cache/gnome-extra/yelp-3.36.2
 2012170251 metadata/md5-cache/gnustep-apps/Manifest.gz
 2012170019 metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
 2012170019 metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
@@ -48014,7 +48065,6 @@
 2011252124 metadata/md5-cache/gui-libs/wf-config-0.6.0
 2011252124 metadata/md5-cache/gui-libs/wf-config-9999
 2011252124 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
-2012170251 metadata/md5-cache/gui-libs/Manifest.gz
 2012170251 metadata/md5-cache/gui-libs/amtk-5.0.2
 2012170251 metadata/md5-cache/gui-libs/greetd-0.6.1
 2012170019 metadata/md5-cache/gui-libs/libhandy-0.0.13
@@ -48026,14 +48076,17 @@
 2012170251 metadata/md5-cache/gui-libs/wlroots-0.12.0
 2012170251 metadata/md5-cache/gui-libs/wlroots-9999
 2012170251 metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.0
+2012191409 metadata/md5-cache/gui-libs/Manifest.gz
+2012191409 metadata/md5-cache/gui-libs/libhandy-1.0.2
 2011252124 metadata/md5-cache/gui-wm/wayfire-0.5.0
 2011252124 metadata/md5-cache/gui-wm/wayfire-0.6.0
 2011252124 metadata/md5-cache/gui-wm/wayfire-9999
-2012170019 metadata/md5-cache/gui-wm/Manifest.gz
 2012160540 metadata/md5-cache/gui-wm/hikari-2.2.2-r1
 2012170019 metadata/md5-cache/gui-wm/sway-1.5
 2012170019 metadata/md5-cache/gui-wm/sway-1.5.1
-2012170019 metadata/md5-cache/gui-wm/sway-9999
+2012200109 metadata/md5-cache/gui-wm/Manifest.gz
+2012200109 metadata/md5-cache/gui-wm/sway-1.5.1-r1
+2012200109 metadata/md5-cache/gui-wm/sway-9999
 2012170251 metadata/md5-cache/java-virtuals/Manifest.gz
 2012170251 metadata/md5-cache/java-virtuals/ejb-api-0
 2012170251 metadata/md5-cache/java-virtuals/interceptor-api-0
@@ -48149,8 +48202,6 @@
 2012170251 metadata/md5-cache/kde-apps/incidenceeditor-20.12.0
 2012170251 metadata/md5-cache/kde-apps/juk-20.08.3
 2012170251 metadata/md5-cache/kde-apps/juk-20.12.0
-2012170251 metadata/md5-cache/kde-apps/k3b-20.08.3
-2012170251 metadata/md5-cache/kde-apps/k3b-20.12.0
 2012170251 metadata/md5-cache/kde-apps/kaccounts-integration-20.08.3
 2012170251 metadata/md5-cache/kde-apps/kaccounts-integration-20.12.0
 2012170251 metadata/md5-cache/kde-apps/kaccounts-providers-20.08.3
@@ -48507,11 +48558,12 @@
 2012170251 metadata/md5-cache/kde-apps/yakuake-20.12.0
 2012170251 metadata/md5-cache/kde-apps/zeroconf-ioslave-20.08.3
 2012170251 metadata/md5-cache/kde-apps/zeroconf-ioslave-20.12.0
-2012180339 metadata/md5-cache/kde-apps/Manifest.gz
 2012180339 metadata/md5-cache/kde-apps/khelpcenter-20.12.0
 2012180109 metadata/md5-cache/kde-apps/konsole-20.12.0-r1
+2012181209 metadata/md5-cache/kde-apps/Manifest.gz
+2012181209 metadata/md5-cache/kde-apps/k3b-20.08.3
+2012181209 metadata/md5-cache/kde-apps/k3b-20.12.0
 1905280009 metadata/md5-cache/kde-frameworks/kf-env-5
-2012170251 metadata/md5-cache/kde-frameworks/Manifest.gz
 2012170251 metadata/md5-cache/kde-frameworks/attica-5.74.0
 2012170251 metadata/md5-cache/kde-frameworks/attica-5.77.0
 2012170251 metadata/md5-cache/kde-frameworks/baloo-5.74.0
@@ -48557,7 +48609,6 @@
 2012170251 metadata/md5-cache/kde-frameworks/kcrash-5.74.0
 2012170251 metadata/md5-cache/kde-frameworks/kcrash-5.77.0
 2012170251 metadata/md5-cache/kde-frameworks/kdav-5.74.0
-2012170251 metadata/md5-cache/kde-frameworks/kdav-5.77.0
 2012170251 metadata/md5-cache/kde-frameworks/kdbusaddons-5.74.0
 2012170251 metadata/md5-cache/kde-frameworks/kdbusaddons-5.77.0
 2012170251 metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0-r2
@@ -48615,7 +48666,6 @@
 2012170251 metadata/md5-cache/kde-frameworks/kmediaplayer-5.74.0
 2012170251 metadata/md5-cache/kde-frameworks/kmediaplayer-5.76.0
 2012170251 metadata/md5-cache/kde-frameworks/knewstuff-5.74.0
-2012170251 metadata/md5-cache/kde-frameworks/knewstuff-5.77.0
 2012170251 metadata/md5-cache/kde-frameworks/knotifications-5.74.0
 2012170251 metadata/md5-cache/kde-frameworks/knotifications-5.77.0
 2012170251 metadata/md5-cache/kde-frameworks/knotifyconfig-5.74.0
@@ -48663,7 +48713,6 @@
 2012170251 metadata/md5-cache/kde-frameworks/oxygen-icons-5.74.0
 2012170251 metadata/md5-cache/kde-frameworks/oxygen-icons-5.77.0
 2012170251 metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1
-2012170251 metadata/md5-cache/kde-frameworks/plasma-5.77.0
 2012170251 metadata/md5-cache/kde-frameworks/prison-5.74.0
 2012170251 metadata/md5-cache/kde-frameworks/prison-5.77.0
 2012170251 metadata/md5-cache/kde-frameworks/purpose-5.74.0
@@ -48680,6 +48729,10 @@
 2012170251 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.77.0
 2012170251 metadata/md5-cache/kde-frameworks/threadweaver-5.74.0
 2012170251 metadata/md5-cache/kde-frameworks/threadweaver-5.77.0
+2012200309 metadata/md5-cache/kde-frameworks/Manifest.gz
+2012181709 metadata/md5-cache/kde-frameworks/kdav-5.77.0-r1
+2012200309 metadata/md5-cache/kde-frameworks/knewstuff-5.77.0-r1
+2012200309 metadata/md5-cache/kde-frameworks/plasma-5.77.0-r1
 2012170251 metadata/md5-cache/kde-misc/basket-2.49b
 2012170251 metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
 2012170251 metadata/md5-cache/kde-misc/kdeconnect-20.08.3
@@ -48713,8 +48766,9 @@
 2012170251 metadata/md5-cache/kde-misc/ultimate-gmail-feed-2.1
 2012170251 metadata/md5-cache/kde-misc/wacomtablet-3.2.0
 2012170251 metadata/md5-cache/kde-misc/zanshin-0.5.71-r2
-2012172309 metadata/md5-cache/kde-misc/Manifest.gz
 2012172309 metadata/md5-cache/kde-misc/tellico-3.3.4-r1
+2012181709 metadata/md5-cache/kde-misc/Manifest.gz
+2012181709 metadata/md5-cache/kde-misc/krename-5.0.1-r1
 2010080539 metadata/md5-cache/kde-plasma/plasma-meta-5.19.5
 2012011939 metadata/md5-cache/kde-plasma/plasma-meta-5.20.4
 2012122109 metadata/md5-cache/kde-plasma/breeze-grub-5.19.5
@@ -48956,7 +49010,6 @@
 2011252124 metadata/md5-cache/mail-filter/sqlgrey-1.8.0
 2012031609 metadata/md5-cache/mail-filter/imapfilter-2.6.16
 2012140439 metadata/md5-cache/mail-filter/spamassassin-3.4.4-r4
-2012170251 metadata/md5-cache/mail-filter/Manifest.gz
 2012170251 metadata/md5-cache/mail-filter/afew-3.0.0
 2012170251 metadata/md5-cache/mail-filter/afew-3.0.1
 2012170251 metadata/md5-cache/mail-filter/amavisd-milter-1.5.0-r1
@@ -48985,7 +49038,6 @@
 2012170251 metadata/md5-cache/mail-filter/postforward-1.1.0
 2012170251 metadata/md5-cache/mail-filter/postfwd-1.35-r3
 2012170251 metadata/md5-cache/mail-filter/postgrey-1.36-r1
-2012170251 metadata/md5-cache/mail-filter/postgrey-1.37
 2012170019 metadata/md5-cache/mail-filter/postsrsd-1.6
 2012170251 metadata/md5-cache/mail-filter/procmail-3.22-r14
 2012170251 metadata/md5-cache/mail-filter/pyzor-1.0.0-r1
@@ -48993,21 +49045,24 @@
 2012170251 metadata/md5-cache/mail-filter/rblcheck-1.5-r2
 2012170251 metadata/md5-cache/mail-filter/rspamd-2.5-r1
 2012170251 metadata/md5-cache/mail-filter/rspamd-2.6-r100
-2012170251 metadata/md5-cache/mail-filter/rspamd-2.6-r2
 2012170251 metadata/md5-cache/mail-filter/rspamd-9999
 2012170251 metadata/md5-cache/mail-filter/scmail-1.3
 2012170251 metadata/md5-cache/mail-filter/sigh-1607.1.2
 2012170251 metadata/md5-cache/mail-filter/sigh-1607.1.6
-2012170251 metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
 2012170251 metadata/md5-cache/mail-filter/spamdyke-4.3.0
 2012170251 metadata/md5-cache/mail-filter/spamdyke-5.0.1
 2012170251 metadata/md5-cache/mail-filter/spf-engine-2.0.2-r1
 2012170251 metadata/md5-cache/mail-filter/spf-engine-2.9.2
+2012211309 metadata/md5-cache/mail-filter/Manifest.gz
+2012211309 metadata/md5-cache/mail-filter/postgrey-1.37
+2012200609 metadata/md5-cache/mail-filter/postgrey-1.37_p20190625-r1
+2012210339 metadata/md5-cache/mail-filter/postsrsd-1.10
+2012200609 metadata/md5-cache/mail-filter/rspamd-2.6-r2
+2012210839 metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
 1910071309 metadata/md5-cache/mail-mta/esmtp-1.2-r1
 2011252124 metadata/md5-cache/mail-mta/sendmail-8.15.2-r2
 2011252124 metadata/md5-cache/mail-mta/sendmail-8.16.1
 2011301639 metadata/md5-cache/mail-mta/protonmail-bridge-1.5.2
-2012170251 metadata/md5-cache/mail-mta/Manifest.gz
 2012170019 metadata/md5-cache/mail-mta/courier-1.0.13
 2012170019 metadata/md5-cache/mail-mta/courier-1.0.14
 2012170019 metadata/md5-cache/mail-mta/courier-1.0.5
@@ -49028,10 +49083,11 @@
 2012170251 metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.4.5
 2012170251 metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.5.0
 2012170251 metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.5.2
-2012170251 metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
-2012170251 metadata/md5-cache/mail-mta/qpsmtpd-0.95
-2012170251 metadata/md5-cache/mail-mta/qpsmtpd-9999
 2012170251 metadata/md5-cache/mail-mta/ssmtp-2.64-r3
+2012210839 metadata/md5-cache/mail-mta/Manifest.gz
+2012210839 metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
+2012210839 metadata/md5-cache/mail-mta/qpsmtpd-0.95
+2012210839 metadata/md5-cache/mail-mta/qpsmtpd-9999
 2008070639 metadata/md5-cache/mate-base/mate-1.24
 2008070639 metadata/md5-cache/mate-base/mate-applets-meta-1.24.0
 2012170251 metadata/md5-cache/mate-base/Manifest.gz
@@ -49097,7 +49153,6 @@
 2009021410 metadata/md5-cache/media-fonts/solarize-9999
 2011252124 metadata/md5-cache/media-fonts/pcf2bdf-1.04-r1
 2012170251 metadata/md5-cache/media-fonts/Humor-Sans-1.0-r1
-2012170251 metadata/md5-cache/media-fonts/Manifest.gz
 2012170251 metadata/md5-cache/media-fonts/ahem-1.0
 2012170251 metadata/md5-cache/media-fonts/alee-fonts-13-r1
 2012170251 metadata/md5-cache/media-fonts/alegreya-sans-2.008
@@ -49337,6 +49392,8 @@
 2012170251 metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46
 2012170251 metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4
 2012170251 metadata/md5-cache/media-fonts/zh-kcfonts-1.05-r3
+2012211309 metadata/md5-cache/media-fonts/Manifest.gz
+2012211309 metadata/md5-cache/media-fonts/liberation-fonts-2.1.2
 1804080138 metadata/md5-cache/media-gfx/figurine-1.0.5-r1
 1702282325 metadata/md5-cache/media-gfx/gif2png-2.5.9
 1808252139 metadata/md5-cache/media-gfx/gifsicle-1.91
@@ -49454,7 +49511,6 @@
 2012170251 metadata/md5-cache/media-gfx/blender-2.90.1-r1
 2012170251 metadata/md5-cache/media-gfx/blender-2.91.0
 2012170251 metadata/md5-cache/media-gfx/cairosvg-2.4.2
-2012170251 metadata/md5-cache/media-gfx/cairosvg-2.5.0
 2012170251 metadata/md5-cache/media-gfx/cellwriter-1.3.5
 2012170251 metadata/md5-cache/media-gfx/clockphoto-1.2
 2012170251 metadata/md5-cache/media-gfx/colorhug-client-0.2.8
@@ -49534,19 +49590,13 @@
 2012170019 metadata/md5-cache/media-gfx/graphicsmagick-9999
 2012170251 metadata/md5-cache/media-gfx/graphite2-1.3.14
 2012170251 metadata/md5-cache/media-gfx/graphviz-2.42.3-r1
-2012170251 metadata/md5-cache/media-gfx/graphviz-2.44.1-r1
 2012170019 metadata/md5-cache/media-gfx/gthumb-3.10.0
 2012170251 metadata/md5-cache/media-gfx/gtkam-1.0-r1
 2012170251 metadata/md5-cache/media-gfx/gtkimageview-1.6.4
 2012170251 metadata/md5-cache/media-gfx/hugin-2019.2.0
-2012170251 metadata/md5-cache/media-gfx/hugin-9999
 2012170251 metadata/md5-cache/media-gfx/icc-examin-0.56_p20171007
 2012170251 metadata/md5-cache/media-gfx/icc-examin-9999
 2012170019 metadata/md5-cache/media-gfx/icoutils-0.32.3
-2012170251 metadata/md5-cache/media-gfx/imagemagick-6.9.11.44
-2012170251 metadata/md5-cache/media-gfx/imagemagick-6.9.11.46
-2012170019 metadata/md5-cache/media-gfx/imagemagick-7.0.10.44
-2012170019 metadata/md5-cache/media-gfx/imagemagick-7.0.10.46
 2012170019 metadata/md5-cache/media-gfx/imagemagick-9999
 2012170019 metadata/md5-cache/media-gfx/imageworsener-1.3.3
 2012170251 metadata/md5-cache/media-gfx/img2pdf-0.3.6
@@ -49617,8 +49667,6 @@
 2012170251 metadata/md5-cache/media-gfx/povray-3.7.0.0
 2012170251 metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
 2012170251 metadata/md5-cache/media-gfx/prusaslicer-2.2.0
-2012162341 metadata/md5-cache/media-gfx/pstoedit-3.70-r1
-2012170251 metadata/md5-cache/media-gfx/pstoedit-3.75
 2012170251 metadata/md5-cache/media-gfx/qimgv-0.9.1
 2012170251 metadata/md5-cache/media-gfx/qiv-2.3.2-r1
 2012170251 metadata/md5-cache/media-gfx/qvv-4.04.2
@@ -49630,9 +49678,6 @@
 2012170019 metadata/md5-cache/media-gfx/sane-backends-1.0.30-r2
 2012170251 metadata/md5-cache/media-gfx/scantailor-advanced-1.0.16-r1
 2012170251 metadata/md5-cache/media-gfx/scour-0.37
-2012170251 metadata/md5-cache/media-gfx/scrot-0.8_p13-r1
-2012170251 metadata/md5-cache/media-gfx/scrot-1.2
-2012170251 metadata/md5-cache/media-gfx/scrot-1.3-r1
 2012170251 metadata/md5-cache/media-gfx/scrot-9999
 2012170251 metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
 2012170019 metadata/md5-cache/media-gfx/shotwell-0.30.10
@@ -49678,10 +49723,20 @@
 2012170251 metadata/md5-cache/media-gfx/yafaray-3.4.1
 2012170019 metadata/md5-cache/media-gfx/zbar-0.23-r1
 2012170019 metadata/md5-cache/media-gfx/zbar-0.23.1
-2012172309 metadata/md5-cache/media-gfx/Manifest.gz
 2012171839 metadata/md5-cache/media-gfx/blender-2.83.10
-2012172309 metadata/md5-cache/media-gfx/hugin-2020.0.0
-2012172009 metadata/md5-cache/media-gfx/scrot-1.4
+2012210039 metadata/md5-cache/media-gfx/Manifest.gz
+2012202239 metadata/md5-cache/media-gfx/cairosvg-2.5.0
+2012191839 metadata/md5-cache/media-gfx/eog-3.36.4
+2012210039 metadata/md5-cache/media-gfx/graphviz-2.44.1-r1
+2012201239 metadata/md5-cache/media-gfx/hugin-2020.0.0-r1
+2012201239 metadata/md5-cache/media-gfx/hugin-9999
+2012202339 metadata/md5-cache/media-gfx/imagemagick-6.9.11.46
+2012202339 metadata/md5-cache/media-gfx/imagemagick-6.9.11.52
+2012202339 metadata/md5-cache/media-gfx/imagemagick-7.0.10.46
+2012202339 metadata/md5-cache/media-gfx/imagemagick-7.0.10.52
+2012181339 metadata/md5-cache/media-gfx/pstoedit-3.75
+2012202209 metadata/md5-cache/media-gfx/scrot-1.4
+2012191839 metadata/md5-cache/media-gfx/simple-scan-3.36.7
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1805290208 metadata/md5-cache/media-libs/lastfmlib-0.4.0
 1910111911 metadata/md5-cache/media-libs/libdmtx-0.7.4
@@ -49837,9 +49892,7 @@
 2012060239 metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r2
 2012071809 metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100
 2012092139 metadata/md5-cache/media-libs/sbc-1.5
-2012102309 metadata/md5-cache/media-libs/mesa-9999
 2012120139 metadata/md5-cache/media-libs/raspberrypi-userland-bin-1.20201022
-2012140439 metadata/md5-cache/media-libs/mesa-20.2.4
 2012170251 metadata/md5-cache/media-libs/Field3D-1.7.2
 2012170251 metadata/md5-cache/media-libs/SoQt-1.6.0
 2012170251 metadata/md5-cache/media-libs/SoXt-1.4.0
@@ -49848,7 +49901,6 @@
 2012170251 metadata/md5-cache/media-libs/allegro-4.4.2-r2
 2012170251 metadata/md5-cache/media-libs/allegro-4.4.3.1
 2012170019 metadata/md5-cache/media-libs/allegro-5.2.5.0
-2012170019 metadata/md5-cache/media-libs/allegro-5.2.6.0
 2012162341 metadata/md5-cache/media-libs/alsa-lib-1.2.2-r1
 2012162341 metadata/md5-cache/media-libs/alsa-lib-1.2.3.2-r1
 2012162341 metadata/md5-cache/media-libs/alsa-lib-1.2.4
@@ -50030,7 +50082,6 @@
 2012170019 metadata/md5-cache/media-libs/libebur128-1.2.4
 2012170251 metadata/md5-cache/media-libs/libeot-0.01
 2012170251 metadata/md5-cache/media-libs/libeot-9999
-2012162341 metadata/md5-cache/media-libs/libexif-0.6.22_p20201105
 2012162341 metadata/md5-cache/media-libs/libexif-gtk-0.3.5-r2
 2012170251 metadata/md5-cache/media-libs/libfame-0.9.1-r2
 2012170251 metadata/md5-cache/media-libs/libffado-2.4.4
@@ -50047,7 +50098,6 @@
 2012162341 metadata/md5-cache/media-libs/libheif-9999
 2012162341 metadata/md5-cache/media-libs/libicns-0.8.1-r1
 2012162341 metadata/md5-cache/media-libs/libid3tag-0.15.1b-r4
-2012170251 metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
 2012162341 metadata/md5-cache/media-libs/libilbc-9999
 2012170019 metadata/md5-cache/media-libs/libinsane-1.0.7
 2012170019 metadata/md5-cache/media-libs/libinsane-1.0.8
@@ -50238,9 +50288,7 @@
 2012170019 metadata/md5-cache/media-libs/soxr-0.1.3-r1
 2012170251 metadata/md5-cache/media-libs/spandsp-0.0.6
 2012170251 metadata/md5-cache/media-libs/speex-1.2.0-r1
-2012170019 metadata/md5-cache/media-libs/speex-1.2.0-r2
 2012170251 metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r2
-2012170019 metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r3
 2012162341 metadata/md5-cache/media-libs/stk-4.6.1
 2012170251 metadata/md5-cache/media-libs/suil-0.10.8
 2012170251 metadata/md5-cache/media-libs/svgalib-1.9.25-r7
@@ -50282,7 +50330,6 @@
 2012170251 metadata/md5-cache/media-libs/x265-3.4
 2012170251 metadata/md5-cache/media-libs/x265-9999
 2012170019 metadata/md5-cache/media-libs/xine-lib-1.2.11
-2012170251 metadata/md5-cache/media-libs/xine-lib-1.2.9-r2
 2012170019 metadata/md5-cache/media-libs/xine-lib-1.2.9999
 2012170251 metadata/md5-cache/media-libs/xvid-1.3.5
 2012170019 metadata/md5-cache/media-libs/xvid-1.3.5-r1
@@ -50294,10 +50341,18 @@
 2012170251 metadata/md5-cache/media-libs/zmusic-1.1.4
 2012170251 metadata/md5-cache/media-libs/zvbi-0.2.35-r1
 2012170251 metadata/md5-cache/media-libs/zxing-cpp-1.1.1
-2012172039 metadata/md5-cache/media-libs/Manifest.gz
 2012172009 metadata/md5-cache/media-libs/a52dec-0.7.4-r8
-2012172009 metadata/md5-cache/media-libs/jbig2dec-0.19
-2012172009 metadata/md5-cache/media-libs/xine-lib-1.2.10
+2012211309 metadata/md5-cache/media-libs/Manifest.gz
+2012202239 metadata/md5-cache/media-libs/allegro-5.2.6.0
+2012211309 metadata/md5-cache/media-libs/jbig2dec-0.19
+2012211139 metadata/md5-cache/media-libs/libexif-0.6.22_p20201105
+2012210839 metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
+2012202239 metadata/md5-cache/media-libs/mesa-20.2.4
+2012201509 metadata/md5-cache/media-libs/mesa-9999
+2012211309 metadata/md5-cache/media-libs/speex-1.2.0-r2
+2012211309 metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r3
+2012201709 metadata/md5-cache/media-libs/tiff-4.2.0
+2012202009 metadata/md5-cache/media-libs/xine-lib-1.2.10
 1908120039 metadata/md5-cache/media-plugins/hexter-1.1.0
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
 1912241539 metadata/md5-cache/media-plugins/vdr-burn-templates-0.0.3
@@ -50649,148 +50704,148 @@
 2012170019 metadata/md5-cache/media-plugins/tap-plugins-9999
 2012170251 metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.0
 2012170251 metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
-2012170019 metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
-2012170019 metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-avards-0.2.4
-2012170019 metadata/md5-cache/media-plugins/vdr-avards-0.2.6
-2012170019 metadata/md5-cache/media-plugins/vdr-beep-0.1.2
-2012170251 metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
-2012170019 metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-burn-0.3.0
-2012170019 metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
-2012170019 metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
-2012170019 metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
-2012170019 metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
-2012170019 metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1
-2012170251 metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
-2012170251 metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
-2012170251 metadata/md5-cache/media-plugins/vdr-ddci2-9999
-2012170019 metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
-2012170019 metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
-2012170251 metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
-2012170251 metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
-2012170251 metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
-2012170019 metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
-2012170251 metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
-2012170019 metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
-2012170019 metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
-2012170019 metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1
-2012170251 metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0
-2012170251 metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
-2012170251 metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
-2012170019 metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
-2012170251 metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
-2012170019 metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0
-2012170019 metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20191202
-2012170019 metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
-2012170019 metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-exec-0.0.3
-2012170251 metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
-2012170019 metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r1
-2012170251 metadata/md5-cache/media-plugins/vdr-femon-2.0.4
-2012170019 metadata/md5-cache/media-plugins/vdr-femon-2.4.0
-2012170251 metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
-2012170251 metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
-2012170251 metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
-2012170019 metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
-2012170251 metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1
-2012170251 metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
-2012170019 metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
-2012170019 metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
-2012170251 metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
-2012170019 metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
-2012170019 metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
-2012170251 metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
-2012170251 metadata/md5-cache/media-plugins/vdr-live-2.3.1
-2012170019 metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
-2012170019 metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1
-2012170019 metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
-2012170019 metadata/md5-cache/media-plugins/vdr-mount-0.0.2
-2012170019 metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r2
-2012170019 metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r3
-2012170251 metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
-2012170019 metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
-2012170019 metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
-2012170019 metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
-2012170251 metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
-2012170251 metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
-2012170251 metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1
-2012170251 metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5
-2012170019 metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7
-2012170019 metadata/md5-cache/media-plugins/vdr-peer-0.0.1
-2012170019 metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
-2012170251 metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-pin-0.1.14
-2012170019 metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
-2012170019 metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
-2012170019 metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
-2012170019 metadata/md5-cache/media-plugins/vdr-radio-0.9.1
-2012170019 metadata/md5-cache/media-plugins/vdr-radio-1.1.0
-2012170251 metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
-2012170019 metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
-2012170019 metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
-2012170251 metadata/md5-cache/media-plugins/vdr-remote-0.7.0
-2012170019 metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
-2012170019 metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
-2012170019 metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
-2012170019 metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
-2012170251 metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
-2012170019 metadata/md5-cache/media-plugins/vdr-satip-2.2.5
-2012170019 metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20191027
-2012170019 metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
-2012170019 metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
-2012170019 metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
-2012170019 metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
-2012170019 metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
-2012170251 metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
-2012170019 metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
-2012170251 metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
-2012170019 metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
-2012170251 metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
-2012170019 metadata/md5-cache/media-plugins/vdr-span-0.0.7
-2012170251 metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
-2012170251 metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
-2012170019 metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
-2012170251 metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
-2012170019 metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
-2012170251 metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
-2012170251 metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
-2012170019 metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
-2012170019 metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
-2012170019 metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
-2012170019 metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
-2012170251 metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
-2012170251 metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
-2012170251 metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
-2012170019 metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
-2012170251 metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
-2012170019 metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r2
-2012170019 metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r1
-2012170019 metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
-2012170019 metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
-2012170251 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
-2012170251 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
-2012172039 metadata/md5-cache/media-plugins/Manifest.gz
-2012172039 metadata/md5-cache/media-plugins/mythplugins-31.0-r1
+2012210839 metadata/md5-cache/media-plugins/Manifest.gz
+2012181209 metadata/md5-cache/media-plugins/mythplugins-31.0-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-actuator-1.2.1
+2012210839 metadata/md5-cache/media-plugins/vdr-actuator-2.4.1_pre20181025
+2012210839 metadata/md5-cache/media-plugins/vdr-atscepg-0.3.0-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-avards-0.2.4
+2012210839 metadata/md5-cache/media-plugins/vdr-avards-0.2.6
+2012210839 metadata/md5-cache/media-plugins/vdr-beep-0.1.2
+2012210839 metadata/md5-cache/media-plugins/vdr-bgprocess-0.1.0
+2012210839 metadata/md5-cache/media-plugins/vdr-burn-0.2.2-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-burn-0.3.0
+2012210839 metadata/md5-cache/media-plugins/vdr-calc-0.0.1_rc5
+2012210839 metadata/md5-cache/media-plugins/vdr-cdplayer-1.2.2
+2012210839 metadata/md5-cache/media-plugins/vdr-cinebars-0.0.5
+2012210839 metadata/md5-cache/media-plugins/vdr-clock-1.0.0-r2
+2012210839 metadata/md5-cache/media-plugins/vdr-cpumon-0.0.6_p1
+2012210839 metadata/md5-cache/media-plugins/vdr-ddci2-1.0.4
+2012210839 metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
+2012210839 metadata/md5-cache/media-plugins/vdr-ddci2-9999
+2012210839 metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1
+2012210839 metadata/md5-cache/media-plugins/vdr-devstatus-0.4.1-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-dummydevice-2.0.0
+2012210839 metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
+2012210839 metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-duplicates-0.1.0
+2012210839 metadata/md5-cache/media-plugins/vdr-duplicates-1.0.1
+2012210839 metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.4
+2012210839 metadata/md5-cache/media-plugins/vdr-dvbapi-2.2.5
+2012210839 metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.1.3_p20140115
+2012210839 metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.0.0
+2012210839 metadata/md5-cache/media-plugins/vdr-dvbsddevice-2.2.0
+2012210839 metadata/md5-cache/media-plugins/vdr-dvd-0.3.7_pre20090106-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.2
+2012210839 metadata/md5-cache/media-plugins/vdr-dvdswitch-0.2.3
+2012210839 metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-epgsearch-2.2.0
+2012210839 metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0
+2012210839 metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20191202
+2012210839 metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1
+2012210839 metadata/md5-cache/media-plugins/vdr-epgsync-1.0.1-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-exec-0.0.3
+2012210839 metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4
+2012210839 metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.4-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-femon-2.0.4
+2012210839 metadata/md5-cache/media-plugins/vdr-femon-2.4.0
+2012210839 metadata/md5-cache/media-plugins/vdr-ffnetdev-0.1.2
+2012210839 metadata/md5-cache/media-plugins/vdr-filebrowser-0.2.1
+2012210839 metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r3
+2012210839 metadata/md5-cache/media-plugins/vdr-freecell-0.0.2-r4
+2012210839 metadata/md5-cache/media-plugins/vdr-fritzbox-1.5.3-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-graphlcd-1.0.1
+2012210839 metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
+2012210839 metadata/md5-cache/media-plugins/vdr-iptv-2.2.1-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-iptv-2.4.0
+2012210839 metadata/md5-cache/media-plugins/vdr-joystick-0.0.3
+2012210839 metadata/md5-cache/media-plugins/vdr-launcher-0.0.4
+2012210839 metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9
+2012210839 metadata/md5-cache/media-plugins/vdr-lcdproc-0.0.10.9-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-live-2.3.1
+2012210839 metadata/md5-cache/media-plugins/vdr-loadepg-0.2.7
+2012210839 metadata/md5-cache/media-plugins/vdr-menuorg-0.5.1
+2012210839 metadata/md5-cache/media-plugins/vdr-mlist-1.0.2
+2012210839 metadata/md5-cache/media-plugins/vdr-mount-0.0.2
+2012210839 metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r2
+2012210839 metadata/md5-cache/media-plugins/vdr-mp3ng-0.0.1_pre5-r3
+2012210839 metadata/md5-cache/media-plugins/vdr-mplayer-0.10.2
+2012210839 metadata/md5-cache/media-plugins/vdr-newsticker-0.0.4
+2012210839 metadata/md5-cache/media-plugins/vdr-noepg-0.0.4
+2012210839 metadata/md5-cache/media-plugins/vdr-noepg-0.0.5
+2012210839 metadata/md5-cache/media-plugins/vdr-osdserver-0.1.2
+2012210839 metadata/md5-cache/media-plugins/vdr-osdserver-0.1.3
+2012210839 metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.4-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.5
+2012210839 metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.7
+2012210839 metadata/md5-cache/media-plugins/vdr-peer-0.0.1
+2012210839 metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
+2012210839 metadata/md5-cache/media-plugins/vdr-pilot-0.0.9-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-pin-0.1.14
+2012210839 metadata/md5-cache/media-plugins/vdr-powermate-0.0.5
+2012210839 metadata/md5-cache/media-plugins/vdr-proxy-0.1.4-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-pvr350-1.7.5
+2012210839 metadata/md5-cache/media-plugins/vdr-quicktimer-0.1.1
+2012210839 metadata/md5-cache/media-plugins/vdr-radio-0.9.1
+2012210839 metadata/md5-cache/media-plugins/vdr-radio-1.1.0
+2012210839 metadata/md5-cache/media-plugins/vdr-radiolist-0.0.2
+2012210839 metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
+2012210839 metadata/md5-cache/media-plugins/vdr-recsearch-0.3.7
+2012210839 metadata/md5-cache/media-plugins/vdr-remote-0.7.0
+2012210839 metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0
+2012210839 metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.0-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2
+2012210839 metadata/md5-cache/media-plugins/vdr-remotetimers-1.0.2-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.3
+2012210839 metadata/md5-cache/media-plugins/vdr-rpihddevice-1.0.5
+2012210839 metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
+2012210839 metadata/md5-cache/media-plugins/vdr-satip-2.2.5
+2012210839 metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20191027
+2012210839 metadata/md5-cache/media-plugins/vdr-scheduler-0.1.3
+2012210839 metadata/md5-cache/media-plugins/vdr-scheduler-0.1.6
+2012210839 metadata/md5-cache/media-plugins/vdr-screenshot-0.0.15
+2012210839 metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-skincurses-2.2.0
+2012210839 metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-skinelchi-0.3.0-r2
+2012210839 metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.0
+2012210839 metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.4.0
+2012210839 metadata/md5-cache/media-plugins/vdr-sleeptimer-0.6
+2012210839 metadata/md5-cache/media-plugins/vdr-sndctl-0.1.5.1
+2012210839 metadata/md5-cache/media-plugins/vdr-solitaire-0.0.3
+2012210839 metadata/md5-cache/media-plugins/vdr-span-0.0.7
+2012210839 metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1
+2012210839 metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20160320
+2012210839 metadata/md5-cache/media-plugins/vdr-streamdev-0.6.1_p20170930
+2012210839 metadata/md5-cache/media-plugins/vdr-suspendoutput-2.0.1
+2012210839 metadata/md5-cache/media-plugins/vdr-svdrposd-1.0.0
+2012210839 metadata/md5-cache/media-plugins/vdr-svdrpservice-1.0.0
+2012210839 metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
+2012210839 metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0
+2012210839 metadata/md5-cache/media-plugins/vdr-ttxtsubs-0.3.0-r2
+2012210839 metadata/md5-cache/media-plugins/vdr-undelete-0.0.7
+2012210839 metadata/md5-cache/media-plugins/vdr-undelete-0.0.7-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-undelete-2.3.0_pre1
+2012210839 metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
+2012210839 metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
+2012210839 metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
+2012210839 metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
+2012210839 metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-vompserver-0.5.1
+2012210839 metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-wirbelscan-0.0.7-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-wirbelscan-2018.11.04-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-xineliboutput-2.1.0-r2
+2012210839 metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r1
+2012210839 metadata/md5-cache/media-plugins/vdr-xineliboutput-2.2.0-r2
+2012210839 metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
+2012210839 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
+2012210839 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
 1703122008 metadata/md5-cache/media-radio/adifmerg-31-r1
 1908231409 metadata/md5-cache/media-radio/dxcc-20190309
 2002201639 metadata/md5-cache/media-radio/gpredict-2.2.1
@@ -50896,7 +50951,6 @@
 2002230040 metadata/md5-cache/media-sound/rip-1.07
 2004121409 metadata/md5-cache/media-sound/mpdscribble-0.22
 2004231209 metadata/md5-cache/media-sound/fluid-soundfont-3.1
-2004261339 metadata/md5-cache/media-sound/abcde-2.9.3-r1
 2004261339 metadata/md5-cache/media-sound/moc-2.5.2-r1
 2005012109 metadata/md5-cache/media-sound/xnoise-0.2.21
 2005282209 metadata/md5-cache/media-sound/audacious-3.10.1-r1
@@ -51009,7 +51063,6 @@
 2011252124 metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r1
 2011252124 metadata/md5-cache/media-sound/xwax-1.7
 2011260309 metadata/md5-cache/media-sound/upmpdcli-1.5.2
-2011300139 metadata/md5-cache/media-sound/teamspeak-server-3.13.2
 2012042209 metadata/md5-cache/media-sound/jack2-1.9.16
 2012050209 metadata/md5-cache/media-sound/openmpt123-0.5.4
 2012122039 metadata/md5-cache/media-sound/upmpdcli-1.5.5
@@ -51032,7 +51085,6 @@
 2012170251 metadata/md5-cache/media-sound/audacity-2.4.2-r1
 2012170251 metadata/md5-cache/media-sound/audex-0.95_pre20190721
 2012170019 metadata/md5-cache/media-sound/audicle-1.0.0.7-r2
-2012170251 metadata/md5-cache/media-sound/audiotools-3.1.1
 2012170251 metadata/md5-cache/media-sound/aumix-2.9.1
 2012170251 metadata/md5-cache/media-sound/baudline-1.08-r1
 2012170251 metadata/md5-cache/media-sound/beets-1.4.9-r2
@@ -51092,7 +51144,6 @@
 2012170019 metadata/md5-cache/media-sound/gmusicbrowser-9999
 2012170019 metadata/md5-cache/media-sound/gnome-music-3.36.4.1
 2012170019 metadata/md5-cache/media-sound/gnome-sound-recorder-3.34.0
-2012170251 metadata/md5-cache/media-sound/gnump3d-3.0-r2
 2012170251 metadata/md5-cache/media-sound/gogglesmm-1.2.1-r1
 2012162341 metadata/md5-cache/media-sound/gom-0.29.103-r1
 2012170251 metadata/md5-cache/media-sound/gpodder-3.10.16-r1
@@ -51142,7 +51193,6 @@
 2012170019 metadata/md5-cache/media-sound/mixxx-9999
 2012162341 metadata/md5-cache/media-sound/mp3asm-0.1.3-r2
 2012162341 metadata/md5-cache/media-sound/mp3blaster-3.2.6
-2012170019 metadata/md5-cache/media-sound/mp3c-0.31-r1
 2012170019 metadata/md5-cache/media-sound/mp3check-0.8.7
 2012170251 metadata/md5-cache/media-sound/mp3diags-1.5.01
 2012162341 metadata/md5-cache/media-sound/mp3splt-gtk-0.9.2-r1
@@ -51168,11 +51218,9 @@
 2012170019 metadata/md5-cache/media-sound/multimux-0.2.5.2
 2012170251 metadata/md5-cache/media-sound/mumble-1.3.1-r1
 2012170251 metadata/md5-cache/media-sound/mumble-1.3.2
-2012170251 metadata/md5-cache/media-sound/mumble-1.3.3
 2012170251 metadata/md5-cache/media-sound/mumble-9999
 2012170251 metadata/md5-cache/media-sound/murmur-1.3.1
 2012170251 metadata/md5-cache/media-sound/murmur-1.3.2
-2012170251 metadata/md5-cache/media-sound/murmur-1.3.3
 2012170251 metadata/md5-cache/media-sound/murmur-9999
 2012170251 metadata/md5-cache/media-sound/muse-0.9.2_p20161002
 2012170251 metadata/md5-cache/media-sound/musepack-tools-465-r1
@@ -51225,13 +51273,10 @@
 2012170019 metadata/md5-cache/media-sound/pwavecat-0.4.5
 2012170251 metadata/md5-cache/media-sound/qastools-0.23.0
 2012170251 metadata/md5-cache/media-sound/qjackctl-0.6.3
-2012170251 metadata/md5-cache/media-sound/qjackctl-9999
 2012170251 metadata/md5-cache/media-sound/qmidiarp-0.6.5
 2012170251 metadata/md5-cache/media-sound/qmidiroute-0.4.0
 2012170251 metadata/md5-cache/media-sound/qmmp-1.4.2
 2012170251 metadata/md5-cache/media-sound/qmmp-9999
-2012170251 metadata/md5-cache/media-sound/qsampler-0.5.6
-2012170251 metadata/md5-cache/media-sound/qsampler-0.6.3
 2012170251 metadata/md5-cache/media-sound/qsampler-9999
 2012170251 metadata/md5-cache/media-sound/qsynth-0.6.3
 2012170251 metadata/md5-cache/media-sound/qsynth-9999
@@ -51272,11 +51317,6 @@
 2012162341 metadata/md5-cache/media-sound/splay-0.9.5.2-r2
 2012170251 metadata/md5-cache/media-sound/split2flac-122
 2012170251 metadata/md5-cache/media-sound/split2flac-9999
-2012170251 metadata/md5-cache/media-sound/spotify-1.0.72-r1
-2012170251 metadata/md5-cache/media-sound/spotify-1.1.10-r1
-2012170251 metadata/md5-cache/media-sound/spotify-1.1.26-r1
-2012170251 metadata/md5-cache/media-sound/spotify-1.1.26-r2
-2012170251 metadata/md5-cache/media-sound/spotify-1.1.42
 2012170251 metadata/md5-cache/media-sound/strawberry-0.8.3
 2012170251 metadata/md5-cache/media-sound/strawberry-0.8.4
 2012170251 metadata/md5-cache/media-sound/strawberry-9999
@@ -51288,8 +51328,6 @@
 2012162341 metadata/md5-cache/media-sound/takcd-0.10-r1
 2012162341 metadata/md5-cache/media-sound/tap-reverbed-0-r1
 2012170251 metadata/md5-cache/media-sound/tapestrea-0.1.0.5-r1
-2012170251 metadata/md5-cache/media-sound/teamspeak-client-3.5.3-r1
-2012170251 metadata/md5-cache/media-sound/teamspeak-client-3.5.6-r1
 2012170251 metadata/md5-cache/media-sound/teamspeak-client-5.0.0_beta32
 2012170251 metadata/md5-cache/media-sound/terminatorx-4.0.1-r2
 2012170251 metadata/md5-cache/media-sound/timemachine-0.3.4
@@ -51318,9 +51356,27 @@
 2012170251 metadata/md5-cache/media-sound/yarock-1.4.0-r1
 2012170251 metadata/md5-cache/media-sound/yoshimi-1.7.2
 2012170251 metadata/md5-cache/media-sound/zynaddsubfx-3.0.5
-2012172009 metadata/md5-cache/media-sound/Manifest.gz
-2012172009 metadata/md5-cache/media-sound/din-49.1
 2012171939 metadata/md5-cache/media-sound/supercollider-3.11.2
+2012210839 metadata/md5-cache/media-sound/Manifest.gz
+2012181209 metadata/md5-cache/media-sound/abcde-2.9.3-r1
+2012181209 metadata/md5-cache/media-sound/audiotools-3.1.1
+2012202239 metadata/md5-cache/media-sound/din-49.1
+2012191839 metadata/md5-cache/media-sound/gnome-music-3.36.7
+2012210839 metadata/md5-cache/media-sound/gnump3d-3.0-r2
+2012181209 metadata/md5-cache/media-sound/mp3c-0.31-r1
+2012201539 metadata/md5-cache/media-sound/mumble-1.3.3
+2012201539 metadata/md5-cache/media-sound/murmur-1.3.3
+2012200809 metadata/md5-cache/media-sound/qjackctl-0.9.0
+2012200809 metadata/md5-cache/media-sound/qjackctl-9999
+2012202109 metadata/md5-cache/media-sound/qsampler-0.6.3
+2012210839 metadata/md5-cache/media-sound/spotify-1.0.72-r1
+2012210839 metadata/md5-cache/media-sound/spotify-1.1.10-r1
+2012210839 metadata/md5-cache/media-sound/spotify-1.1.26-r1
+2012210839 metadata/md5-cache/media-sound/spotify-1.1.26-r2
+2012210839 metadata/md5-cache/media-sound/spotify-1.1.42
+2012210839 metadata/md5-cache/media-sound/teamspeak-client-3.5.3-r1
+2012210839 metadata/md5-cache/media-sound/teamspeak-client-3.5.6-r1
+2012190009 metadata/md5-cache/media-sound/teamspeak-server-3.13.3
 1806021308 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r2
 1702282327 metadata/md5-cache/media-tv/mythtv-status-0.10.4
 1702282327 metadata/md5-cache/media-tv/shoutcast2vdr-0.0.8-r1
@@ -51417,7 +51473,6 @@
 2011252124 metadata/md5-cache/media-video/vdr2jpeg-0.2.0-r5
 2011252124 metadata/md5-cache/media-video/vobcopy-1.2.0
 2011281709 metadata/md5-cache/media-video/pipewire-0.3.17
-2012170251 metadata/md5-cache/media-video/acidrip-0.14-r4
 2012170019 metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r100
 2012170251 metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r2
 2012170251 metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r3
@@ -51443,20 +51498,15 @@
 2012170019 metadata/md5-cache/media-video/celluloid-0.19
 2012170019 metadata/md5-cache/media-video/celluloid-0.20
 2012170019 metadata/md5-cache/media-video/cheese-3.34.0-r1
-2012170251 metadata/md5-cache/media-video/clive-2.3.0.1
 2012170019 metadata/md5-cache/media-video/cpvts-1.2-r1
-2012170251 metadata/md5-cache/media-video/devedeng-4.16.0-r1
 2012170251 metadata/md5-cache/media-video/dirac-1.0.2-r1
 2012170251 metadata/md5-cache/media-video/dvbsnoop-1.4.50-r1
 2012170251 metadata/md5-cache/media-video/dvdauthor-0.7.1-r1
 2012170251 metadata/md5-cache/media-video/dvdauthor-0.7.2-r2
 2012170019 metadata/md5-cache/media-video/dvdimagecmp-0.3-r1
-2012170251 metadata/md5-cache/media-video/dvdrip-0.98.11-r4
-2012170251 metadata/md5-cache/media-video/dvdstyler-3.0.4
 2012162341 metadata/md5-cache/media-video/ffcast-2.4.8
 2012170251 metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r2
 2012170019 metadata/md5-cache/media-video/ffmpeg-4.2.4
-2012170019 metadata/md5-cache/media-video/ffmpeg-4.3.1
 2012170019 metadata/md5-cache/media-video/ffmpeg-9999
 2012170251 metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0-r1
 2012170251 metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.2
@@ -51479,7 +51529,6 @@
 2012170251 metadata/md5-cache/media-video/jubler-5.1
 2012170251 metadata/md5-cache/media-video/kaffeine-2.0.18
 2012162341 metadata/md5-cache/media-video/kino-1.3.4-r1
-2012170251 metadata/md5-cache/media-video/kmplayer-0.12.0b-r4
 2012162341 metadata/md5-cache/media-video/libva-utils-2.4.0
 2012162341 metadata/md5-cache/media-video/libva-utils-2.8.0
 2012162341 metadata/md5-cache/media-video/libva-utils-2.9.1
@@ -51556,7 +51605,6 @@
 2012170251 metadata/md5-cache/media-video/sonic-snap-1.7-r1
 2012170251 metadata/md5-cache/media-video/streamdeck-ui-0.0_p20200102-r1
 2012170251 metadata/md5-cache/media-video/streamdeck-ui-9999
-2012170019 metadata/md5-cache/media-video/streamdvd-0.4-r2
 2012170251 metadata/md5-cache/media-video/subliminal-2.1.0-r1
 2012170251 metadata/md5-cache/media-video/subliminal-9999
 2012170251 metadata/md5-cache/media-video/subtitlecomposer-0.7.0
@@ -51589,12 +51637,18 @@
 2012170019 metadata/md5-cache/media-video/x264-encoder-0.0.20190214
 2012170019 metadata/md5-cache/media-video/x264-encoder-0.0.20190903
 2012170019 metadata/md5-cache/media-video/x264-encoder-9999
-2012170251 metadata/md5-cache/media-video/xine-ui-0.99.10
 2012170251 metadata/md5-cache/media-video/xvattr-1.3-r3
 2012170251 metadata/md5-cache/media-video/yle-dl-20201022
-2012172009 metadata/md5-cache/media-video/Manifest.gz
-2012172009 metadata/md5-cache/media-video/rav1e-0.3.4
-2012172009 metadata/md5-cache/media-video/xine-ui-0.99.12
+2012211309 metadata/md5-cache/media-video/Manifest.gz
+2012210839 metadata/md5-cache/media-video/acidrip-0.14-r4
+2012210839 metadata/md5-cache/media-video/clive-2.3.0.1
+2012181209 metadata/md5-cache/media-video/devedeng-4.16.0-r1
+2012210839 metadata/md5-cache/media-video/dvdrip-0.98.11-r4
+2012181209 metadata/md5-cache/media-video/dvdstyler-3.0.4
+2012211309 metadata/md5-cache/media-video/ffmpeg-4.3.1
+2012202009 metadata/md5-cache/media-video/rav1e-0.3.4
+2012181209 metadata/md5-cache/media-video/streamdvd-0.4-r2
+2012202009 metadata/md5-cache/media-video/xine-ui-0.99.12
 1910070809 metadata/md5-cache/net-analyzer/arptools-1.0.2
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 1907081539 metadata/md5-cache/net-analyzer/chaosreader-0.96
@@ -51779,7 +51833,6 @@
 2012170251 metadata/md5-cache/net-analyzer/bwmon-1.3-r2
 2012170709 metadata/md5-cache/net-analyzer/bwping-2.1
 2012170019 metadata/md5-cache/net-analyzer/cacti-1.2.13
-2012170019 metadata/md5-cache/net-analyzer/cacti-1.2.14
 2012162341 metadata/md5-cache/net-analyzer/cacti-spine-1.2.13
 2012162341 metadata/md5-cache/net-analyzer/cacti-spine-1.2.14
 2012162341 metadata/md5-cache/net-analyzer/cacti-spine-99999
@@ -51844,7 +51897,6 @@
 2012170019 metadata/md5-cache/net-analyzer/hydra-9.1
 2012170019 metadata/md5-cache/net-analyzer/hydra-9999999
 2012170251 metadata/md5-cache/net-analyzer/icinga2-2.11.6
-2012170251 metadata/md5-cache/net-analyzer/icinga2-2.12.0
 2012170251 metadata/md5-cache/net-analyzer/icinga2-2.12.1
 2012170251 metadata/md5-cache/net-analyzer/icinga2-2.12.2
 2012170251 metadata/md5-cache/net-analyzer/icinga2-2.12.3
@@ -51874,8 +51926,6 @@
 2012170251 metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r3
 2012170251 metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r4
 2012170251 metadata/md5-cache/net-analyzer/mping-2.01
-2012170251 metadata/md5-cache/net-analyzer/mtr-0.87
-2012170251 metadata/md5-cache/net-analyzer/mtr-0.93-r2
 2012170251 metadata/md5-cache/net-analyzer/mtr-0.94
 2012170251 metadata/md5-cache/net-analyzer/mtr-9999
 2012170019 metadata/md5-cache/net-analyzer/multimon-ng-1.1.8
@@ -51916,7 +51966,6 @@
 2012162341 metadata/md5-cache/net-analyzer/nfdump-1.6.20
 2012162341 metadata/md5-cache/net-analyzer/nfdump-1.6.21
 2012170251 metadata/md5-cache/net-analyzer/ngrep-1.45-r3
-2012162341 metadata/md5-cache/net-analyzer/ngrep-1.47
 2012170251 metadata/md5-cache/net-analyzer/nipper-0.12.0
 2012162341 metadata/md5-cache/net-analyzer/nload-0.7.4-r1
 2012170251 metadata/md5-cache/net-analyzer/nmap-7.80-r1
@@ -51976,7 +52025,6 @@
 2012170019 metadata/md5-cache/net-analyzer/sarg-2.4.0
 2012170251 metadata/md5-cache/net-analyzer/scanlogd-2.2.7
 2012162341 metadata/md5-cache/net-analyzer/scanssh-2.1.2
-2012170251 metadata/md5-cache/net-analyzer/scapy-2.4.3
 2012170251 metadata/md5-cache/net-analyzer/scapy-2.4.4
 2012170251 metadata/md5-cache/net-analyzer/scapy-9999
 2012170251 metadata/md5-cache/net-analyzer/scli-0.4.0-r1
@@ -52031,7 +52079,6 @@
 2012162341 metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p5
 2012162341 metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
 2012170251 metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r2
-2012162341 metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r3
 2012170251 metadata/md5-cache/net-analyzer/tcptrack-1.4.2
 2012170251 metadata/md5-cache/net-analyzer/thc-ipv6-3.2-r1
 2012170251 metadata/md5-cache/net-analyzer/thc-ipv6-9999
@@ -52048,8 +52095,6 @@
 2012170251 metadata/md5-cache/net-analyzer/wapiti-3.0.3
 2012170251 metadata/md5-cache/net-analyzer/wapiti-9999
 2012170251 metadata/md5-cache/net-analyzer/wireshark-3.4.0
-2012171339 metadata/md5-cache/net-analyzer/wireshark-3.4.1
-2012170251 metadata/md5-cache/net-analyzer/wireshark-99999999
 2012170251 metadata/md5-cache/net-analyzer/yersinia-0.8.2
 2012170019 metadata/md5-cache/net-analyzer/yersinia-9999
 2012170019 metadata/md5-cache/net-analyzer/zabbix-3.0.31-r2
@@ -52061,9 +52106,16 @@
 2012170019 metadata/md5-cache/net-analyzer/zabbix-5.2.2-r1
 2012170251 metadata/md5-cache/net-analyzer/zmap-2.1.1-r2
 2012170251 metadata/md5-cache/net-analyzer/zmap-9999
-2012180109 metadata/md5-cache/net-analyzer/Manifest.gz
-2012180109 metadata/md5-cache/net-analyzer/netdata-1.27.0
 2012180109 metadata/md5-cache/net-analyzer/netdata-9999
+2012211309 metadata/md5-cache/net-analyzer/Manifest.gz
+2012202009 metadata/md5-cache/net-analyzer/cacti-1.2.14
+2012181739 metadata/md5-cache/net-analyzer/netdata-1.28.0
+2012211309 metadata/md5-cache/net-analyzer/ngrep-1.47
+2012211309 metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r3
+2012181739 metadata/md5-cache/net-analyzer/wireshark-3.4.1
+2012201939 metadata/md5-cache/net-analyzer/wireshark-3.4.2
+2012210209 metadata/md5-cache/net-analyzer/wireshark-3.4.2-r100
+2012210209 metadata/md5-cache/net-analyzer/wireshark-99999999
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2002112051 metadata/md5-cache/net-dialup/wvdial-1.61
 2004032241 metadata/md5-cache/net-dialup/ppp-scripts-0
@@ -52142,7 +52194,6 @@
 2011252124 metadata/md5-cache/net-dns/pdnsd-1.2.9a-r2
 2011252124 metadata/md5-cache/net-dns/rbldnsd-0.998b-r2
 2012030109 metadata/md5-cache/net-dns/idnkit-2.3
-2012031039 metadata/md5-cache/net-dns/ldns-utils-1.7.1
 2012062209 metadata/md5-cache/net-dns/ddclient-3.9.1
 2012090709 metadata/md5-cache/net-dns/valtz-0.8
 2012170019 metadata/md5-cache/net-dns/avahi-0.8-r2
@@ -52169,7 +52220,6 @@
 2012170251 metadata/md5-cache/net-dns/dnsviz-0.8.2
 2012170251 metadata/md5-cache/net-dns/dnsviz-0.8.2-r1
 2012170251 metadata/md5-cache/net-dns/ez-ipupdate-3.0.11.13.3_beta8-r3
-2012170251 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
 2012170251 metadata/md5-cache/net-dns/getdns-1.5.1
 2012170251 metadata/md5-cache/net-dns/getdns-1.5.2-r2
 2012170251 metadata/md5-cache/net-dns/getdns-1.6.0_beta1-r2
@@ -52198,10 +52248,13 @@
 2012170019 metadata/md5-cache/net-dns/unbound-1.11.0
 2012170019 metadata/md5-cache/net-dns/unbound-1.12.0
 2012170019 metadata/md5-cache/net-dns/unbound-1.12.0-r1
-2012170251 metadata/md5-cache/net-dns/unbound-1.13.0
-2012170019 metadata/md5-cache/net-dns/unbound-1.13.0-r1
-2012172339 metadata/md5-cache/net-dns/Manifest.gz
 2012172339 metadata/md5-cache/net-dns/pdns-recursor-4.4.2
+2012211309 metadata/md5-cache/net-dns/Manifest.gz
+2012210839 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
+2012211309 metadata/md5-cache/net-dns/ldns-utils-1.7.1
+2012182339 metadata/md5-cache/net-dns/pdns-4.4.0
+2012201909 metadata/md5-cache/net-dns/unbound-1.13.0
+2012201909 metadata/md5-cache/net-dns/unbound-1.13.0-r1
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2011252124 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.3
@@ -52267,7 +52320,6 @@
 2011252124 metadata/md5-cache/net-fs/autofs-5.1.6
 2011252124 metadata/md5-cache/net-fs/autofs-5.1.6-r1
 2011252124 metadata/md5-cache/net-fs/sshfs-3.7.0
-2012170409 metadata/md5-cache/net-fs/Manifest.gz
 2012162341 metadata/md5-cache/net-fs/btfs-2.20
 2012162341 metadata/md5-cache/net-fs/btfs-2.22
 2012170251 metadata/md5-cache/net-fs/cifs-utils-6.11
@@ -52300,7 +52352,8 @@
 2012170251 metadata/md5-cache/net-fs/samba-4.13.1-r1
 2012170251 metadata/md5-cache/net-fs/samba-4.13.2-r1
 2012170251 metadata/md5-cache/net-fs/smbtad-1.2.6
-2012170251 metadata/md5-cache/net-fs/wdfs-1.4.2-r1
+2012181339 metadata/md5-cache/net-fs/Manifest.gz
+2012181339 metadata/md5-cache/net-fs/wdfs-1.4.2-r2
 1910111911 metadata/md5-cache/net-ftp/cmdftp-0.9.8
 1912111539 metadata/md5-cache/net-ftp/tnftp-20141104
 1912111539 metadata/md5-cache/net-ftp/tnftp-20151004
@@ -52310,7 +52363,6 @@
 2012170019 metadata/md5-cache/net-ftp/atftp-0.7.2-r1
 2012170251 metadata/md5-cache/net-ftp/filezilla-3.47.2.1
 2012170251 metadata/md5-cache/net-ftp/filezilla-3.50.0
-2012170251 metadata/md5-cache/net-ftp/filezilla-3.51.0
 2012170251 metadata/md5-cache/net-ftp/frox-0.7.18-r6
 2012170251 metadata/md5-cache/net-ftp/ftp-0.17.23.0.2.1
 2012170019 metadata/md5-cache/net-ftp/ftpbase-0.01-r3
@@ -52321,7 +52373,6 @@
 2012170251 metadata/md5-cache/net-ftp/linksys-tftp-1.2.1-r3
 2012170251 metadata/md5-cache/net-ftp/ncftp-3.2.6
 2012162341 metadata/md5-cache/net-ftp/ncftp-3.2.6-r1
-2012170251 metadata/md5-cache/net-ftp/profxp-3_pre2-r2
 2012170019 metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r2
 2012170019 metadata/md5-cache/net-ftp/pure-ftpd-9999
 2012170251 metadata/md5-cache/net-ftp/pureadmin-0.4-r1
@@ -52329,8 +52380,10 @@
 2012162341 metadata/md5-cache/net-ftp/tlswrap-1.04-r3
 2012170251 metadata/md5-cache/net-ftp/vsftpd-3.0.3-r3
 2012170251 metadata/md5-cache/net-ftp/yafc-1.3.7
-2012180209 metadata/md5-cache/net-ftp/Manifest.gz
-2012180209 metadata/md5-cache/net-ftp/ncftp-3.2.6-r2
+2012211309 metadata/md5-cache/net-ftp/Manifest.gz
+2012210339 metadata/md5-cache/net-ftp/filezilla-3.51.0
+2012211309 metadata/md5-cache/net-ftp/ncftp-3.2.6-r2
+2012210839 metadata/md5-cache/net-ftp/profxp-3_pre2-r2
 1910111911 metadata/md5-cache/net-im/centerim-5.0.1
 1702282328 metadata/md5-cache/net-im/gg-transport-2.2.6
 1905062239 metadata/md5-cache/net-im/profanity-0.6.0
@@ -52345,12 +52398,9 @@
 2011252124 metadata/md5-cache/net-im/bitlbee-3.6-r1
 2011252124 metadata/md5-cache/net-im/bitlbee-9999
 2011252124 metadata/md5-cache/net-im/skype-dbus-mock-0_pre20181011
-2011252124 metadata/md5-cache/net-im/swift-4.0.2-r100
 2012031609 metadata/md5-cache/net-im/swift-4.0.2-r4
-2012082239 metadata/md5-cache/net-im/element-desktop-bin-1.7.15
 2012140439 metadata/md5-cache/net-im/prosody-0.11.5-r1
 2012142109 metadata/md5-cache/net-im/prosody-0.11.7-r100
-2012170251 metadata/md5-cache/net-im/Manifest.gz
 2012162341 metadata/md5-cache/net-im/bitlbee-facebook-1.2.0
 2012162341 metadata/md5-cache/net-im/bitlbee-facebook-1.2.1
 2012162341 metadata/md5-cache/net-im/bitlbee-facebook-9999
@@ -52365,7 +52415,6 @@
 2012170251 metadata/md5-cache/net-im/dino-0.1.0
 2012170251 metadata/md5-cache/net-im/dino-0.2.0
 2012170251 metadata/md5-cache/net-im/dino-9999
-2012170251 metadata/md5-cache/net-im/discord-bin-0.0.13
 2012170251 metadata/md5-cache/net-im/ejabberd-20.04
 2012170251 metadata/md5-cache/net-im/ejabberd-20.07
 2012162341 metadata/md5-cache/net-im/ekg2-0.4_pre20190315
@@ -52374,8 +52423,6 @@
 2012170251 metadata/md5-cache/net-im/err-6.1.4
 2012170251 metadata/md5-cache/net-im/gajim-1.2.1
 2012170251 metadata/md5-cache/net-im/gajim-1.2.2
-2012170251 metadata/md5-cache/net-im/gitter-bin-3.1.0
-2012170251 metadata/md5-cache/net-im/gitter-bin-4.1.0
 2012170251 metadata/md5-cache/net-im/kouchat-1.1.0
 2012170251 metadata/md5-cache/net-im/libcommuni-3.5.0_p20200711
 2012170251 metadata/md5-cache/net-im/mattermost-desktop-bin-4.5.1
@@ -52401,15 +52448,8 @@
 2012170251 metadata/md5-cache/net-im/qtox-9999
 2012170251 metadata/md5-cache/net-im/ricochet-1.1.4
 2012170251 metadata/md5-cache/net-im/ricochet-9999
-2012170251 metadata/md5-cache/net-im/sendxmpp-1.24
-2012161209 metadata/md5-cache/net-im/signal-desktop-bin-1.39.2
-2012170251 metadata/md5-cache/net-im/skypeforlinux-8.66.0.74
 2012170251 metadata/md5-cache/net-im/skypeforlinux-8.67.0.87
-2012170251 metadata/md5-cache/net-im/slack-4.11.3
-2012170251 metadata/md5-cache/net-im/slack-4.4.2
-2012170251 metadata/md5-cache/net-im/slack-4.4.3
 2012170251 metadata/md5-cache/net-im/spectrum2-2.0.13-r2
-2012170251 metadata/md5-cache/net-im/teams-1.3.00.25560
 2012170251 metadata/md5-cache/net-im/telegram-desktop-2.4.11
 2012170251 metadata/md5-cache/net-im/telegram-desktop-2.4.7-r1
 2012170251 metadata/md5-cache/net-im/telegram-desktop-bin-2.4.4
@@ -52428,6 +52468,21 @@
 2012170251 metadata/md5-cache/net-im/zoom-5.4.54779.1115-r3
 2012170251 metadata/md5-cache/net-im/zoom-5.4.56259.1207
 2012170251 metadata/md5-cache/net-im/zoom-5.4.56259.1207-r2
+2012210839 metadata/md5-cache/net-im/Manifest.gz
+2012210839 metadata/md5-cache/net-im/discord-bin-0.0.13
+2012210839 metadata/md5-cache/net-im/element-desktop-bin-1.7.15
+2012210839 metadata/md5-cache/net-im/gitter-bin-3.1.0
+2012210839 metadata/md5-cache/net-im/gitter-bin-4.1.0
+2012200609 metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.1
+2012210839 metadata/md5-cache/net-im/sendxmpp-1.24
+2012210839 metadata/md5-cache/net-im/signal-desktop-bin-1.39.2
+2012191639 metadata/md5-cache/net-im/skypeforlinux-8.67.0.96
+2012210839 metadata/md5-cache/net-im/slack-4.11.3
+2012210839 metadata/md5-cache/net-im/slack-4.4.2
+2012210839 metadata/md5-cache/net-im/slack-4.4.3
+2012210239 metadata/md5-cache/net-im/swift-4.0.2-r101
+2012210839 metadata/md5-cache/net-im/teams-1.3.00.25560
+2012210839 metadata/md5-cache/net-im/teams-1.3.00.30857
 1812301839 metadata/md5-cache/net-irc/eggdrop-1.8.4
 1802070108 metadata/md5-cache/net-irc/ninja-1.5.9_pre14-r1
 2002112051 metadata/md5-cache/net-irc/bnc-2.9.4-r1
@@ -52460,15 +52515,11 @@
 2011252124 metadata/md5-cache/net-irc/znc-palaver-1.2.1
 2011291139 metadata/md5-cache/net-irc/emech-3.0.99_p3
 2012041739 metadata/md5-cache/net-irc/irssi-1.2.2-r1
-2012170251 metadata/md5-cache/net-irc/Manifest.gz
-2012170251 metadata/md5-cache/net-irc/anope-2.0.7
 2012170251 metadata/md5-cache/net-irc/anope-2.0.9
 2012170019 metadata/md5-cache/net-irc/atheme-services-7.2.10_p2-r2
 2012170251 metadata/md5-cache/net-irc/cgiirc-0.5.10
 2012162341 metadata/md5-cache/net-irc/epic5-2.0.1
 2012160039 metadata/md5-cache/net-irc/hexchat-2.14.3
-2012160039 metadata/md5-cache/net-irc/hexchat-9999
-2012170251 metadata/md5-cache/net-irc/irccloud-desktop-bin-0.15.0
 2012162341 metadata/md5-cache/net-irc/irssi-9999
 2012170251 metadata/md5-cache/net-irc/konversation-1.7.7-r1
 2012170251 metadata/md5-cache/net-irc/konversation-20.12.0
@@ -52478,7 +52529,6 @@
 2012170251 metadata/md5-cache/net-irc/limnoria-99999999
 2012162341 metadata/md5-cache/net-irc/ngircd-26
 2012170251 metadata/md5-cache/net-irc/onis-0.8.2-r1
-2012170251 metadata/md5-cache/net-irc/pisg-0.73-r1
 2012170019 metadata/md5-cache/net-irc/polari-3.36.3
 2012170251 metadata/md5-cache/net-irc/quassel-0.13.1-r2
 2012170251 metadata/md5-cache/net-irc/quassel-9999
@@ -52491,10 +52541,16 @@
 2012160540 metadata/md5-cache/net-irc/unrealircd-5.0.7-r2
 2012170251 metadata/md5-cache/net-irc/weechat-2.9
 2012170251 metadata/md5-cache/net-irc/weechat-3.0
-2012170251 metadata/md5-cache/net-irc/weechat-9999
 2012170251 metadata/md5-cache/net-irc/znc-1.8.1
 2012170251 metadata/md5-cache/net-irc/znc-1.8.2
 2012170251 metadata/md5-cache/net-irc/znc-9999
+2012210839 metadata/md5-cache/net-irc/Manifest.gz
+2012210109 metadata/md5-cache/net-irc/hexchat-2.14.3-r100
+2012210109 metadata/md5-cache/net-irc/hexchat-9999
+2012210839 metadata/md5-cache/net-irc/irccloud-desktop-bin-0.15.0
+2012210839 metadata/md5-cache/net-irc/pisg-0.73-r1
+2012210039 metadata/md5-cache/net-irc/weechat-3.0-r100
+2012210039 metadata/md5-cache/net-irc/weechat-9999
 1903300009 metadata/md5-cache/net-libs/freaklabs-chibiarduino-1.0.8_p20190329
 1803282239 metadata/md5-cache/net-libs/libblkmaker-0.3.2
 1803282239 metadata/md5-cache/net-libs/libblkmaker-0.4.3
@@ -52518,8 +52574,6 @@
 2004032241 metadata/md5-cache/net-libs/sofia-sip-1.12.11
 2004191909 metadata/md5-cache/net-libs/libnma-1.8.24
 2004211009 metadata/md5-cache/net-libs/rpcsvc-proto-0
-2006041239 metadata/md5-cache/net-libs/libmrss-0.19.2
-2006041239 metadata/md5-cache/net-libs/libnxml-0.18.3
 2008011109 metadata/md5-cache/net-libs/libntlm-1.6
 2009021410 metadata/md5-cache/net-libs/freaklabs-chibiarduino-9999
 2009021410 metadata/md5-cache/net-libs/liba53-9999
@@ -52582,21 +52636,16 @@
 2011252124 metadata/md5-cache/net-libs/libqmi-1.20.0
 2011252124 metadata/md5-cache/net-libs/libqmi-1.20.2
 2011252124 metadata/md5-cache/net-libs/libqmi-1.22.2
-2011252124 metadata/md5-cache/net-libs/libslirp-4.3.1
 2011252124 metadata/md5-cache/net-libs/libtirpc-1.2.6
-2011252124 metadata/md5-cache/net-libs/miniupnpc-2.1.20201016
 2011252124 metadata/md5-cache/net-libs/netwib-5.39.0
 2011252124 metadata/md5-cache/net-libs/nghttp2-1.41.0
 2011252124 metadata/md5-cache/net-libs/telepathy-accounts-signon-2.1
 2011252124 metadata/md5-cache/net-libs/udns-0.4
-2012030039 metadata/md5-cache/net-libs/gnutls-3.6.15
 2012030039 metadata/md5-cache/net-libs/gnutls-3.7.0
-2012030739 metadata/md5-cache/net-libs/libsmi-0.5.0-r1
 2012041739 metadata/md5-cache/net-libs/libmicrohttpd-0.9.71
 2012041739 metadata/md5-cache/net-libs/libotr-4.1.1
 2012041209 metadata/md5-cache/net-libs/libtirpc-1.3.1
 2012122039 metadata/md5-cache/net-libs/libupnpp-0.20.1
-2012131209 metadata/md5-cache/net-libs/nghttp2-1.42.0
 2012140439 metadata/md5-cache/net-libs/loudmouth-1.5.3-r3
 2012141339 metadata/md5-cache/net-libs/libslirp-4.4.0
 2012170251 metadata/md5-cache/net-libs/NativeThread-0_pre20190914
@@ -52746,7 +52795,6 @@
 2012162341 metadata/md5-cache/net-libs/libprotoident-9999
 2012170251 metadata/md5-cache/net-libs/libproxy-0.4.15-r1
 2012170251 metadata/md5-cache/net-libs/libproxy-0.4.15-r2
-2012171509 metadata/md5-cache/net-libs/libproxy-0.4.16
 2012162341 metadata/md5-cache/net-libs/libqmi-9999
 2012162341 metadata/md5-cache/net-libs/librouteros-1.1.2
 2012170019 metadata/md5-cache/net-libs/librsync-2.3.1
@@ -52755,7 +52803,6 @@
 2012170251 metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.3
 2012170251 metadata/md5-cache/net-libs/libsignal-protocol-c-9999
 2012170019 metadata/md5-cache/net-libs/libsignon-glib-2.1
-2012151409 metadata/md5-cache/net-libs/libslirp-4.3.1-r1
 2012170251 metadata/md5-cache/net-libs/libsmi-0.4.8-r1
 2012170019 metadata/md5-cache/net-libs/libsoup-2.70.0
 2012162341 metadata/md5-cache/net-libs/libsrtp-1.6.0-r1
@@ -52811,7 +52858,6 @@
 2012162341 metadata/md5-cache/net-libs/neon-0.31.1
 2012162341 metadata/md5-cache/net-libs/neon-0.31.2
 2012170251 metadata/md5-cache/net-libs/net6-1.3.14-r2
-2012162341 metadata/md5-cache/net-libs/nghttp2-9999
 2012170251 metadata/md5-cache/net-libs/nghttp3-0_pre20190912
 2012170251 metadata/md5-cache/net-libs/nghttp3-9999
 2012170251 metadata/md5-cache/net-libs/ngtcp2-0_pre20190912
@@ -52891,11 +52937,20 @@
 2012170251 metadata/md5-cache/net-libs/xrootd-ceph-5.0.3
 2012162341 metadata/md5-cache/net-libs/zeromq-4.3.3
 2012170251 metadata/md5-cache/net-libs/zmqpp-4.2.0
-2012172009 metadata/md5-cache/net-libs/Manifest.gz
-2012172009 metadata/md5-cache/net-libs/libgsasl-1.8.1
-2012172009 metadata/md5-cache/net-libs/libmrss-0.19.2-r1
-2012172009 metadata/md5-cache/net-libs/libnxml-0.18.3-r1
-2012172009 metadata/md5-cache/net-libs/miniupnpc-2.2.0
+2012211309 metadata/md5-cache/net-libs/Manifest.gz
+2012210009 metadata/md5-cache/net-libs/axtls-2.1.5-r100
+2012210209 metadata/md5-cache/net-libs/gnutls-3.6.15
+2012202009 metadata/md5-cache/net-libs/libgsasl-1.8.1
+2012202239 metadata/md5-cache/net-libs/libmrss-0.19.2-r1
+2012202239 metadata/md5-cache/net-libs/libnxml-0.18.3-r1
+2012211309 metadata/md5-cache/net-libs/libproxy-0.4.16
+2012181339 metadata/md5-cache/net-libs/libslirp-4.3.1-r1
+2012211309 metadata/md5-cache/net-libs/libsmi-0.5.0-r1
+2012201939 metadata/md5-cache/net-libs/miniupnpc-2.2.0
+2012211239 metadata/md5-cache/net-libs/miniupnpc-2.2.1
+2012201509 metadata/md5-cache/net-libs/nghttp2-1.42.0
+2012191139 metadata/md5-cache/net-libs/nghttp2-9999
+2012191909 metadata/md5-cache/net-libs/webkit-gtk-2.30.4
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 1910170740 metadata/md5-cache/net-mail/mhonarc-gentoo-2.6.18-r2
 1705221538 metadata/md5-cache/net-mail/mlmmj-1.2.19.0-r1
@@ -52980,12 +53035,8 @@
 2012170251 metadata/md5-cache/net-mail/hyperkitty-1.3.3
 2012151409 metadata/md5-cache/net-mail/imapsync-1.882
 2012162341 metadata/md5-cache/net-mail/isync-9999
-2012170251 metadata/md5-cache/net-mail/lbdb-0.41
-2012171209 metadata/md5-cache/net-mail/lbdb-0.47
 2012170251 metadata/md5-cache/net-mail/libdbx-1.0.3
-2012170251 metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2
 2012170019 metadata/md5-cache/net-mail/mailbase-1.5-r1
-2012170019 metadata/md5-cache/net-mail/mailbox-count-0.0.5
 2012170251 metadata/md5-cache/net-mail/mailman-3.3.1-r1
 2012170251 metadata/md5-cache/net-mail/mailman-3.3.2
 2012170251 metadata/md5-cache/net-mail/mailmanclient-3.3.1
@@ -53027,8 +53078,12 @@
 2012170251 metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
 2012170251 metadata/md5-cache/net-mail/vqadmin-2.3.7
 2012162341 metadata/md5-cache/net-mail/ytnef-1.9.3
-2012172009 metadata/md5-cache/net-mail/Manifest.gz
-2012172009 metadata/md5-cache/net-mail/cyrus-imapd-3.0.14
+2012210239 metadata/md5-cache/net-mail/Manifest.gz
+2012202239 metadata/md5-cache/net-mail/cyrus-imapd-3.0.14
+2012202209 metadata/md5-cache/net-mail/dovecot-2.3.11.3-r100
+2012201939 metadata/md5-cache/net-mail/lbdb-0.47
+2012210239 metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2
+2012210239 metadata/md5-cache/net-mail/mailbox-count-0.0.5
 1910170740 metadata/md5-cache/net-misc/arpsponge-3.17.11
 1910022239 metadata/md5-cache/net-misc/autossh-1.4g
 1911110039 metadata/md5-cache/net-misc/autoupnp-0.4.7
@@ -53118,7 +53173,6 @@
 2011252124 metadata/md5-cache/net-misc/balance-3.57
 2011252124 metadata/md5-cache/net-misc/batctl-2020.4
 2011252124 metadata/md5-cache/net-misc/casync-2_p20190407
-2011252124 metadata/md5-cache/net-misc/chrony-3.5.1-r1
 2011252124 metadata/md5-cache/net-misc/chrony-9999
 2011252124 metadata/md5-cache/net-misc/cni-plugins-0.8.6
 2011252124 metadata/md5-cache/net-misc/cni-plugins-0.8.7
@@ -53158,10 +53212,7 @@
 2011252124 metadata/md5-cache/net-misc/liveice-2000530-r2
 2011252124 metadata/md5-cache/net-misc/minissdpd-1.5.20190824
 2011252124 metadata/md5-cache/net-misc/minissdpd-1.5.20200928
-2011252124 metadata/md5-cache/net-misc/miniupnpd-2.1.20200510
 2011252124 metadata/md5-cache/net-misc/miniupnpd-2.2.0
-2011252124 metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2
-2011252124 metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc3
 2011252124 metadata/md5-cache/net-misc/mrouted-3.9.5-r1
 2011252124 metadata/md5-cache/net-misc/mrouted-3.9.8
 2011252124 metadata/md5-cache/net-misc/ncp-1.2.4-r2
@@ -53247,7 +53298,6 @@
 2012170019 metadata/md5-cache/net-misc/bgpq3-0.1.35
 2012162341 metadata/md5-cache/net-misc/bopm-3.1.3-r4
 2012162341 metadata/md5-cache/net-misc/bridge-utils-1.6
-2012170251 metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
 2012162341 metadata/md5-cache/net-misc/cadaver-0.23.3
 2012152339 metadata/md5-cache/net-misc/calico-cni-plugin-3.1.3
 2012152339 metadata/md5-cache/net-misc/calicoctl-3.1.3
@@ -53256,9 +53306,6 @@
 2012170019 metadata/md5-cache/net-misc/cgminer-4.10.0
 2012170251 metadata/md5-cache/net-misc/cgminer-4.9.2
 2012170019 metadata/md5-cache/net-misc/clockspeed-0.62-r7
-2012170251 metadata/md5-cache/net-misc/clusterssh-4.03.03
-2012170251 metadata/md5-cache/net-misc/clusterssh-4.30.600
-2012170251 metadata/md5-cache/net-misc/clusterssh-9999
 2012170251 metadata/md5-cache/net-misc/cmst-2020.05.09
 2012170251 metadata/md5-cache/net-misc/cmst-2020.11.01
 2012162341 metadata/md5-cache/net-misc/connman-1.38
@@ -53286,7 +53333,6 @@
 2012152339 metadata/md5-cache/net-misc/drive-0.3.9.1-r1
 2012170019 metadata/md5-cache/net-misc/dropbear-2020.80-r1
 2012170251 metadata/md5-cache/net-misc/dropbox-111.4.472
-2012170251 metadata/md5-cache/net-misc/dropbox-112.4.321
 2012170251 metadata/md5-cache/net-misc/dropbox-cli-19
 2012170251 metadata/md5-cache/net-misc/dropbox-cli-2020.03.04
 2012170251 metadata/md5-cache/net-misc/electron-cash-4.0.2-r2
@@ -53308,7 +53354,6 @@
 2012170251 metadata/md5-cache/net-misc/gallery-dl-1.15.3
 2012170251 metadata/md5-cache/net-misc/gallery-dl-1.16.0
 2012170251 metadata/md5-cache/net-misc/gallery-dl-9999
-2012170251 metadata/md5-cache/net-misc/gcap-0.1.1-r1
 2012152339 metadata/md5-cache/net-misc/geoipupdate-4.0.3-r1
 2012152339 metadata/md5-cache/net-misc/geoipupdate-4.0.4
 2012170019 metadata/md5-cache/net-misc/geoipupdate-4.3.0
@@ -53330,11 +53375,7 @@
 2012170251 metadata/md5-cache/net-misc/gsutil-4.47
 2012170251 metadata/md5-cache/net-misc/gsutil-4.50
 2012170251 metadata/md5-cache/net-misc/gvrpcd-1.3
-2012170019 metadata/md5-cache/net-misc/haeredes-0.5.2
-2012170019 metadata/md5-cache/net-misc/hath-0.5.0
 2012170251 metadata/md5-cache/net-misc/htbinit-0.8.5-r7
-2012170251 metadata/md5-cache/net-misc/htpdate-1.0.7
-2012170251 metadata/md5-cache/net-misc/httpie-2.1.0
 2012170251 metadata/md5-cache/net-misc/httpie-2.2.0
 2012170019 metadata/md5-cache/net-misc/hylafaxplus-7.0.2
 2012170251 metadata/md5-cache/net-misc/iaxmodem-1.3.0-r1
@@ -53431,7 +53472,6 @@
 2012170251 metadata/md5-cache/net-misc/nyx-2.1.0-r1
 2012170251 metadata/md5-cache/net-misc/ofono-1.16
 2012170019 metadata/md5-cache/net-misc/ofono-1.30
-2012170019 metadata/md5-cache/net-misc/ofono-1.31
 2012170019 metadata/md5-cache/net-misc/oidc-agent-3.3.1
 2012170019 metadata/md5-cache/net-misc/oidc-agent-3.3.5-r1
 2012162341 metadata/md5-cache/net-misc/oidentd-2.5.0
@@ -53565,13 +53605,6 @@
 2012170251 metadata/md5-cache/net-misc/yandex-disk-0.1.5.1039_p1
 2012170251 metadata/md5-cache/net-misc/you-get-0.4.1355-r1
 2012170251 metadata/md5-cache/net-misc/you-get-0.4.1432
-2012170251 metadata/md5-cache/net-misc/youtube-dl-2020.09.20
-2012170251 metadata/md5-cache/net-misc/youtube-dl-2020.11.26
-2012170251 metadata/md5-cache/net-misc/youtube-dl-2020.11.29
-2012170251 metadata/md5-cache/net-misc/youtube-dl-2020.12.02
-2012170251 metadata/md5-cache/net-misc/youtube-dl-2020.12.05
-2012170251 metadata/md5-cache/net-misc/youtube-dl-2020.12.12
-2012170251 metadata/md5-cache/net-misc/youtube-dl-2020.12.14
 2012170251 metadata/md5-cache/net-misc/youtube-dl-9999
 2012170251 metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2
 2012170251 metadata/md5-cache/net-misc/youtube-viewer-9999
@@ -53579,35 +53612,52 @@
 2012170019 metadata/md5-cache/net-misc/zerotier-1.4.6
 2012170251 metadata/md5-cache/net-misc/zssh-1.5c-r1
 2012170251 metadata/md5-cache/net-misc/zsync-0.6.2-r1
-2012180239 metadata/md5-cache/net-misc/Manifest.gz
 2012172239 metadata/md5-cache/net-misc/anydesk-6.0.1
 2012172109 metadata/md5-cache/net-misc/aria2-1.35.0
 2012172009 metadata/md5-cache/net-misc/curl-7.74.0-r2
 2012180239 metadata/md5-cache/net-misc/electrum-4.0.8
-2012172009 metadata/md5-cache/net-misc/gsasl-1.8.1
 2012172209 metadata/md5-cache/net-misc/kea-1.8.1-r1
 2012171739 metadata/md5-cache/net-misc/openntpd-6.8_p1
+2012211309 metadata/md5-cache/net-misc/Manifest.gz
+2012201909 metadata/md5-cache/net-misc/asterisk-16.14.0-r100
+2012210839 metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
+2012210839 metadata/md5-cache/net-misc/clusterssh-4.03.03
+2012210839 metadata/md5-cache/net-misc/clusterssh-4.30.600
+2012210839 metadata/md5-cache/net-misc/clusterssh-9999
+2012201909 metadata/md5-cache/net-misc/dropbox-112.4.321
+2012191209 metadata/md5-cache/net-misc/electrum-4.0.9
+2012210839 metadata/md5-cache/net-misc/gcap-0.1.1-r1
+2012190109 metadata/md5-cache/net-misc/gnome-remote-desktop-0.1.9
+2012202009 metadata/md5-cache/net-misc/gsasl-1.8.1
+2012210239 metadata/md5-cache/net-misc/haeredes-0.5.2
+2012210239 metadata/md5-cache/net-misc/hath-0.5.0
+2012210839 metadata/md5-cache/net-misc/htpdate-1.0.7
+2012210309 metadata/md5-cache/net-misc/httpie-2.3.0
+2012191939 metadata/md5-cache/net-misc/kea-1.8.2
+2012211239 metadata/md5-cache/net-misc/miniupnpd-2.2.1
+2012211309 metadata/md5-cache/net-misc/ofono-1.31
+2012191009 metadata/md5-cache/net-misc/websocat-1.6.0
+2012200609 metadata/md5-cache/net-misc/websocat-1.6.0-r1
+2012182339 metadata/md5-cache/net-misc/youtube-dl-2020.12.14
 1911091712 metadata/md5-cache/net-nds/led-1.111
 1912052009 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
 2004032241 metadata/md5-cache/net-nds/gssproxy-0.8.2
 2008310309 metadata/md5-cache/net-nds/gssproxy-0.8.3
 2011031239 metadata/md5-cache/net-nds/smbldap-tools-0.9.10-r1
 2011252124 metadata/md5-cache/net-nds/rpcbind-1.2.5
-2012170251 metadata/md5-cache/net-nds/Manifest.gz
 2012162341 metadata/md5-cache/net-nds/adtool-1.3.3-r1
 2012170251 metadata/md5-cache/net-nds/jxplorer-3.3.1
 2012170251 metadata/md5-cache/net-nds/jxplorer-3.3.1.1
 2012170251 metadata/md5-cache/net-nds/jxplorer-3.3.1.2
 2012162341 metadata/md5-cache/net-nds/ldapvi-1.7_p20101214
 2012170251 metadata/md5-cache/net-nds/nsscache-0.39
-2012170019 metadata/md5-cache/net-nds/openldap-2.4.53-r1
-2012170019 metadata/md5-cache/net-nds/openldap-2.4.54
-2012170019 metadata/md5-cache/net-nds/openldap-2.4.56
 2012162341 metadata/md5-cache/net-nds/rpcbind-9999
 2012170019 metadata/md5-cache/net-nds/shelldap-1.5.1
 2012170251 metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r4
 2012170251 metadata/md5-cache/net-nds/tac_plus-4.0.4.27a
 2012162341 metadata/md5-cache/net-nds/yp-tools-4.2.3
+2012181739 metadata/md5-cache/net-nds/Manifest.gz
+2012181739 metadata/md5-cache/net-nds/openldap-2.4.56
 1702282329 metadata/md5-cache/net-news/amphetadesk-0.93.1-r1
 2002112051 metadata/md5-cache/net-news/yydecode-0.2.10-r1
 2011252124 metadata/md5-cache/net-news/rsstail-1.8
@@ -53652,11 +53702,8 @@
 2011061444 metadata/md5-cache/net-p2p/bitflu-1.52
 2011041509 metadata/md5-cache/net-p2p/qbittorrent-4.3.0.1
 2011252124 metadata/md5-cache/net-p2p/ncdc-1.22.1
-2011252124 metadata/md5-cache/net-p2p/resilio-sync-2.6.1
-2011252124 metadata/md5-cache/net-p2p/resilio-sync-2.6.3
 2011291139 metadata/md5-cache/net-p2p/mktorrent-1.1_p20180912
 2012011509 metadata/md5-cache/net-p2p/qbittorrent-4.3.1
-2012170251 metadata/md5-cache/net-p2p/Manifest.gz
 2012170251 metadata/md5-cache/net-p2p/airdcpp-webclient-2.10.0
 2012170251 metadata/md5-cache/net-p2p/airdcpp-webclient-2.10.1
 2012170019 metadata/md5-cache/net-p2p/amule-2.3.2-r5
@@ -53708,7 +53755,6 @@
 2012162341 metadata/md5-cache/net-p2p/ncdc-9999
 2012170251 metadata/md5-cache/net-p2p/nicotine+-2.0.1-r1
 2012170251 metadata/md5-cache/net-p2p/nicotine+-2.1.2
-2012170251 metadata/md5-cache/net-p2p/nicotine+-2.2.0
 2012170251 metadata/md5-cache/net-p2p/opendchub-0.8.2
 2012170251 metadata/md5-cache/net-p2p/retroshare-0.6.5
 2012162341 metadata/md5-cache/net-p2p/rtorrent-0.9.7
@@ -53745,6 +53791,10 @@
 2012170251 metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.4
 2012170251 metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.5
 2012170251 metadata/md5-cache/net-p2p/xmr-stak-rx-9999
+2012210839 metadata/md5-cache/net-p2p/Manifest.gz
+2012181339 metadata/md5-cache/net-p2p/nicotine+-2.2.0
+2012210839 metadata/md5-cache/net-p2p/resilio-sync-2.6.1
+2012210839 metadata/md5-cache/net-p2p/resilio-sync-2.6.3
 1802061938 metadata/md5-cache/net-print/cups-bjnp-2.0
 1702282329 metadata/md5-cache/net-print/fax4cups-1.29-r1
 1702282329 metadata/md5-cache/net-print/ink-0.5.1
@@ -53758,10 +53808,8 @@
 2010020309 metadata/md5-cache/net-print/apsfilter-7.2.8-r1
 2010242039 metadata/md5-cache/net-print/pnm2ppa-1.13-r1
 2011252124 metadata/md5-cache/net-print/cups-pdf-3.0.1
-2011252124 metadata/md5-cache/net-print/hplip-plugin-3.20.9
 2011290239 metadata/md5-cache/net-print/c2esp-27
 2012020639 metadata/md5-cache/net-print/poster-20060221-r3
-2012080209 metadata/md5-cache/net-print/hplip-plugin-3.20.11
 2012170251 metadata/md5-cache/net-print/brlaser-4
 2012170251 metadata/md5-cache/net-print/brlaser-6
 2012162341 metadata/md5-cache/net-print/cndrvcups-common-lb-3.60-r1
@@ -53779,7 +53827,6 @@
 2012170019 metadata/md5-cache/net-print/cups-filters-1.27.4
 2012170019 metadata/md5-cache/net-print/cups-filters-1.27.5
 2012170019 metadata/md5-cache/net-print/cups-filters-1.28.2
-2012170019 metadata/md5-cache/net-print/cups-filters-1.28.3
 2012170019 metadata/md5-cache/net-print/cups-filters-9999
 2012170251 metadata/md5-cache/net-print/cups-pk-helper-0.2.6
 2012170019 metadata/md5-cache/net-print/dymo-cups-drivers-1.4.0-r2
@@ -53788,7 +53835,6 @@
 2012170251 metadata/md5-cache/net-print/foomatic-db-4.0.20170331
 2012170251 metadata/md5-cache/net-print/foomatic-db-4.0.20180126
 2012170251 metadata/md5-cache/net-print/foomatic-db-4.0.20190226
-2012170251 metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
 2012170251 metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
 2012170251 metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20180126
 2012170251 metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20190226
@@ -53800,10 +53846,14 @@
 2012170251 metadata/md5-cache/net-print/lm1100-1.0.2a-r1
 2012170251 metadata/md5-cache/net-print/npadmin-0.8.7-r1
 2012170019 metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
-2012180209 metadata/md5-cache/net-print/Manifest.gz
 2012180209 metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.8
 2012171639 metadata/md5-cache/net-print/gutenprint-5.3.3-r2
 2012171639 metadata/md5-cache/net-print/hplip-3.20.9-r3
+2012211309 metadata/md5-cache/net-print/Manifest.gz
+2012211309 metadata/md5-cache/net-print/cups-filters-1.28.3
+2012210839 metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
+2012210839 metadata/md5-cache/net-print/hplip-plugin-3.20.11
+2012210839 metadata/md5-cache/net-print/hplip-plugin-3.20.9
 2009141809 metadata/md5-cache/net-proxy/obfs4proxy-0.0.11-r1
 2011252124 metadata/md5-cache/net-proxy/hatop-0.8.0
 2011252124 metadata/md5-cache/net-proxy/microsocks-1.0.1_p20200805
@@ -53897,7 +53947,6 @@
 2011252124 metadata/md5-cache/net-vpn/vtun-3.0.3-r1
 2012130039 metadata/md5-cache/net-vpn/frp-0.34.3
 2012150509 metadata/md5-cache/net-vpn/tailscale-1.2.10
-2012170251 metadata/md5-cache/net-vpn/Manifest.gz
 2012170251 metadata/md5-cache/net-vpn/badvpn-1.999.127
 2012170251 metadata/md5-cache/net-vpn/badvpn-1.999.129
 2012170251 metadata/md5-cache/net-vpn/badvpn-1.999.130
@@ -53932,7 +53981,6 @@
 2012170019 metadata/md5-cache/net-vpn/pptpd-1.4.0-r3
 2012170251 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.0
 2012170251 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2
-2012160739 metadata/md5-cache/net-vpn/tailscale-1.2.10-r1
 2012162341 metadata/md5-cache/net-vpn/tinc-1.1_pre17-r1
 2012170019 metadata/md5-cache/net-vpn/tor-0.4.4.6
 2012170019 metadata/md5-cache/net-vpn/tor-0.4.5.2_alpha
@@ -53940,6 +53988,8 @@
 2012170251 metadata/md5-cache/net-vpn/wireguard-modules-1.0.20201112
 2012170251 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
 2012170251 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200827
+2012202239 metadata/md5-cache/net-vpn/Manifest.gz
+2012202239 metadata/md5-cache/net-vpn/tailscale-1.2.10-r1
 1808170009 metadata/md5-cache/net-wireless/bladerf-firmware-2.2.0
 1808170009 metadata/md5-cache/net-wireless/bladerf-fpga-0.7.3
 1909122209 metadata/md5-cache/net-wireless/gr-scan-20160211
@@ -53996,27 +54046,17 @@
 2012170019 metadata/md5-cache/net-wireless/dump1090-9999
 2012170019 metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.1
 2012170019 metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.3
-2012170251 metadata/md5-cache/net-wireless/gqrx-9999
 2012170019 metadata/md5-cache/net-wireless/gqrx-scanner-1.0.1_p20190329
-2012170019 metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20191006
-2012170019 metadata/md5-cache/net-wireless/gr-ieee802154-9999
-2012170251 metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r1
-2012170251 metadata/md5-cache/net-wireless/gr-iio-9999
 2012170251 metadata/md5-cache/net-wireless/gr-iqbal-0.38.1
 2012170251 metadata/md5-cache/net-wireless/gr-iqbal-9999
 2012170251 metadata/md5-cache/net-wireless/gr-m2k-9999
 2012170019 metadata/md5-cache/net-wireless/gr-osmosdr-0.2.0
-2012170251 metadata/md5-cache/net-wireless/gr-osmosdr-0.2.2
-2012170251 metadata/md5-cache/net-wireless/gr-osmosdr-9999
-2012170019 metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517
-2012170019 metadata/md5-cache/net-wireless/gr-paint-9999
 2012170251 metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807
 2012170251 metadata/md5-cache/net-wireless/gr-rds-9999
 2012170251 metadata/md5-cache/net-wireless/gr-scopy-0.0_p20201005
 2012170251 metadata/md5-cache/net-wireless/gr-scopy-9999
 2012170251 metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r2
 2012170251 metadata/md5-cache/net-wireless/hackrf-tools-9999
-2012160540 metadata/md5-cache/net-wireless/hostapd-2.9-r1
 2012160540 metadata/md5-cache/net-wireless/hostapd-2.9-r3
 2012160540 metadata/md5-cache/net-wireless/hostapd-9999
 2012170251 metadata/md5-cache/net-wireless/inspectrum-0.2.3
@@ -54028,7 +54068,6 @@
 2012170251 metadata/md5-cache/net-wireless/iwd-9999
 2012170251 metadata/md5-cache/net-wireless/jackit-0.0_p20170918-r1
 2012170019 metadata/md5-cache/net-wireless/kismet-2020.09.4
-2012170019 metadata/md5-cache/net-wireless/kismet-2020.12.2
 2012170019 metadata/md5-cache/net-wireless/kismet-9999
 2012170251 metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
 2012170251 metadata/md5-cache/net-wireless/kismet-rest-9999
@@ -54057,7 +54096,6 @@
 2012170251 metadata/md5-cache/net-wireless/rtl_433-9999
 2012170019 metadata/md5-cache/net-wireless/rtl_power_fftw-0.0_p20180528
 2012170019 metadata/md5-cache/net-wireless/rtl_power_fftw-9999
-2012170251 metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
 2012170251 metadata/md5-cache/net-wireless/sigdigger-0.1.0
 2012170251 metadata/md5-cache/net-wireless/sigutils-0.1.0-r1
 2012170251 metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
@@ -54102,58 +54140,79 @@
 2012170251 metadata/md5-cache/net-wireless/wpa_supplicant-9999
 2012162341 metadata/md5-cache/net-wireless/yatebts-6.0.0-r1
 2012170251 metadata/md5-cache/net-wireless/yatebts-9999
-2012172009 metadata/md5-cache/net-wireless/Manifest.gz
-2012172009 metadata/md5-cache/net-wireless/gnuradio-3.8.2.0
 2012172009 metadata/md5-cache/net-wireless/gnuradio-9999
-2012171909 metadata/md5-cache/net-wireless/gqrx-2.14.3
-2012171739 metadata/md5-cache/net-wireless/unifi-6.0.43
+2012210839 metadata/md5-cache/net-wireless/Manifest.gz
+2012182309 metadata/md5-cache/net-wireless/gnuradio-3.8.2.0-r1
+2012182309 metadata/md5-cache/net-wireless/gqrx-2.14.3-r1
+2012182309 metadata/md5-cache/net-wireless/gqrx-9999
+2012182309 metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20191006-r1
+2012182309 metadata/md5-cache/net-wireless/gr-ieee802154-9999
+2012182309 metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r2
+2012182309 metadata/md5-cache/net-wireless/gr-iio-9999
+2012182339 metadata/md5-cache/net-wireless/gr-osmosdr-0.2.3
+2012182309 metadata/md5-cache/net-wireless/gr-osmosdr-9999
+2012182309 metadata/md5-cache/net-wireless/gr-paint-0.0_p20200517-r1
+2012182309 metadata/md5-cache/net-wireless/gr-paint-9999
+2012202039 metadata/md5-cache/net-wireless/kismet-2020.12.2
+2012182309 metadata/md5-cache/net-wireless/liblms7002m-0.0_p20200518
+2012182309 metadata/md5-cache/net-wireless/liblms7002m-9999
+2012182309 metadata/md5-cache/net-wireless/libusb3380-0.0_p20190125
+2012182309 metadata/md5-cache/net-wireless/libusb3380-9999
+2012182309 metadata/md5-cache/net-wireless/libxtrx-0.0_p20201202
+2012182309 metadata/md5-cache/net-wireless/libxtrx-9999
+2012182309 metadata/md5-cache/net-wireless/libxtrxdsp-0.0_p20200830
+2012182309 metadata/md5-cache/net-wireless/libxtrxdsp-9999
+2012182309 metadata/md5-cache/net-wireless/libxtrxll-0.0_p20201202
+2012182309 metadata/md5-cache/net-wireless/libxtrxll-9999
+2012210839 metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
+2012201909 metadata/md5-cache/net-wireless/unifi-6.0.43
 2012162341 metadata/md5-cache/perl-core/Archive-Tar-2.300.0
 2012162341 metadata/md5-cache/perl-core/CPAN-Meta-2.150.1
-2012170251 metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
-2012170251 metadata/md5-cache/perl-core/Data-Dumper-2.154.0
-2012170251 metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
-2012170251 metadata/md5-cache/perl-core/Digest-1.170.0-r1
-2012170251 metadata/md5-cache/perl-core/Digest-MD5-2.530.0
-2012170251 metadata/md5-cache/perl-core/Digest-SHA-5.880.0
-2012170251 metadata/md5-cache/perl-core/Dumpvalue-1.170.0
-2012170251 metadata/md5-cache/perl-core/Encode-2.730.0
-2012170251 metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1
 2012170251 metadata/md5-cache/perl-core/ExtUtils-MakeMaker-7.240.0
-2012170251 metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0
 2012162341 metadata/md5-cache/perl-core/File-Path-2.130.0
 2012162341 metadata/md5-cache/perl-core/File-Temp-0.230.900
-2012170251 metadata/md5-cache/perl-core/Getopt-Long-2.420.0
-2012170251 metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
-2012170251 metadata/md5-cache/perl-core/IO-Zlib-1.100.0
 2012162341 metadata/md5-cache/perl-core/JSON-PP-2.273.0
-2012170251 metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1
-2012170251 metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1
-2012170251 metadata/md5-cache/perl-core/Manifest.gz
 2012162341 metadata/md5-cache/perl-core/Math-BigInt-1.999.806
-2012170251 metadata/md5-cache/perl-core/Math-Complex-1.590.0
-2012170251 metadata/md5-cache/perl-core/Memoize-1.30.0-r1
 2012162341 metadata/md5-cache/perl-core/Module-CoreList-5.201.806.260
-2012170251 metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1
-2012170251 metadata/md5-cache/perl-core/Module-Metadata-1.0.26
-2012170251 metadata/md5-cache/perl-core/Params-Check-0.380.0-r1
-2012170251 metadata/md5-cache/perl-core/Pod-Simple-3.280.0
 2012162341 metadata/md5-cache/perl-core/Scalar-List-Utils-1.460.0
-2012170251 metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
-2012170251 metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
-2012170251 metadata/md5-cache/perl-core/Test-1.260.0
 2012162341 metadata/md5-cache/perl-core/Test-Simple-1.302.96
-2012170251 metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1
-2012170251 metadata/md5-cache/perl-core/Text-ParseWords-3.290.0
-2012170251 metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1
-2012170251 metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1
-2012170251 metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1
-2012170251 metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
 2012162341 metadata/md5-cache/perl-core/Unicode-Collate-1.250.0
-2012170251 metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
-2012170251 metadata/md5-cache/perl-core/libnet-1.270.0
-2012170251 metadata/md5-cache/perl-core/parent-0.228-r1
-2012170251 metadata/md5-cache/perl-core/podlators-2.5.3
-2012170251 metadata/md5-cache/perl-core/version-0.990.800
+2012210839 metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
+2012210839 metadata/md5-cache/perl-core/Data-Dumper-2.154.0
+2012210839 metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
+2012210839 metadata/md5-cache/perl-core/Digest-1.170.0-r1
+2012210839 metadata/md5-cache/perl-core/Digest-MD5-2.530.0
+2012210839 metadata/md5-cache/perl-core/Digest-SHA-5.880.0
+2012210839 metadata/md5-cache/perl-core/Dumpvalue-1.170.0
+2012210839 metadata/md5-cache/perl-core/Encode-2.730.0
+2012210839 metadata/md5-cache/perl-core/ExtUtils-Constant-0.230.0-r1
+2012210839 metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0
+2012210839 metadata/md5-cache/perl-core/Getopt-Long-2.420.0
+2012210839 metadata/md5-cache/perl-core/HTTP-Tiny-0.43.0
+2012210839 metadata/md5-cache/perl-core/IO-Zlib-1.100.0
+2012210839 metadata/md5-cache/perl-core/Locale-Maketext-Simple-0.210.0-r1
+2012210839 metadata/md5-cache/perl-core/MIME-Base64-3.140.0-r1
+2012210839 metadata/md5-cache/perl-core/Manifest.gz
+2012210839 metadata/md5-cache/perl-core/Math-Complex-1.590.0
+2012210839 metadata/md5-cache/perl-core/Memoize-1.30.0-r1
+2012210839 metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r1
+2012210839 metadata/md5-cache/perl-core/Module-Metadata-1.0.26
+2012210839 metadata/md5-cache/perl-core/Params-Check-0.380.0-r1
+2012210839 metadata/md5-cache/perl-core/Pod-Simple-3.280.0
+2012210839 metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
+2012210839 metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
+2012210839 metadata/md5-cache/perl-core/Test-1.260.0
+2012210839 metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1
+2012210839 metadata/md5-cache/perl-core/Text-ParseWords-3.290.0
+2012210839 metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1
+2012210839 metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1
+2012210839 metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1
+2012210839 metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
+2012210839 metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
+2012210839 metadata/md5-cache/perl-core/libnet-1.270.0
+2012210839 metadata/md5-cache/perl-core/parent-0.228-r1
+2012210839 metadata/md5-cache/perl-core/podlators-2.5.3
+2012210839 metadata/md5-cache/perl-core/version-0.990.800
 2008171609 metadata/md5-cache/ros-meta/mavros-1.2.0
 2008171609 metadata/md5-cache/ros-meta/mavros-9999
 2010141409 metadata/md5-cache/ros-meta/mavros-1.4.0
@@ -54414,10 +54473,8 @@
 2011252124 metadata/md5-cache/sci-biology/trnascan-se-1.31
 2011252124 metadata/md5-cache/sci-biology/wgs-assembler-7.0-r2
 2012170251 metadata/md5-cache/sci-biology/ApE-2.0.7-r1
-2012170251 metadata/md5-cache/sci-biology/GBrowse-2.48-r1
 2012170251 metadata/md5-cache/sci-biology/HTSeq-0.12.4
 2012170251 metadata/md5-cache/sci-biology/HTSeq-9999
-2012170251 metadata/md5-cache/sci-biology/Manifest.gz
 2012162341 metadata/md5-cache/sci-biology/abyss-2.0.3-r2
 2012170251 metadata/md5-cache/sci-biology/amap-2.2-r3
 2012170251 metadata/md5-cache/sci-biology/bamtools-2.5.1
@@ -54425,17 +54482,12 @@
 2012170251 metadata/md5-cache/sci-biology/bfast-0.7.0a
 2012162341 metadata/md5-cache/sci-biology/biogrep-1.0-r2
 2012170251 metadata/md5-cache/sci-biology/biopandas-0.2.7
-2012170251 metadata/md5-cache/sci-biology/bioperl-1.6.9
-2012170251 metadata/md5-cache/sci-biology/bioperl-db-1.6.9
-2012170251 metadata/md5-cache/sci-biology/bioperl-network-1.6.9
-2012170251 metadata/md5-cache/sci-biology/bioperl-run-1.6.9
 2012170251 metadata/md5-cache/sci-biology/biopython-1.77
 2012170251 metadata/md5-cache/sci-biology/cd-hit-4.6.6
 2012162341 metadata/md5-cache/sci-biology/clustal-omega-1.2.4
 2012170251 metadata/md5-cache/sci-biology/clustalx-2.1-r3
 2012170251 metadata/md5-cache/sci-biology/consed-29
 2012170251 metadata/md5-cache/sci-biology/dialign2-2.2.1
-2012170251 metadata/md5-cache/sci-biology/diya-1.0_rc4
 2012170251 metadata/md5-cache/sci-biology/embassy-cbstools-1.0.0.660
 2012170251 metadata/md5-cache/sci-biology/embassy-clustalomega-1.1.0.660
 2012170251 metadata/md5-cache/sci-biology/embassy-domainatrix-0.1.660
@@ -54501,6 +54553,13 @@
 2012170251 metadata/md5-cache/sci-biology/velvet-1.2.10
 2012170251 metadata/md5-cache/sci-biology/wise-2.4.0_alpha
 2012162341 metadata/md5-cache/sci-biology/yass-1.14-r2
+2012210839 metadata/md5-cache/sci-biology/GBrowse-2.48-r1
+2012210839 metadata/md5-cache/sci-biology/Manifest.gz
+2012210839 metadata/md5-cache/sci-biology/bioperl-1.6.9
+2012210839 metadata/md5-cache/sci-biology/bioperl-db-1.6.9
+2012210839 metadata/md5-cache/sci-biology/bioperl-network-1.6.9
+2012210839 metadata/md5-cache/sci-biology/bioperl-run-1.6.9
+2012210839 metadata/md5-cache/sci-biology/diya-1.0_rc4
 1812231809 metadata/md5-cache/sci-calculators/datamash-1.4
 1909181309 metadata/md5-cache/sci-calculators/datamash-1.5
 1702282330 metadata/md5-cache/sci-calculators/transcalc-0.14-r2
@@ -54554,7 +54613,6 @@
 2011300009 metadata/md5-cache/sci-chemistry/cara-bin-1.8.4-r2
 2012170251 metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0
 2012170251 metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0-r1
-2012170251 metadata/md5-cache/sci-chemistry/Manifest.gz
 2012170251 metadata/md5-cache/sci-chemistry/aqua-3.2-r3
 2012162341 metadata/md5-cache/sci-chemistry/autodock-4.2.6
 2012170019 metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2
@@ -54594,7 +54652,6 @@
 2012170251 metadata/md5-cache/sci-chemistry/nmrglue-0.7
 2012170251 metadata/md5-cache/sci-chemistry/numbat-0.999-r1
 2012170251 metadata/md5-cache/sci-chemistry/openbabel-2.4.1
-2012170251 metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
 2012170251 metadata/md5-cache/sci-chemistry/openbabel-perl-2.4.1
 2012170251 metadata/md5-cache/sci-chemistry/pdbcat-1.3
 2012170251 metadata/md5-cache/sci-chemistry/pdbmat-3.89
@@ -54641,6 +54698,8 @@
 2012170251 metadata/md5-cache/sci-chemistry/votca-xtp-1.6_rc1
 2012170251 metadata/md5-cache/sci-chemistry/votca-xtp-9999
 2012170251 metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1
+2012181409 metadata/md5-cache/sci-chemistry/Manifest.gz
+2012181409 metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
 1702282330 metadata/md5-cache/sci-electronics/espresso-ab-1.0-r1
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 1704192008 metadata/md5-cache/sci-electronics/labone-16.12.42529
@@ -54746,7 +54805,6 @@
 2011252124 metadata/md5-cache/sci-geosciences/mc2bsbh-0.0.9
 2011252124 metadata/md5-cache/sci-geosciences/routino-3.1.1
 2011252124 metadata/md5-cache/sci-geosciences/routino-3.2
-2012170251 metadata/md5-cache/sci-geosciences/Manifest.gz
 2012170251 metadata/md5-cache/sci-geosciences/bt747-2.1.7-r1
 2012170251 metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
 2012170251 metadata/md5-cache/sci-geosciences/congen-1.6.2-r1
@@ -54839,6 +54897,8 @@
 2012170251 metadata/md5-cache/sci-geosciences/viking-1.7
 2012170251 metadata/md5-cache/sci-geosciences/viking-1.7-r1
 2012170251 metadata/md5-cache/sci-geosciences/xtide-2.15.1
+2012211339 metadata/md5-cache/sci-geosciences/Manifest.gz
+2012211339 metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0
 1702282330 metadata/md5-cache/sci-libs/clashscore-db-3.17
 1702282331 metadata/md5-cache/sci-libs/fetk-1.5
 1706010238 metadata/md5-cache/sci-libs/h5part-1.6.6
@@ -54910,10 +54970,8 @@
 2012071839 metadata/md5-cache/sci-libs/btf-1.2.6
 2012071839 metadata/md5-cache/sci-libs/klu-1.3.9
 2012090809 metadata/md5-cache/sci-libs/fplll-5.4.0
-2012092339 metadata/md5-cache/sci-libs/geos-3.9.0
 2012092339 metadata/md5-cache/sci-libs/proj-7.1.1
 2012150209 metadata/md5-cache/sci-libs/cddlib-094m-r1
-2012170251 metadata/md5-cache/sci-libs/Manifest.gz
 2012170251 metadata/md5-cache/sci-libs/ViSP-3.3.0
 2012162341 metadata/md5-cache/sci-libs/adolc-2.7.2
 2012162341 metadata/md5-cache/sci-libs/adolc-9999
@@ -54936,7 +54994,6 @@
 2012170251 metadata/md5-cache/sci-libs/buddy-2.4-r1
 2012170251 metadata/md5-cache/sci-libs/cantera-2.4.0-r4
 2012170251 metadata/md5-cache/sci-libs/cantera-2.4.0-r5
-2012170251 metadata/md5-cache/sci-libs/cartopy-0.18.0
 2012170251 metadata/md5-cache/sci-libs/cbflib-0.9.3.3
 2012162341 metadata/md5-cache/sci-libs/ccfits-2.4-r1
 2012170251 metadata/md5-cache/sci-libs/ccfits-2.5
@@ -55011,7 +55068,6 @@
 2012170251 metadata/md5-cache/sci-libs/getdata-0.9.0-r3
 2012170019 metadata/md5-cache/sci-libs/ginkgo-1.1.1-r1
 2012170019 metadata/md5-cache/sci-libs/ginkgo-9999
-2012170251 metadata/md5-cache/sci-libs/gmsh-4.6.0
 2012170251 metadata/md5-cache/sci-libs/gsl-1.16
 2012170251 metadata/md5-cache/sci-libs/gsl-2.4
 2012170019 metadata/md5-cache/sci-libs/gsl-2.5
@@ -55075,9 +55131,6 @@
 2012162341 metadata/md5-cache/sci-libs/libnova-0.16.0
 2012170251 metadata/md5-cache/sci-libs/liborigin-3.0.0
 2012170251 metadata/md5-cache/sci-libs/libpdb-991112-r1
-2012170251 metadata/md5-cache/sci-libs/libsc-2.0
-2012170019 metadata/md5-cache/sci-libs/libsc-2.2
-2012170251 metadata/md5-cache/sci-libs/libsc-9999
 2012170251 metadata/md5-cache/sci-libs/libsigrok-0.5.2
 2012170251 metadata/md5-cache/sci-libs/libsigrok-0.5.2-r1
 2012170251 metadata/md5-cache/sci-libs/libsigrok-9999
@@ -55156,7 +55209,6 @@
 2012170251 metadata/md5-cache/sci-libs/orocos_kdl-9999
 2012170251 metadata/md5-cache/sci-libs/p4est-2.0
 2012170019 metadata/md5-cache/sci-libs/p4est-2.2
-2012170251 metadata/md5-cache/sci-libs/p4est-9999
 2012170251 metadata/md5-cache/sci-libs/parmetis-4.0.3-r1
 2012170251 metadata/md5-cache/sci-libs/pastix-5.2.2.22-r1
 2012170251 metadata/md5-cache/sci-libs/pastix-5.2.3
@@ -55171,7 +55223,6 @@
 2012170251 metadata/md5-cache/sci-libs/profphd-utils-1.0.10
 2012170251 metadata/md5-cache/sci-libs/profphd-utils-1.0.10-r1
 2012170251 metadata/md5-cache/sci-libs/punc-1.5
-2012170251 metadata/md5-cache/sci-libs/pyshp-2.1.0
 2012170251 metadata/md5-cache/sci-libs/pyshp-2.1.2
 2012170251 metadata/md5-cache/sci-libs/qd-2.3.17
 2012170251 metadata/md5-cache/sci-libs/qd-2.3.22
@@ -55216,12 +55267,9 @@
 2012170251 metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc4
 2012170251 metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
 2012170251 metadata/md5-cache/sci-libs/tensorflow-estimator-2.4.0_rc0
-2012170019 metadata/md5-cache/sci-libs/trilinos-12.14.1
-2012170019 metadata/md5-cache/sci-libs/trilinos-12.18.1
 2012170019 metadata/md5-cache/sci-libs/trilinos-13.0.0
 2012170251 metadata/md5-cache/sci-libs/udunits-2.1.24-r1
 2012170251 metadata/md5-cache/sci-libs/udunits-2.2.20
-2012170251 metadata/md5-cache/sci-libs/volk-2.3.0-r2
 2012170251 metadata/md5-cache/sci-libs/voro++-0.4.6-r1
 2012170251 metadata/md5-cache/sci-libs/votca-tools-1.4
 2012170251 metadata/md5-cache/sci-libs/votca-tools-1.4.1
@@ -55242,6 +55290,18 @@
 2012170251 metadata/md5-cache/sci-libs/xkaapi-2.2
 2012170251 metadata/md5-cache/sci-libs/xkaapi-3.0.3
 2012170019 metadata/md5-cache/sci-libs/xylib-1.6
+2012210039 metadata/md5-cache/sci-libs/Manifest.gz
+2012191809 metadata/md5-cache/sci-libs/cartopy-0.18.0
+2012181439 metadata/md5-cache/sci-libs/geos-3.9.0-r2
+2012201809 metadata/md5-cache/sci-libs/gmsh-4.6.0
+2012201639 metadata/md5-cache/sci-libs/libsc-2.0
+2012201639 metadata/md5-cache/sci-libs/libsc-2.2
+2012201639 metadata/md5-cache/sci-libs/libsc-2.2-r100
+2012201639 metadata/md5-cache/sci-libs/libsc-9999
+2012201639 metadata/md5-cache/sci-libs/p4est-2.2-r100
+2012201639 metadata/md5-cache/sci-libs/p4est-9999
+2012210039 metadata/md5-cache/sci-libs/trilinos-13.0.1
+2012182309 metadata/md5-cache/sci-libs/volk-2.4.1
 1909120939 metadata/md5-cache/sci-mathematics/alt-ergo-1.30
 1907310209 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
 1912080309 metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
@@ -55277,11 +55337,6 @@
 2012170251 metadata/md5-cache/sci-mathematics/4ti2-1.6.2
 2012170251 metadata/md5-cache/sci-mathematics/4ti2-1.6.6
 2012162341 metadata/md5-cache/sci-mathematics/4ti2-1.6.7
-2012171039 metadata/md5-cache/sci-mathematics/Manifest.gz
-2012171039 metadata/md5-cache/sci-mathematics/agda-2.6.1.2
-2012170251 metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2
-2012170251 metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2-r2
-2012171039 metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
 2012170019 metadata/md5-cache/sci-mathematics/arb-2.18.1
 2012170251 metadata/md5-cache/sci-mathematics/calc-2.12.4.13-r1
 2012170251 metadata/md5-cache/sci-mathematics/cgal-4.11.3
@@ -55386,6 +55441,12 @@
 2012170251 metadata/md5-cache/sci-mathematics/yafu-1.34.3
 2012170251 metadata/md5-cache/sci-mathematics/yafu-9999
 2012170251 metadata/md5-cache/sci-mathematics/z3-4.8.9
+2012210239 metadata/md5-cache/sci-mathematics/Manifest.gz
+2012210239 metadata/md5-cache/sci-mathematics/agda-2.6.1.2
+2012210239 metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2
+2012210239 metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2-r2
+2012210239 metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
+2012190209 metadata/md5-cache/sci-mathematics/flint-2.7.0
 1908291909 metadata/md5-cache/sci-misc/ViSP-images-3.2.0
 1702282331 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
 2005151939 metadata/md5-cache/sci-misc/ViSP-images-3.3.0
@@ -55521,8 +55582,6 @@
 2012162341 metadata/md5-cache/sci-visualization/opendx-samples-4.4.0-r2
 2012170251 metadata/md5-cache/sci-visualization/paraview-5.8.0-r3
 2012170251 metadata/md5-cache/sci-visualization/paraview-5.8.1
-2012162341 metadata/md5-cache/sci-visualization/pythonprop-0.29
-2012162341 metadata/md5-cache/sci-visualization/pythonprop-0.30
 2012170251 metadata/md5-cache/sci-visualization/quickplot-0.10.6
 2012170251 metadata/md5-cache/sci-visualization/quickplot-0.10.8
 2012170251 metadata/md5-cache/sci-visualization/quickplot-1.0.1_rc
@@ -55534,8 +55593,9 @@
 2012162341 metadata/md5-cache/sci-visualization/xgraph-12.1-r4
 2012170251 metadata/md5-cache/sci-visualization/xyscan-4.3.0
 2012170251 metadata/md5-cache/sci-visualization/zhu3d-4.2.6-r1
-2012171609 metadata/md5-cache/sci-visualization/Manifest.gz
-2012171609 metadata/md5-cache/sci-visualization/gnuplot-5.2.8-r1
+2012211309 metadata/md5-cache/sci-visualization/Manifest.gz
+2012211309 metadata/md5-cache/sci-visualization/gnuplot-5.2.8-r1
+2012191809 metadata/md5-cache/sci-visualization/pythonprop-0.30
 2003191139 metadata/md5-cache/sec-policy/apparmor-profiles-2.13.4
 2010101309 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0
 2010120609 metadata/md5-cache/sec-policy/selinux-base-policy-2.20190609-r1
@@ -56313,7 +56373,6 @@
 2012081009 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.1
 1910170740 metadata/md5-cache/sys-apps/ack-3.0.0
 1704141039 metadata/md5-cache/sys-apps/aix-miscutils-0.1.1671
-1910111911 metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1
 1712021939 metadata/md5-cache/sys-apps/byld-1.0.3
 1907281509 metadata/md5-cache/sys-apps/ckbcomp-1.164
 1711271440 metadata/md5-cache/sys-apps/clrngd-1.0.3
@@ -56329,7 +56388,6 @@
 1909270009 metadata/md5-cache/sys-apps/inxi-3.0.36.1
 1711271440 metadata/md5-cache/sys-apps/lssbus-0.1
 1910111911 metadata/md5-cache/sys-apps/most-5.1.0
-1910051539 metadata/md5-cache/sys-apps/mouseemu-0.12
 1706100039 metadata/md5-cache/sys-apps/noexec-1.1.0-r1
 1801130140 metadata/md5-cache/sys-apps/readahead-list-1.20060421.1016-r3
 1810090339 metadata/md5-cache/sys-apps/s6-2.7.2.1
@@ -56345,7 +56403,6 @@
 1906221109 metadata/md5-cache/sys-apps/s6-portable-utils-2.2.1.3
 1810090339 metadata/md5-cache/sys-apps/s6-rc-0.4.1.0
 1906221109 metadata/md5-cache/sys-apps/s6-rc-0.5.0.0
-1908101709 metadata/md5-cache/sys-apps/servicelog-1.1.14
 1901201539 metadata/md5-cache/sys-apps/stroke-0.1.3-r1
 1712021939 metadata/md5-cache/sys-apps/syscriptor-1.5.15
 1910111911 metadata/md5-cache/sys-apps/xmbmon-2.0.5-r1
@@ -56388,7 +56445,6 @@
 2008081739 metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57-r2
 2008131609 metadata/md5-cache/sys-apps/man-pages-5.07
 2008160409 metadata/md5-cache/sys-apps/logwatch-7.5.3
-2008160409 metadata/md5-cache/sys-apps/logwatch-7.5.4
 2008201839 metadata/md5-cache/sys-apps/cciss_vol_status-1.12a
 2008302139 metadata/md5-cache/sys-apps/osinfo-db-20200529
 2008310109 metadata/md5-cache/sys-apps/yarn-1.22.5
@@ -56494,7 +56550,6 @@
 2011252124 metadata/md5-cache/sys-apps/minijail-12
 2011252124 metadata/md5-cache/sys-apps/minijail-9
 2011252124 metadata/md5-cache/sys-apps/minised-1.15
-2011252124 metadata/md5-cache/sys-apps/moreutils-0.63
 2011252124 metadata/md5-cache/sys-apps/nawk-20121220-r3
 2011252124 metadata/md5-cache/sys-apps/nawk-20180827
 2011252124 metadata/md5-cache/sys-apps/netkit-base-0.17-r9
@@ -56503,9 +56558,7 @@
 2011252124 metadata/md5-cache/sys-apps/nvme-cli-1.11.1
 2011252124 metadata/md5-cache/sys-apps/nvme-cli-1.9-r3
 2011252124 metadata/md5-cache/sys-apps/onerng-3.6-r3
-2011252124 metadata/md5-cache/sys-apps/opal-utils-6.5.2
 2011252124 metadata/md5-cache/sys-apps/opal-utils-6.6.2
-2011252124 metadata/md5-cache/sys-apps/opal-utils-6.7
 2011252124 metadata/md5-cache/sys-apps/osinfo-db-tools-1.8.0
 2011252124 metadata/md5-cache/sys-apps/paxctld-1.2.3
 2011252124 metadata/md5-cache/sys-apps/paxctld-1.2.5
@@ -56555,7 +56608,6 @@
 2012030639 metadata/md5-cache/sys-apps/semodule-utils-3.1
 2012031239 metadata/md5-cache/sys-apps/apparmor-utils-3.0.0-r1
 2012041739 metadata/md5-cache/sys-apps/gentoo-systemd-integration-8
-2012081109 metadata/md5-cache/sys-apps/ack-3.4.0
 2012081009 metadata/md5-cache/sys-apps/apparmor-3.0.1
 2012081009 metadata/md5-cache/sys-apps/apparmor-utils-3.0.1
 2012072109 metadata/md5-cache/sys-apps/hwids-20200813.1
@@ -56571,9 +56623,7 @@
 2012170019 metadata/md5-cache/sys-apps/agedu-20200705
 2012170251 metadata/md5-cache/sys-apps/apmd-3.2.2_p14-r1
 2012162341 metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
-2012170251 metadata/md5-cache/sys-apps/attr-2.4.48-r3
 2012170019 metadata/md5-cache/sys-apps/attr-2.4.48-r4
-2012170019 metadata/md5-cache/sys-apps/attr-9999
 2012170251 metadata/md5-cache/sys-apps/baobab-3.34.1
 2012162341 metadata/md5-cache/sys-apps/bar-1.11.1
 2012170251 metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
@@ -56680,14 +56730,11 @@
 2012170251 metadata/md5-cache/sys-apps/hponcfg-4.6.0.0
 2012170251 metadata/md5-cache/sys-apps/hponcfg-5.4.0.0
 2012170251 metadata/md5-cache/sys-apps/hponcfg-5.5.0.0
-2012170251 metadata/md5-cache/sys-apps/hwdata-gentoo-0.4
 2012170251 metadata/md5-cache/sys-apps/hwinfo-21.23
 2012170251 metadata/md5-cache/sys-apps/hwinfo-21.4
 2012170251 metadata/md5-cache/sys-apps/hwloc-1.11.13
 2012170251 metadata/md5-cache/sys-apps/hwloc-2.3.0
-2012170251 metadata/md5-cache/sys-apps/hwsetup-1.2-r3
 2012170251 metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
-2012170251 metadata/md5-cache/sys-apps/i2c-tools-4.2
 2012162341 metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.3.8-r1
 2012162341 metadata/md5-cache/sys-apps/ibm-powerpc-utils-99999
 2012170251 metadata/md5-cache/sys-apps/input-utils-1.2
@@ -56713,7 +56760,6 @@
 2012162341 metadata/md5-cache/sys-apps/irqbalance-1.6.0-r1
 2012162341 metadata/md5-cache/sys-apps/irqbalance-1.7.0
 2012170019 metadata/md5-cache/sys-apps/kbd-2.2.0-r2
-2012170019 metadata/md5-cache/sys-apps/kbd-2.3.0-r1
 2012170019 metadata/md5-cache/sys-apps/kbd-2.4.0
 2012170019 metadata/md5-cache/sys-apps/kbd-9999
 2012170251 metadata/md5-cache/sys-apps/kcheck-0.0.2-r1
@@ -56732,12 +56778,9 @@
 2012170251 metadata/md5-cache/sys-apps/lnxhc-1.2-r1
 2012170251 metadata/md5-cache/sys-apps/lsb-release-1.4-r3
 2012170251 metadata/md5-cache/sys-apps/lsd-0.16.0
-2012170251 metadata/md5-cache/sys-apps/lsd-0.17.0
-2012170251 metadata/md5-cache/sys-apps/lsd-0.18.0
 2012170251 metadata/md5-cache/sys-apps/lshw-02.18b
 2012170251 metadata/md5-cache/sys-apps/lshw-02.18b-r1
 2012162341 metadata/md5-cache/sys-apps/lsvpd-1.7.10
-2012162341 metadata/md5-cache/sys-apps/lsvpd-1.7.11
 2012170251 metadata/md5-cache/sys-apps/makedev-3.23.1-r1
 2012162341 metadata/md5-cache/sys-apps/man-db-9999
 2012170251 metadata/md5-cache/sys-apps/man-pages-posix-2013a
@@ -56784,7 +56827,6 @@
 2012170251 metadata/md5-cache/sys-apps/portage-3.0.12
 2012170251 metadata/md5-cache/sys-apps/portage-3.0.4-r1
 2012170251 metadata/md5-cache/sys-apps/portage-3.0.8
-2012170251 metadata/md5-cache/sys-apps/portage-3.0.9
 2012170251 metadata/md5-cache/sys-apps/portage-9999
 2012162341 metadata/md5-cache/sys-apps/prctl-1.6-r1
 2012162341 metadata/md5-cache/sys-apps/preload-0.6.4-r3
@@ -56883,11 +56925,24 @@
 2012170251 metadata/md5-cache/sys-apps/xinetd-2.3.15.4
 2012170251 metadata/md5-cache/sys-apps/zorroutils-0.04
 2012170019 metadata/md5-cache/sys-apps/zorroutils-0.05
-2012180639 metadata/md5-cache/sys-apps/Manifest.gz
 2012172239 metadata/md5-cache/sys-apps/ethtool-5.10
 2012172309 metadata/md5-cache/sys-apps/fwupd-1.5.4
 2012172109 metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100
 2012171939 metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100
+2012210510 metadata/md5-cache/sys-apps/Manifest.gz
+2012192309 metadata/md5-cache/sys-apps/ack-3.4.0
+2012201939 metadata/md5-cache/sys-apps/attr-2.4.48-r5
+2012201939 metadata/md5-cache/sys-apps/attr-9999
+2012182339 metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1
+2012191409 metadata/md5-cache/sys-apps/fd-8.2.1
+2012181139 metadata/md5-cache/sys-apps/i2c-tools-4.2
+2012210510 metadata/md5-cache/sys-apps/kbd-2.3.0-r1
+2012200009 metadata/md5-cache/sys-apps/kexec-tools-2.0.21
+2012210510 metadata/md5-cache/sys-apps/logwatch-7.5.4
+2012190039 metadata/md5-cache/sys-apps/lsd-0.19.0
+2012181339 metadata/md5-cache/sys-apps/lsvpd-1.7.11
+2012181339 metadata/md5-cache/sys-apps/opal-utils-6.7
+2012181739 metadata/md5-cache/sys-apps/portage-3.0.9
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 2009131039 metadata/md5-cache/sys-auth/nss-myhostname-0.3-r1
 2009141809 metadata/md5-cache/sys-auth/docker_auth-1.5.0
@@ -56928,7 +56983,6 @@
 2012170251 metadata/md5-cache/sys-auth/google-authenticator-wrappers-2
 2012170251 metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
 2012170251 metadata/md5-cache/sys-auth/keystone-17.0.0
-2012170251 metadata/md5-cache/sys-auth/keystone-18.0.0
 2012170251 metadata/md5-cache/sys-auth/keystone-2020.1.9999
 2012170251 metadata/md5-cache/sys-auth/keystone-2020.2.9999
 2012162341 metadata/md5-cache/sys-auth/libnss-compat-1.2
@@ -56942,13 +56996,11 @@
 2012170019 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
 2012170251 metadata/md5-cache/sys-auth/nss_ldap-265-r5
 2012170251 metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
-2012170251 metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2
 2012162341 metadata/md5-cache/sys-auth/pam-script-1.1.8
 2012162341 metadata/md5-cache/sys-auth/pam-script-1.1.9
 2012170019 metadata/md5-cache/sys-auth/pam_blue-0.9.0-r1
 2012170019 metadata/md5-cache/sys-auth/pam_dotfile-0.7-r2
 2012170251 metadata/md5-cache/sys-auth/pam_fprint-0.2-r1
-2012170251 metadata/md5-cache/sys-auth/pam_ldap-186-r1
 2012170019 metadata/md5-cache/sys-auth/pam_mktemp-1.1.1
 2012170251 metadata/md5-cache/sys-auth/pam_mysql-0.8.1-r1
 2012170019 metadata/md5-cache/sys-auth/pam_p11-0.3.1
@@ -56979,8 +57031,11 @@
 2012162341 metadata/md5-cache/sys-auth/ykpers-1.20.0
 2012170251 metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1-r2
 2012170251 metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25
-2012171609 metadata/md5-cache/sys-auth/Manifest.gz
 2012171609 metadata/md5-cache/sys-auth/pam_abl-0.6.0
+2012200109 metadata/md5-cache/sys-auth/Manifest.gz
+2012200109 metadata/md5-cache/sys-auth/keystone-18.0.0
+2012191809 metadata/md5-cache/sys-auth/pam-pgsql-0.7.3.2
+2012191839 metadata/md5-cache/sys-auth/pam_ldap-186-r1
 1910191339 metadata/md5-cache/sys-block/devio-1.2
 1911072009 metadata/md5-cache/sys-block/endpoint-0.1.0-r1
 1702282333 metadata/md5-cache/sys-block/flashbench-20120606
@@ -57038,14 +57093,12 @@
 2011252124 metadata/md5-cache/sys-block/ms-sys-2.6.0
 2011252124 metadata/md5-cache/sys-block/ms-sys-2.7.0
 2011252124 metadata/md5-cache/sys-block/sedutil-1.15
-2011252124 metadata/md5-cache/sys-block/storcli-7.1410
 2011252124 metadata/md5-cache/sys-block/vblade-24
 2011252124 metadata/md5-cache/sys-block/whdd-3.0
 2011252124 metadata/md5-cache/sys-block/whdd-9999
 2011252124 metadata/md5-cache/sys-block/zram-init-8.1
 2011252124 metadata/md5-cache/sys-block/zram-init-8.1-r1
 2012081509 metadata/md5-cache/sys-block/whdd-3.0.1
-2012170251 metadata/md5-cache/sys-block/Manifest.gz
 2012170251 metadata/md5-cache/sys-block/aoetools-36
 2012170251 metadata/md5-cache/sys-block/blktrace-1.1.0
 2012170251 metadata/md5-cache/sys-block/blktrace-1.1.0-r1
@@ -57097,12 +57150,13 @@
 2012170019 metadata/md5-cache/sys-block/thin-provisioning-tools-0.9.0
 2012170019 metadata/md5-cache/sys-block/thin-provisioning-tools-9999
 2012170251 metadata/md5-cache/sys-block/whdd-2.2
-1907151840 metadata/md5-cache/sys-boot/bootcreator-1.1
+2012210309 metadata/md5-cache/sys-block/Manifest.gz
+2012210309 metadata/md5-cache/sys-block/storcli-7.1410
+2012210309 metadata/md5-cache/sys-block/storcli-7.1508
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.2
 1911100139 metadata/md5-cache/sys-boot/makebootfat-1.4
 1910191339 metadata/md5-cache/sys-boot/nettrom-2.3.3
 1912110241 metadata/md5-cache/sys-boot/mbr-1.1.11-r1
-2002130739 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20190925
 2002230040 metadata/md5-cache/sys-boot/cromwell-bin-2.40-r1
 2006061709 metadata/md5-cache/sys-boot/plymouth-openrc-plugin-0.1.3
 2010150109 metadata/md5-cache/sys-boot/yaboot-static-1.3.17-r2
@@ -57114,7 +57168,6 @@
 2011252124 metadata/md5-cache/sys-boot/netboot-0.10.2-r2
 2011252124 metadata/md5-cache/sys-boot/os-prober-1.77
 2011252124 metadata/md5-cache/sys-boot/palo-2.12-r1
-2011252124 metadata/md5-cache/sys-boot/palo-2.13
 2011252124 metadata/md5-cache/sys-boot/palo-2.14
 2011252124 metadata/md5-cache/sys-boot/palo-9999
 2011252124 metadata/md5-cache/sys-boot/refind-0.11.4
@@ -57124,7 +57177,6 @@
 2012071109 metadata/md5-cache/sys-boot/refind-0.12.0-r1
 2012120139 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20201022
 2012120039 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20201201
-2012170409 metadata/md5-cache/sys-boot/Manifest.gz
 2012170019 metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3
 2012170251 metadata/md5-cache/sys-boot/colo-1.22
 2012170019 metadata/md5-cache/sys-boot/cromwell-2.40-r3
@@ -57145,7 +57197,6 @@
 2012170019 metadata/md5-cache/sys-boot/plymouth-0.9.5-r1
 2012170019 metadata/md5-cache/sys-boot/plymouth-9999
 2012170251 metadata/md5-cache/sys-boot/shim-15.5-r1
-2012170251 metadata/md5-cache/sys-boot/silo-1.4.14_p20120819-r1
 2012170251 metadata/md5-cache/sys-boot/silo-1.4.14_p20170829
 2012170019 metadata/md5-cache/sys-boot/silo-1.4.14_p20200602
 2012170251 metadata/md5-cache/sys-boot/syslinux-6.04_pre1
@@ -57155,6 +57206,7 @@
 2012170251 metadata/md5-cache/sys-boot/vboot-utils-72_p20181229-r1
 2012170019 metadata/md5-cache/sys-boot/woeusb-3.3.1
 2012170019 metadata/md5-cache/sys-boot/yaboot-1.3.17-r4
+2012200939 metadata/md5-cache/sys-boot/Manifest.gz
 1905311709 metadata/md5-cache/sys-cluster/ganglia-web-3.7.3-r1
 1712240039 metadata/md5-cache/sys-cluster/native-mpi-0
 1911101439 metadata/md5-cache/sys-cluster/onesis-2.0.2
@@ -57176,36 +57228,18 @@
 2010071939 metadata/md5-cache/sys-cluster/kube-router-1.1.0
 2010190239 metadata/md5-cache/sys-cluster/openstack-meta-2020.2.0
 2010190239 metadata/md5-cache/sys-cluster/openstack-meta-2020.2.9999
-2010260639 metadata/md5-cache/sys-cluster/kube-apiserver-1.17.13
-2010260639 metadata/md5-cache/sys-cluster/kube-controller-manager-1.17.13
 2010260639 metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.10
 2010260639 metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.3
-2010260639 metadata/md5-cache/sys-cluster/kube-proxy-1.17.13
 2010260639 metadata/md5-cache/sys-cluster/kube-proxy-1.18.10
 2010260639 metadata/md5-cache/sys-cluster/kube-proxy-1.19.3
-2010260639 metadata/md5-cache/sys-cluster/kube-scheduler-1.17.13
 2010260639 metadata/md5-cache/sys-cluster/kube-scheduler-1.18.10
 2010260639 metadata/md5-cache/sys-cluster/kube-scheduler-1.19.3
 2010260809 metadata/md5-cache/sys-cluster/minikube-1.10.1
 2010260809 metadata/md5-cache/sys-cluster/minikube-1.11.0
 2011110239 metadata/md5-cache/sys-cluster/openstack-meta-2020.1.1
-2011230539 metadata/md5-cache/sys-cluster/kube-apiserver-1.17.14
-2011230539 metadata/md5-cache/sys-cluster/kube-controller-manager-1.17.14
-2011230539 metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.12
-2011230539 metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.4
-2011230539 metadata/md5-cache/sys-cluster/kube-proxy-1.17.14
-2011230539 metadata/md5-cache/sys-cluster/kube-proxy-1.18.12
-2011230539 metadata/md5-cache/sys-cluster/kube-proxy-1.19.4
-2011230539 metadata/md5-cache/sys-cluster/kube-scheduler-1.17.14
-2011230539 metadata/md5-cache/sys-cluster/kube-scheduler-1.18.12
-2011230539 metadata/md5-cache/sys-cluster/kube-scheduler-1.19.4
 2011252124 metadata/md5-cache/sys-cluster/hpl-2.0-r4
-2011252124 metadata/md5-cache/sys-cluster/kubelet-1.17.13
-2011252124 metadata/md5-cache/sys-cluster/kubelet-1.17.14
 2011252124 metadata/md5-cache/sys-cluster/kubelet-1.18.10
-2011252124 metadata/md5-cache/sys-cluster/kubelet-1.18.12
 2011252124 metadata/md5-cache/sys-cluster/kubelet-1.19.3
-2011252124 metadata/md5-cache/sys-cluster/kubelet-1.19.4
 2011252124 metadata/md5-cache/sys-cluster/nomad-0.12.3
 2011252124 metadata/md5-cache/sys-cluster/nomad-0.12.4
 2011252124 metadata/md5-cache/sys-cluster/nomad-0.12.5
@@ -57230,7 +57264,6 @@
 2012170251 metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
 2012170251 metadata/md5-cache/sys-cluster/cinder-16.2.0
 2012170251 metadata/md5-cache/sys-cluster/cinder-16.2.1
-2012170251 metadata/md5-cache/sys-cluster/cinder-17.0.1
 2012170251 metadata/md5-cache/sys-cluster/cinder-2020.1.9999
 2012170251 metadata/md5-cache/sys-cluster/cinder-2020.2.9999
 2012162341 metadata/md5-cache/sys-cluster/classads-1.0.10
@@ -57265,7 +57298,6 @@
 2012170019 metadata/md5-cache/sys-cluster/glusterfs-7.8-r1
 2012170019 metadata/md5-cache/sys-cluster/glusterfs-9999
 2012170251 metadata/md5-cache/sys-cluster/heat-14.1.0
-2012170251 metadata/md5-cache/sys-cluster/heat-15.0.0
 2012170251 metadata/md5-cache/sys-cluster/heat-2020.1.9999
 2012170251 metadata/md5-cache/sys-cluster/heat-2020.2.9999
 2012162341 metadata/md5-cache/sys-cluster/hpl-2.3
@@ -57279,25 +57311,15 @@
 2012170251 metadata/md5-cache/sys-cluster/knem-9999
 2012162341 metadata/md5-cache/sys-cluster/kronosnet-1.19
 2012170251 metadata/md5-cache/sys-cluster/kube-apiserver-1.18.10
-2012170251 metadata/md5-cache/sys-cluster/kube-apiserver-1.18.12
 2012170251 metadata/md5-cache/sys-cluster/kube-apiserver-1.19.3
-2012170251 metadata/md5-cache/sys-cluster/kube-apiserver-1.19.4
 2012170251 metadata/md5-cache/sys-cluster/kube-apiserver-1.20.0
 2012152339 metadata/md5-cache/sys-cluster/kube-router-0.4.0
 2012152339 metadata/md5-cache/sys-cluster/kube-router-1.0.1
-2012170251 metadata/md5-cache/sys-cluster/kubeadm-1.17.13
-2012170251 metadata/md5-cache/sys-cluster/kubeadm-1.17.14
 2012170251 metadata/md5-cache/sys-cluster/kubeadm-1.18.10
-2012170251 metadata/md5-cache/sys-cluster/kubeadm-1.18.12
 2012170251 metadata/md5-cache/sys-cluster/kubeadm-1.19.3
-2012170251 metadata/md5-cache/sys-cluster/kubeadm-1.19.4
 2012170251 metadata/md5-cache/sys-cluster/kubeadm-1.20.0
-2012170251 metadata/md5-cache/sys-cluster/kubectl-1.17.13
-2012170251 metadata/md5-cache/sys-cluster/kubectl-1.17.14
 2012170251 metadata/md5-cache/sys-cluster/kubectl-1.18.10
-2012170251 metadata/md5-cache/sys-cluster/kubectl-1.18.12
 2012170251 metadata/md5-cache/sys-cluster/kubectl-1.19.3
-2012170251 metadata/md5-cache/sys-cluster/kubectl-1.19.4
 2012170251 metadata/md5-cache/sys-cluster/kubectl-1.20.0
 2012170251 metadata/md5-cache/sys-cluster/legion-16.08.0-r1
 2012170251 metadata/md5-cache/sys-cluster/legion-16.10.0
@@ -57326,7 +57348,6 @@
 2012170251 metadata/md5-cache/sys-cluster/mpich-3.3-r1
 2012170251 metadata/md5-cache/sys-cluster/mpich2-1.5
 2012170251 metadata/md5-cache/sys-cluster/neutron-16.2.0
-2012170251 metadata/md5-cache/sys-cluster/neutron-17.0.0
 2012170251 metadata/md5-cache/sys-cluster/neutron-2020.1.9999
 2012170251 metadata/md5-cache/sys-cluster/neutron-2020.2.9999
 2012170251 metadata/md5-cache/sys-cluster/nova-2020.1.9999
@@ -57362,7 +57383,6 @@
 2012170251 metadata/md5-cache/sys-cluster/resource-agents-3.9.6
 2012170251 metadata/md5-cache/sys-cluster/resource-agents-4.0.1
 2012170019 metadata/md5-cache/sys-cluster/resource-agents-4.6.1
-2012161439 metadata/md5-cache/sys-cluster/sanlock-3.8.2
 2012170251 metadata/md5-cache/sys-cluster/slurm-20.11.0.1
 2012160540 metadata/md5-cache/sys-cluster/spark-bin-2.4.3
 2012160540 metadata/md5-cache/sys-cluster/spark-bin-2.4.7-r1
@@ -57385,8 +57405,55 @@
 2012152339 metadata/md5-cache/sys-cluster/zetcd-0.0.4
 2012170251 metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13-r1
 2012152339 metadata/md5-cache/sys-cluster/zookeepercli-1.0.12
-2012171709 metadata/md5-cache/sys-cluster/Manifest.gz
 2012171709 metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r100
+2012211309 metadata/md5-cache/sys-cluster/Manifest.gz
+2012200109 metadata/md5-cache/sys-cluster/cinder-17.0.1
+2012200109 metadata/md5-cache/sys-cluster/heat-15.0.0
+2012192309 metadata/md5-cache/sys-cluster/kube-apiserver-1.17.14
+2012200409 metadata/md5-cache/sys-cluster/kube-apiserver-1.18.12
+2012182339 metadata/md5-cache/sys-cluster/kube-apiserver-1.18.14
+2012200409 metadata/md5-cache/sys-cluster/kube-apiserver-1.19.4
+2012182339 metadata/md5-cache/sys-cluster/kube-apiserver-1.19.6
+2012182239 metadata/md5-cache/sys-cluster/kube-apiserver-1.20.1
+2012192309 metadata/md5-cache/sys-cluster/kube-controller-manager-1.17.14
+2012200409 metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.12
+2012182339 metadata/md5-cache/sys-cluster/kube-controller-manager-1.18.14
+2012200409 metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.4
+2012182339 metadata/md5-cache/sys-cluster/kube-controller-manager-1.19.6
+2012182239 metadata/md5-cache/sys-cluster/kube-controller-manager-1.20.1
+2012192309 metadata/md5-cache/sys-cluster/kube-proxy-1.17.14
+2012200409 metadata/md5-cache/sys-cluster/kube-proxy-1.18.12
+2012182339 metadata/md5-cache/sys-cluster/kube-proxy-1.18.14
+2012200409 metadata/md5-cache/sys-cluster/kube-proxy-1.19.4
+2012182339 metadata/md5-cache/sys-cluster/kube-proxy-1.19.6
+2012182239 metadata/md5-cache/sys-cluster/kube-proxy-1.20.1
+2012192239 metadata/md5-cache/sys-cluster/kube-router-1.1.1
+2012192309 metadata/md5-cache/sys-cluster/kube-scheduler-1.17.14
+2012200409 metadata/md5-cache/sys-cluster/kube-scheduler-1.18.12
+2012182339 metadata/md5-cache/sys-cluster/kube-scheduler-1.18.14
+2012200409 metadata/md5-cache/sys-cluster/kube-scheduler-1.19.4
+2012182339 metadata/md5-cache/sys-cluster/kube-scheduler-1.19.6
+2012182239 metadata/md5-cache/sys-cluster/kube-scheduler-1.20.1
+2012192309 metadata/md5-cache/sys-cluster/kubeadm-1.17.14
+2012200409 metadata/md5-cache/sys-cluster/kubeadm-1.18.12
+2012182339 metadata/md5-cache/sys-cluster/kubeadm-1.18.14
+2012200409 metadata/md5-cache/sys-cluster/kubeadm-1.19.4
+2012182339 metadata/md5-cache/sys-cluster/kubeadm-1.19.6
+2012182239 metadata/md5-cache/sys-cluster/kubeadm-1.20.1
+2012192309 metadata/md5-cache/sys-cluster/kubectl-1.17.14
+2012200409 metadata/md5-cache/sys-cluster/kubectl-1.18.12
+2012182339 metadata/md5-cache/sys-cluster/kubectl-1.18.14
+2012200409 metadata/md5-cache/sys-cluster/kubectl-1.19.4
+2012182339 metadata/md5-cache/sys-cluster/kubectl-1.19.6
+2012182239 metadata/md5-cache/sys-cluster/kubectl-1.20.1
+2012192309 metadata/md5-cache/sys-cluster/kubelet-1.17.14
+2012200409 metadata/md5-cache/sys-cluster/kubelet-1.18.12
+2012182339 metadata/md5-cache/sys-cluster/kubelet-1.18.14
+2012200409 metadata/md5-cache/sys-cluster/kubelet-1.19.4
+2012182339 metadata/md5-cache/sys-cluster/kubelet-1.19.6
+2012182239 metadata/md5-cache/sys-cluster/kubelet-1.20.1
+2012200109 metadata/md5-cache/sys-cluster/neutron-17.0.0
+2012211309 metadata/md5-cache/sys-cluster/sanlock-3.8.2
 1910071309 metadata/md5-cache/sys-devel/cons-2.3.0
 1901180209 metadata/md5-cache/sys-devel/slibtool-0.5.28
 1910271939 metadata/md5-cache/sys-devel/ucpp-1.3.4
@@ -57473,7 +57540,6 @@
 2012170019 metadata/md5-cache/sys-devel/binutils-2.35.1
 2012170019 metadata/md5-cache/sys-devel/binutils-2.35.1-r1
 2012170019 metadata/md5-cache/sys-devel/binutils-9999
-2012170251 metadata/md5-cache/sys-devel/binutils-apple-11.3.1
 2012170251 metadata/md5-cache/sys-devel/binutils-apple-3.2
 2012170251 metadata/md5-cache/sys-devel/binutils-apple-3.2.6
 2012170251 metadata/md5-cache/sys-devel/binutils-apple-4.3-r2
@@ -57494,7 +57560,6 @@
 2012170251 metadata/md5-cache/sys-devel/bison-3.1
 2012170019 metadata/md5-cache/sys-devel/bison-3.6.4
 2012170019 metadata/md5-cache/sys-devel/bison-3.7.1-r1
-2012170019 metadata/md5-cache/sys-devel/bison-3.7.3
 2012170019 metadata/md5-cache/sys-devel/bison-3.7.4
 2012170251 metadata/md5-cache/sys-devel/clang-10.0.1
 2012170251 metadata/md5-cache/sys-devel/clang-11.0.0
@@ -57521,7 +57586,6 @@
 2012170019 metadata/md5-cache/sys-devel/gcc-7.5.0-r1
 2012170019 metadata/md5-cache/sys-devel/gcc-8.4.0-r1
 2012170019 metadata/md5-cache/sys-devel/gcc-9.3.0-r1
-2012170019 metadata/md5-cache/sys-devel/gcc-9.3.0-r2
 2012170251 metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
 2012170019 metadata/md5-cache/sys-devel/gdb-10.1
 2012170019 metadata/md5-cache/sys-devel/gdb-9.2
@@ -57557,7 +57621,6 @@
 2012170251 metadata/md5-cache/sys-devel/llvm-roc-3.9.0
 2012170251 metadata/md5-cache/sys-devel/m4-1.4.17
 2012170251 metadata/md5-cache/sys-devel/make-4.2.1-r4
-2012170019 metadata/md5-cache/sys-devel/make-4.3
 2012170251 metadata/md5-cache/sys-devel/native-cctools-4
 2012170251 metadata/md5-cache/sys-devel/native-cctools-5
 2012162341 metadata/md5-cache/sys-devel/parity-9999
@@ -57568,11 +57631,23 @@
 2012170019 metadata/md5-cache/sys-devel/rust-std-1.46.0
 2012170019 metadata/md5-cache/sys-devel/rust-std-1.47.0
 2012170019 metadata/md5-cache/sys-devel/rust-std-1.48.0
-2012170019 metadata/md5-cache/sys-devel/sparse-0.6.1
 2012170019 metadata/md5-cache/sys-devel/sparse-0.6.2
 2012170019 metadata/md5-cache/sys-devel/sparse-9999
-2012172039 metadata/md5-cache/sys-devel/Manifest.gz
 2012172039 metadata/md5-cache/sys-devel/gcc-11.0.0_pre9999
+2012211309 metadata/md5-cache/sys-devel/Manifest.gz
+2012192309 metadata/md5-cache/sys-devel/binutils-apple-11.3.1-r1
+2012211139 metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r100
+2012211309 metadata/md5-cache/sys-devel/bison-3.7.3
+2012191239 metadata/md5-cache/sys-devel/clang-11.0.1_rc2
+2012191239 metadata/md5-cache/sys-devel/clang-common-11.0.1_rc2
+2012191239 metadata/md5-cache/sys-devel/clang-runtime-11.0.1_rc2
+2012190009 metadata/md5-cache/sys-devel/gcc-10.2.0-r4
+2012190039 metadata/md5-cache/sys-devel/gcc-8.4.0-r2
+2012182109 metadata/md5-cache/sys-devel/gcc-9.3.0-r2
+2012191239 metadata/md5-cache/sys-devel/lld-11.0.1_rc2
+2012191239 metadata/md5-cache/sys-devel/llvm-11.0.1_rc2
+2012191239 metadata/md5-cache/sys-devel/llvm-common-11.0.1_rc2
+2012210510 metadata/md5-cache/sys-devel/make-4.3
 2012170251 metadata/md5-cache/sys-fabric/Manifest.gz
 2012170251 metadata/md5-cache/sys-fabric/dapl-2.0.40
 2012170251 metadata/md5-cache/sys-fabric/ibacm-1.0.8
@@ -57632,17 +57707,13 @@
 2011252124 metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1
 2011252124 metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
 2011252124 metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
-2011252124 metadata/md5-cache/sys-firmware/nvidia-firmware-340.32-r1
 2012030239 metadata/md5-cache/sys-firmware/bluez-firmware-1.2
 2012072209 metadata/md5-cache/sys-firmware/b43-firmware-5.100.138
 2012120139 metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p9
 2012150739 metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p10
-2012170251 metadata/md5-cache/sys-firmware/Manifest.gz
 2012170019 metadata/md5-cache/sys-firmware/edk2-ovmf-201905
 2012170019 metadata/md5-cache/sys-firmware/edk2-ovmf-202008
 2012170019 metadata/md5-cache/sys-firmware/edk2-ovmf-999999
-2012170251 metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
-2012170251 metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
 2012170251 metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414
 2012170251 metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414
 2012162341 metadata/md5-cache/sys-firmware/midisport-firmware-1.2-r1
@@ -57653,6 +57724,10 @@
 2012170251 metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1
 2012162341 metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999
 2012170209 metadata/md5-cache/sys-firmware/tt-s2-6400-firmware-0.5.1
+2012210839 metadata/md5-cache/sys-firmware/Manifest.gz
+2012181209 metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
+2012181209 metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
+2012210839 metadata/md5-cache/sys-firmware/nvidia-firmware-340.32-r1
 1812311909 metadata/md5-cache/sys-fs/aufs-headers-4.14_p20180709
 1907071039 metadata/md5-cache/sys-fs/aufs-headers-4.14_p20190603
 1805272138 metadata/md5-cache/sys-fs/autorun-3.17
@@ -57715,7 +57790,6 @@
 2011252124 metadata/md5-cache/sys-fs/davl-1.2.4-r2
 2011252124 metadata/md5-cache/sys-fs/dmg2img-1.6.7
 2011252124 metadata/md5-cache/sys-fs/dmg2img-1.6.7-r1
-2011252124 metadata/md5-cache/sys-fs/duperemove-0.11.1
 2011252124 metadata/md5-cache/sys-fs/e2tools-0.1.0
 2011252124 metadata/md5-cache/sys-fs/fatsort-1.6.3.622
 2011252124 metadata/md5-cache/sys-fs/fuse-common-3.9.1
@@ -57736,7 +57810,6 @@
 2011252124 metadata/md5-cache/sys-fs/nilfs-utils-2.1.6
 2011252124 metadata/md5-cache/sys-fs/nilfs-utils-2.2.2
 2011252124 metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r3
-2011252124 metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5
 2011252124 metadata/md5-cache/sys-fs/quotatool-1.6.2
 2011252124 metadata/md5-cache/sys-fs/reiser4progs-2.0.2
 2011252124 metadata/md5-cache/sys-fs/vzquota-3.1
@@ -57775,8 +57848,6 @@
 2012162341 metadata/md5-cache/sys-fs/cryptsetup-2.3.3
 2012162341 metadata/md5-cache/sys-fs/cryptsetup-2.3.4
 2012170251 metadata/md5-cache/sys-fs/dd-rescue-1.99.8-r1
-2012170251 metadata/md5-cache/sys-fs/ddrescue-1.24
-2012170019 metadata/md5-cache/sys-fs/ddrescue-1.25
 2012170251 metadata/md5-cache/sys-fs/dfc-3.1.1
 2012170019 metadata/md5-cache/sys-fs/dislocker-0.7.1-r2
 2012170251 metadata/md5-cache/sys-fs/dislocker-0.7.1-r3
@@ -57816,9 +57887,7 @@
 2012162341 metadata/md5-cache/sys-fs/inotify-tools-3.20.1
 2012162341 metadata/md5-cache/sys-fs/inotify-tools-3.20.11.0
 2012162341 metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2
-2012170251 metadata/md5-cache/sys-fs/iprutils-2.4.17.1
 2012170251 metadata/md5-cache/sys-fs/iprutils-2.4.18.1
-2012170251 metadata/md5-cache/sys-fs/iprutils-2.4.7
 2012170251 metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1
 2012170019 metadata/md5-cache/sys-fs/jfsutils-1.1.15-r1
 2012162341 metadata/md5-cache/sys-fs/jmtpfs-0.5-r1
@@ -57849,8 +57918,6 @@
 2012162341 metadata/md5-cache/sys-fs/simple-mtpfs-0.4.0
 2012162341 metadata/md5-cache/sys-fs/snapraid-11.4
 2012162341 metadata/md5-cache/sys-fs/snapraid-11.5
-2012170019 metadata/md5-cache/sys-fs/squashfs-tools-4.4
-2012170019 metadata/md5-cache/sys-fs/squashfs-tools-4.4-r1
 2012162341 metadata/md5-cache/sys-fs/squashfs-tools-ng-9999
 2012170251 metadata/md5-cache/sys-fs/squashfuse-0.1.100
 2012170019 metadata/md5-cache/sys-fs/squashfuse-0.1.103
@@ -57871,24 +57938,27 @@
 2012170019 metadata/md5-cache/sys-fs/vhba-20200106-r1
 2012170251 metadata/md5-cache/sys-fs/xfsdump-3.1.8
 2012170019 metadata/md5-cache/sys-fs/xfsdump-3.1.9
-2012170019 metadata/md5-cache/sys-fs/xfsprogs-5.10.0
 2012170019 metadata/md5-cache/sys-fs/xfsprogs-5.4.0-r1
 2012170019 metadata/md5-cache/sys-fs/xfsprogs-5.6.0
 2012170019 metadata/md5-cache/sys-fs/xfsprogs-5.7.0
 2012170019 metadata/md5-cache/sys-fs/xfsprogs-5.8.0
 2012170019 metadata/md5-cache/sys-fs/xfsprogs-5.9.0
-2012170019 metadata/md5-cache/sys-fs/zerofree-1.1.1
 2012170251 metadata/md5-cache/sys-fs/zfs-0.8.5
 2012170251 metadata/md5-cache/sys-fs/zfs-0.8.6
 2012170251 metadata/md5-cache/sys-fs/zfs-2.0.0
 2012170251 metadata/md5-cache/sys-fs/zfs-9999
 2012170019 metadata/md5-cache/sys-fs/zfs-kmod-0.8.5
-2012170019 metadata/md5-cache/sys-fs/zfs-kmod-0.8.6
 2012170019 metadata/md5-cache/sys-fs/zfs-kmod-2.0.0
 2012170019 metadata/md5-cache/sys-fs/zfs-kmod-9999
-2012172009 metadata/md5-cache/sys-fs/Manifest.gz
-2012172009 metadata/md5-cache/sys-fs/duperemove-0.11.2
-2012172009 metadata/md5-cache/sys-fs/squashfs-tools-4.4_p1
+2012210839 metadata/md5-cache/sys-fs/Manifest.gz
+2012210839 metadata/md5-cache/sys-fs/ddrescue-1.24
+2012210839 metadata/md5-cache/sys-fs/ddrescue-1.25
+2012202239 metadata/md5-cache/sys-fs/duperemove-0.11.2
+2012200409 metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5-r1
+2012202239 metadata/md5-cache/sys-fs/squashfs-tools-4.4_p1
+2012182309 metadata/md5-cache/sys-fs/xfsprogs-5.10.0
+2012202339 metadata/md5-cache/sys-fs/zerofree-1.1.1
+2012182309 metadata/md5-cache/sys-fs/zfs-kmod-0.8.6
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-3789.70.16-r5
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-4570.71.2-r5
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-4903.241.1-r5
@@ -57941,7 +58011,6 @@
 2012140439 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.80-r2
 2012142239 metadata/md5-cache/sys-kernel/linux-docs-5.10.0
 2012150639 metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.79_p20201201
-2012170339 metadata/md5-cache/sys-kernel/Manifest.gz
 2012170251 metadata/md5-cache/sys-kernel/aufs-sources-4.14.138
 2012170251 metadata/md5-cache/sys-kernel/aufs-sources-4.14.143
 2012170251 metadata/md5-cache/sys-kernel/aufs-sources-4.14.144
@@ -57982,7 +58051,6 @@
 2012170251 metadata/md5-cache/sys-kernel/cryptodev-1.9-r1
 2012170019 metadata/md5-cache/sys-kernel/cryptodev-9999
 2012170251 metadata/md5-cache/sys-kernel/dracut-050-r2
-2012170251 metadata/md5-cache/sys-kernel/dracut-051
 2012170251 metadata/md5-cache/sys-kernel/dracut-9999
 2012170251 metadata/md5-cache/sys-kernel/genkernel-3.5.3.3
 2012170251 metadata/md5-cache/sys-kernel/genkernel-4.0.10
@@ -58071,7 +58139,6 @@
 2012170251 metadata/md5-cache/sys-kernel/mips-sources-4.14.206
 2012170251 metadata/md5-cache/sys-kernel/mips-sources-4.19.157
 2012170251 metadata/md5-cache/sys-kernel/mips-sources-5.4.77
-2012170251 metadata/md5-cache/sys-kernel/pf-sources-5.10_p1
 2012170251 metadata/md5-cache/sys-kernel/pf-sources-5.7_p7
 2012170251 metadata/md5-cache/sys-kernel/pf-sources-5.8_p7
 2012170251 metadata/md5-cache/sys-kernel/pf-sources-5.9_p1
@@ -58095,22 +58162,9 @@
 2012170251 metadata/md5-cache/sys-kernel/rt-sources-5.4.66_p38
 2012170251 metadata/md5-cache/sys-kernel/rt-sources-5.4.70_p40
 2012170251 metadata/md5-cache/sys-kernel/rt-sources-5.9.1_p20
-2012170309 metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.1
 2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.72
 2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.77
-2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.78
-2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.79
-2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.80
-2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.81
-2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.82
-2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.83
-2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.10
-2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.11
-2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.12
-2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.13
-2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.14
 2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.8
-2012160540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.9
 2012170251 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.212
 2012170251 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.163
 2012170251 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.248
@@ -58121,6 +58175,32 @@
 2012170251 metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
 2012170251 metadata/md5-cache/sys-kernel/zen-sources-5.9.11
 2012170251 metadata/md5-cache/sys-kernel/zen-sources-5.9.13
+2012210339 metadata/md5-cache/sys-kernel/Manifest.gz
+2012202039 metadata/md5-cache/sys-kernel/dracut-051-r1
+2012182239 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.1-r1
+2012191839 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.84
+2012191839 metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.15
+2012182239 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.1-r1
+2012191839 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.84
+2012200339 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.84-r1
+2012191839 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.15
+2012182009 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.1-r1
+2012191039 metadata/md5-cache/sys-kernel/pf-sources-5.10_p1-r1
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.1
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.78
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.79
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.80
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.81
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.82
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.83
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.84
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.10
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.11
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.12
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.13
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.14
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.15
+2012210339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.9
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.6
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.7
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
@@ -58138,7 +58218,6 @@
 2009061139 metadata/md5-cache/sys-libs/freeipmi-1.6.6
 2011252124 metadata/md5-cache/sys-libs/blocksruntime-0_pre20171027-r1
 2011252124 metadata/md5-cache/sys-libs/csu-85-r1
-2011252124 metadata/md5-cache/sys-libs/cygwin-crypt-1.4
 2011252124 metadata/md5-cache/sys-libs/db-1.85-r4
 2011252124 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.5
 2011252124 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.6
@@ -58159,7 +58238,6 @@
 2011252124 metadata/md5-cache/sys-libs/liburing-0.6
 2011252124 metadata/md5-cache/sys-libs/liburing-9999
 2011252124 metadata/md5-cache/sys-libs/libuuid-1.0.3
-2011252124 metadata/md5-cache/sys-libs/libvpd-2.2.6
 2011252124 metadata/md5-cache/sys-libs/lwp-2.8
 2011252124 metadata/md5-cache/sys-libs/musl-nscd-1.0.2
 2011252124 metadata/md5-cache/sys-libs/musl-nscd-9999
@@ -58216,7 +58294,6 @@
 2012170251 metadata/md5-cache/sys-libs/freeipmi-1.5.7
 2012162341 metadata/md5-cache/sys-libs/fts-standalone-1.2.7
 2012170251 metadata/md5-cache/sys-libs/glibc-2.19-r2
-2012170251 metadata/md5-cache/sys-libs/glibc-2.25-r11
 2012170019 metadata/md5-cache/sys-libs/glibc-2.30-r8
 2012170019 metadata/md5-cache/sys-libs/glibc-2.30-r9
 2012170019 metadata/md5-cache/sys-libs/glibc-2.31-r6
@@ -58260,7 +58337,6 @@
 2012162341 metadata/md5-cache/sys-libs/libhx-3.24-r1
 2012162341 metadata/md5-cache/sys-libs/libhx-3.25
 2012162341 metadata/md5-cache/sys-libs/libieee1284-0.2.11-r8
-2012170251 metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
 2012170019 metadata/md5-cache/sys-libs/libnih-1.0.3-r4
 2012170251 metadata/md5-cache/sys-libs/libomp-10.0.1
 2012170251 metadata/md5-cache/sys-libs/libomp-11.0.0
@@ -58310,8 +58386,6 @@
 2012170251 metadata/md5-cache/sys-libs/pam-1.5.1
 2012170251 metadata/md5-cache/sys-libs/pam_wrapper-1.1.3
 2012170251 metadata/md5-cache/sys-libs/pwdb-0.62-r1
-2012170251 metadata/md5-cache/sys-libs/readline-6.3_p8-r3
-2012170251 metadata/md5-cache/sys-libs/readline-7.0_p5-r1
 2012170019 metadata/md5-cache/sys-libs/readline-8.0_p4
 2012170019 metadata/md5-cache/sys-libs/readline-8.1
 2012162341 metadata/md5-cache/sys-libs/rpmatch-standalone-1.0
@@ -58319,7 +58393,6 @@
 2012170251 metadata/md5-cache/sys-libs/suacomp-9999
 2012170251 metadata/md5-cache/sys-libs/tapi-1.30
 2012170251 metadata/md5-cache/sys-libs/tapi-2.0.0
-2012170019 metadata/md5-cache/sys-libs/timezone-data-2020a
 2012170019 metadata/md5-cache/sys-libs/timezone-data-2020d
 2012170251 metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1
 2012170019 metadata/md5-cache/sys-libs/uclibc-ng-1.0.32
@@ -58331,10 +58404,18 @@
 2012170251 metadata/md5-cache/sys-libs/zlib-1.2.11-r2
 2012162341 metadata/md5-cache/sys-libs/zlib-1.2.11-r3
 2012171539 metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
-2012180639 metadata/md5-cache/sys-libs/Manifest.gz
 2012172039 metadata/md5-cache/sys-libs/libunwind-1.4.0
 2012172039 metadata/md5-cache/sys-libs/libunwind-1.5.0
 2012172309 metadata/md5-cache/sys-libs/tevent-0.10.2
+2012210839 metadata/md5-cache/sys-libs/Manifest.gz
+2012191239 metadata/md5-cache/sys-libs/compiler-rt-11.0.1_rc2
+2012191239 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.1_rc2
+2012181739 metadata/md5-cache/sys-libs/cygwin-crypt-1.4
+2012210839 metadata/md5-cache/sys-libs/glibc-2.25-r11
+2012191239 metadata/md5-cache/sys-libs/libcxx-11.0.1_rc2
+2012191239 metadata/md5-cache/sys-libs/libcxxabi-11.0.1_rc2
+2012191239 metadata/md5-cache/sys-libs/libomp-11.0.1_rc2
+2012191239 metadata/md5-cache/sys-libs/llvm-libunwind-11.0.1_rc2
 1902071639 metadata/md5-cache/sys-power/acpi-1.7-r1
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
 1907151840 metadata/md5-cache/sys-power/uhubctl-1.8-r1
@@ -58396,7 +58477,6 @@
 2009141809 metadata/md5-cache/sys-process/ctop-0.7.3
 2009171809 metadata/md5-cache/sys-process/xjobs-20200726
 2009270039 metadata/md5-cache/sys-process/psmisc-23.3-r1
-2011040409 metadata/md5-cache/sys-process/parallel-20200922
 2011061444 metadata/md5-cache/sys-process/cronbase-0.3.7-r6
 2011252124 metadata/md5-cache/sys-process/anacron-2.3-r4
 2011252124 metadata/md5-cache/sys-process/atop-2.3.0-r1
@@ -58421,7 +58501,6 @@
 2011252124 metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
 2011252124 metadata/md5-cache/sys-process/watchpid-0.1-r2
 2011281209 metadata/md5-cache/sys-process/parallel-20201122
-2012170251 metadata/md5-cache/sys-process/Manifest.gz
 2012162341 metadata/md5-cache/sys-process/acct-6.6.4-r1
 2012170019 metadata/md5-cache/sys-process/at-3.1.23
 2012170019 metadata/md5-cache/sys-process/at-3.2.1
@@ -58451,7 +58530,6 @@
 2012170251 metadata/md5-cache/sys-process/glances-3.1.5
 2012170019 metadata/md5-cache/sys-process/gnome-usage-3.32.0
 2012162341 metadata/md5-cache/sys-process/htop-3.0.1
-2012162341 metadata/md5-cache/sys-process/htop-3.0.2
 2012162341 metadata/md5-cache/sys-process/htop-3.0.3
 2012170251 metadata/md5-cache/sys-process/iotop-0.6
 2012170251 metadata/md5-cache/sys-process/latencytop-0.5-r1
@@ -58482,7 +58560,8 @@
 2012162341 metadata/md5-cache/sys-process/unixtop-3.8_beta1-r3
 2012170251 metadata/md5-cache/sys-process/usbtop-0.2
 2012170019 metadata/md5-cache/sys-process/usbtop-1.0
-1910111911 metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
+2012211309 metadata/md5-cache/sys-process/Manifest.gz
+2012211309 metadata/md5-cache/sys-process/htop-3.0.2
 1910111911 metadata/md5-cache/virtual/gnustep-back-0.25.0
 1910111911 metadata/md5-cache/virtual/gnustep-back-0.25.1
 1910111911 metadata/md5-cache/virtual/gnustep-back-0.26.2
@@ -58494,29 +58573,15 @@
 1706251038 metadata/md5-cache/virtual/skkserv-0
 1912222309 metadata/md5-cache/virtual/wine-0-r7
 2003261841 metadata/md5-cache/virtual/service-manager-1
-2004032241 metadata/md5-cache/virtual/cdrtools-0
-2004032241 metadata/md5-cache/virtual/commonlisp-0
 2004032241 metadata/md5-cache/virtual/freedesktop-icon-theme-0-r3
-2004032241 metadata/md5-cache/virtual/httpd-basic-0-r2
-2004032241 metadata/md5-cache/virtual/httpd-cgi-0-r1
-2004032241 metadata/md5-cache/virtual/httpd-cgi-0-r2
 2004032241 metadata/md5-cache/virtual/imagemagick-tools-0
-2004032241 metadata/md5-cache/virtual/imap-c-client-1
-2004032241 metadata/md5-cache/virtual/imap-c-client-2
 2004032241 metadata/md5-cache/virtual/latex-base-1.0
-2004032241 metadata/md5-cache/virtual/resolvconf-1
 2004032241 metadata/md5-cache/virtual/w3m-0
-2004062109 metadata/md5-cache/virtual/httpd-fastcgi-0-r1
 2004062109 metadata/md5-cache/virtual/mysql-5.6-r13
 2004211009 metadata/md5-cache/virtual/checkpassword-0
 2004211009 metadata/md5-cache/virtual/daemontools-0
-2004211009 metadata/md5-cache/virtual/eject-0-r1
-2004211009 metadata/md5-cache/virtual/fortran-0
 2004211009 metadata/md5-cache/virtual/inetd-0
-2004211009 metadata/md5-cache/virtual/libiconv-0
-2004211009 metadata/md5-cache/virtual/libintl-0
 2004211009 metadata/md5-cache/virtual/man-0-r3
-2004211009 metadata/md5-cache/virtual/mda-0
 2004211009 metadata/md5-cache/virtual/mta-1-r1
 2004211009 metadata/md5-cache/virtual/package-manager-1
 2004211009 metadata/md5-cache/virtual/pager-0
@@ -58556,13 +58621,10 @@
 2004211009 metadata/md5-cache/virtual/service-manager-0
 2004211009 metadata/md5-cache/virtual/ssh-0
 2004211009 metadata/md5-cache/virtual/tex-base-0
-2004211009 metadata/md5-cache/virtual/texi2dvi-0-r2
 2004211009 metadata/md5-cache/virtual/yacc-0
 2004231009 metadata/md5-cache/virtual/perl-Archive-Tar-2.320.0
-2005062039 metadata/md5-cache/virtual/acl-0
 2005062039 metadata/md5-cache/virtual/acl-0-r1
 2005062039 metadata/md5-cache/virtual/dev-manager-0-r2
-2005062039 metadata/md5-cache/virtual/logger-0-r1
 2005062039 metadata/md5-cache/virtual/mailx-1
 2005062039 metadata/md5-cache/virtual/mailx-2
 2005091739 metadata/md5-cache/virtual/gnustep-back-0.28.0
@@ -58582,7 +58644,6 @@
 2007182339 metadata/md5-cache/virtual/perl-autodie-2.320.0
 2007182339 metadata/md5-cache/virtual/perl-bignum-0.510.0-r1
 2007231639 metadata/md5-cache/virtual/perl-Time-Piece-1.330.0
-2007290039 metadata/md5-cache/virtual/gsasl-2
 2007290039 metadata/md5-cache/virtual/podofo-build-0.9.6
 2007310009 metadata/md5-cache/virtual/cblas-3.8
 2007311609 metadata/md5-cache/virtual/cron-0-r2
@@ -58679,26 +58740,21 @@
 2009191139 metadata/md5-cache/virtual/jre-11-r2
 2009191009 metadata/md5-cache/virtual/mailx-3
 2010062139 metadata/md5-cache/virtual/qmail-1.03
-2010100009 metadata/md5-cache/virtual/awk-1
 2010241239 metadata/md5-cache/virtual/libc-1-r1
 2010241809 metadata/md5-cache/virtual/mpi-2.0-r3
 2011072109 metadata/md5-cache/virtual/szip-2.1
 2011121839 metadata/md5-cache/virtual/lapacke-3.8-r1
 2011172209 metadata/md5-cache/virtual/udev-217-r2
 2011252124 metadata/md5-cache/virtual/jack-1
-2011252124 metadata/md5-cache/virtual/jpeg-compat-62
 2011252124 metadata/md5-cache/virtual/libelf-2
 2011252124 metadata/md5-cache/virtual/libelf-3
 2011252124 metadata/md5-cache/virtual/libffi-3.3_rc0
-2011252124 metadata/md5-cache/virtual/libgudev-232
 2011252124 metadata/md5-cache/virtual/libudev-232-r1
 2011252124 metadata/md5-cache/virtual/libudev-232-r2
 2011252124 metadata/md5-cache/virtual/libudev-232-r3
 2011252124 metadata/md5-cache/virtual/mpi-2.0-r4
 2011252124 metadata/md5-cache/virtual/mpi-2.0-r5
 2011252124 metadata/md5-cache/virtual/opencl-3-r1
-2011252124 metadata/md5-cache/virtual/python-cffi-1
-2011252124 metadata/md5-cache/virtual/python-greenlet-1.0-r2
 2011252124 metadata/md5-cache/virtual/rust-1.46.0
 2011252124 metadata/md5-cache/virtual/rust-1.48.0
 2011271939 metadata/md5-cache/virtual/rust-1.47.0
@@ -58708,38 +58764,60 @@
 2012041739 metadata/md5-cache/virtual/opengl-7.0-r2
 2012041739 metadata/md5-cache/virtual/perl-Locale-Maketext-1.290.0-r3
 2012031439 metadata/md5-cache/virtual/tmpfiles-0-r1
-2012041739 metadata/md5-cache/virtual/ttf-fonts-1-r1
 2012080439 metadata/md5-cache/virtual/httpd-php-8.0
-2012091539 metadata/md5-cache/virtual/libcrypt-1-r1
-2012091539 metadata/md5-cache/virtual/libcrypt-2
 2012111539 metadata/md5-cache/virtual/man-0-r4
 2012150539 metadata/md5-cache/virtual/httpd-php-7.2
 2012150539 metadata/md5-cache/virtual/httpd-php-7.3
 2012150539 metadata/md5-cache/virtual/httpd-php-7.4
-2012170251 metadata/md5-cache/virtual/Manifest.gz
-2012170251 metadata/md5-cache/virtual/acl-0-r2
 2012170251 metadata/md5-cache/virtual/fam-0-r1
 2012170251 metadata/md5-cache/virtual/krb5-0-r1
 2012170251 metadata/md5-cache/virtual/libgudev-215-r3
-2012170251 metadata/md5-cache/virtual/libgudev-230
-2012170251 metadata/md5-cache/virtual/libiconv-0-r1
 2012170251 metadata/md5-cache/virtual/libiconv-0-r2
-2012170251 metadata/md5-cache/virtual/libintl-0-r1
-2012170251 metadata/md5-cache/virtual/libintl-0-r2
 2012170251 metadata/md5-cache/virtual/libudev-215-r1
 2012170251 metadata/md5-cache/virtual/libusb-0-r2
-2012170251 metadata/md5-cache/virtual/libusb-1-r1
-2012170251 metadata/md5-cache/virtual/libusb-1-r2
-2012170251 metadata/md5-cache/virtual/ruby-ssl-11
 2012170251 metadata/md5-cache/virtual/rubygems-15
 2012170251 metadata/md5-cache/virtual/rubygems-16
+2012200839 metadata/md5-cache/virtual/Manifest.gz
+2012200709 metadata/md5-cache/virtual/acl-0
+2012200709 metadata/md5-cache/virtual/acl-0-r2
+2012200709 metadata/md5-cache/virtual/awk-1
+2012200709 metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
+2012200709 metadata/md5-cache/virtual/commonlisp-0
+2012200709 metadata/md5-cache/virtual/eject-0-r1
+2012200709 metadata/md5-cache/virtual/fortran-0
+2012200709 metadata/md5-cache/virtual/gsasl-2
+2012200709 metadata/md5-cache/virtual/httpd-basic-0-r2
+2012200709 metadata/md5-cache/virtual/httpd-cgi-0-r1
+2012200709 metadata/md5-cache/virtual/httpd-cgi-0-r2
+2012200709 metadata/md5-cache/virtual/httpd-fastcgi-0-r1
+2012200709 metadata/md5-cache/virtual/imap-c-client-1
+2012200709 metadata/md5-cache/virtual/imap-c-client-2
+2012200709 metadata/md5-cache/virtual/jpeg-compat-62
+2012181739 metadata/md5-cache/virtual/libcrypt-1-r1
+2012181739 metadata/md5-cache/virtual/libcrypt-2
+2012200739 metadata/md5-cache/virtual/libgudev-230
+2012200739 metadata/md5-cache/virtual/libgudev-232
+2012200709 metadata/md5-cache/virtual/libiconv-0
+2012200709 metadata/md5-cache/virtual/libiconv-0-r1
+2012200709 metadata/md5-cache/virtual/libintl-0
+2012200709 metadata/md5-cache/virtual/libintl-0-r1
+2012200709 metadata/md5-cache/virtual/libintl-0-r2
+2012200839 metadata/md5-cache/virtual/libusb-1-r1
+2012200839 metadata/md5-cache/virtual/libusb-1-r2
+2012200709 metadata/md5-cache/virtual/logger-0-r1
+2012200709 metadata/md5-cache/virtual/mda-0
+2012200839 metadata/md5-cache/virtual/python-cffi-1
+2012200839 metadata/md5-cache/virtual/python-greenlet-1.0-r2
+2012200739 metadata/md5-cache/virtual/resolvconf-1
+2012200839 metadata/md5-cache/virtual/ruby-ssl-11
+2012200739 metadata/md5-cache/virtual/texi2dvi-0-r2
+2012200739 metadata/md5-cache/virtual/ttf-fonts-1-r1
 1808151104 metadata/md5-cache/www-apache/modsec-flameeyes-20130216
 1810260409 metadata/md5-cache/www-apache/modsecurity-crs-3.0.2
 1903040439 metadata/md5-cache/www-apache/modsecurity-crs-3.1.0
 2009021410 metadata/md5-cache/www-apache/modsec-flameeyes-99999999
 2010091839 metadata/md5-cache/www-apache/modsecurity-crs-3.3.0
 2012170251 metadata/md5-cache/www-apache/anyterm-1.1.29-r1
-2012170251 metadata/md5-cache/www-apache/libapreq2-2.13-r1
 2012170251 metadata/md5-cache/www-apache/libapreq2-2.15-r1
 2012170251 metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r2
 2012170251 metadata/md5-cache/www-apache/mod_auth_radius-1.5.8
@@ -58773,7 +58851,6 @@
 2012170251 metadata/md5-cache/www-apache/mod_maxminddb-1.2.0
 2012170251 metadata/md5-cache/www-apache/mod_musicindex-1.4.1-r1
 2012170251 metadata/md5-cache/www-apache/mod_nss-1.0.12-r1
-2012170251 metadata/md5-cache/www-apache/mod_perl-2.0.11
 2012170251 metadata/md5-cache/www-apache/mod_qos-11.61
 2012170251 metadata/md5-cache/www-apache/mod_qos-11.65
 2012170251 metadata/md5-cache/www-apache/mod_qos-11.66
@@ -58791,8 +58868,10 @@
 2012170251 metadata/md5-cache/www-apache/passenger-6.0.5
 2012170251 metadata/md5-cache/www-apache/passenger-6.0.6
 2012170251 metadata/md5-cache/www-apache/passenger-6.0.7
-2012171609 metadata/md5-cache/www-apache/Manifest.gz
 2012171609 metadata/md5-cache/www-apache/pwauth-2.3.10
+2012210839 metadata/md5-cache/www-apache/Manifest.gz
+2012210839 metadata/md5-cache/www-apache/libapreq2-2.13-r1
+2012210839 metadata/md5-cache/www-apache/mod_perl-2.0.11
 1902211339 metadata/md5-cache/www-apps/dokuwiki-20180422a
 1902211339 metadata/md5-cache/www-apps/dokuwiki-20180422b
 1904250439 metadata/md5-cache/www-apps/icingaweb2-module-director-1.6.2
@@ -58867,8 +58946,6 @@
 2012101409 metadata/md5-cache/www-apps/nextcloud-20.0.3
 2012131909 metadata/md5-cache/www-apps/cgp-1_p20190510-r1
 2012150539 metadata/md5-cache/www-apps/phpsysinfo-3.3.2
-2012170251 metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
-2012170251 metadata/md5-cache/www-apps/Manifest.gz
 2012170251 metadata/md5-cache/www-apps/blazeblogger-1.2.0-r1
 2012170251 metadata/md5-cache/www-apps/blohg-0.13-r4
 2012170251 metadata/md5-cache/www-apps/blohg-9999
@@ -58879,11 +58956,9 @@
 2012170251 metadata/md5-cache/www-apps/dotproject-2.1.7-r1
 2012170251 metadata/md5-cache/www-apps/gitea-1.13.0
 2012170251 metadata/md5-cache/www-apps/gitea-9999
-2012170019 metadata/md5-cache/www-apps/gitit-0.13.0.0
 2012170251 metadata/md5-cache/www-apps/hugo-0.78.1
 2012170251 metadata/md5-cache/www-apps/icingaweb2-2.8.2
 2012170251 metadata/md5-cache/www-apps/icingaweb2-9999
-2012170251 metadata/md5-cache/www-apps/ikiwiki-3.20190228
 2012170251 metadata/md5-cache/www-apps/jekyll-4.1.1
 2012170251 metadata/md5-cache/www-apps/jekyll-coffeescript-1.2.2
 2012170251 metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
@@ -58927,6 +59002,11 @@
 2012170251 metadata/md5-cache/www-apps/webdavcgi-1.1.1
 2012160039 metadata/md5-cache/www-apps/webmcp-1.2.6
 2012160540 metadata/md5-cache/www-apps/zeppelin-bin-0.8.2
+2012210839 metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
+2012210839 metadata/md5-cache/www-apps/Manifest.gz
+2012210239 metadata/md5-cache/www-apps/gitit-0.13.0.0
+2012210839 metadata/md5-cache/www-apps/ikiwiki-3.20190228
+2012201939 metadata/md5-cache/www-apps/mediawiki-1.35.1
 1703072138 metadata/md5-cache/www-client/fetch-1.0-r3
 2003261841 metadata/md5-cache/www-client/lynx-2.9.0_pre4
 2006150539 metadata/md5-cache/www-client/lynx-2.8.9_p1
@@ -58935,8 +59015,6 @@
 2011292039 metadata/md5-cache/www-client/luakit-2.2.1-r100
 2011292039 metadata/md5-cache/www-client/luakit-9999
 2012170251 metadata/md5-cache/www-client/chromium-87.0.4280.88
-2012170251 metadata/md5-cache/www-client/chromium-88.0.4324.41
-2012170251 metadata/md5-cache/www-client/chromium-89.0.4350.4
 2012170251 metadata/md5-cache/www-client/dillo-3.0.5-r3
 2012170251 metadata/md5-cache/www-client/dillo-3.1_pre20181005
 2012170251 metadata/md5-cache/www-client/dillo-9999
@@ -58951,18 +59029,12 @@
 2012170251 metadata/md5-cache/www-client/firefox-84.0
 2012170251 metadata/md5-cache/www-client/firefox-bin-78.6.0
 2012170251 metadata/md5-cache/www-client/firefox-bin-84.0
-2012170251 metadata/md5-cache/www-client/google-chrome-87.0.4280.88
-2012171109 metadata/md5-cache/www-client/google-chrome-beta-88.0.4324.50
-2012170251 metadata/md5-cache/www-client/google-chrome-unstable-89.0.4350.4
 2012170019 metadata/md5-cache/www-client/httrack-3.49.2-r2
 2012170251 metadata/md5-cache/www-client/jd-2.8.5_p120826
 2012170251 metadata/md5-cache/www-client/jd-2.8.9_p150226
 2012170251 metadata/md5-cache/www-client/links-2.20.2
 2012170251 metadata/md5-cache/www-client/links-2.20.2-r1
 2012170251 metadata/md5-cache/www-client/links-2.21
-2012170251 metadata/md5-cache/www-client/microsoft-edge-dev-88.0.705.15
-2012170251 metadata/md5-cache/www-client/microsoft-edge-dev-89.0.723.0
-2012170251 metadata/md5-cache/www-client/microsoft-edge-dev-89.0.731.0
 2012170019 metadata/md5-cache/www-client/midori-9.0
 2012170251 metadata/md5-cache/www-client/netrik-1.16.1-r1
 2012170251 metadata/md5-cache/www-client/netsurf-3.10-r4
@@ -58983,18 +59055,26 @@
 2012170251 metadata/md5-cache/www-client/uget-2.2.0
 2012170251 metadata/md5-cache/www-client/uget-2.2.1
 2012170251 metadata/md5-cache/www-client/uget-9999
-2012170251 metadata/md5-cache/www-client/vivaldi-3.5.2115.81
-2012170251 metadata/md5-cache/www-client/vivaldi-3.5.2115.81-r1
-2012170251 metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2130.3
-2012170251 metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2131.8-r1
 2012162341 metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r10
 2012162341 metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12
-2012172109 metadata/md5-cache/www-client/Manifest.gz
-2012172039 metadata/md5-cache/www-client/opera-73.0.3856.284-r1
-2012172109 metadata/md5-cache/www-client/opera-beta-73.0.3856.283
-2012172039 metadata/md5-cache/www-client/opera-developer-74.0.3904.0-r1
 2012171709 metadata/md5-cache/www-client/w3m-0.5.3_p20180125
 2012171709 metadata/md5-cache/www-client/w3m-0.5.3_p20190105
+2012210839 metadata/md5-cache/www-client/Manifest.gz
+2012181209 metadata/md5-cache/www-client/chromium-88.0.4324.50
+2012191239 metadata/md5-cache/www-client/chromium-89.0.4356.6
+2012210839 metadata/md5-cache/www-client/google-chrome-87.0.4280.88
+2012210839 metadata/md5-cache/www-client/google-chrome-beta-88.0.4324.50
+2012210839 metadata/md5-cache/www-client/google-chrome-unstable-89.0.4356.6
+2012210839 metadata/md5-cache/www-client/microsoft-edge-dev-88.0.705.15
+2012210839 metadata/md5-cache/www-client/microsoft-edge-dev-89.0.723.0
+2012210839 metadata/md5-cache/www-client/microsoft-edge-dev-89.0.731.0
+2012210839 metadata/md5-cache/www-client/opera-73.0.3856.284-r1
+2012210839 metadata/md5-cache/www-client/opera-beta-73.0.3856.283
+2012210839 metadata/md5-cache/www-client/opera-developer-74.0.3904.0-r1
+2012210839 metadata/md5-cache/www-client/vivaldi-3.5.2115.81
+2012210839 metadata/md5-cache/www-client/vivaldi-3.5.2115.81-r1
+2012210839 metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2130.3
+2012210839 metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2131.8-r1
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
 1904231239 metadata/md5-cache/www-misc/wsmake-0.6.4
@@ -59019,20 +59099,21 @@
 2012170251 metadata/md5-cache/www-misc/urlwatch-2.18-r1
 2012170251 metadata/md5-cache/www-misc/urlwatch-2.21
 2012170251 metadata/md5-cache/www-misc/xxv-1.6.1-r1
-2012171809 metadata/md5-cache/www-misc/Manifest.gz
 2012171609 metadata/md5-cache/www-misc/vdradmin-am-3.6.10-r1
+2012200039 metadata/md5-cache/www-misc/Manifest.gz
+2012200039 metadata/md5-cache/www-misc/urlwatch-2.22
 2006171439 metadata/md5-cache/www-plugins/pdfjs-2.4.456
 2009141809 metadata/md5-cache/www-plugins/browserpass-3.0.7
 2011232139 metadata/md5-cache/www-plugins/pdfjs-2.5.207
 2011252124 metadata/md5-cache/www-plugins/passff-host-1.2.1-r1
-2012030039 metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.88
-2012111209 metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4350.4_alpha
-2012171109 metadata/md5-cache/www-plugins/Manifest.gz
 2012170251 metadata/md5-cache/www-plugins/adobe-flash-32.0.0.453
-2012171109 metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.50_beta
-2012170251 metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
-2012170251 metadata/md5-cache/www-plugins/google-talkplugin-9999
 2012170251 metadata/md5-cache/www-plugins/lightspark-0.8.2-r1
+2012210839 metadata/md5-cache/www-plugins/Manifest.gz
+2012210839 metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.88
+2012210839 metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.50_beta
+2012210839 metadata/md5-cache/www-plugins/chrome-binary-plugins-89.0.4356.6_alpha
+2012210839 metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
+2012210839 metadata/md5-cache/www-plugins/google-talkplugin-9999
 1702282335 metadata/md5-cache/www-servers/mongrel2-1.11.0-r1
 2006041239 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
 2009141809 metadata/md5-cache/www-servers/caddy-2.0.0
@@ -59040,7 +59121,6 @@
 2011252124 metadata/md5-cache/www-servers/boa-0.94.14_rc21-r2
 2011252124 metadata/md5-cache/www-servers/bozohttpd-20190228
 2011252124 metadata/md5-cache/www-servers/pshs-0.4.1
-2012170251 metadata/md5-cache/www-servers/Manifest.gz
 2012170251 metadata/md5-cache/www-servers/adsf-1.4.3
 2012170251 metadata/md5-cache/www-servers/apache-2.4.46
 2012170251 metadata/md5-cache/www-servers/apache-2.4.46-r1
@@ -59094,6 +59174,9 @@
 2012162341 metadata/md5-cache/www-servers/varnish-6.4.0
 2012162341 metadata/md5-cache/www-servers/varnish-6.5.0
 2012170251 metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
+2012181239 metadata/md5-cache/www-servers/Manifest.gz
+2012181239 metadata/md5-cache/www-servers/puma-4.3.7
+2012181239 metadata/md5-cache/www-servers/puma-5.1.1
 2011252124 metadata/md5-cache/x11-apps/amlc-0.5.1
 2011252124 metadata/md5-cache/x11-apps/igt-gpu-tools-1.25
 2011252124 metadata/md5-cache/x11-apps/igt-gpu-tools-9999
@@ -59102,14 +59185,12 @@
 2011252124 metadata/md5-cache/x11-apps/xisxwayland-9999
 2011252124 metadata/md5-cache/x11-apps/xwarppointer-1-r2
 2012041739 metadata/md5-cache/x11-apps/luit-20190106
-2012170251 metadata/md5-cache/x11-apps/Manifest.gz
 2012170251 metadata/md5-cache/x11-apps/appres-1.0.5
 2012170251 metadata/md5-cache/x11-apps/bdftopcf-1.1
 2012170251 metadata/md5-cache/x11-apps/beforelight-1.0.5
 2012170251 metadata/md5-cache/x11-apps/bitmap-1.0.9
 2012170251 metadata/md5-cache/x11-apps/editres-1.0.7
 2012170019 metadata/md5-cache/x11-apps/fonttosfnt-1.1.0
-2012170019 metadata/md5-cache/x11-apps/fonttosfnt-1.2.0
 2012170019 metadata/md5-cache/x11-apps/fonttosfnt-1.2.1
 2012170251 metadata/md5-cache/x11-apps/fslsfonts-1.0.5-r1
 2012170251 metadata/md5-cache/x11-apps/fstobdf-1.0.6
@@ -59162,7 +59243,6 @@
 2012170019 metadata/md5-cache/x11-apps/xinput-1.6.3
 2012170019 metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r2
 2012170019 metadata/md5-cache/x11-apps/xkbcomp-1.4.3
-2012170019 metadata/md5-cache/x11-apps/xkbcomp-1.4.4
 2012170251 metadata/md5-cache/x11-apps/xkbevd-1.1.4
 2012170019 metadata/md5-cache/x11-apps/xkbprint-1.0.5
 2012170251 metadata/md5-cache/x11-apps/xkbutils-1.0.4
@@ -59179,7 +59259,6 @@
 2012170019 metadata/md5-cache/x11-apps/xmore-1.0.3
 2012170251 metadata/md5-cache/x11-apps/xpr-1.0.5
 2012170019 metadata/md5-cache/x11-apps/xprop-1.2.4
-2012170019 metadata/md5-cache/x11-apps/xprop-1.2.5
 2012170019 metadata/md5-cache/x11-apps/xrandr-1.5.1
 2012170019 metadata/md5-cache/x11-apps/xrdb-1.2.0
 2012162341 metadata/md5-cache/x11-apps/xrectsel-0.3.2
@@ -59193,27 +59272,22 @@
 2012170251 metadata/md5-cache/x11-apps/xwd-1.0.7
 2012170019 metadata/md5-cache/x11-apps/xwininfo-1.1.5
 2012170251 metadata/md5-cache/x11-apps/xwud-1.0.5
+2012202239 metadata/md5-cache/x11-apps/Manifest.gz
+2012202239 metadata/md5-cache/x11-apps/fonttosfnt-1.2.0
+2012202239 metadata/md5-cache/x11-apps/xkbcomp-1.4.4
+2012202239 metadata/md5-cache/x11-apps/xprop-1.2.5
 2005190009 metadata/md5-cache/x11-base/xorg-drivers-9999
 2011252124 metadata/md5-cache/x11-base/xorg-proto-9999
 2012041739 metadata/md5-cache/x11-base/xorg-proto-2020.1
 2012150109 metadata/md5-cache/x11-base/xorg-drivers-1.20-r2
 2012150109 metadata/md5-cache/x11-base/xorg-x11-7.4-r3
-2012170019 metadata/md5-cache/x11-base/Manifest.gz
 2012170019 metadata/md5-cache/x11-base/xcb-proto-1.14-r1
-2012170019 metadata/md5-cache/x11-base/xcb-proto-1.14.1
-2012170019 metadata/md5-cache/x11-base/xorg-server-1.20.10
 2012170019 metadata/md5-cache/x11-base/xorg-server-1.20.8-r1
-2012170019 metadata/md5-cache/x11-base/xorg-server-9999
+2012202239 metadata/md5-cache/x11-base/Manifest.gz
+2012202239 metadata/md5-cache/x11-base/xcb-proto-1.14.1
+2012201509 metadata/md5-cache/x11-base/xorg-server-1.20.10
+2012201509 metadata/md5-cache/x11-base/xorg-server-9999
 1907282239 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.0
-2012170251 metadata/md5-cache/x11-drivers/Manifest.gz
-2012170251 metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r5
-2012170251 metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r5
-2012170251 metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r7
-2012170251 metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r3
-2012170251 metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02-r1
-2012170251 metadata/md5-cache/x11-drivers/nvidia-drivers-455.28-r1
-2012170251 metadata/md5-cache/x11-drivers/nvidia-drivers-455.38-r1
-2012170251 metadata/md5-cache/x11-drivers/nvidia-drivers-455.45.01-r1
 2012170019 metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.2
 2012170251 metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
 2012170251 metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3
@@ -59247,8 +59321,17 @@
 2012170251 metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.9
 2012170251 metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0
 2012170251 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0
-2012170019 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0
 2012170251 metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0
+2012210839 metadata/md5-cache/x11-drivers/Manifest.gz
+2012210839 metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r5
+2012210839 metadata/md5-cache/x11-drivers/nvidia-drivers-390.138-r5
+2012210839 metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r7
+2012210839 metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r3
+2012210839 metadata/md5-cache/x11-drivers/nvidia-drivers-450.80.02-r1
+2012210839 metadata/md5-cache/x11-drivers/nvidia-drivers-455.28-r1
+2012210839 metadata/md5-cache/x11-drivers/nvidia-drivers-455.38-r1
+2012210839 metadata/md5-cache/x11-drivers/nvidia-drivers-455.45.01-r1
+2012202239 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0
 1702282335 metadata/md5-cache/x11-libs/gtk-mac-integration-2.0.5
 1706300138 metadata/md5-cache/x11-libs/libtinynotify-0.2.1
 1706300138 metadata/md5-cache/x11-libs/libtinynotify-cli-1.2.1
@@ -59266,7 +59349,6 @@
 2011252124 metadata/md5-cache/x11-libs/goffice-0.10.47
 2011252124 metadata/md5-cache/x11-libs/libclxclient-3.9.2
 2011252124 metadata/md5-cache/x11-libs/libdrm-2.4.102
-2011252124 metadata/md5-cache/x11-libs/libdrm-9999
 2011252124 metadata/md5-cache/x11-libs/libnotify-0.7.8
 2011252124 metadata/md5-cache/x11-libs/libnotify-0.7.9
 2011252124 metadata/md5-cache/x11-libs/libva-2.5.0-r1
@@ -59283,8 +59365,6 @@
 2012041739 metadata/md5-cache/x11-libs/pixman-0.40.0
 2012141109 metadata/md5-cache/x11-libs/gdk-pixbuf-xlib-2.40.2
 2012140439 metadata/md5-cache/x11-libs/goffice-0.10.48
-2012140439 metadata/md5-cache/x11-libs/libdrm-2.4.103
-2012140439 metadata/md5-cache/x11-libs/libxkbcommon-1.0.3
 2012162341 metadata/md5-cache/x11-libs/agg-2.5-r3
 2012162341 metadata/md5-cache/x11-libs/c++-gtk-utils-2.0.34
 2012162341 metadata/md5-cache/x11-libs/c++-gtk-utils-2.2.19
@@ -59298,11 +59378,9 @@
 2012170251 metadata/md5-cache/x11-libs/gdk-pixbuf-loader-webp-20160328234507
 2012170251 metadata/md5-cache/x11-libs/gl2ps-1.3.9
 2012170251 metadata/md5-cache/x11-libs/gl2ps-1.4.0
-2012170409 metadata/md5-cache/x11-libs/gl2ps-1.4.2
 2012170251 metadata/md5-cache/x11-libs/gnome-pty-helper-0.40.2
 2012170251 metadata/md5-cache/x11-libs/goocanvas-1.0.0
 2012170251 metadata/md5-cache/x11-libs/goocanvas-2.0.4-r1
-2012170251 metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
 2012170251 metadata/md5-cache/x11-libs/gtk+-3.24.20
 2012170251 metadata/md5-cache/x11-libs/gtk+-3.24.22
 2012170251 metadata/md5-cache/x11-libs/gtk+-3.24.24
@@ -59320,10 +59398,8 @@
 2012170251 metadata/md5-cache/x11-libs/libQGLViewer-2.7.2
 2012170019 metadata/md5-cache/x11-libs/libSM-1.2.3-r1
 2012170019 metadata/md5-cache/x11-libs/libX11-1.6.12
-2012170019 metadata/md5-cache/x11-libs/libX11-1.7.0
 2012170251 metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
 2012170251 metadata/md5-cache/x11-libs/libXau-1.0.9
-2012170019 metadata/md5-cache/x11-libs/libXau-1.0.9-r1
 2012170019 metadata/md5-cache/x11-libs/libXaw-1.0.13-r2
 2012170251 metadata/md5-cache/x11-libs/libXaw3d-1.6.3
 2012170251 metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2d
@@ -59346,7 +59422,6 @@
 2012170251 metadata/md5-cache/x11-libs/libXres-1.2.0-r1
 2012170019 metadata/md5-cache/x11-libs/libXt-1.2.0
 2012170251 metadata/md5-cache/x11-libs/libXtst-1.2.3-r1
-2012170019 metadata/md5-cache/x11-libs/libXtst-1.2.3-r2
 2012170019 metadata/md5-cache/x11-libs/libXv-1.0.11-r2
 2012170019 metadata/md5-cache/x11-libs/libXvMC-1.0.12
 2012170019 metadata/md5-cache/x11-libs/libXxf86dga-1.1.5
@@ -59391,11 +59466,9 @@
 2012170019 metadata/md5-cache/x11-libs/libvdpau-99999
 2012170251 metadata/md5-cache/x11-libs/libwnck-2.31.0
 2012170019 metadata/md5-cache/x11-libs/libwnck-3.36.0
-2012170019 metadata/md5-cache/x11-libs/libxcb-1.14
 2012170019 metadata/md5-cache/x11-libs/libxkbfile-1.1.0
 2012170251 metadata/md5-cache/x11-libs/libxklavier-5.4
 2012170251 metadata/md5-cache/x11-libs/libxshmfence-1.3-r1
-2012170019 metadata/md5-cache/x11-libs/libxshmfence-1.3-r2
 2012170251 metadata/md5-cache/x11-libs/libyui-3.3.3
 2012170251 metadata/md5-cache/x11-libs/libyui-gtk-2.44.9
 2012170251 metadata/md5-cache/x11-libs/libyui-ncurses-2.48.3
@@ -59433,9 +59506,19 @@
 2012170251 metadata/md5-cache/x11-libs/xosd-2.2.14_p2_p1
 2012170251 metadata/md5-cache/x11-libs/xpa-2.1.18
 2012170019 metadata/md5-cache/x11-libs/xtrans-1.4.0
-2012172009 metadata/md5-cache/x11-libs/Manifest.gz
 2012172009 metadata/md5-cache/x11-libs/cairo-1.16.0-r4
 2012172009 metadata/md5-cache/x11-libs/cairo-9999
+2012202239 metadata/md5-cache/x11-libs/Manifest.gz
+2012181339 metadata/md5-cache/x11-libs/gl2ps-1.4.2
+2012190109 metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
+2012202239 metadata/md5-cache/x11-libs/libX11-1.7.0
+2012202239 metadata/md5-cache/x11-libs/libXau-1.0.9-r1
+2012202239 metadata/md5-cache/x11-libs/libXtst-1.2.3-r2
+2012202239 metadata/md5-cache/x11-libs/libdrm-2.4.103
+2012201509 metadata/md5-cache/x11-libs/libdrm-9999
+2012190109 metadata/md5-cache/x11-libs/libxcb-1.14
+2012202239 metadata/md5-cache/x11-libs/libxkbcommon-1.0.3
+2012202239 metadata/md5-cache/x11-libs/libxshmfence-1.3-r2
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1805220439 metadata/md5-cache/x11-misc/autocutsel-0.10.0
 1910111911 metadata/md5-cache/x11-misc/bbcd-0.3.1-r2
@@ -59623,7 +59706,6 @@
 2012041739 metadata/md5-cache/x11-misc/xbitmaps-1.1.2-r1
 2012041739 metadata/md5-cache/x11-misc/xcb-2.4-r1
 2012051039 metadata/md5-cache/x11-misc/urxvt-tabbedex-20.49
-2012140439 metadata/md5-cache/x11-misc/xkeyboard-config-2.31
 2012170251 metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1
 2012162341 metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2
 2012170251 metadata/md5-cache/x11-misc/3dfb-0.6.1-r1
@@ -59652,7 +59734,6 @@
 2012170251 metadata/md5-cache/x11-misc/cdm-0.6.1_pre20180107
 2012170019 metadata/md5-cache/x11-misc/cdm-0.7
 2012170251 metadata/md5-cache/x11-misc/colord-1.3.5
-2012170019 metadata/md5-cache/x11-misc/compose-tables-1.7.0
 2012170251 metadata/md5-cache/x11-misc/copyq-3.13.0
 2012170019 metadata/md5-cache/x11-misc/dclock-2.2.2_p12
 2012170251 metadata/md5-cache/x11-misc/dclock-2.2.2_p9
@@ -59829,7 +59910,6 @@
 2012170251 metadata/md5-cache/x11-misc/whaw-0.2
 2012162341 metadata/md5-cache/x11-misc/x11vnc-0.9.16-r2
 2012162341 metadata/md5-cache/x11-misc/x11vnc-0.9.16-r3
-2012162341 metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4
 2012170251 metadata/md5-cache/x11-misc/xaos-3.6
 2012170251 metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1
 2012170251 metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1-r1
@@ -59865,7 +59945,6 @@
 2012170019 metadata/md5-cache/x11-misc/xlockmore-5.66_alpha10
 2012170019 metadata/md5-cache/x11-misc/xlockmore-5.66_alpha11
 2012170019 metadata/md5-cache/x11-misc/xlockmore-5.66_alpha12
-2012170019 metadata/md5-cache/x11-misc/xmobar-0.36
 2012170251 metadata/md5-cache/x11-misc/xnee-3.19-r2
 2012170251 metadata/md5-cache/x11-misc/xnots-0.2.1-r2
 2012170251 metadata/md5-cache/x11-misc/xnots-9999
@@ -59899,13 +59978,17 @@
 2012170251 metadata/md5-cache/x11-misc/zim-0.73.2
 2012170251 metadata/md5-cache/x11-misc/zim-0.73.3
 2012170251 metadata/md5-cache/x11-misc/zim-0.73.4
-2012171709 metadata/md5-cache/x11-misc/Manifest.gz
 2012171609 metadata/md5-cache/x11-misc/cbatticon-1.6.10
 2012171709 metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
 2012171709 metadata/md5-cache/x11-misc/xscreensaver-5.38-r2
 2012171709 metadata/md5-cache/x11-misc/xscreensaver-5.43-r4
 2012171709 metadata/md5-cache/x11-misc/xscreensaver-5.44-r3
 2012171609 metadata/md5-cache/x11-misc/xsnow-3.0.7
+2012211309 metadata/md5-cache/x11-misc/Manifest.gz
+2012202239 metadata/md5-cache/x11-misc/compose-tables-1.7.0
+2012211309 metadata/md5-cache/x11-misc/x11vnc-0.9.16-r4
+2012202239 metadata/md5-cache/x11-misc/xkeyboard-config-2.31
+2012210239 metadata/md5-cache/x11-misc/xmobar-0.36
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 1803190338 metadata/md5-cache/x11-plugins/pidgin-birthday-reminder-1.7-r1
@@ -60052,8 +60135,6 @@
 2011272109 metadata/md5-cache/x11-plugins/gkrellmss-2.6-r4
 2011281239 metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.7
 2011300339 metadata/md5-cache/x11-plugins/pidgin-telegram-1.4.4
-2012030509 metadata/md5-cache/x11-plugins/wmbiff-0.4.36
-2012031339 metadata/md5-cache/x11-plugins/wmcoincoin-2.6.3
 2012061139 metadata/md5-cache/x11-plugins/lurch-0.6.8-r2
 2012130209 metadata/md5-cache/x11-plugins/wmpasman-2.2
 2012170251 metadata/md5-cache/x11-plugins/asapm-3.1-r1
@@ -60102,9 +60183,12 @@
 2012171539 metadata/md5-cache/x11-plugins/wmbutton-0.7.1
 2012171539 metadata/md5-cache/x11-plugins/wmix-3.5
 2012171539 metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r1
-2012171809 metadata/md5-cache/x11-plugins/Manifest.gz
 2012171709 metadata/md5-cache/x11-plugins/wmdrawer-0.10.5-r3
 2012171709 metadata/md5-cache/x11-plugins/wmmenu-1.3-r2
+2012210039 metadata/md5-cache/x11-plugins/Manifest.gz
+2012181409 metadata/md5-cache/x11-plugins/wmbiff-0.4.36
+2012181409 metadata/md5-cache/x11-plugins/wmcoincoin-2.6.3
+2012210039 metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r2
 1802161308 metadata/md5-cache/x11-terms/pangoterm-0.0_pre20171111
 2004032241 metadata/md5-cache/x11-terms/eterm-0.9.6-r2
 2005081846 metadata/md5-cache/x11-terms/xfce4-terminal-0.8.9.2
@@ -60150,13 +60234,13 @@
 2012170019 metadata/md5-cache/x11-terms/tilda-1.5.0
 2012170019 metadata/md5-cache/x11-terms/tilda-1.5.2
 2012170251 metadata/md5-cache/x11-terms/xterm-337
-2012170251 metadata/md5-cache/x11-terms/xterm-351
-2012170251 metadata/md5-cache/x11-terms/xterm-360
-2012170251 metadata/md5-cache/x11-terms/xterm-361
-2012172109 metadata/md5-cache/x11-terms/Manifest.gz
 2012172109 metadata/md5-cache/x11-terms/kitty-0.19.1
 2012172109 metadata/md5-cache/x11-terms/kitty-0.19.2
 2012172109 metadata/md5-cache/x11-terms/kitty-9999
+2012201539 metadata/md5-cache/x11-terms/Manifest.gz
+2012201539 metadata/md5-cache/x11-terms/xterm-351
+2012201539 metadata/md5-cache/x11-terms/xterm-360
+2012201539 metadata/md5-cache/x11-terms/xterm-361
 1707301038 metadata/md5-cache/x11-themes/chameleon-xcursors-0.5-r1
 1902221239 metadata/md5-cache/x11-themes/clearlooks-phenix-7.0.1
 1702282336 metadata/md5-cache/x11-themes/comix-xcursors-0.8.2
@@ -60240,16 +60324,12 @@
 2011252124 metadata/md5-cache/x11-themes/greybird-3.22.12
 2011252124 metadata/md5-cache/x11-themes/greybird-9999
 2011252124 metadata/md5-cache/x11-themes/gtk-theme-switch-2.1.0-r1
-2011252124 metadata/md5-cache/x11-themes/icewm-extra-themes-1.2
 2012030239 metadata/md5-cache/x11-themes/wm-icons-0.4.0
 2012061639 metadata/md5-cache/x11-themes/ubuntu-wallpapers-20.10.3
 2012072309 metadata/md5-cache/x11-themes/fedora-backgrounds-33.0.8
 2012091839 metadata/md5-cache/x11-themes/hicolor-icon-theme-0.17
-2012170251 metadata/md5-cache/x11-themes/Manifest.gz
 2012170251 metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1
 2012162341 metadata/md5-cache/x11-themes/adapta-gtk-theme-3.95.0.11
-2012170251 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.32.0
-2012170251 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1-r1
 2012170251 metadata/md5-cache/x11-themes/adwaita-qt-1.1.1
 2012170251 metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
 2012170251 metadata/md5-cache/x11-themes/arc-icon-theme-20161122
@@ -60264,7 +60344,6 @@
 2012170251 metadata/md5-cache/x11-themes/gnome-icon-theme-extras-3.12.0
 2012170251 metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.10.1
 2012170251 metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.12.0
-2012170251 metadata/md5-cache/x11-themes/gnome-themes-standard-3.28
 2012170251 metadata/md5-cache/x11-themes/gnustep-neos-theme-0.1
 2012170019 metadata/md5-cache/x11-themes/gnustep-silver-theme-3.1-r1
 2012170251 metadata/md5-cache/x11-themes/goddard-backgrounds-13.0.0.3-r1
@@ -60274,7 +60353,6 @@
 2012170251 metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3
 2012170019 metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r100
 2012170251 metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r2
-2012170251 metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28
 2012162341 metadata/md5-cache/x11-themes/gtk-engines-candido-0.9.1
 2012162341 metadata/md5-cache/x11-themes/gtk-engines-experience-0.10.5
 2012170251 metadata/md5-cache/x11-themes/gtk-engines-flat-2.0-r3
@@ -60349,6 +60427,12 @@
 2012170251 metadata/md5-cache/x11-themes/xcursor-themes-1.0.6
 2012170251 metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1
 2012170251 metadata/md5-cache/x11-themes/xxv-skins-1.6.1-r1
+2012210839 metadata/md5-cache/x11-themes/Manifest.gz
+2012190109 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.32.0
+2012190109 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1-r1
+2012190109 metadata/md5-cache/x11-themes/gnome-themes-standard-3.28
+2012190109 metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28
+2012210839 metadata/md5-cache/x11-themes/icewm-extra-themes-1.2
 2010121339 metadata/md5-cache/x11-wm/e16-1.0.21
 2011252124 metadata/md5-cache/x11-wm/aewm++-1.1.5-r2
 2011252124 metadata/md5-cache/x11-wm/aewm-1.3.12-r1
@@ -60442,17 +60526,17 @@
 2012170251 metadata/md5-cache/x11-wm/wm2-4-r1
 2012170251 metadata/md5-cache/x11-wm/wmfs-201003
 2012170251 metadata/md5-cache/x11-wm/wmii-3.9.2-r5
-2012170251 metadata/md5-cache/x11-wm/xmonad-0.15
-2012170019 metadata/md5-cache/x11-wm/xmonad-contrib-0.16
 2012170019 metadata/md5-cache/x11-wm/xoat-9999
 2012170251 metadata/md5-cache/x11-wm/xpra-3.0.2-r1
 2012170251 metadata/md5-cache/x11-wm/xpra-3.0.5-r2
 2012170251 metadata/md5-cache/x11-wm/xpra-4.0.4
-2012171709 metadata/md5-cache/x11-wm/Manifest.gz
-2012171709 metadata/md5-cache/x11-wm/icewm-1.8.3
-2012171709 metadata/md5-cache/x11-wm/icewm-1.9.2
-2012171709 metadata/md5-cache/x11-wm/icewm-2.0.0
 2012171709 metadata/md5-cache/x11-wm/sawfish-1.12.90-r1
+2012210839 metadata/md5-cache/x11-wm/Manifest.gz
+2012210839 metadata/md5-cache/x11-wm/icewm-1.8.3
+2012210839 metadata/md5-cache/x11-wm/icewm-1.9.2
+2012210839 metadata/md5-cache/x11-wm/icewm-2.0.0
+2012210239 metadata/md5-cache/x11-wm/xmonad-0.15
+2012210239 metadata/md5-cache/x11-wm/xmonad-contrib-0.16
 2002112051 metadata/md5-cache/xfce-base/xfce4-appfinder-4.14.0
 2003191509 metadata/md5-cache/xfce-base/exo-0.12.11
 2003261841 metadata/md5-cache/xfce-base/garcon-0.6.4-r2
@@ -60501,14 +60585,12 @@
 2002112051 metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r4
 2002112051 metadata/md5-cache/xfce-extra/xfce4-verve-plugin-2.0.0
 2003091039 metadata/md5-cache/xfce-extra/xfce4-statusnotifier-plugin-0.2.2
-2004192139 metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.1
 2006292139 metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.3
 2007041609 metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.1
 2007161739 metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3
 2008051739 metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.5.1
 2009181139 metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.1.1
 2009241009 metadata/md5-cache/xfce-extra/tumbler-0.2.9
-2010062139 metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.10
 2010090009 metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.6-r1
 2010211109 metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.1.0
 2011022209 metadata/md5-cache/xfce-extra/thunar-volman-4.15.1
@@ -60534,7 +60616,6 @@
 2012170251 metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1-r2
 2012170251 metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.4
 2012170251 metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r4
-2012170251 metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r6
 2012170251 metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.3
 2012170251 metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0-r1
 2012170019 metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92-r1
@@ -60543,8 +60624,11 @@
 2012170019 metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r7
 2012170251 metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.6
 2012162341 metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6-r3
-2012172009 metadata/md5-cache/xfce-extra/Manifest.gz
-2012172009 metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.3.0
-2012172009 metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.11
-2012172009 metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.2
-2012180739 metadata/md5-cache/Manifest.gz
+2012210339 metadata/md5-cache/xfce-extra/Manifest.gz
+2012210309 metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.3
+2012202339 metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.3.0
+2012210339 metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.4
+2012202239 metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.11
+2012210309 metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.4
+2012202239 metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.2
+2012211409 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 769f94034521..e4a7815881b5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Dec 2020 06:30:01 +0000
+Mon, 21 Dec 2020 12:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f3762b795ade..6d3da6368e5d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-cc26e5c6852b6df5a26878871e0cc87a3a6e604d 1608265827 2020-12-18T04:30:27+00:00
+cb7d775232e53b50a8d1ca731f4098d43e9a43e1 1608547018 2020-12-21T10:36:58+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7f9a7d0bd707..8a596ea8685b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1608271501 Fri 18 Dec 2020 06:05:01 AM UTC
+1608550501 Mon 21 Dec 2020 11:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 6e9dcaf3d8d0..33efc54e44ae 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Dec 2020 06:08:40 +0000
+Mon, 21 Dec 2020 11:38:25 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 20fca1138f6b..97604f633fcf 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index d9041f7109e1..b2bbaf04450b 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -2,5 +2,5 @@ AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005
 DIST cacti-1.2.13.tar.gz 25182816 BLAKE2B 934deba81a0ac66d4f6a6efcb254204f3d26b40ee56b3b0b926334cefc99a8dcda688250218b796446e6dc9ad3b0efdbe4a0e408873921ff38977485c3fcf9af SHA512 e111c90b77a43bb3ea7cd5cc90cd95a09be95413443db474c04e30d5b00ff96a69e8cb2792a3995462f4623538fc33b89029ff13c25181beff015c47e506d4b9
 DIST cacti-1.2.14.tar.gz 25182521 BLAKE2B 555c30ebd06ac71df608a1564892ecd176cf46fa079fd3615dc59fd984bc8bedd4512d971dc3c2731848107da728724ef459d84f0308bef8b0b6ab943b8bc3cf SHA512 734d8e059ea47630072269d92ad79e773268c5dd1cd9c565d23c41b2a74c8892bdc5190f7de6bb9ed281a67ade9c8ef6d723a9d4f486a4ba9aca99182d6ad056
 EBUILD cacti-1.2.13.ebuild 1011 BLAKE2B c9c42e80eb588faec3c8c16337905c5006fabe200bab3b0d1c8dfe6ff02391a52947d9efa30f331bd3352030d8d48bafbfe90d1b11ff9de1fe3eeffd7d2fdb16 SHA512 2b58b91c60e77448d15b8fd91b05692a3102e0ce699452b11a71b0c9767820e65a47e1feb816dfad6a0a16f3869e8f765ef97e67f08250a47a49f6cdadde92a8
-EBUILD cacti-1.2.14.ebuild 1014 BLAKE2B 6a411ccf50676e6fbe8f67144d445a7519318ccf83f7003ad9b322ff8cd0c4871c8b582e646041ca1920fda51f6c7dd96f9e598eb0195a4e22abd603c5bd4d3a SHA512 a564373a907200a00816b135240c10eb1dc8741dbcb88a2488e43a4794be0194b470b55e31c481ccc36b75d1b7dd6a2ed761bc48f02944562785db311b35fe8b
+EBUILD cacti-1.2.14.ebuild 1013 BLAKE2B 0c88fa57c853da64387053fd7d20ba5b21aba8d347cc4f39f476c590b931cf4076e19ff560f5d9d2ab81a6eb65d9ac4ef6c55a51b9e4755bf017638e37ed8793 SHA512 6ab0dbd653f0c4267d573b54ca81964a1c4bee8af6a00a234e10ae53e73c3d89795823c05b7283bee8775a142fa5d640cf927b0fcb169d8d1bb0fba34acfc776
 MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616
diff --git a/net-analyzer/cacti/cacti-1.2.14.ebuild b/net-analyzer/cacti/cacti-1.2.14.ebuild
index 66775efc3b40..dc7979df255e 100644
--- a/net-analyzer/cacti/cacti-1.2.14.ebuild
+++ b/net-analyzer/cacti/cacti-1.2.14.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.cacti.net/"
 SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 63e08bd39129..c90bf7ef7931 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,12 +2,10 @@ AUX icinga2-2.12.1-boost-1.74.0.patch 19210 BLAKE2B e6e09b631dc70b740212ad20d4e1
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec SHA512 e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e
-DIST icinga2-2.12.0.tar.gz 7530104 BLAKE2B 6f4a37d638449596d163add4ee070d24c1eb5f483e32f6c666454353578e6399a04cda949cb51b135516be7b437196e5beeff0e5e24a7bc26b855de87e24a797 SHA512 2a0ead159cfd71ebb662b909d8c4a64bdf13235b14d37b67057034da4fbf8764167b175e20f635989a98faafabb5da4f71321a4f8592172bed5cbb3ee557b276
 DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6 SHA512 8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529
 DIST icinga2-2.12.2.tar.gz 7534173 BLAKE2B 58aa25be81cfd9d674371dcd17043fbdd8fd9f03b2fdbe994101dfe6088ed289e64c213bb5ec1c62863fc2a5d015f2ee928a4bd45343eeead62aea3472faf187 SHA512 db61843f0ea0e05ea8c0ae035e6fdaf1ebc03115b0690a0465ef1847426656acd8ffc108e36056a46cfbc4eb9538c612bbb5adff2db72c9cc51330fcdd62c136
 DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e SHA512 28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799
 EBUILD icinga2-2.11.6.ebuild 4584 BLAKE2B 26ebea2c0c182362d24720bf50b95bc5ec364629c0229d2399c666081570909d66f3cfb4dd357a0b5c61447a5a369bbb833fc51c1fc1a99a6902ed33c4ca6402 SHA512 801050caf9c1ac07a2177f61965aac1829b8ba8bb8961c7a6f300ac1fadee3cee290cf58d499c8e6f52dada72a659baaf8905cf636cd3dd369764a2a4781af09
-EBUILD icinga2-2.12.0.ebuild 4582 BLAKE2B e4f9f977636053c64d8a1bb86bf8f62cb5f42f9a3fea84bb90eb03470533a6b29a24851023b6353558fd8ae3ef7622759887b559b7080aae400505eaeb7e8838 SHA512 94ef9210e2b300cf6aecf8b3caedc9fde4e17b53b90ad554737a94c0207d86a31c139e1280ae55ca17332cbe70326afccb1e7670d2eea279fcc5d42dbbfa9678
 EBUILD icinga2-2.12.1.ebuild 4060 BLAKE2B f775606357a69066c8cbf1cd2e686f623e4e88824e703f6b4dfe4280ca3ea0620436ef156625974ff5e9cc177b206101a968892b68fc4783828a4192b39ea67e SHA512 5f37665f4efce4dc3f7bc26620b8573606ea45a77858a66c0feb881644dba96c9ee1215912c9b0787e58e5e63ab988d0b96ab7de854890dc0467cd02b300c4fb
 EBUILD icinga2-2.12.2.ebuild 4062 BLAKE2B d1f56152154fbb597dcafbe5e567af8e84b7bb264cec07a513c2d0f8f1933714c0da7c34754e33c39198d46a964629c31010f4657c849bc0779da26daf2b5b79 SHA512 d9757572257d0bd9ca576cc454b885b9b7f4f5419b3de85e61e1b7bdf75b40dd4dc9355543249d61d9900a1c5d0023812d7f4fdbbb934b5af35d25cdec0d5004
 EBUILD icinga2-2.12.3.ebuild 4062 BLAKE2B d1f56152154fbb597dcafbe5e567af8e84b7bb264cec07a513c2d0f8f1933714c0da7c34754e33c39198d46a964629c31010f4657c849bc0779da26daf2b5b79 SHA512 d9757572257d0bd9ca576cc454b885b9b7f4f5419b3de85e61e1b7bdf75b40dd4dc9355543249d61d9900a1c5d0023812d7f4fdbbb934b5af35d25cdec0d5004
diff --git a/net-analyzer/icinga2/icinga2-2.12.0.ebuild b/net-analyzer/icinga2/icinga2-2.12.0.ebuild
deleted file mode 100644
index 72756f463b8e..000000000000
--- a/net-analyzer/icinga2/icinga2-2.12.0.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; then
-	inherit cmake-utils depend.apache eutils systemd toolchain-funcs wxwidgets
-	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-else
-	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs wxwidgets
-	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-	EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/boost-1.66.0:=[context]
-	console? ( dev-libs/libedit )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	dev-libs/yajl"
-
-DEPEND="
-	${CDEPEND}
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35"
-
-RDEPEND="
-	${CDEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	mail? ( virtual/mailx )
-	acct-user/icinga
-	acct-group/icinga
-	acct-group/icingacmd
-	acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-src_configure() {
-	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-	local mycmakeargs=(
-		-DICINGA2_UNITY_BUILD=FALSE
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-		-DICINGA2_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DICINGA2_RUNDIR=/run
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-		-DUSE_SYSTEMD=$(usex systemd ON OFF)
-		-DLOGROTATE_HAS_SU=ON
-	)
-	# default to off if minimal, allow the flags to be set otherwise
-	if use minimal; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
-			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
-		)
-	fi
-	# LTO
-	if use lto; then
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd "${BUILDDIR}" || die
-
-	emake DESTDIR="${D}" install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-	if use mysql ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	fi
-	if use mariadb ; then  # same as mysql
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	fi
-	if use postgres ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-	fi
-
-	keepdir /etc/icinga2
-	keepdir /var/lib/icinga2/api/zones
-	keepdir /var/lib/icinga2/api/repository
-	keepdir /var/lib/icinga2/api/log
-	keepdir /var/spool/icinga2/perfdata
-
-	rm -r "${D}/run" || die "failed to remove /run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners root:icinga /etc/icinga2
-	fperms 0750 /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners icinga:icinga /var/spool/icinga2
-	fowners -R icinga:icingacmd /var/lib/icinga2/api
-	fowners icinga:icinga /var/spool/icinga2/perfdata
-	fowners icinga:icingacmd /var/log/icinga2
-
-	fperms ug+rwX,o-rwx /etc/icinga2
-	fperms ug+rwX,o-rwx /var/lib/icinga2
-	fperms ug+rwX,o-rwx /var/spool/icinga2
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-	fi
-}
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 216fa0b8a909..fc53a216ff1c 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,12 +1,5 @@
-AUX mtr-0.80-impl-dec.patch 226 BLAKE2B ba16f81170ad40b472760f9130f139f092c69d7028912fc5c93b3e709bc4628e7778a97f77bd7ad98a16a5220ab476caa980c2adab306689fd8f77743788a1f1 SHA512 71c53c22f4ff99b29cd71f4e910e857ea0f4f497d25dcd59295ca2b59eb7be40d021d865489a53234d5fa4395f6baf011073d117653ad82aef78562a60898b1c
-AUX mtr-0.87-ipv6.patch 1846 BLAKE2B 7d2166183a203454eca233b8ad2bc3e97c4dd7fcacd6325d83694938c026cf9cee25d8ecc3d799e8ffa09315361117f41981e382af296538cbf6fffb23b5121e SHA512 07a43b798b30893583fb08e7e65a6833ece98f18656f6a31e7e61acd1f582d68d35b63d5aada4175d5df2451cbd856370e85f514e1ee8447ada9a91a83af1345
-AUX mtr-0.87-tinfo.patch 380 BLAKE2B b81110442dde3e7d0337c2b6e6685a377593b6c91c31fd20fbf42cd54296282aec3ab73a8f047ed4742a7a369a18ecf9b26bcd3f56d5e9a5e565e6f66b906f5f SHA512 91442d319840620273c712e7668d8895a28a10615afa4e06a16a3f86c2dc319a9484c7a8b92a8ad7de97f56c52b881a230ebd3fe59e45a7a4df85fcd77c74229
 AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f384258339495abcd937271ad29b429bebe5922f5288113683e5910c5ea513d2a131aa50b230ab51bfaf332e31379 SHA512 996905be6f96f71a742d3a00c0a5c6730b69709f50db4132284e12030dd80929ed838f7a7a94bf3634698bd17234a1324a84f81a5dfe5f4a71ab70e9f8f294aa
-DIST mtr-0.87.tar.gz 184645 BLAKE2B e96535b0bd46ee63c5e6110ee465195a9ead6ff7c7ea3629b2668631f25e9181cf4236ba0e2cfc0517e7c70683bbb6347d9c26a2b09701d89e225c27aa2faae4 SHA512 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9
-DIST mtr-0.93.tar.gz 291015 BLAKE2B 6ac0e21f9e06fbfee9e9ada4cddb6cd9685ae669a05d1ed257a2c238ab78ac16e1a1e152ef1359ca530b0eced14c9333df2b691c27cbc29173c843ebc64eaaa9 SHA512 046e98a661bd6248ce819411ceb6e2b875b92877de38523594898df507836c113573cf40d7d4cc548370f515abe99e0aa4d8b3ba44ad54dd00f8e93c8a96c021
 DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
-EBUILD mtr-0.87.ebuild 1154 BLAKE2B 7dabf8118eb039767ee7f67948667de349928e053525f41af128db531bfe92192613ad5047ef0836deca9b23da72816b9fbd628546cc76131c9bb4b7b6ce8948 SHA512 51b6c6ed2710f98729551d2ba2ff4d79f048d31c31fd839a9ec8268be675e940d7e91cf2e9f1255d6b6a715ef43f1a5cb2b1a1817ac72c63b8b413091b2a85c0
-EBUILD mtr-0.93-r2.ebuild 1331 BLAKE2B aa44ba0f4126312bbfed53cf22fab692f84775f966c61b5b3b3cfb76d476cc6ef7db231194d957a7e5f7c5c140f4217b08737a31f250c4e984b1e981267d0283 SHA512 bc24e0412acc8f0a5c1dfbe556ec9ee0fe9044b2ce8e39366f555068a1471b80517f0d443a21e36bdc542d255f594d336c9817f5cfa75f21a0da8c38247f5612
 EBUILD mtr-0.94.ebuild 1389 BLAKE2B 165b9a35094f2a1ea4adf246b79335e97310b7633a0aad75997dbc22a2a9f7e9b94f09c9395b68fb49e9c34e2ed2da48a9c63a84d0e879216e3360b1870915a6 SHA512 e0a6ece96b0302de707a498421e12ff106b90ffc82f3a2366a6325d837e240bab832e33dfb008f8ed21abd66f68d747baf059190760199a77de8d8fb28f0e914
 EBUILD mtr-9999.ebuild 1241 BLAKE2B 5c4b500e1ef1995947154e627d262b79ca135a6ee6c231e2f865b955952bb5f968f227d82f9a4217d963b4387a2afc379ef46c90fc88c43eff227676b34e78e7 SHA512 e954551e3a37dfca502d2c76e77134193ae7cdba68e74dd755a1f853ddbbe274488bf7bc758711805875f06e80e1790b638d2adfb247421c06c0aa706b9bb163
 MISC metadata.xml 556 BLAKE2B 23e3fd72b2360a5a1a5361df09a8116a70ed178a2e1367c21e7ce77b4f8956a521b8ffb69719eeca673e5766aa8733623baa579a8998adcf884e29a850bdeaca SHA512 a61448154f21ee3870c53bf3877cfbbad543fa11d9e0d1a4579cdcb18215e46129993df0dec9e01c97e76915ecb052c3f16e4c19cc85ac0f21c19cc4d45f71e1
diff --git a/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch b/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch
deleted file mode 100644
index 5b41a54c744b..000000000000
--- a/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/gtk.c b/gtk.c
-index e42f4f6..333d7c8 100644
---- a/gtk.c
-+++ b/gtk.c
-@@ -24,6 +24,7 @@
- #include <unistd.h>
- #include <sys/time.h>
- #include <sys/types.h>
-+#include <string.h>
- 
- #ifndef NO_GTK
- #include <stdio.h>
diff --git a/net-analyzer/mtr/files/mtr-0.87-ipv6.patch b/net-analyzer/mtr/files/mtr-0.87-ipv6.patch
deleted file mode 100644
index 32a62853387c..000000000000
--- a/net-analyzer/mtr/files/mtr-0.87-ipv6.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/net.c
-+++ b/net.c
-@@ -320,9 +320,13 @@
-   struct sockaddr_storage local;
-   struct sockaddr_storage remote;
-   struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
-+#ifdef ENABLE_IPV6
-   struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
-+#endif
-   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
-+#ifdef ENABLE_IPV6
-   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
-+#endif
-   socklen_t len;
- 
-   ttl = index + 1;
-@@ -437,9 +441,13 @@
-   struct sockaddr_storage local;
-   struct sockaddr_storage remote;
-   struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
-+#ifdef ENABLE_IPV6
-   struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
-+#endif
-   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
-+#ifdef ENABLE_IPV6
-   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
-+#endif
-   socklen_t len;
- 
-   ttl = index + 1;
-@@ -726,8 +734,12 @@
- 
-   /* sendto() assumes packet length includes the IPv4 header but not the 
-      IPv6 header. */
-+#ifdef ENABLE_IPV6
-   spacketsize = abs(packetsize)	-
- 		( ( af == AF_INET ) ? 0 : sizeof (struct ip6_hdr) );
-+#else
-+  spacketsize = abs(packetsize);
-+#endif
-   rv = sendto(sendsock, packet, spacketsize, 0, remotesockaddr, salen);
-   if (first && (rv < 0) && ((errno == EINVAL) || (errno == EMSGSIZE))) {
-     /* Try the first packet again using host byte order. */
-@@ -1535,11 +1547,15 @@
-   struct sockaddr_in name_struct;
- #endif
-   struct sockaddr_in *  sa4;
-+#ifdef ENABLE_IPV6
-   struct sockaddr_in6 * sa6;
-+#endif
-   struct sockaddr * name = (struct sockaddr *) &name_struct;
-   struct sockaddr_storage remote;
-   struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
-+#ifdef ENABLE_IPV6
-   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
-+#endif
-   socklen_t len;
-   int s;
- 
diff --git a/net-analyzer/mtr/files/mtr-0.87-tinfo.patch b/net-analyzer/mtr/files/mtr-0.87-tinfo.patch
deleted file mode 100644
index 4dbdef1cc2fb..000000000000
--- a/net-analyzer/mtr/files/mtr-0.87-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,6 +25,8 @@
-   AC_DEFINE(NO_CURSES, 1, [Define if you don't have the curses libraries available.])
-   CURSES_OBJ=)
- 
-+AC_SEARCH_LIBS(raw, [ncurses curses cursesX tinfo])
-+
- AC_CHECK_LIB(ncurses, use_default_colors, 
-   AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() command.]))
- 
diff --git a/net-analyzer/mtr/mtr-0.87.ebuild b/net-analyzer/mtr/mtr-0.87.ebuild
deleted file mode 100644
index c3577104b26d..000000000000
--- a/net-analyzer/mtr/mtr-0.87.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic
-
-DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
-HOMEPAGE="https://www.bitwizard.nl/mtr/"
-SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="gtk ipv6"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
-FILECAPS=( cap_net_raw /usr/sbin/mtr )
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.80-impl-dec.patch
-	"${FILESDIR}"/${PN}-0.87-ipv6.patch
-	"${FILESDIR}"/${PN}-0.87-tinfo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# In the source's configure script -lresolv is commented out. Apparently it
-	# is needed for 64bit macos still.
-	[[ ${CHOST} == *-darwin* ]] && append-libs -lresolv
-
-	econf \
-		$(use_enable ipv6) \
-		$(use_with gtk) \
-		--disable-gtktest
-}
diff --git a/net-analyzer/mtr/mtr-0.93-r2.ebuild b/net-analyzer/mtr/mtr-0.93-r2.ebuild
deleted file mode 100644
index 880c2729a41f..000000000000
--- a/net-analyzer/mtr/mtr-0.93-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils fcaps
-
-DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
-HOMEPAGE="https://www.bitwizard.nl/mtr/"
-SRC_URI="https://www.bitwizard.nl/mtr/files/${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"
-IUSE="gtk ipv6 ncurses"
-
-RDEPEND="
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-DOCS=( AUTHORS NEWS SECURITY TODO )
-FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.88-tinfo.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's|m4_esyscmd(\[build-aux/git-version-gen .tarball-version\])|'"${PV}"'|g' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_with gtk) \
-		$(use_with ncurses)
-}
-
-src_test() {
-	[[ "$UID" = 0 ]] && default
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "mtr needs root privileges to run.  To grant them:"
-		ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr"
-		ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr"
-	fi
-}
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index dd27ae23c3dc..e4bad07a7e5f 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,4 +1,4 @@
-DIST netdata-1.27.0.tar.gz 6217873 BLAKE2B 6a3b577d3c67efd925c8b496f19ef7f76fe990f381bbd8a9c1decf5e55a56e565c1b4a5f8aa95421f0e12d122a9142f23942a2d28bec434027f326b5239397d1 SHA512 90d6aa30600385e64a90b28569712f0d09e4c0dfa6de46ac17aede81189797e39c823092067b5ee8118289c7b62a224b8e7107d85f8bd6cc90311c4efaa631e8
-EBUILD netdata-1.27.0.ebuild 3422 BLAKE2B 33b578b75b69c9762b816cb5d30a502757470fc780c7f7dbfa7f33660dfd33dfc2504b509f7cbe8cd94354163ec056886eee188b6851cdc2e4f3d2f83819a4b7 SHA512 d2453b66acc2cd802e00e7de98c0730bd468669c8bd17fcfbddbc3b3347656e5754813fc11240cf2633ad38b219ef62dac0c42c21910b47ea659ec0057c910cb
+DIST netdata-1.28.0.tar.gz 6218048 BLAKE2B 9ee0eea1a17df207ffbc934b3c0dfe261fb3c3a51312947df0e287fc29c4dacf35e414593da0b3829999cea6bb03eab89fe7f1743fdcc3be39d532427a9239b2 SHA512 98048ebb10ff9db9cd273fb7b66e30aa14f6cd71e53a0c80c7ac5bd45c9f85b64b1d2d5fd12734921a11b584f67435563e26f0249aab61458b563405bbc54b17
+EBUILD netdata-1.28.0.ebuild 3422 BLAKE2B 33b578b75b69c9762b816cb5d30a502757470fc780c7f7dbfa7f33660dfd33dfc2504b509f7cbe8cd94354163ec056886eee188b6851cdc2e4f3d2f83819a4b7 SHA512 d2453b66acc2cd802e00e7de98c0730bd468669c8bd17fcfbddbc3b3347656e5754813fc11240cf2633ad38b219ef62dac0c42c21910b47ea659ec0057c910cb
 EBUILD netdata-9999.ebuild 3422 BLAKE2B 33b578b75b69c9762b816cb5d30a502757470fc780c7f7dbfa7f33660dfd33dfc2504b509f7cbe8cd94354163ec056886eee188b6851cdc2e4f3d2f83819a4b7 SHA512 d2453b66acc2cd802e00e7de98c0730bd468669c8bd17fcfbddbc3b3347656e5754813fc11240cf2633ad38b219ef62dac0c42c21910b47ea659ec0057c910cb
 MISC metadata.xml 1229 BLAKE2B 4247be48b9fc7f1e16f9a145d5c5fa6036d7721fd829d3e515903043a29397e29d9ef550ce21bb17bb3c4da012b41ef2961d4772f99b37169bc25b79e840696a SHA512 264dda2113eec7e86976c09bb0074a21c3255344be635131d737bda61ba8f95e103882d44957e92a7a44d73473448ada0041c80e63fa221b72c8d19d2953447e
diff --git a/net-analyzer/netdata/netdata-1.27.0.ebuild b/net-analyzer/netdata/netdata-1.28.0.ebuild
similarity index 100%
rename from net-analyzer/netdata/netdata-1.27.0.ebuild
rename to net-analyzer/netdata/netdata-1.28.0.ebuild
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index 480412a2eeaf..b5b07f0e9cda 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -5,5 +5,5 @@ AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827
 DIST ngrep-1.45.tar.bz2 463361 BLAKE2B 31f7828fb28197f06a583cd6d250b5d70bfbd2bc5dae657daaed3f7ea286aec4dff9cca449c72a3c27d8e8b30d861304872eaaaa11abc9eb71f2acc94d9fc9f2 SHA512 0feb4080f834449d57ae99897c573d2b8148711cfb550fa4ff415169dedb1f0d23f4b03f625660162ca72f8ad06e19874c1af46da6afd8f8fe8dd553558c14f7
 DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657
 EBUILD ngrep-1.45-r3.ebuild 1050 BLAKE2B 405266d7b8805ff562241b5ac72e0a0319754884b64934e71c650e63577da53e18704a32648bc72c1aae35a4036606c4922169d10a3e2b8d481632c141a25ce9 SHA512 6bdd2ebb0b45d9c7744243a0f16c193b3d4501b10716ffdf614774a9ba63168be8d14c2b2795322b41469e820a3aeb511e57343ebbbef01abc45292192af93d0
-EBUILD ngrep-1.47.ebuild 977 BLAKE2B d21dfa617c287895d12884125ddd71c7120f4927ae272144d51ee219b939511c19869a59911339d0ed72991abf4e8814ce7909d714353959c1857dc8dde872fe SHA512 46b2fbbef2f0471cd0c72f2daf7e7bd655c98fd4ca397cfffbacdb6b094a7a3d22c28ab553a72936d3abe6a2cef3fcc8e5dd587e1f0b4602e750c197c230889d
+EBUILD ngrep-1.47.ebuild 976 BLAKE2B ae6431ab7b83c039dc2bc83adf85ad77b36e2191e89362a259dbd66649898851b086553fb05e2e85fa01991baaee54cbb678deab0f49aaf38addf4a91f83865d SHA512 ec26676f4873a6ef973b96c3668f92b99e29932785b9c8850b7847664512552f47ba253983047a18d558a2e1af8650a1ad5bfa94a31f180a4c05e9e53adc07cd
 MISC metadata.xml 669 BLAKE2B 79852bd4c0d1185bcbf60e5ba9e5a9c58b6d6720942cd0cd6d7f8f4f6d445d9ba3fa888bbfba625d1627df4a0aaed22513163075806483a576e199acb9c5fb4d SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad
diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild
index 6ca8a342aa3a..641f886507d9 100644
--- a/net-analyzer/ngrep/ngrep-1.47.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.47.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jpr5/ngrep/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ngrep"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6"
 
 DEPEND="
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 565dcf845fac..d6a2b0a54cff 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,6 +1,4 @@
-DIST scapy-2.4.3.tar.gz 2969754 BLAKE2B 83ab6500dbc0424b728253661f03391d450f77b19c0059b8a605a19f48b4ddd7344743310a5cb7c741fcf750876ba125daf883d04714981ff81ef4db97519ae0 SHA512 579e3f326f90e10b2839aee805949e14ecab9431f360ef75e60080a971653e1f48a240d812b8ace77754b01b07a2ddb8533d1e6b18ee8804280bf9b2c237cede
 DIST scapy-2.4.4.tar.gz 3240890 BLAKE2B 38b4fc0c34f229bb33f4d488ae9ba20905db572e3dd3caa15a92e8a33ba7305ba86a2b32a2664779c5085e53d44b4c55336d7afa8d65b90ffa3babcdc94bff25 SHA512 b8ad138ae2563967af07d123339ac73468fadb8f7687123aed364ad6d45198e9039314e17a155c37d01ef084e25571c587330dfd21777527110342c01821a389
-EBUILD scapy-2.4.3.ebuild 1005 BLAKE2B 43241ada322289f7fb8a7f987241dd4115aa0b5a30c575a84b990f2931ea30ede71f4bf2052403e4da4136b6a0a89bd7f1e0c05a351f2714570ede8f0bdd9255 SHA512 429aaeddb0535f18904c064bbd4e08ffba1a8d6519813cae285ab4917fbb78bafc24337eeb30384be8e4da205d5c1a041fb8b30db9075ac09921f4d5a15a7c78
 EBUILD scapy-2.4.4.ebuild 1060 BLAKE2B 7e069b3d74fda950c54f80df95847629af78386509467afcc3f387962eefa2eb1a41c386eb6d6d2e35b336d46f29e2840c26b5c8fe99802e8ba1dfd779e92629 SHA512 d80bec0aab72a90f7cdfac918e87e85d8ebc42c730d67e7a1700343b42624d2a19d51722e9eec78695dc4316ab6649c3f3974b98ac570c63f084a1a7a52b15aa
 EBUILD scapy-9999.ebuild 987 BLAKE2B 07bc33cd80fc39c47d49e181ccee40df7e93f895c73a97166c31922b941bff4cd4ef98baa5141aa4fdadef4260eb31570371eef5c99a2c4e39120779441439da SHA512 806261e8e3fc3407e6849c20106732d8f7e34bcfc979b8c88f4b76b9dd45a072c730ff37d48d5be23b1f18551aff3bfb266196339b7ce9e7330c04f603f6f729
 MISC metadata.xml 584 BLAKE2B a5b6c42179b511881bdc9c7946bb059f38a67e7e56edb76a81d021674badb4fca4a0ef51302d71adf64b6ce06b165d05d9cf43c3fefdd6127469736e6e37efee SHA512 a3193634b17020af3d35454f160ac6fc5289d5cadcc7a50c95e44d9ee98d26f102489334a750bb806f98e2e978dafe25718ef7468bf7159499ff33f5064da89d
diff --git a/net-analyzer/scapy/scapy-2.4.3.ebuild b/net-analyzer/scapy/scapy-2.4.3.ebuild
deleted file mode 100644
index 2b9cea9f0d1f..000000000000
--- a/net-analyzer/scapy/scapy-2.4.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
-SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RDEPEND="
-	net-analyzer/tcpdump
-"
-S=${WORKDIR}/${P/_/}
-DOC_CONTENTS="
-Scapy has optional support for the following packages:
-
-	dev-python/cryptography
-	dev-python/ipython
-	dev-python/matplotlib
-	dev-python/pyx
-	media-gfx/graphviz
-	net-analyzer/tcpreplay
-	virtual/imagemagick-tools
-
-	See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst""
-"
-
-src_prepare() {
-	echo ${PV/_/} > ${PN}/VERSION
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc -r doc/${PN}/*
-	DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc
-}
diff --git a/net-analyzer/tcptraceroute/Manifest b/net-analyzer/tcptraceroute/Manifest
index 3a15f2accad5..5123bb420414 100644
--- a/net-analyzer/tcptraceroute/Manifest
+++ b/net-analyzer/tcptraceroute/Manifest
@@ -1,5 +1,5 @@
 AUX tcptraceroute-1.5_beta7-cross-compile-checks.patch 1228 BLAKE2B f18640804c946225fed7324203c928062b37001053ac87a8f78c500b1bb6c65f3263650484f51ccf20b09bb8d1ce95f871b2ad53f8752154e0134b5e26b2e01a SHA512 a994d9d0dfd633fd9f091c77a0ca96b0b73dc9a7373631feece29fef3f3daeb38dddf7fc6fc829c64cb8eb3809d7e25d22f3c18d2202188df9d94ca237601815
 DIST tcptraceroute-1.5_beta7.tar.gz 119059 BLAKE2B e2d627c7fa96439e77be7d2fb5d57e0b92451367c95022876895fcbebdc0adf8c78b262e41ecb8a2696e8377e9862b45f2139cb8ca9d92a696d9a0dc319d4a64 SHA512 ad5588e62a56f1b5fa851b68280a88e66a900777fe4fd67587262245cd9da17b536b7dc972abe540fc124a93ac76abcabbc55bc32f9f8ee872d5df57b08f7222
 EBUILD tcptraceroute-1.5_beta7-r2.ebuild 932 BLAKE2B 27bdd1f9cdf1a458adaa96b26a4dac6cf005b6b2d0014bbd116afb59770dc129c7ce5705491a4ef06d10c4977a3e9e1be8f2f31775a2a4f1df8f961f3f82d340 SHA512 e71e63651dea0d1eb69ae3c3d0e5fc4b265c4b4cf0f57616541e443c34a517a2a9b3ea2b46cfcb67038c2a9e4bad91efed24b8f23266568828f3f2d0fe33697d
-EBUILD tcptraceroute-1.5_beta7-r3.ebuild 880 BLAKE2B 36134fa45277ae34998f7dc9c8670e306d1a1ffd71ec036682aa2f7b2117b9225c1369a33108fef63392dcbffb64c4460fbe606e17fb192583fc60ea80016b70 SHA512 29153fadcec39febd3976118d2aec6f052babf67eaae7e44747b2e8574bfa72e8ba82f0243fbb0622a8afcb8404a11cbe87a8fd98ae83ee84e6e8c80aca4a7ac
+EBUILD tcptraceroute-1.5_beta7-r3.ebuild 879 BLAKE2B e6cc5df639c5d096207f3240e5755aaae8522a5e8a91b2fe84fb8f7d05128e5908f00e2ec15881ddc657469ebbe983609b5ff009bfcf20672008db57e80ed144 SHA512 f161a9244fcec7442983857641506e8a517e127ba9c0918fa23c424c95cb7acd15a0e9d1a18edc2ab39424ed0366b871e599565562181df17d1d729a4e66b7d2
 MISC metadata.xml 362 BLAKE2B 7e5066833673e1881f77a10c92f8ff281c050140a6a77154fedb4f469b99d6c53abbdb0a35702d5325e294f7acfe8b050254be7ffac4c3832455777c65a98cd5 SHA512 783a1867b40907e8704e19ec6d423f4db8a97ba683f64efc72ea7bf4e4157e9bf630470fcf8a0410d6fa9bc5cf63f810f1f577828bdfe1203f2f56e55458c7cf
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
index bfb827e2b245..274ac82275e0 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mct/${PN}/archive/${P/_}.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"
 
 DEPEND="
 	net-libs/libnet:1.1
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index bd5c819475be..cdb2e55163ae 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,8 +1,12 @@
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
+AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.4.0.tar.xz 32502760 BLAKE2B 5d8106f36cc3a1425fd472f7ba645b2a07bfb93c96178a98f90676f39cad38089b625d7d6725ecfaf67bfc78aba3476567b9bf390d6f0dd838537eb81bc4aaa7 SHA512 02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649
 DIST wireshark-3.4.1.tar.xz 32470004 BLAKE2B aa2c3e56df4232b087d09a52209eec1e91a10ab125f6fb973171771d86d349ddf76bef3da089f0d6740c67883009fb77c5760c1141c99a056e7a36fe8ae5c088 SHA512 a968158a5a22d04a9bf3b060246f7579210a8106e06184411fd00dad69e030c10aecfa579c09dcca11fb659e0a1de4773951578cb3697dd2dc8e5153d3892728
+DIST wireshark-3.4.2.tar.xz 32465900 BLAKE2B dab7e871c798a6e0f03f45eaa49ba5cbabc18afabd6a5675a3241e4f1e6d86ef21b56b4cee5d561da2f2ec2b274ac6c5a52ed7b8ad50cbf02949a3a7f68d4f09 SHA512 38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a
 EBUILD wireshark-3.4.0.ebuild 6898 BLAKE2B 3bdaa80868d870e2a5fc8f71cb53431e865a3f9f28bb893651e11b04d1ccab30dd4bb29dba30129000dc3b401ab5ab2d4a22a6e7c4d7c603a309206f42b310b0 SHA512 bc0c37dfc811d0f425079aad51a86cf793d7c8eca6e083a674e2df9f321c87c45d386dc5ba8153dbe999a2ee89140939dffa5fe660b858534f1cb48159e3f531
-EBUILD wireshark-3.4.1.ebuild 6901 BLAKE2B 9d380e47c2cfe7d3f14a842e802baf99b200ca01999ce46d090bd32ee941a205838120885aa157d40ca0d89ddfbfa1733aabb285e03ae8e3a87118374981d7e8 SHA512 d930a68747eaa2b4c4350ce2274b7377e56f71b8c010e4fdd73944f3e44e8f0ed3643804de0e547cb4cd150954e82ab51ebe55357e75b198a2901b6e3a65b869
-EBUILD wireshark-99999999.ebuild 6788 BLAKE2B 7d04031c8fb62d7dcb7ea915205bd7d00dc1d3cad0066a2a0443fe26d6af2400ef85552211c110eaec7c411e00bc4fa7634dc2a6456eaecb7959363c83ab2a1c SHA512 b59f2d1e5e4bd82a280d2ed7ce546ee9d43ed09251f71ff01efb5be38ca524bd8fbbf061a4ba4f823e829a92f6891e2180e01dbfee8bba659ab08764d9a737ff
+EBUILD wireshark-3.4.1.ebuild 6900 BLAKE2B dee044bb566ed6e40604dce9dbbc40413ece61731bd394d79f2f8b0ae80b26ddd74548ae5facef5bea890c9e8025556f841d3dbc935c60b7b6c6bb209e0f4c15 SHA512 ac765291dc390bbbb7411afe6b3d1f3870536230f9083519bf4e61446f0a1bd4e64c891840baf9c3d899773f47c30728bab827970adcb9a062a755549458667f
+EBUILD wireshark-3.4.2-r100.ebuild 7053 BLAKE2B 0ce54139d5ee587734b38fa9f8c70517cee1444db20617e52b3c03d0d3559a929a5f5e9cc1002944ea7b0bad893b5518aad3de4eb298bf649ce6e8855891cc53 SHA512 1cc9876807637eedda39d6c0f0300393e4fbb26344452338e3fb29bb1d64fc9f6181a47be80996d2c1bb25379e571301e3ef576c4e1b0e313864e3ab1099263e
+EBUILD wireshark-3.4.2.ebuild 6900 BLAKE2B 0e4e83c00f4062484bc4896778fa6edfa1277d929dbf6b19181bf4ff97699c88e2132a661f0b0b85d80d0d4cf1845450050ef4bdf7607b199101fea3eb399bc0 SHA512 ed637af1b113a2efa5b49eba13887d659312421bfafa7fca7ca19ee29b3683f39d5aa9497b0aae719f6ddca2e4256ef3c7a9e3edf65c8273f8519eb46c6299fc
+EBUILD wireshark-99999999.ebuild 7000 BLAKE2B 9d40f8d222273bab993e3cea331bbf8c326dfe85c23ab1630188468ba8c2ef261886a642e9f5865ee0969330a51c1b658f95eb063b98d0e9b300de70b0579448 SHA512 ad1a3e7bf9c668e294bff31c6618ce93d7e38af8c47195c95a9ad8d405e6287d9403bb2c92c3b1b9f58c842c114d1841ea1cce87d31a4cc209f82e2884a9f2e8
 MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch b/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch
new file mode 100644
index 000000000000..18f663b7d814
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch
@@ -0,0 +1,11 @@
+--- a/cmake/modules/FindLUA.cmake
++++ b/cmake/modules/FindLUA.cmake
+@@ -19,7 +19,7 @@
+ 
+ if(NOT WIN32)
+   find_package(PkgConfig)
+-  pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51)
++  pkg_search_module(LUA lua)
+   if(NOT LUA_FOUND)
+       pkg_search_module(LUA "lua<=5.2.99")
+   endif()
diff --git a/net-analyzer/wireshark/wireshark-3.4.1.ebuild b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
index b72304eb72c8..f577758732b3 100644
--- a/net-analyzer/wireshark/wireshark-3.4.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~x86"
 IUSE="
 	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
diff --git a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
new file mode 100644
index 000000000000..8a5f5b3e6dff
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
+	+mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt
+	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
+	sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	acct-group/pcap
+	>=dev-libs/glib-2.32:2
+	>=net-dns/c-ares-1.5
+	dev-libs/libgcrypt:0
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
+	ilbc? ( media-libs/libilbc )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( ${LUA_DEPS} )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	minizip? ( sys-libs/zlib[minizip] )
+	netlink? ( dev-libs/libnl:3 )
+	opus? ( media-libs/opus )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	test? (
+		dev-python/pytest
+		dev-python/pytest-xdist
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	plugin-ifdemo? ( plugins )
+"
+RESTRICT="test"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_ILBC=$(usex ilbc)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LTO=$(usex lto)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_OPUS=$(usex opus)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test-programs
+
+	myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if [[ -d "${D}"/usr/share/appdata ]]; then
+		rm -r "${D}"/usr/share/appdata || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g pcap -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the pcap group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-3.4.2.ebuild b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
new file mode 100644
index 000000000000..c95fe3129e8c
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.2.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+IUSE="
+	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
+	+mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt
+	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
+	sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	acct-group/pcap
+	>=dev-libs/glib-2.32:2
+	>=net-dns/c-ares-1.5
+	dev-libs/libgcrypt:0
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
+	ilbc? ( media-libs/libilbc )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:0= )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	minizip? ( sys-libs/zlib[minizip] )
+	netlink? ( dev-libs/libnl:3 )
+	opus? ( media-libs/opus )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	test? (
+		dev-python/pytest
+		dev-python/pytest-xdist
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	plugin-ifdemo? ( plugins )
+"
+RESTRICT="test"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
+)
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_ILBC=$(usex ilbc)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LTO=$(usex lto)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_OPUS=$(usex opus)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test-programs
+
+	myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if [[ -d "${D}"/usr/share/appdata ]]; then
+		rm -r "${D}"/usr/share/appdata || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g pcap -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the pcap group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 25d08cbda033..61860be16a1b 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -2,8 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils xdg-utils cmake
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic git-r3 lua-single python-any-r1 qmake-utils xdg-utils cmake
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="https://www.wireshark.org/"
@@ -15,11 +18,10 @@ KEYWORDS=""
 IUSE="
 	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
-	+mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
+	+mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt
 	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
 	sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
 "
-RESTRICT="!test? ( test )"
 S=${WORKDIR}/${P/_/}
 
 CDEPEND="
@@ -35,11 +37,12 @@ CDEPEND="
 	ilbc? ( media-libs/libilbc )
 	kerberos? ( virtual/krb5 )
 	libxml2? ( dev-libs/libxml2 )
-	lua? ( >=dev-lang/lua-5.1:0= )
+	lua? ( ${LUA_DEPS} )
 	lz4? ( app-arch/lz4 )
 	maxminddb? ( dev-libs/libmaxminddb )
 	minizip? ( sys-libs/zlib[minizip] )
 	netlink? ( dev-libs/libnl:3 )
+	opus? ( media-libs/opus )
 	pcap? ( net-libs/libpcap )
 	qt5? (
 		dev-qt/qtcore:5
@@ -88,13 +91,20 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-wireshark )
 "
 REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
 	plugin-ifdemo? ( plugins )
 "
+RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
 	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
 )
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 src_configure() {
 	local mycmakeargs
 
@@ -159,6 +169,7 @@ src_configure() {
 		-DENABLE_MINIZIP=$(usex minizip)
 		-DENABLE_NETLINK=$(usex netlink)
 		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_OPUS=$(usex opus)
 		-DENABLE_PCAP=$(usex pcap)
 		-DENABLE_PLUGINS=$(usex plugins)
 		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index d27340895fba..09fba9e2e211 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 8f3410d320c5..64b749b5832e 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,5 +1,5 @@
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
 EBUILD ldns-utils-1.7.0-r1.ebuild 1194 BLAKE2B bd2ee91e3a1adee034b4864ec624e15531bf27cadd9625744344c5df88a2a5adc0fc6c02045ef36bc4e88042bda9e85ad658c076709cdc413ba5f041dbd9c871 SHA512 a59e00760c948641198c9693f503244b62166cc4f628c1fe49fb6aa3a7abddeb47e616fded6d466e85d982a1d921883d51f0776f88dad3c0162f40d017561b22
-EBUILD ldns-utils-1.7.1.ebuild 1476 BLAKE2B 3394248b15bd9111b06f44836692f55bff86d5b1db7d021e2f204d5e17db9513151198e3a014bfad5528c2f41445960dea9481d891486000328e847e11861153 SHA512 a0fd24e05a4b72ef64d54204066ef87302c761e412dbab4272c6b50962af9de2b7cd41e60c2df6200f63d00025b24070037d0de8014a0712fe0275cbf51c1a37
+EBUILD ldns-utils-1.7.1.ebuild 1475 BLAKE2B f1e9d6e35ee543fccd1fc675026ff8018359e33df40f7d256327b9ce27579ac07fa868db3fba8aacf9e0a432e120622c06b020291ef2a098a73f0a6a574ed484 SHA512 c7826a4dbaa260ca456b44ad58e98ba823a12c7df051a810e9c79ef060ed2e4d5556dd7c39599ba40d0383784c382dfba4f531efe434e2ccff50f60900dc5df3
 MISC metadata.xml 848 BLAKE2B a31c8bfb2c5a90add80c4f608cdbd02e3bf15126726ed92203425b166ae01cf8240fa040d98ba44991cd315bdb388664692eca5820fc807cf3fddefc7663ffb4 SHA512 6ce3c5421c6e739f0c15a5b7e9120638cddc78fa3d9c2f564acfccd4c98bb3034512ce1a68422ba0ef7896750c1a41e273f2960d9d1f0ffc21c9028342482366
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
index 969fdba5b692..c892f13acaaa 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 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="+dane ecdsa ed25519 ed448 examples gost ssl"
 
 REQUIRED_USE="
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 2c1bd5f11ae6..ad9b2eba1b32 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -2,5 +2,7 @@ AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf40345342288
 AUX pdns-4.3.0-boost-1.73-compatibility.patch 2676 BLAKE2B 9b6a5e56915abc80fb354f0bf68732270823fb2b5a2d603bfd0f1a24bb346d44ea137de3e835018327f4216ea3e6288d625493540598e9c15ac719441d01f001 SHA512 306a1c14479b1078a4025efacaa893b2ef3a2f64f7dd5d06a2a18e3a23098f810f8fbb9f443015d6071c1e794a13c75f581b0da78ddd5e4737886a1419cf250c
 AUX pdns-r1 2535 BLAKE2B 4e718bbba73b20a86dd11acc07ce91d259d82a3fc3e6133cac0d7fb2b24d2b5ff3e3596d00c4289017845c7a1751d0a43e83ba67e4b8e55e10aca892ba3d3aea SHA512 5ebc7cd236195543e67db5ed2c831ff6a1b9bdba5a72c179df72f84e4ade2dfc962a988ab02a7b893c62a7c3d8df7a15e2de3ae02413ff296a6404a7937eb8de
 DIST pdns-4.3.1.tar.bz2 1216876 BLAKE2B 0449835d104ec430329dc88087b489e29f1e1fa0c2a22af8715883a0a80d73f3a4848df207abbf986b946c640c4f1d35a1c8335f13f96a00915e4a40bcbecc9f SHA512 e61e23544f1e57c1ec3a85b4edbc3ff3e8e831410237afdc8896e9f34602774c1dc8bd02eb7440e765262fcc988f98e47b6f1b7945427b1f4a59dd6b84b9437e
+DIST pdns-4.4.0.tar.bz2 1270854 BLAKE2B 2c855197d0b5f8fc141e4fa19268e68b9114353c7f89157023b9cd6b9559e788b55a9b0eeebea55d4ba0a206229d9c032f0c84c40ffd91c7277eb611a4bc966a SHA512 e7f35539915ee7945b537cfedae72e2b83c86b39c5e44a9268b8a086f44b30a33a64e0b65aad140ba02c349cedaa12820226578dea87c9b666dc75f8bd15c1f6
 EBUILD pdns-4.3.1.ebuild 4618 BLAKE2B daf71679af4131348fff051d27f68fe8dba4bd71719dba8b5455fa427d2c95b7ed352b1b379a1687dafa33178e6bb25200456f686c0fee8421164863d9e85d0c SHA512 a769ac32e2cad69666b8567e88137f650da24767e2ed6beb9c3a9de9742bebd809bf19c1ef95705ace5dcf0a71cfcc5b345f9f45810320834b9dd55d1c4d2dcb
+EBUILD pdns-4.4.0.ebuild 4609 BLAKE2B c728a0355cc25483bd9a17c072f201933a69bd490955a64fb76dc861a9f24946bbbcf3402990a1e905357fe65385bfd4f50a94288f4675710c55a8287964f555 SHA512 bc6a56d1fbf9173201026179e0f62f9bcb4df3f0fa6ed6daf77077345365c1b023916a9709883cae20cf2398a51fe617cd81e2ea0ce50bb317710e94e18e62db
 MISC metadata.xml 1111 BLAKE2B 5a55e94593f1c010f9ee71fa2d3bc887a0eddc8627db36a1792b911a1cfe3fa3d5a33923b95d18a02f36097717d76ed2aae711c2deb793625b1186090ad072c8 SHA512 c010bbd0daa87980a4d9f164fc3d15239251890e56c63b1165d55a92b9c0f24e5f141439bdfc13b4efa4483e0fc199cd6107e2f152d26d4ca954f4c3d0cc4913
diff --git a/net-dns/pdns/pdns-4.4.0.ebuild b/net-dns/pdns/pdns-4.4.0.ebuild
new file mode 100644
index 000000000000..bdffd529f014
--- /dev/null
+++ b/net-dns/pdns/pdns-4.4.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="debug doc geoip ldap libressl luajit lua-records mydns mysql postgres protobuf remote sodium sqlite systemd tools tinydns test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="mydns? ( mysql )"
+
+RDEPEND="
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:=
+	!luajit? ( dev-lang/lua:0= )
+	luajit? ( dev-lang/luajit:= )
+	lua-records? ( >=net-misc/curl-7.21.3 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
+	sodium? ( dev-libs/libsodium:= )
+	tinydns? ( >=dev-db/tinycdb-0.77 )
+	protobuf? ( dev-libs/protobuf )"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	acct-user/pdns
+	acct-group/pdns"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/${P/_/-}
+
+src_configure() {
+	local dynmodules="pipe bind" # the default backends, always enabled
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	#use oracle && dynmodules+=" goracle oracle"
+	use postgres && dynmodules+=" gpgsql"
+	use remote && dynmodules+=" remote"
+	use sqlite && dynmodules+=" gsqlite3"
+	use tinydns && dynmodules+=" tinydns"
+	use geoip && dynmodules+=" geoip"
+	#use xdb && dynmodules+=" xdb"
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-modules= \
+		--with-dynmodules="${dynmodules}" \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		--with-lua=$(usex luajit luajit lua) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable lua-records) \
+		$(use_enable test unit-tests) \
+		$(use_enable tools) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		$(use_with protobuf) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	newinitd "${FILESDIR}"/pdns-r1 pdns
+
+	keepdir /var/empty
+
+	if use doc; then
+		docinto html
+		dodoc -r codedocs/html/.
+	fi
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	if use ldap ; then
+		echo
+		ewarn "The official LDAP backend module is only compile-tested by upstream."
+		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
+	fi
+
+	local old
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 3.2 || continue
+
+		echo
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/powerdns"
+		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
+
+		break
+	done
+
+	if use postgres; then
+		for old in ${REPLACING_VERSIONS}; do
+			ver_test ${old} -lt 4.1.11-r1 || continue
+
+			echo
+			ewarn "PowerDNS 4.1.11 contains a security fix for the PostgreSQL backend."
+			ewarn "This security fix needs to be applied manually to the database schema."
+			ewarn "Please refer to the official security advisory for more information:"
+			ewarn
+			ewarn "  https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-06.html"
+
+			break
+		done
+	fi
+}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 9042801d716b..7de8f33695ef 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -15,6 +15,6 @@ EBUILD unbound-1.10.1-r1.ebuild 5424 BLAKE2B 85fe1509a5c82edf8985ce6cfa80325db99
 EBUILD unbound-1.11.0.ebuild 6003 BLAKE2B 5e92333ca334d085b994fd9dcfc4b9eb97c0355b130472dd434b6a892bcde8439ae33f4413f8aa5e9e6867891750e152c28892a88f9d88e5848f20ebcee459b0 SHA512 4d6061372950b54091b0fae9c1e2d8eb93b75a60a081d0f8431239457bd5311bdb78109f55e08779c50cab4a8bc0f07281f95d51b8b1dd83f4eac03b40b6e2b7
 EBUILD unbound-1.12.0-r1.ebuild 6075 BLAKE2B 06c59fcad9b6351fdca6d0f7f5e71a2802005ade6c9f285a8a0b52a3158084638c698831c9b61158582f48223e22b48eddc300780dad2e7c8cee8f78887d1f91 SHA512 422b16aadcd2b8f38f03cd2fe8c22dff94bac532ad837bc1f81c1c2a3cddafccacc7fca70b41f7debb8ece6a04660a8f1e4b78a2ae18180e8ea4f475e8c21335
 EBUILD unbound-1.12.0.ebuild 6008 BLAKE2B dd27e2b8d4d1c320af8e268ae5f0d9f95d26782137bfb11deebe44533904da8716d894bfacdcd3bbd187c0d1d52d9e6a57a330f75ced2cb3d1b802f705bc352e SHA512 df2940e7037f61717bc8c53a6ce386d189b4bffbb4a8881074798718087ab78e10e5c840070f629432f2ca328727b585ba2695703f9572ba5913fe8ad461d415
-EBUILD unbound-1.13.0-r1.ebuild 6123 BLAKE2B b415d7c63e1354bad6811412a05412e0d848ec18e6ba72bfb92f26f537ec6338f4c8423e899fc26dfa058f083a51810c4af9e34a5f549f0735c130683fdeda7e SHA512 2cd8aa239ec804e9690c59b61be0c3a45303783e4c7944cf498dad204a1c073fd77396172733186f120fa0ff7c2640798262ffcf9c805201e967df0783be589f
-EBUILD unbound-1.13.0.ebuild 6073 BLAKE2B d579436b4f1ec822d0f03fe1278a9ad2ce4286dd6a302c0b9f325274d9360ea6c2fa876ce0ed9b2bf67d4abaa83eec6ac60c0d1844538b99d92116619bbabbfb SHA512 163016e35575a4e5c14866a57da1f6181f53350a7bf895979f9e837ad0d2f8bd72b00b7317ca941fecf5cc0fe8709c3ec9903e458695684bbbc15067c8e6e2cb
+EBUILD unbound-1.13.0-r1.ebuild 6143 BLAKE2B 0f07c35fda52f77bef87a75fbf7933a3abc62657949b4f3abf851070b81edb6426609ef7110d286d451d01dccc7059a5a5726cfbd3b1d959a427108181f91ea0 SHA512 da693f42ea28efc8aba7e4abdf47daebbcd4c6941c86632ed319f5c14c1a36ce56e90da3644f5e248c547848173690c567c9742de56507a22cdbaed30ca32c3d
+EBUILD unbound-1.13.0.ebuild 6093 BLAKE2B 469191637382e9a067486a76a35b99dbd23af394a65f22560c72152a9a5aefbd535ee787ccd2df08f634278725dce5f6c79816857810a56d5f7325f14ba998d3 SHA512 48a08c1533f125485daed702cad1d4ce70ee6477ed08fff2cd809febff38b60410055f601b764cc62f9a15614811543ebb93e45b9f8040ac5089deec0393f7f9
 MISC metadata.xml 1444 BLAKE2B ff1a69e8795fc834ba6b365ee389743bc8d2a2e82375a07c757ad6fcf5cad4cbfec321bba6ce4f8e505414a5cdce09e8257f97eb1fe199bc1fb911a769f7a6b5 SHA512 a96d5847589f861d2d3e7a416e5af0dafc0940a60f997456bf6a3a9c09e3e2910a8fe9474474e81b907cd9093525125539ad93345f84dbf6d10454a3aa5cbf4f
diff --git a/net-dns/unbound/unbound-1.13.0-r1.ebuild b/net-dns/unbound/unbound-1.13.0-r1.ebuild
index daaba00dd008..4db67fdaa952 100644
--- a/net-dns/unbound/unbound-1.13.0-r1.ebuild
+++ b/net-dns/unbound/unbound-1.13.0-r1.ebuild
@@ -37,7 +37,7 @@ CDEPEND="acct-group/unbound
 	ecdsa? (
 		!libressl? ( dev-libs/openssl:0[-bindist] )
 	)
-	http2? ( net-libs/nghttp2 )
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	redis? ( dev-libs/hiredis:= )"
 
diff --git a/net-dns/unbound/unbound-1.13.0.ebuild b/net-dns/unbound/unbound-1.13.0.ebuild
index a63ec2835321..fdf0da892afe 100644
--- a/net-dns/unbound/unbound-1.13.0.ebuild
+++ b/net-dns/unbound/unbound-1.13.0.ebuild
@@ -37,7 +37,7 @@ CDEPEND="acct-group/unbound
 	ecdsa? (
 		!libressl? ( dev-libs/openssl:0[-bindist] )
 	)
-	http2? ( net-libs/nghttp2 )
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	redis? ( dev-libs/hiredis:= )"
 
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index fa3565de7fc6..337bc757b225 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/wdfs/Manifest b/net-fs/wdfs/Manifest
index 1cd574009c58..50af0131e2b3 100644
--- a/net-fs/wdfs/Manifest
+++ b/net-fs/wdfs/Manifest
@@ -1,4 +1,4 @@
 AUX wdfs-1.4.2-fix-Waddress.patch 1269 BLAKE2B 8ae89ff50d0feb200389f938c26586cce88bb67504aa30e4aac992ecf608f0478a0b36d5198cbb3e668f2b4207fd363549f67f2e044b2aef6d7ced0686224760 SHA512 e01f9a45cd045edf05b19ddd3b3a04bbf9a03dac4e032709a98396b024079bfb4856b91aa1c0aba8b1c3ce765ce9499f46102fafc87776ae5e0d57f8b71bc0e5
 DIST wdfs-1.4.2.tar.gz 109315 BLAKE2B 7bfe32d0c957afc347b4280e909b8964e2cb736686833580072149f107aec908e9ce220fa18ccd998ae9bea5d34e0aa2349c6a832ed40dbfae3bf6cb353f9e4e SHA512 da7e16ed86cbe4746fabe5fce44c83b1d0cd0fbc19994eefe0ce2a75f3d8c77c3c341a76409150a3509be08f8c0d28b8a9650037edcbbf2aa60f4c8ea5407004
-EBUILD wdfs-1.4.2-r1.ebuild 537 BLAKE2B 076400925aa5484fc83191750c94a408ff6ec70900aeef342eb60ac8ab249e365f84d326200d6bed2c75cb06083c77c81becbe3f9bc05581455472e4cda11cb0 SHA512 a1dc12bfdf86b98892862fadccaea957b733d28cd0553c75af3ca40710e9f8038cc0c1e6629316922595855dbb0ee4601f9e622bd3d62ee0d25ba91a9cbc2a14
+EBUILD wdfs-1.4.2-r2.ebuild 503 BLAKE2B ac6d082c357f8ff4d552075e818a5d950ab20dba9332d8010757d2e358bd3f86843fb97885cf5317656e37892d1cb18c7661e2a91b5b10295daa765491702c33 SHA512 f6fd0bced9465da533e6e57f6da81189c1fd517a9541f574374cb6c6d95edffa7c7ce0050c97c72326a6f126869d9b5946756c11cc6e1326e17b31e5bde993f4
 MISC metadata.xml 440 BLAKE2B 9930eff1050d22f7ee8019b00f3155b65b3156fd690820cb9eba3f6af02cca50d3a1072866a13a8bb7548b57c3c62ea223c3c5e0a4bd8a8305cde80892825f00 SHA512 00ef130f56f063239b4c4ea485009188e3ddf1840cec24b9df22b9b39645b98908fb35e480d68480938c2573533c6be3fca6830dea24c1475286b81986b58f4d
diff --git a/net-fs/wdfs/wdfs-1.4.2-r1.ebuild b/net-fs/wdfs/wdfs-1.4.2-r2.ebuild
similarity index 68%
rename from net-fs/wdfs/wdfs-1.4.2-r1.ebuild
rename to net-fs/wdfs/wdfs-1.4.2-r2.ebuild
index 5de6083daed2..60e8d6219fb5 100644
--- a/net-fs/wdfs/wdfs-1.4.2-r1.ebuild
+++ b/net-fs/wdfs/wdfs-1.4.2-r2.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="WebDAV filesystem with special features for accessing subversion repositories"
 HOMEPAGE="http://noedler.de/projekte/wdfs/"
@@ -15,10 +13,10 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/neon-0.24.7
-	 >=sys-fs/fuse-2.5
-	 dev-libs/glib:2"
+	>=sys-fs/fuse-2.5:0
+	dev-libs/glib:2"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-Waddress.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${P}-fix-Waddress.patch"
+)
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 5ea09728dcfc..06671439bf34 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index b4316add69cb..a6f0c3294f62 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -6,5 +6,5 @@ DIST FileZilla_3.50.0_src.tar.bz2 4791977 BLAKE2B c0352eea9c4cd0a10d25b21b0a6982
 DIST FileZilla_3.51.0_src.tar.bz2 4808717 BLAKE2B 67f614032145abe7f715254fd47756d3a537d2eca63be976c29351f79e15d3620e77c1bb7beccc2b61a1df8b86484334a3e77639402c93e8ce28d4b12eb8884f SHA512 b5e0f80b61eb168b41f7582bf10bf0067da76aec3165ffe13819e20eb842ffc0fb12b01c54843b3ec4e7355111c36be249db3526e2ea2eaa77ba4274ffa03e93
 EBUILD filezilla-3.47.2.1.ebuild 1991 BLAKE2B f3d922bc88cf3de4cb7c7b97713006d7699025cb9240f3602b2aebbda21e470a5b0f85980adfcc0c5548054e732bb4e0c2f56f4c515ceab73d0169dc5bacac9d SHA512 57275acd8ee50c2f5d4e42faf3e5b834d3d68267dac42c141f42a0d45da32be23f9b612c0ba54623b0b2ae672f45a060d2ec5245a02ed75bc5a5e22a63b21ee5
 EBUILD filezilla-3.50.0.ebuild 1961 BLAKE2B af10edbedc83cd229573186d94fbc595e3860475ac0b0de392903dffb21a92dac9b22588ee4b5edbd4b55e3ec168c58a8203155db35cd751738c7bd42aa0539c SHA512 2f97de78b3c0b7907c05f988c3c07c788366975241f425beeee54127593fa0fc9a323477e0af64e73b766d011a13b32d3d9ca25aa75e2a18a665f6c43186dd87
-EBUILD filezilla-3.51.0.ebuild 1961 BLAKE2B 9e072f2cb2f0d21a53e3a420691b0731f89d999c0c594715b114e465ea28238a9e2723af936444af7614e81819aa3bd5ac2680836712079f23126246111760aa SHA512 0416cf2e4294bdbd422620981b59a654224d68b1bd4de5097f1436945e12846495c88ca2367efb6f3a5814dcd6c64e48fad2d90251a6fd60347b274cf5a0038d
+EBUILD filezilla-3.51.0.ebuild 1960 BLAKE2B 46af51082f919a1362769a3abecbad93f37c2b13f3371badea3ea838ef617f2595cf87b894ec7344a06f665bf000b5e34a26450626047aec8c4b674d96ecd25c SHA512 772e9d1b6330fa06b85fd2f935b7abfc6334f639392cc4b92cb6b59677a41f49a0a17d8db3cebba3cf8ffbcab21128e4729549dc648630be0ba7ecc3cfce33fe
 MISC metadata.xml 459 BLAKE2B 71b683a0a48407daa9577a84b6d08bb6bcbcea46b9805fd31256e4f55666c0716b4fe43cbd30617ec1b88cc8697eb9a4254f7bd3e399ecdfcd81e92db24b4cd2 SHA512 e1f653c9a5dd7631ebea96be29472e2824cc6377c9e8783cd56913c1d7951eb9d80cbdaff05affc766c6f38277b6aea5b8a23e8b808840f29249eb7e0cfdfe3f
diff --git a/net-ftp/filezilla/filezilla-3.51.0.ebuild b/net-ftp/filezilla/filezilla-3.51.0.ebuild
index 3639ea6627fa..7ddafbf88f96 100644
--- a/net-ftp/filezilla/filezilla-3.51.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.51.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
 IUSE="dbus nls test"
 
 # pugixml 1.7 minimal dependency is for c++11 proper configuration
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 97ca9e3416da..5819f5b4763a 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -2,6 +2,6 @@ AUX ncftp-3.2.6-fno-common.patch 1818 BLAKE2B 620e3fbc7e297d3186fe9eef8855e2a663
 DIST ncftp-3.2.6-src.tar.xz 420564 BLAKE2B ce6d8d2bf06761f884e9edfe6d0bb0230f5d515078a787c4e6faf7716b760166acdd0accf3de1e1f5f3d892c8c86348cdbbefeac6be05e6806011a3e8f4c9b02 SHA512 8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382
 DIST ncftp-3.2.6.tar.xz 418836 BLAKE2B f0ffa0cc26617ee4007fe8589dbbc8d122edbfc8106a8618a66eab5d9def258d2ee9c2b709e1a637b9d833513ef87b652f4ab0ff518dc9d67d90a7dd43941d3c SHA512 040db7e2ca2ee78b79d682a951fd98c1e0ee2936b64462259992d70c51241fa50ae06c66b4f40933ad0ab7122f581bbb8ba7cda764dba5f70a1f8c7d3d751199
 EBUILD ncftp-3.2.6-r1.ebuild 975 BLAKE2B 30ff54992100b50c7b9a55300f324b369b8a5d6bc4e6084a00c5982648595211839262463d4f44b0474cfc86b63dbebb6ac650b2c7a9ab32c2cdb59fee3dc73b SHA512 9cf1333cd5ab061dabbc252df65598d0411a7a254596b35601a41dace0c713d0b0f503956f0fe26f2acfddfda1b8bde1d1d7da4fd0345ba8066d1b23263555a9
-EBUILD ncftp-3.2.6-r2.ebuild 1046 BLAKE2B a1afd17b1b8e6ee93b6ef47c165b9f64f2620c78285d4189c6082fff806c09adecceeb383849a3e34781e2cec9d87025ecac56d78c00276c9816c44d7d97a9e5 SHA512 a3aa877ecec8db3172610fbe85aebd58ff6dec57efcff2115b5601d112df057e0d3bdb4ac16c3ee89f139cee8929c98bc17fe21124215ad70ffc336ab295bc31
+EBUILD ncftp-3.2.6-r2.ebuild 1042 BLAKE2B 7e80b44f1aa36b8343ac572e3f23fc606973ab122b850089586bcb4f73bfd7267e86f495b3c97d32bdd6f025eb88ce2c860a7916d9ff30e23321081b72e820e8 SHA512 9f2df48df2b76c4a8534e6715bd5c5303f58e8a322e3bb7d21ed19e3ed9fc279ddc590f9031e6929b35ee0c7171bd9df8e8385fa2fac6b3189d236c127b8b0c0
 EBUILD ncftp-3.2.6.ebuild 1043 BLAKE2B b5b30ecd0d33201c30a5ccfa13ddddbc9134b2176f4097be558659182538d5604d4ba9adf9ceb69a1c596695b4aad38e24e5184c9b389dfafb24f887cccbaa89 SHA512 e9912f780ccd6f0658a227d451934ba95ac0b29f27098300af44abaf8375a893992ef1aed4e13db43d59dadcbcb2dab3f60512383fcc4ece14d72eed612e0dfd
 MISC metadata.xml 662 BLAKE2B e41a84c3553efba6d4425c73d7aefeabc235057178408f63a649a2580110f8e7af365b41bea7ec150091b2a57f871ad81476607bbfe73dc7d2ee123a9f175ada SHA512 a3a91d842e2865916280524c6d844c83133f136cf6f9fd59e6246026295f4fe9f5ab535944b79c7c5417b50672de5edc25b5dc34df069721a535342b30b6ab98
diff --git a/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
index bc8df4725fed..2de409549084 100644
--- a/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="pch"
 
 DEPEND="
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index e60f22ded410..8c82d1ba939e 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index d82db600d504..2e73ea0792ab 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -2,8 +2,12 @@ DIST mattermost-desktop-4.5.1-linux-ia32.tar.gz 104826424 BLAKE2B c2d29b5ba463d7
 DIST mattermost-desktop-4.5.1-linux-x64.tar.gz 103238742 BLAKE2B dc7e9e2358cb9d82a080fca3082abff38a7850b5cb66cd47d8c111963e2980445f6767ee1f1cdcfedb8b8ff399bf20467de898ff7cc1e7b415e9d999d835e362 SHA512 7b1504c957ee30b2f3faa091556c30ac2e5a8cfd7595282e51bc616a74b2da76a6b363ebc56809c6bfdb931d08ae75360ef85bf6a6abe00c40ccccc14754e0bd
 DIST mattermost-desktop-4.5.2-linux-ia32.tar.gz 104826222 BLAKE2B f0552069099e548b4eff29a8dee8b830ebdba7aeab708748a242776a5d758be2253e8e2bbfe8f0b4eda5d0c25cad46fa7e7728233007f76102ef7b271a0280a5 SHA512 21943587b00585ab103213726de16bd010a013be2d780a9b1bad1ffb2bbcc23bff0cab76699bebb324e950b7d321df1d657cdbb8f889d670bfb7d8ca961ee652
 DIST mattermost-desktop-4.5.2-linux-x64.tar.gz 103238897 BLAKE2B 46e56c55409db645ba0962a816f584610decea4696c182e66544d2085d5b420019aed7d2680c5a90b7bdd293f9549be81508d24f79d409446918f862bfeca474 SHA512 f22938b629840dd6e8fbdec5e6ae6fdadaa0eae0fb727a063ef1539a3a0a625d61dd8468ea8cf45732a8f3b2c6da002dceed2b287aa75b14d09a03268f967eb4
+DIST mattermost-desktop-4.6.1-linux-ia32.tar.gz 116278144 BLAKE2B 737089a5454c8d8bc87cfefc68d4fbe5036287f2b8c4e92d8cdc000b481996641cc22c7aec1915bac0bd21f0fc2c2019e0e6d011070879cda25f566716f0c193 SHA512 8a2b7369fedf4cfb28bb5e54b2fa61bdc22ceda4ae01753a4259581856ba71459d4c2bea238d2e9aba8fe1c11bddfe6e45f1e470e99e7ca642058605c5589453
+DIST mattermost-desktop-4.6.1-linux-x64.tar.gz 114688536 BLAKE2B 68be76641eeb0e073388ce6cbd6987903ff0a4a0e266ac1e27fa977dff7e1354ac226d1f19b43b4f07d0d731ea92ded2585b2744f68263ff57751f059703a0c2 SHA512 ed24ad4e33c88ae55440e8aa5f57e4e83f022b22ccb488146507707a79cf403895066be6b43dcaeb34217ddf0df4e1d02c3a8128bf8568d7b4be94a4e51bdd06
 DIST mattermost-desktop-bin-4.5.1.tar.gz 1653861 BLAKE2B 2ad02df830cd2b62a730e8c6b385a739cfa7be30765ee4245f92e7a3db194ea03863490b337d03d47357f0d18ec31dd34fcde4576b93c80702e716ae9fd772a7 SHA512 6e2269de681ec416be2354ff8ee37d219ede4b10361e6a3669cc4e93e9ab06cd6a198dece05411756fdea271e55cafb94ad29161801cc55b5dae02b99b24ccab
 DIST mattermost-desktop-bin-4.5.2.tar.gz 1653801 BLAKE2B fac573ce27cd693489a173d3b90480476e569a7d0c435a53e44b075fc96a56720558e1e555c5a587f0fb7bed06b7f5e53c11728280804e812ee2090adc6d96d3 SHA512 69148aa9de18f6dac78450dc0b79630e9ea1552027ed46f6d03aca02ae57342b251a236f4c3ed6b9145e050be38d7748820bc4dd9f36f300c59940b7c2db7827
+DIST mattermost-desktop-bin-4.6.1.tar.gz 1702070 BLAKE2B 1c8f0c21add6563f6cca51bea37c25f41ba2e00daed7101b3d937941b12cef2e34cfb958a2c83c9641e08b99dd99d4784196e71cdc98227a66d6f2a31ee35219 SHA512 ee16e27cd836a49c8329397ee70d0d61e72c1295dcc2329e235cd813ac2583394d24e7d0d40c8c6d47dc85c5c900a22d3b96bd3b4f0262224443e5232d2b2102
 EBUILD mattermost-desktop-bin-4.5.1.ebuild 2025 BLAKE2B c9499a828e19aea2c827a209c9d14ee27920b40f2fb57fab1468c3bbd17862745f2c5b88d02961cea5a43f8886323b81062e2309ce9bf304242cffc4203a7a76 SHA512 e6e084861a423eb5fce6d5fc9c095ac464a8a3937ebaaff9f5e8920c2bc8f875ec1f363e311ddb156c5296a1e4475bf8ee0582bb27acade2252fe542c3c61816
 EBUILD mattermost-desktop-bin-4.5.2.ebuild 2025 BLAKE2B c9499a828e19aea2c827a209c9d14ee27920b40f2fb57fab1468c3bbd17862745f2c5b88d02961cea5a43f8886323b81062e2309ce9bf304242cffc4203a7a76 SHA512 e6e084861a423eb5fce6d5fc9c095ac464a8a3937ebaaff9f5e8920c2bc8f875ec1f363e311ddb156c5296a1e4475bf8ee0582bb27acade2252fe542c3c61816
+EBUILD mattermost-desktop-bin-4.6.1.ebuild 2025 BLAKE2B c9499a828e19aea2c827a209c9d14ee27920b40f2fb57fab1468c3bbd17862745f2c5b88d02961cea5a43f8886323b81062e2309ce9bf304242cffc4203a7a76 SHA512 e6e084861a423eb5fce6d5fc9c095ac464a8a3937ebaaff9f5e8920c2bc8f875ec1f363e311ddb156c5296a1e4475bf8ee0582bb27acade2252fe542c3c61816
 MISC metadata.xml 250 BLAKE2B 8611f4d73e35bd0d1118f324a7f3e5a50277fe6e0eafa82c39438dc4ae44bc64dc85a28e85286987c724d4cfa528063109cb78984eaf10f08bcc60962750a9ba SHA512 b24a6971fcb3eb7c99a0229fcf084abb689b21b48f29d3634aac103977460011b0a58fc298d1432671520e94a94ef19570f7831fd181b5ea51a0155d47222d0b
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.1.ebuild
new file mode 100644
index 000000000000..0f1c0d6f81df
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%-*}"
+
+inherit desktop eutils
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://about.mattermost.com/"
+
+SRC_URI="
+	https://github.com/mattermost/desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
+	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
+"
+
+LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	gnome-base/gconf:2
+	dev-libs/atk:0
+	dev-libs/expat:0
+	dev-libs/glib:2
+	dev-libs/nspr:0
+	dev-libs/nss:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib:0
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	net-print/cups:0
+	sys-apps/dbus:0
+	sys-devel/gcc
+	sys-libs/glibc:2.2
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11:0
+	x11-libs/libxcb:0/1.12
+	x11-libs/libXcomposite:0
+	x11-libs/libXcursor:0
+	x11-libs/libXdamage:0
+	x11-libs/libXext:0
+	x11-libs/libXfixes:0
+	x11-libs/libXi:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXtst:0
+	x11-libs/pango:0"
+
+QA_PREBUILT="
+	opt/mattermost-desktop/mattermost-desktop
+	opt/mattermost-desktop/libnode.so
+	opt/mattermost-desktop/libffmpeg.so
+"
+
+DOCS=(
+	NOTICE.txt
+	LICENSES.chromium.html
+	LICENSE.txt
+	LICENSE.electron.txt
+	README.md
+)
+
+src_unpack() {
+	unpack ${A}
+	use amd64 && mv "${WORKDIR}/mattermost-desktop-${PV}-linux-x64" "${S}"
+	use x86 && mv "${WORKDIR}/mattermost-desktop-${PV}-linux-ia32" "${S}"
+}
+
+src_install() {
+	insinto "/opt/${MY_PN}/locales"
+	doins locales/*.pak
+
+	insinto "/opt/${MY_PN}/resources"
+	doins resources/*.asar
+
+	insinto "/opt/${MY_PN}"
+	doins *.pak *.bin *.dat
+	exeinto "/opt/${MY_PN}"
+	doexe *.so "${MY_PN}"
+
+	dosym "../..//opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+	newicon "${S}/icon.svg" "${MY_PN}.svg"
+	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
+
+	einstalldocs
+}
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index eb39926a8fdc..5c8fdc42422d 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,5 +1,5 @@
-DIST skypeforlinux_8.66.0.74-1.x86_64.rpm 115074997 BLAKE2B 84b1ff85d3be0279879bd0d53eec4ead09170806f726c1dd81c91a9348d9d4c72486f50b3917b263814c0215411f9a9ee1fd3eb356a930e29d1ee550d811eb24 SHA512 db10e658f977b6293150252cd0018baaf17ed1d64978f3b7b171309921928de0cef275cec15819e38a9c3be47101067070695311ef63fa5fa47cf9ba95e9af45
 DIST skypeforlinux_8.67.0.87-1.x86_64.rpm 113618026 BLAKE2B e6b69afba83848b25f1e3d9588f6b9950e28a21ec5d99aa3f6ee2438b66f03e80bf106424d5f970a273276e7d588e8e55adf1012e3839076ffcbf834c5649b03 SHA512 936ba0b3d8811ce1d308bb63708a63ccdea3c5765c0631248d32cd4bfffe8ee7cc98744aaffb3ed13bdb7433d7a81cfe8e2f769c60dd232a5924681a17c5bf94
-EBUILD skypeforlinux-8.66.0.74.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
+DIST skypeforlinux_8.67.0.96-1.x86_64.rpm 113616838 BLAKE2B aecf6d8f24836d2d6ef23b80b79796cbe5e309af862eac5e8caa0436e6cc8f10de5fd6337901c70a4b5b5c6cc3d7d15f6b0225b86187db800c8374762adf0313 SHA512 8d1c35026bbe90a2492f3ac88cc8fb2f098258050cf263121a06b9c9e048bda18774582d669d9a9177d8cfcaaa66a615b206587e74b371ef80b089dfecbb9a2e
 EBUILD skypeforlinux-8.67.0.87.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
+EBUILD skypeforlinux-8.67.0.96.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
 MISC metadata.xml 460 BLAKE2B 136f61594a68e6efed725d448cd9fcd0e0c72f884cd64ef5f8c3adbc39fd4322a4ed8ef692fa500bb00488e616520efdec943be7c4d0381345247776a8258d42 SHA512 d82b35cfa2dc12b2629f7084f071d3d3cd83e2d6246cb4c2544883f28becde6677a1739f7c028e69352267561441419d135774daa1177a803d485d38880191a8
diff --git a/net-im/skypeforlinux/skypeforlinux-8.66.0.74.ebuild b/net-im/skypeforlinux/skypeforlinux-8.67.0.96.ebuild
similarity index 100%
rename from net-im/skypeforlinux/skypeforlinux-8.66.0.74.ebuild
rename to net-im/skypeforlinux/skypeforlinux-8.67.0.96.ebuild
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 8915ca7a2424..28f11be0a6d2 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -3,6 +3,6 @@ AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8
 AUX swift-4.0.2-qt-5.15-compatibility.patch 245 BLAKE2B 77facc560f6cea3dedd7c3095b6e5d7a91ff956b80022dc8a27c93edac72884bfd7f484fc84052a47bccb184f4225eb90fcc3d30f925ee15e18d5c97037a0b16 SHA512 9e8adaec0e7b1e727a2f91a675eaea4f62b7f8a53fdbaaf2adf9e13d57a1df15e921f1aa1b876561c7eecd1a4602763a52b3e875cecebe139d6e338df1001b12
 DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 17b75950bba9252bb76e30eb9fadb9eaaaad6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a SHA512 fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba
 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
-EBUILD swift-4.0.2-r100.ebuild 5049 BLAKE2B b07dd02728d4fb65737389776fae9baa58b794d99321743c7a297c75ecd4948939434ced0936b33f83c44d7910b42957d1ef26f2551a2de900d5d8c6aba901ef SHA512 2408c703ec8fee9af7da03a67e7420bce2f3de7548858d5031393b27e1d43e6ce4ba25864f32fc523d956169273e188891eb2ee0477d7808d809cd34671d076c
+EBUILD swift-4.0.2-r101.ebuild 4175 BLAKE2B 59b986c2783319970234040a4b130690d88b85b6c6dccca5b7a01631d7bf3c8823a19476e9a1ccb615d1450a30a600024a1c8766719e2c7fb8fc1a33f21d04b6 SHA512 bfbd56dcb4190067e314b890f600bc38b65d38440fa07a28eab65c3cd6f2f2c971f93d19e82a13bd32ae6458101bc7b2a8482f385b7ce054182d94f071c1d958
 EBUILD swift-4.0.2-r4.ebuild 4658 BLAKE2B 468c37828f1d27097846b64fe22107b77e9f90ce169fc6faf6ece26d66c6792a84b264e086f4f9730e7f39a4e14438f37a295e1a42803507200e809251976370 SHA512 681f9e8d9dcff75952128dd7eca37a15b6936f2c2b0961a465134a0e0a62fe0e8c9a1feac205c9d044ea60bc6177c3cb49870be6f6f3dc4017b4d95d8965704d
 MISC metadata.xml 851 BLAKE2B 014ba09099a0971ceb413f590ba7f8e16f661380f15e12a319077886847c14695ab52f10afd7ce165b07cd9852e00397720ccf4465f475effec1cee65ad5b752 SHA512 1dbe2f86f1a0826b3ad0c629493fb0b9f9b1a1e2435e761a4e55afe85c52a7eef1269f25bfa94c4c8fbd5a8c5604d6c0bff6d0cb9d011245c1273df2a162bea7
diff --git a/net-im/swift/swift-4.0.2-r100.ebuild b/net-im/swift/swift-4.0.2-r101.ebuild
similarity index 77%
rename from net-im/swift/swift-4.0.2-r100.ebuild
rename to net-im/swift/swift-4.0.2-r101.ebuild
index c41fea304bf0..3027230dbbf8 100644
--- a/net-im/swift/swift-4.0.2-r100.ebuild
+++ b/net-im/swift/swift-4.0.2-r101.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-{1..2} luajit )
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit lua-single python-any-r1 scons-utils toolchain-funcs xdg-utils
+inherit lua-single python-any-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
 HOMEPAGE="https://www.swift.im/"
@@ -17,12 +17,10 @@ SRC_URI="
 LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
 SLOT="4/0"
 KEYWORDS="~amd64"
-IUSE="+client expat gconf +icu +idn lua spell test zeroconf"
+IUSE="expat +icu +idn lua test zeroconf"
 REQUIRED_USE="
 	|| ( icu idn )
-	gconf? ( client )
 	lua? ( ${LUA_REQUIRED_USE} )
-	spell? ( client )
 "
 
 RDEPEND="
@@ -32,31 +30,16 @@ RDEPEND="
 	net-libs/libnatpmp
 	net-libs/miniupnpc:=
 	sys-libs/zlib
-	client? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtx11extras:5
-		net-dns/avahi
-	)
 	expat? ( dev-libs/expat )
 	!expat? ( dev-libs/libxml2:2 )
-	gconf? ( gnome-base/gconf:2 )
 	icu? ( dev-libs/icu:= )
 	idn? ( net-dns/libidn:= )
 	lua? ( ${LUA_DEPS} )
-	spell? ( app-text/hunspell:= )
 "
 
 DEPEND="
 	${RDEPEND}
 	>=dev-util/scons-3.0.1-r3
-	client? ( dev-qt/linguist-tools:5 )
 	test? ( net-dns/avahi )
 "
 
@@ -97,12 +80,9 @@ src_prepare() {
 	ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die
 
 	# Remove parts of Swift, which a user don't want to compile
-	if ! use client; then rm -fr Swift Slimber || die; fi
+	rm -fr Swift Slimber || die
 	if ! use lua; then rm -fr Sluift || die; fi
-	if ! use zeroconf; then
-		rm -fr Limber || die
-		if use client; then rm -fr Slimber || die; fi
-	fi
+	if ! use zeroconf; then rm -fr Limber || die; fi
 
 	# Remove '3rdParty', as the system libs should be used
 	# `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
@@ -149,7 +129,7 @@ src_configure() {
 		distcc="no"
 		experimental="no"
 		experimental_ft="yes"
-		hunspell_enable="$(usex spell)"
+		hunspell_enable="no"
 		icu="$(usex icu)"
 		install_git_hooks="no"
 		libidn_bundled_enable="false"
@@ -163,14 +143,14 @@ src_configure() {
 		max_jobs="no"
 		optimize="no"
 		qt="${T}/qt"
-		qt5="$(usex client)"
+		qt5="no"
 		swiften_dll="true"
 		swift_mobile="no"
 		target="native"
 		test="none"
-		try_avahi="$(usex client)"
+		try_avahi="no"
 		try_expat="$(usex expat)"
-		try_gconf="$(usex gconf)"
+		try_gconf="no"
 		try_libidn="$(usex idn)"
 		try_libxml="$(usex !expat)"
 		tls_backend="openssl"
@@ -184,10 +164,8 @@ src_configure() {
 src_compile() {
 	local myesconsinstall=(
 		Swiften
-		$(usex client Swift '')
 		$(usex lua Sluift '')
 		$(usex zeroconf Limber '')
-		$(usex zeroconf "$(usex client Slimber '')" '')
 	)
 
 	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
@@ -205,7 +183,6 @@ src_install() {
 	local myesconsinstall=(
 		SWIFTEN_INSTALLDIR="${ED}/usr"
 		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
-		$(usex client "SWIFT_INSTALLDIR=${ED}/usr" '')
 		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
 		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
 		"${ED}"
@@ -214,16 +191,6 @@ src_install() {
 	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
 
 	use zeroconf && dobin Limber/limber
-	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
-	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
 
 	einstalldocs
 }
-
-pkg_postinst() {
-	use client && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use client && xdg_icon_cache_update
-}
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index 664c6f29d586..b595ba760514 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,3 +1,5 @@
 DIST teams_1.3.00.25560_amd64.deb 71805276 BLAKE2B b39d8f62653d303451e306290bdf0ea492b59b84fc87abefc8c9cbdf5462a917247d7dd9eda8c9c51e70e5ce3bc2db6ebd1eeda1c6b16c372cf154a8d81166aa SHA512 91f90f321118faef0d1a619feb213f0d8af9380a75fffa01b3fcc62570c5a2984cbfc415595e5fabc4f683250517a88064b038897e476410709b35de770c8043
+DIST teams_1.3.00.30857_amd64.deb 76334658 BLAKE2B 486ee2945f46e7a7c7bfe1d2a6edf29f8cac5a7827c0a8bcf121d25ce95fde2caf31fed520c2f036e27b399c986ac1acc1531aaa1a9caf5a5d6848b10ac0d204 SHA512 5a8be75bfe752347bd36bf2abc2de74ad069cbf4a6430bfcad9ca7396d5b5bf8196a74798a0595908a33ebcb2fcdbedc403c7ff31eec76d07246a3d1c46eeab4
 EBUILD teams-1.3.00.25560.ebuild 3066 BLAKE2B ef03a90372ff5656324941c85a914e88b34afe53559e23a72e1a9c7a7a0c575328fccc07d91ff05a5598bce3fcea8a2a7b429c2e8088b6fd3761c00bc666b1c4 SHA512 296f01c8cccc3b2336be234f91339b44016c41c8eb21e0d988e4b027f6ca53b429c97a4add3fd83fe67a1474c37e1b8b6d8134b3ea45c6de2b76cda0c938ed76
+EBUILD teams-1.3.00.30857.ebuild 3066 BLAKE2B ef03a90372ff5656324941c85a914e88b34afe53559e23a72e1a9c7a7a0c575328fccc07d91ff05a5598bce3fcea8a2a7b429c2e8088b6fd3761c00bc666b1c4 SHA512 296f01c8cccc3b2336be234f91339b44016c41c8eb21e0d988e4b027f6ca53b429c97a4add3fd83fe67a1474c37e1b8b6d8134b3ea45c6de2b76cda0c938ed76
 MISC metadata.xml 488 BLAKE2B 8a110d1b3cf045e0a0fb8d53252534752a7b561a32c7f1e15a46585aaeafe025272f682dc857f9ee42098b3db7fbcacf7720f16f42af145f05d7a55edbaf1d9f SHA512 25b924038e4c4bf04267cd6c945254203f7d70ae19b9f7ffe7c7c777b58083758bc71849282ef89ef1c16e5cbbc8c1d7d3bb81268ece2d4825143dd4dbca0e2a
diff --git a/net-im/teams/teams-1.3.00.30857.ebuild b/net-im/teams/teams-1.3.00.30857.ebuild
new file mode 100644
index 000000000000..6f18946cc3f1
--- /dev/null
+++ b/net-im/teams/teams-1.3.00.30857.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker xdg-utils
+
+DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
+HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
+SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
+
+LICENSE="ms-teams-pre"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror splitdebug test"
+IUSE="system-ffmpeg system-mesa"
+
+QA_PREBUILT="*"
+
+# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.6.0), libcups2 (>= 1.4.0),
+# libexpat1 (>= 2.0.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.8), libgtk-3-0 (>= 3.9.10), libnspr4 (>= 2:4.9-2~), libnss3
+# (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libuuid1 (>= 2.16), libx11-6 (>= 2:1.4.99.1), libx11-xcb1,
+# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
+# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-crypt/libsecret
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	x11-libs/pango
+	system-mesa? ( media-libs/mesa )
+	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	rm _gpgorigin || die
+	doins -r .
+
+	fperms +x /usr/bin/teams
+	fperms +x /usr/share/teams/teams
+
+	if use system-ffmpeg ; then
+		rm -f "${D}"/usr/share/teams/libffmpeg.so || die
+
+		cat > 99teams <<-EOF
+		LDPATH=${EROOT}/usr/$(get_libdir)/chromium
+		EOF
+		doenvd 99teams
+		elog "Using system ffmpeg. This is experimental and may lead to crashes."
+	fi
+
+	if use system-mesa ; then
+		rm -f "${D}"/usr/share/teams/libEGL.so || die
+		rm -f "${D}"/usr/share/teams/libGLESv2.so || die
+		rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
+		rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
+		elog "Using system mesa. This is experimental and may lead to crashes."
+	fi
+
+	rm -rf "${D}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die
+
+	sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
+	domenu usr/share/applications/teams.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 89dfcb6e58a5..5ee74f5983b8 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 1854f6929314..be211cca89f3 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -3,8 +3,6 @@ AUX anope-2.0.7-example.conf-user.patch 391 BLAKE2B 781e413ef79a7ca601710957b519
 AUX anope-2.0.7-musl-libintl.patch 566 BLAKE2B 7deb854a68c259c9055a086fbb33a63d00544bacd1a9dd2bdd6793d93a8885be195336aa66054933a6bc9cfd1dabb5ff8eaea2529f4fd4841ff51364931fd320 SHA512 11e69a97bc0cca89719584e849577868c045a75ab531bc43c61140b29f640cf761f9f73165ebb70079d0d9e1dfeb335222c8954bf2b037f6b80b9f33da69bf87
 AUX anope-conf.d-v2 344 BLAKE2B 8817bba9938aa03abf79e61b86ddde537c6ec68b6584074e1f9bc50fe8334c5d0135ca17551390618f60b26d93f0209789b9337879dbecdcb4fced3d2bb88b3b SHA512 ae1851ccaa128404f3a721c92571ae3c4e0efd18c318485594f87da565b2de505ee9ace580b5d1c4ce4a7b53a4eba8338874195ca3a2cbc415ab6facdb3c9d7a
 AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c
-DIST anope-2.0.7-source.tar.gz 1817484 BLAKE2B 13a4628db8cb885d4636ab1897aab322f7846740e4a3fccd02a417d84a8eb3c942aebf5e0a51f8ca1108f455b44b4e280e7386b42e03f640c9b0e68943252814 SHA512 22a9f3e0d9fe7f68304062829a19b693a3414f94c90f8da601ab98995cbff7310dc22ca40749d50d6722dfb4649817d2f4b1dbe4afa3254b28980f03a491de65
 DIST anope-2.0.9.tar.gz 1808866 BLAKE2B db5755dbb88edb9fcc2f00c1dc324894f22b9e6bc97c9cf57b40d2296014341fe3ade8a8e1b64879b852aef6637e1bb89947deb7a41e009e25101a0a992515e7 SHA512 0ce2caa5ede2831215781a333d896f1169f90bbb515078912f32beaff1699b7957384974cca7c86f1d584d624cb43c76769299ce245ee1fb6836ce7f14ada3e0
-EBUILD anope-2.0.7.ebuild 4305 BLAKE2B 0bfc78a17737d333768066bb5182f2a426f62c5e4de7559226b76aa81a7d7bf6ed1e4ec7748832569d4725f6d0107d4dabfa8ce2110d263fcc4996c850683808 SHA512 d2134d165f68f718c1e60a0056a89dfb346c12e6c2ebb363cd688d50e792860c8292008b2e6020350cac769a3ac0cea51e22a5dffdcedf95a1e735b4857a038a
 EBUILD anope-2.0.9.ebuild 4208 BLAKE2B 2151b5481c62b9e5f82c77e3bbc43311822769dfc669a8486c94bc653b344bf6254d6be6121c39202d83de9743a406be26780b0a1406a1bc8c8bea8c93172aec SHA512 d2a54a36e19fe66a8e0d67a223822c7a40c85ec60f95563f6674d0a03b65ee394a9ca63c9d0301ba5c3481e363dcc49e206688af493fff9bedd951843ba68af2
 MISC metadata.xml 901 BLAKE2B 0051a2f196c30f3fddfaae55dc660140a77d8b636454230473107af38f9e54cc059fa012516b07b86d1667bcfaf6fdeec6005de95c48b1b832ebd22826c03210 SHA512 f8271f6ece0d7f9488f317d8f4f8bdc8813521d15a603ea81445e109792ed5720319529f5c5527a902ff323151f4a58fbf62a83110104ce270ae5d96ec154ef6
diff --git a/net-irc/anope/anope-2.0.7.ebuild b/net-irc/anope/anope-2.0.7.ebuild
deleted file mode 100644
index f00b232f80bd..000000000000
--- a/net-irc/anope/anope-2.0.7.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Anope IRC Services"
-HOMEPAGE="https://anope.org/ https://github.com/anope/anope/"
-SRC_URI="https://github.com/anope/anope/releases/download/${PV}/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="gnutls ldap mysql pcre sql sqlite ssl tre"
-REQUIRED_USE="
-	sql? ( || ( mysql sqlite ) )
-"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	acct-group/anope
-	acct-user/anope
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ssl? ( dev-libs/openssl:0= )
-	gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= )
-	ldap? ( net-nds/openldap )
-	pcre? ( dev-libs/libpcre )
-	sqlite? ( dev-db/sqlite:3 )
-	tre? ( dev-libs/tre )
-	virtual/libintl
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.6-example.conf-pid-path.patch"
-	"${FILESDIR}/${PN}-2.0.7-example.conf-user.patch"
-	"${FILESDIR}/${PN}-2.0.7-musl-libintl.patch"
-)
-
-S="${WORKDIR}/${P}-source"
-
-src_prepare() {
-	anope_enable_mod() {
-		local modulefile=${1}
-		ln -s "extra/${modulefile}" "modules/" || \
-			die "Failed to use ${modulefile}"
-	}
-
-	# These all require MySQL specifically
-	if use mysql ; then
-	   anope_enable_mod "m_mysql.cpp"
-	   anope_enable_mod "stats/irc2sql/irc2sql.cpp"
-	   anope_enable_mod "stats/irc2sql/irc2sql.h"
-	   anope_enable_mod "stats/irc2sql/tables.cpp"
-	   anope_enable_mod "stats/irc2sql/utils.cpp"
-	   anope_enable_mod "stats/m_chanstats.cpp"
-	   anope_enable_mod "stats/cs_fantasy_top.cpp"
-	   anope_enable_mod "stats/cs_fantasy_stats.cpp"
-	   anope_enable_mod "m_sql_log.cpp"
-	   anope_enable_mod "m_sql_oper.cpp"
-	fi
-
-	use sqlite && anope_enable_mod "m_sqlite.cpp"
-
-	# Any SQL implementation
-	if use sql ; then
-	   anope_enable_mod "m_sql_authentication.cpp"
-	fi
-
-	if use ldap ; then
-		anope_enable_mod "m_ldap.cpp"
-		anope_enable_mod "m_ldap_authentication.cpp"
-		anope_enable_mod "m_ldap_oper.cpp"
-	fi
-
-	use gnutls && anope_enable_mod "m_ssl_gnutls.cpp"
-	use pcre && anope_enable_mod "m_regex_pcre.cpp"
-	use ssl && anope_enable_mod "m_ssl_openssl.cpp"
-	use tre && anope_enable_mod "m_regex_tre.cpp"
-
-	# Unconditional modules
-	anope_enable_mod "m_regex_posix.cpp"
-
-	# Avoid a silly sandbox error - tries to delete /usr/lib/modules
-	sed -i '/install.*REMOVE_RECURSE.*/d' CMakeLists.txt || die
-
-	# Copy anope.conf for fixup to comply w/ prefix
-	cp "${FILESDIR}/anope-conf.d-v2" "${T}" || die
-
-	# Look in the right place for modules
-	sed -i "s~%LIBDIR%~${EPREFIX}/usr/$(get_libdir)/anope/~" \
-		"${T}/anope-conf.d-v2" || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBIN_DIR="libexec/anope"
-		-DDB_DIR="../var/lib/anope"
-		-DDOC_DIR="share/doc/${PF}"
-		-DLIB_DIR="$(get_libdir)/anope"
-		-DLOCALE_DIR="share/locale"
-		-DCONF_DIR="/etc/anope"
-		-DLOGS_DIR="../var/log/anope/"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}/anope-init.d" "${PN}"
-	newconfd "${T}/anope-conf.d-v2" "${PN}"
-
-	dosym ../libexec/anope/services /usr/bin/services
-	dosym ../libexec/anope/anopesmtp /usr/bin/anopesmtp
-
-	keepdir /var/log/anope /var/lib/anope/backups
-	fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups
-
-	dodoc -r docs/* data/example.conf
-
-	insinto /etc/anope
-	newins data/example.conf services.conf
-
-	fowners anope:anope /var/log/anope
-	fowners anope:anope /var/lib/anope/backups/
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		# Only tell them about this on a fresh install.
-		elog
-		ewarn "Anope won't run out of the box, you still have to configure it to match your IRCd's configuration."
-		ewarn "Edit /etc/anope/services.conf to configure Anope."
-		elog
-	else
-		# We're replacing some versions. Find out which.
-		local ver
-		for ver in ${REPLACING_VERSIONS} ; do
-			if ver_test ${ver} -lt 2.0.7 ; then
-				# In this version, we introduced correct FHS structure
-				# We need the users to make some changes to their services.conf
-				ewarn "Please modify your services.conf to include the following directive:"
-				ewarn "in options{}, please include user=\"anope\" and group=\"anope\""
-				ewarn "This is needed because Anope now starts as root and drops down."
-				ewarn "Reference: https://wiki.anope.org/index.php/2.0/Configuration#Services_Process_Options"
-			fi
-		done
-	fi
-}
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index d32b386de42f..ab25ea85a338 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -1,4 +1,5 @@
 DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5
+EBUILD hexchat-2.14.3-r100.ebuild 3421 BLAKE2B cdd21f3e4817d28e08eb21ebb6f63c35fba21e6a2945fe213e61dfceeb7834928eed9bae02461aa39ecb040cad638f5bf2221d6aaf6043610a1e552fd28f4ee9 SHA512 765cbf04bb5fa04b9368c3df38d490f00093dee2f0634e4392d733c1ea26f925a4da8c3d16768e9378e68c575c4ba03ee51d0e84ee8487d762db6577d11c1324
 EBUILD hexchat-2.14.3.ebuild 3307 BLAKE2B 6e244e6ad21f70f3f4812f56f6f06ccaefd7a64a36804b02c684794525a9e995fee6e966865e65e0098ddd240f3b92c55a805acabe969b9b3ba358bd868c7984 SHA512 8427252de4ff905f19ed50421cfa70c9c9329f7be4557775d1998160c450f4929f412541be1978ab622d633e578048b55cbf2b4963aec825f78020826aff2458
-EBUILD hexchat-9999.ebuild 3306 BLAKE2B 82ca2d76d4ecef009e6610f1694a28ff4851c46e2d2038edc7b9a54dc20cb2159fe82b36afd2fd4a2526ac6dfdd6764c5cf147633cddd5690109d4c7911ea3f6 SHA512 d4299a5c060e46f818c6ffd6ba0c6b27321f378cf43f6de6b0997ba5bdc70e07e10563ceee04fa8c35fd133f454ed6f36e478764bfb40ef75460fcf2f2ede187
+EBUILD hexchat-9999.ebuild 3421 BLAKE2B cdd21f3e4817d28e08eb21ebb6f63c35fba21e6a2945fe213e61dfceeb7834928eed9bae02461aa39ecb040cad638f5bf2221d6aaf6043610a1e552fd28f4ee9 SHA512 765cbf04bb5fa04b9368c3df38d490f00093dee2f0634e4392d733c1ea26f925a4da8c3d16768e9378e68c575c4ba03ee51d0e84ee8487d762db6577d11c1324
 MISC metadata.xml 1042 BLAKE2B a8b2d37197b07fb76badeb4439d07f5b8acc0ab888f277050306ccf7b906de3bc4dc8b7a13af4b398494c350ea83eb373b107528055e6e502667b2a56e052133 SHA512 aac3a4017b0e64d98a71fcfffaec8a8245ccb7f691d40fc327599202831462e09eb7e382ed4230f5f3c584dfe0ebd9c0e3bd8f157103109cad037c9e597ef68d
diff --git a/net-irc/hexchat/hexchat-2.14.3-r100.ebuild b/net-irc/hexchat/hexchat-2.14.3-r100.ebuild
new file mode 100644
index 000000000000..850dd84f2ac3
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.14.3-r100.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit lua-single meson mono-env python-single-r1 xdg
+
+DESCRIPTION="Graphical IRC client based on XChat"
+HOMEPAGE="https://hexchat.github.io/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2 plugin-fishlim? ( MIT )"
+SLOT="0"
+IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dbus? ( dev-libs/dbus-glib )
+	gtk? (
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	libcanberra? ( media-libs/libcanberra )
+	libproxy? ( net-libs/libproxy )
+	libnotify? ( x11-libs/libnotify )
+	lua? ( ${LUA_DEPS} )
+	perl? ( dev-lang/perl:= )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	theme-manager? (
+		|| (
+			( dev-lang/mono[minimal] dev-dotnet/libgdiplus )
+			dev-lang/mono[-minimal]
+		)
+	)"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-arch/xz-utils
+	app-text/iso-codes
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+	if use theme-manager ; then
+		mono-env_pkg_setup
+		export XDG_CACHE_HOME="${T}/.cache"
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dwith-gtk="$(usex gtk true false)"
+		-Dwith-text="$(usex gtk false true)"
+		-Dwith-ssl="$(usex ssl true false)"
+		-Dwith-plugin=true
+		-Dwith-dbus="$(usex dbus true false)"
+		-Dwith-libproxy="$(usex libproxy true false)"
+		-Dwith-libnotify="$(usex libnotify true false)"
+		-Dwith-libcanberra="$(usex libcanberra true false)"
+		-Dwith-theme-manager="$(usex theme-manager true false)"
+		-Ddbus-service-use-appid=false
+		-Dwith-checksum="$(usex plugin-checksum true false)"
+		-Dwith-fishlim="$(usex plugin-fishlim true false)"
+		-Dwith-lua="$(usex lua ${ELUA} false)"
+		-Dwith-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)"
+		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
+		-Dwith-sysinfo="$(usex plugin-sysinfo true false)"
+		-Dwith-appdata=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dodoc readme.md
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		xdg_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		xdg_pkg_postinst
+	else
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+	fi
+
+	if use theme-manager ; then
+		elog "Themes are available at:"
+		elog "  https://hexchat.github.io/themes.html"
+	fi
+
+	elog
+	elog "optional dependencies:"
+	elog "  media-sound/sox (sound playback if you don't have libcanberra"
+	elog "    enabled)"
+	elog "  x11-plugins/hexchat-javascript (javascript support)"
+	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
+	elog "    needs libcanberra enabled)"
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		xdg_pkg_postrm
+	fi
+}
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index 0a64b4be026b..850dd84f2ac3 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit meson mono-env python-single-r1 xdg
+inherit lua-single meson mono-env python-single-r1 xdg
 
 DESCRIPTION="Graphical IRC client based on XChat"
 HOMEPAGE="https://hexchat.github.io/"
@@ -16,13 +17,14 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
 SLOT="0"
 IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -36,7 +38,7 @@ RDEPEND="
 	libcanberra? ( media-libs/libcanberra )
 	libproxy? ( net-libs/libproxy )
 	libnotify? ( x11-libs/libnotify )
-	lua? ( dev-lang/lua:0= )
+	lua? ( ${LUA_DEPS} )
 	perl? ( dev-lang/perl:= )
 	plugin-sysinfo? ( sys-apps/pciutils )
 	python? ( ${PYTHON_DEPS} )
@@ -61,6 +63,7 @@ BDEPEND="
 "
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 	if use theme-manager ; then
 		mono-env_pkg_setup
@@ -82,7 +85,7 @@ src_configure() {
 		-Ddbus-service-use-appid=false
 		-Dwith-checksum="$(usex plugin-checksum true false)"
 		-Dwith-fishlim="$(usex plugin-fishlim true false)"
-		-Dwith-lua="$(usex lua lua false)"
+		-Dwith-lua="$(usex lua ${ELUA} false)"
 		-Dwith-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)"
 		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
 		-Dwith-sysinfo="$(usex plugin-sysinfo true false)"
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 407ac0c0a846..b498e6cc78a8 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,6 +1,8 @@
+AUX weechat-3.0-cmake_lua_version.patch 272 BLAKE2B 3c88a0aad5d0ad9c5067062039fd147c9356923324089d74ebd5987e6f5a67bc1da785a12b863dffafc8e63af18b52b5ed6aba97cacec105b04f7b70ac0b3e5c SHA512 81a3143acfeb35ccd8e913efa0b881165459049bdbb3e7bf96b41c7f764fe37647349599d3bceadb966ae52f2156cba5170926ba7af7ed667f7664f8adb920aa
 DIST weechat-2.9.tar.xz 2206584 BLAKE2B 8089cd846ca192ec666a50e8071ed57e1c2518b2d5ea98733b8e3fa6c8c684e8ed14253d787b3f9995a8f481a7413444c3ba262dcb6c100283192bcafb502627 SHA512 c4a5723accb417c0496b5427ee58fbf5d3e842e6d79a7988f8680cd605534cfc9d30f6f4844afe45f5223458f28b8deff1284fff2fb5b7d04cb99a81cde4e13e
 DIST weechat-3.0.tar.xz 2215408 BLAKE2B ed43c16af2a9fea101b54714e21d5f28f2b18fed5734c5f6adde857500befd94089f6bd7be5e2ad2738fce4e1bd5b10ebef32d0d46039242efaa2dc7f664eb42 SHA512 d6a68f35dc7363b838af811ff0a0a8d9fff519a4231c66f963e896bdda8653a56608e46333dc866e7dee25c1eafd2f1bf99c443089dde5a268bba637a0dee8ca
 EBUILD weechat-2.9.ebuild 3868 BLAKE2B 7cb10514f4000d737a0748dd1c885deb877813fe4e7953c1547aa1b973e9eeb97c3ceacf0c4e1a5e5de94a762647aec4779badcab7b0ef7d83f30ef46d898cec SHA512 e5b27cf8d34ba432cc5d55e31cea0beb96076964e991efdbd842f20c82fc1667c04d107735e8295865351aaf7e453e3d08492701148736fb64fb9b4c39f19678
+EBUILD weechat-3.0-r100.ebuild 4189 BLAKE2B dd2b47e18560aa368222ff5ced136c3d58f5a0d05e958560095eb004f00fdd509457ce920ebbea9bf4162edc15155d47515814fe97d6236afc8b554ee24cccf6 SHA512 b6ad28286bf87e8081b7dab73a752f16d77b742622da0ac3205332f0e516a11ac3b61e2766ef35ed9ba799948177d85aef0555d537daac97559108f58dff22ea
 EBUILD weechat-3.0.ebuild 4029 BLAKE2B 5ba766edfd551f4dde7d04c923aea4657d7107e3e32a85701c68ec7b81700c6842fd36f6bbf4c1ea629db7759faed1e7ade0181e24f3290cdebc6684d53a7bdb SHA512 9ed9379cebedc21a72e13740d3325175181ae72da664dfd7cecd9a12a082d3d823d9a30dbde9aa8338c19d9d9d15540a8d6c23345a327ca6bd04e715c3777239
-EBUILD weechat-9999.ebuild 4029 BLAKE2B 5ba766edfd551f4dde7d04c923aea4657d7107e3e32a85701c68ec7b81700c6842fd36f6bbf4c1ea629db7759faed1e7ade0181e24f3290cdebc6684d53a7bdb SHA512 9ed9379cebedc21a72e13740d3325175181ae72da664dfd7cecd9a12a082d3d823d9a30dbde9aa8338c19d9d9d15540a8d6c23345a327ca6bd04e715c3777239
+EBUILD weechat-9999.ebuild 4189 BLAKE2B dd2b47e18560aa368222ff5ced136c3d58f5a0d05e958560095eb004f00fdd509457ce920ebbea9bf4162edc15155d47515814fe97d6236afc8b554ee24cccf6 SHA512 b6ad28286bf87e8081b7dab73a752f16d77b742622da0ac3205332f0e516a11ac3b61e2766ef35ed9ba799948177d85aef0555d537daac97559108f58dff22ea
 MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
diff --git a/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch b/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..6ed16efbd064
--- /dev/null
+++ b/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch
@@ -0,0 +1,9 @@
+--- a/cmake/FindLua.cmake
++++ b/cmake/FindLua.cmake
+@@ -35,5 +35,5 @@
+ 
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+-  pkg_search_module(LUA lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
++  pkg_search_module(LUA lua)
+ endif()
diff --git a/net-irc/weechat/weechat-3.0-r100.ebuild b/net-irc/weechat/weechat-3.0-r100.ebuild
new file mode 100644
index 000000000000..9612d0567f73
--- /dev/null
+++ b/net-irc/weechat/weechat-3.0-r100.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake lua-single python-single-r1 xdg-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
+LANGS=" cs de es fr it ja pl ru"
+IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( nls )
+"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-libs/gnutls:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	net-misc/curl[ssl]
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0 )
+	lua? ( ${LUA_DEPS} )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	php? ( >=dev-lang/php-7.0:*[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+
+DEPEND="${RDEPEND}
+	test? ( dev-util/cpputest )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
+	man? ( >=dev-ruby/asciidoctor-1.5.4 )
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
+)
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in $(grep add_subdirectory doc/CMakeLists.txt \
+			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e '/add_subdirectory('${i}')/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDIR=/usr/$(get_libdir)
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_NCURSES=ON
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_MAN=$(usex man)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PHP=$(usex php)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_SPELL=$(usex spell)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_XFER=$(usex xfer)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if $(locale -a | grep -iq "en_US\.utf.*8"); then
+		cmake_src_test -V
+	else
+		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
+		die "required locale missing"
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index b33c433ae6d2..9612d0567f73 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-{1..4} )
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit cmake python-single-r1 xdg-utils
+inherit cmake lua-single python-single-r1 xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
@@ -29,6 +30,7 @@ LANGS=" cs de es fr it ja pl ru"
 IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 
 REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( nls )
 "
@@ -41,7 +43,7 @@ RDEPEND="
 	net-misc/curl[ssl]
 	charset? ( virtual/libiconv )
 	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( dev-lang/lua:0 )
+	lua? ( ${LUA_DEPS} )
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:*[embed] )
@@ -62,11 +64,16 @@ BDEPEND="
 	nls? ( >=sys-devel/gettext-0.15 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
+)
+
 DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
 
 RESTRICT="!test? ( test )"
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 }
 
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7c7cd5566b58..251db70f6685 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 025ca9c59b71..696335c56c1f 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -4,5 +4,6 @@ AUX config 3064 BLAKE2B baedffe4b9e8696a0f933ba761db3f3b8d4d2cf4b910c22077857a43
 AUX explicit-libdir-r1.patch 1578 BLAKE2B 1495850dff9ad1dab1e4820158cff5f706ea3420d664ae2fcb7ae9200790e52fbac093ac510812b80d0eaa177a5d210b6b9c43e80d0317ae4621fe3c18b65c01 SHA512 8e10b10eb6959e309e504a0ff2c16795e258f0fab57b97ffb3b64a6c3b84de8e782cc1697983ed7ff0a05a211e43146ecf39588782e8d3c813a4aa053d94557a
 DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18
 EBUILD axtls-2.1.5-r1.ebuild 4678 BLAKE2B de0672efc998ede965c0680e0388edbc5f76df9e00649ca77877c8ad10a5d265b6fb99c99a7f49e1172a4e1c3abafe53e576d4f1a6862d8cc1b963befba4b933 SHA512 304a0a97988470d3d9a13969da303f5689c38cd8c5c2a5996ac39db7084bba234d81278ce78aaf243b26446aa228cc909690caa49104d27b006e300774a0dc35
+EBUILD axtls-2.1.5-r100.ebuild 4863 BLAKE2B 722f8c6e4b0544ad44467e7d6d66d7f1abe66b859d6fea8f8f18f6a1ac445b007076dd6c9a1870e51b9c143beeae670631c0a97df3e756cec8b37985034dd14b SHA512 654aa536d7ed88846788442e8ef657d50ab2cdef6ad85318ecc19c9b60dcb11d82846659b29d05d5c5a4658c6c6f750cc999405ede1a6b370fa95167fc33beea
 EBUILD axtls-2.1.5.ebuild 4672 BLAKE2B fcae6be59c45d8041d395bd73c0f6d6f3d99418a93310ffab9613cbb35e335c67f947ea9fcbf05ee8d317da34fe8733b05608f89004fdfc59e9e0ae6d036527f SHA512 4e103608244c3026cd8dda2967c9635e393c7f288282b63017c409a0e5e89f61496df5c5410163eaac8ad74ffd6b18d063a2f02602a70773df9cc8fe2136d5f9
 MISC metadata.xml 632 BLAKE2B b83cd23e97a4fdd09ea7354c1245dd65e54c50b418538c2ef71ae9054626861b6516268fcd37485ba19d1981024c47d869cdce00b276473200a7352c29072b1a SHA512 bfd387d998bcf2a457ff01752b553307b0de430cb9372115b366ab80a10866ede54b8ee149c726aba6f12c8cc3c5ea089dc5b25083e95594d8912e181a8626b0
diff --git a/net-libs/axtls/axtls-2.1.5-r100.ebuild b/net-libs/axtls/axtls-2.1.5-r100.ebuild
new file mode 100644
index 000000000000..a988deef75dd
--- /dev/null
+++ b/net-libs/axtls/axtls-2.1.5-r100.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single multilib multilib-minimal savedconfig toolchain-funcs user
+
+################################################################################
+# axtls CONFIG MINI-HOWTO
+#
+# Note: axtls is highly configurable and uses mconf, like the linux kernel.
+# You can configure it in a couple of ways:
+#
+# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
+# you want, and possibly a lot more.
+#
+# 2) You can create your own configuration file by doing
+#
+#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
+#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
+#	make menuconfig
+#
+# Now configure axtls as you want.  Finally save your config file:
+#
+#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
+#
+# where ${PV} is the current version.  You can then run emerge again with
+# your configuration by doing
+#
+#	USE="savedconfig" emerge axtls
+#
+################################################################################
+
+MY_PN=${PN/tls/TLS}
+
+DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
+HOMEPAGE="http://axtls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-code"
+
+LICENSE="BSD GPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="httpd cgi-lua cgi-php static static-libs doc"
+
+# TODO: add ipv6, and c#, java, lua, perl bindings
+# Currently these all have some issue
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="
+	httpd? (
+		cgi-lua? ( ${LUA_DEPS} )
+		cgi-php? ( dev-lang/php[cgi] )
+	)"
+
+#Note1: static, cgi-* makes no sense if httpd is not given
+REQUIRED_USE="
+	static? ( httpd )
+	cgi-lua? ( httpd ${LUA_REQUIRED_USE} )
+	cgi-php? ( httpd )"
+
+AXTLS_GROUP="axtls"
+AXTLS_USER="axtls"
+
+pkg_setup() {
+	use cgi-lua && lua-single_pkg_setup
+
+	use httpd && {
+		ebegin "Creating axtls user and group"
+		enewgroup ${AXTLS_GROUP}
+		enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
+	}
+}
+
+src_prepare() {
+	tc-export AR CC
+
+	eapply "${FILESDIR}/explicit-libdir-r1.patch"
+
+	#We want CONFIG_DEBUG to avoid stripping
+	#but not for debugging info
+	sed -i -e 's: -g::' config/Rules.mak || die
+	sed -i -e 's: -g::' config/makefile.conf || die
+
+	eapply_user
+
+	multilib_copy_sources
+}
+
+use_flag_config() {
+	cp "${FILESDIR}"/config config/.config || die
+
+	#Respect CFLAGS/LDFLAGS
+	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
+		config/.config || die
+	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDFLAGS}\":" \
+		config/.config || die
+
+	#The logic is that the default config file enables everything and we disable
+	#here with sed unless a USE flags says to keep it
+	if use httpd; then
+		if ! use static; then
+			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
+				config/.config || die
+		fi
+		if ! use cgi-php && ! use cgi-lua; then			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
+				config/.config || die
+		fi
+		if ! use cgi-php; then
+			sed -i -e 's:,.php::' config/.config || die
+		fi
+		if ! use cgi-lua; then
+			sed -i -e 's:\.lua,::' \
+				-e 's:lua:php:' \
+				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
+				config/.config || die
+		fi
+		if use cgi-lua; then
+			sed -i -e "s:/usr/bin/lua:${LUA}:" config/.config || die
+		fi
+	else
+		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
+			config/.config || die
+	fi
+
+	emake -j1 oldconfig < <(yes n) > /dev/null
+}
+
+multilib_src_configure() {
+	#Per-ABI substitutions.
+	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
+		Makefile || die
+
+	#Use CC as the host compiler for mconf
+	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
+		config/Rules.mak || die
+
+	if use savedconfig; then
+		restore_config config/.config
+		if [[ -f config/.config ]]; then
+			ewarn "Using saved config, all other USE flags ignored"
+		else
+			ewarn "No saved config, seeding with the default"
+			cp "${FILESDIR}"/config config/.config || die
+		fi
+		emake -j1 oldconfig < <(yes '') > /dev/null
+	else
+		use_flag_config
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use savedconfig; then
+		save_config config/.config
+	fi
+
+	emake PREFIX="${ED}/usr" install
+
+	if ! use static-libs; then
+		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
+	fi
+
+	# The build system needs to install before it builds docs
+	if multilib_is_native_abi && use doc; then
+		emake docs
+		dodoc -r docsrc/html
+	fi
+}
+
+multilib_src_install_all() {
+	if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
+		mv "${ED}"/usr/bin/{,ax}htpasswd || die
+	fi
+
+	if use httpd; then
+		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
+		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
+	fi
+
+	docompress -x /usr/share/doc/${PF}/README
+	dodoc README
+}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index fa2eee675d59..d211fa45e212 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,6 +1,6 @@
 AUX gnutls-3.6.15-skip-dtls-seccomp-tests.patch 477 BLAKE2B 4c1add5ab8041b7847c0b579d77483b9fc0f779bb24e3ba50953c2ca2b2bfc7774861085da3d9709fdf250c450cc77aa312095f816bf67748b5d2b5bed4f43ee SHA512 6f2dc20dbdd27875a964aa806380556f4a3da1d2c0c4f7337e0845fb304319b5b9ad94ba519982a4db75486f673a717e20c294487b2d3e339bf7d144a0f33803
 DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
 DIST gnutls-3.7.0.tar.xz 6129176 BLAKE2B 3b03e7017ac1d715c740f8f09b0690dd1c983dcfd5faef0740cf66ac785c1a84e959f85808aa10a6eebd745d96ca0293681049911ea663aeff85fedfa2567aad SHA512 5cf1025f2d0a0cbf5a83dd7f3b22dafd1769f7c3349096c0272d08573bb5ff87f510e0e69b4bbb47dad1b64476aa5479804b2f4ceb2216cd747bbc53bf42d885
-EBUILD gnutls-3.6.15.ebuild 4315 BLAKE2B c451f75c65ea442bffbf56c29e161946ecf70006edec3c1496feff2eb5585eeade30fda535658a2ec17b5bb751c13c77caf285cded5eb57dcdf188076e86877b SHA512 ab68c63f942f032f093bddec410edeb12d0d553b1572f5fcab4f4205c63a6c0af2c5c65c4eb05bb686ff60dea6574cfef134598b612f25c69fa98e97c5ff5f5a
+EBUILD gnutls-3.6.15.ebuild 4314 BLAKE2B 78cb04889e4a7b369d78cecff6003fc3ce0a3adb32f2641fc7528764ac787dde0bbd3908fe416ce5ec8888bfde3cbb295b95eca5d7fa7fe365055baf73f21a99 SHA512 68e3d074285f0ecd930f7fca12fd5318dddbf52e39341e66f74a2acfc1bf39c5b3d06aa881014b3cf38ee838c573cf294fc288ba4cd4948e732954f09a8c9243
 EBUILD gnutls-3.7.0.ebuild 4251 BLAKE2B 4190cf568be96a624156a5156568c9f29479e2dc534cdc21d3b67d12a676ff417ca5feeb58678db1a1a48d40e1f9dbc1c1afa9f55d5b64bd4b8922d68ddf2f11 SHA512 edaaf1006d559fa68bec37f5312de542968c34e13950469206b5f2bb8e636abecb12897dd01f11b0ba29d4676ed573919227685718e7f519e800c89b76637709
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/gnutls-3.6.15.ebuild b/net-libs/gnutls/gnutls-3.6.15.ebuild
index 4103ba431769..94ab0018b3e9 100644
--- a/net-libs/gnutls/gnutls-3.6.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.15.ebuild
@@ -54,7 +54,7 @@ DOCS=(
 
 HTML_DOCS=()
 
-#PATCHES=( "${FILESDIR}"/${PN}-3.6.15-skip-dtls-seccomp-tests.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.6.15-skip-dtls-seccomp-tests.patch )
 
 pkg_setup() {
 	# bug#520818
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index b5a6b43435cd..ee8b6f336a83 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,7 +1,8 @@
 AUX libgsasl-1.8.0-gss-extra.patch 861 BLAKE2B 607f64758406228cc3996e25759e1644c12a0c61227f62c9b8ad8a0181aa30987aa8a93ccb09e42676544e13a6dc43d779b906c5481916f73668ae5eeb50a212 SHA512 67fdf2a74829bc5164ddf92decd3478bfc6a474171dc74f4088636e424aa78146b9b5c7c8d961753cc2a2a391f7e3b0c071f6c391dd680cf9b3ee6c8c8bb0040
+AUX libgsasl-1.8.1-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08
 AUX libgsasl-1.8.1-gss-extra.patch 855 BLAKE2B 68eb983dee51393b4d871b71932a61c880bc37f6ead9047472215f8388833efea85db9ab4282bfcb700d0bda366623935bb487652dd334c4bb87dcb188b30d8f SHA512 97922b23fb967ee0110076913ac1ad89b3720be5d9883bce3762b4e41d95375ae1602470eeaf1551cb7ef7d46952d3dfffda64ef6ecc51149cd93dea681ad988
 DIST libgsasl-1.8.0.tar.gz 1208417 BLAKE2B 03eea4be45ccc28bbc5c98b5f266552e6f5da151dfc561b1f01dac107a6edf0f06a3000e868c07d5539df33334d3c965c6c276de30c75038e25165aa7e2db2e8 SHA512 7e591d12404919559bf67590f862270ffcae2030a14097cdaf92820aa79619b3048541e9f83b3fcb98a84622c44a52ecaceeebb1be55b9e9f68fb1790ade8721
 DIST libgsasl-1.8.1.tar.gz 1791261 BLAKE2B bd8b954f9d950fe449fe140baca840a14f12ef6318e74a6fd070b35504b8c3a7002f13fe93142bce992e4a1df773ebaad4ec01d04c01c63a7374187a8142136b SHA512 52bda3a962a2cbb598009fd02c547a4f8b5b9a4243511aa8104df97b4737023281ab57dbbcf839db3cad73c64cbc72bbd89b49da8b0379dd635220ffb642aa22
 EBUILD libgsasl-1.8.0-r1.ebuild 1387 BLAKE2B 131b327007cfd2b3ca71d38da504b93a7fca6b9bd4a986b57edac157529d561852bc2881d927931d82b75678875a269aa70a0c2ed38eb9c2f70125f8e1896197 SHA512 634b59ac8efe01d93c0f15f1794c122e608f7b2427bd61f3b93413d301cb5b908c0162a652c8d3dc9a4745eed8630c6bc94a907a12b0f4d4da5ad35f6f92ab7d
-EBUILD libgsasl-1.8.1.ebuild 1391 BLAKE2B 03650654ff9aca810eded2d81455eacbdd8f7336f481184790a520bab506f77588ba03f8427924166db56b94e63afad6ee89a2c0ec410935b402965d263c275f SHA512 4670a67f78b76f8a09e9a24de28d62c6788354ece31e0e22da2efcfd3d8e331b2f84288cc20799d16df0b28eac6301ce3a8d90b899e17379b0c1a8c375d26b79
+EBUILD libgsasl-1.8.1.ebuild 1428 BLAKE2B 54517c71b38471f8a02a31917d46599a124ab90b86ce5a129415e059c3e958fe386cfb77ab76499bf9b0edc27d9e52711fd049572b9b5d8a47dd662b5f6bed4b SHA512 4e8878580c7a4407bd18999402b98c30880c30f7aba34f6e3a74e25ed07f0b1da2cfd9fcc8e3f7999f6928a9c62660934f894d317b20d6fbbc64d9a09bbb0912
 MISC metadata.xml 366 BLAKE2B d144c8ef6b53c919ee09ebf2f3d4a7e8ab6528e4c3d9e01cd1de83dd92626f09b698f84020b7fcffb3cc67db8174d182bcf1aeed294e3f9765d5c5f02c27918b SHA512 acd5a38df05489c2bc01e25f1a246d23609513bc70ec07bee2cc87e0548d355197c05da7bfc26e70a2302317dd3345fd638930ee3436ffe7b6d4cd7ff8b101b0
diff --git a/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch b/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch
new file mode 100644
index 000000000000..a2a558db5a64
--- /dev/null
+++ b/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch
@@ -0,0 +1,36 @@
+--- a/m4/std-gnu11.m4
++++ b/m4/std-gnu11.m4
+@@ -6,6 +6,8 @@
+ # This implementation will be obsolete once we can assume Autoconf 2.70
+ # or later is installed everywhere a Gnulib program might be developed.
+ 
++m4_version_prereq([2.70], [], [
++
+ 
+ # Copyright (C) 2001-2020 Free Software Foundation, Inc.
+ 
+@@ -70,7 +72,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
+ set X $ac_compile
+ ac_compiler=$[2]
+ for ac_option in --version -v -V -qversion -version; do
+-  m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
++  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+ done
+ 
+ m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
+@@ -135,7 +137,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
+ set X $ac_compile
+ ac_compiler=$[2]
+ for ac_option in --version -v -V -qversion; do
+-  m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
++  _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+ done
+ 
+ m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
+@@ -822,3 +824,6 @@ dnl Tru64	N/A (no support)
+ dnl with extended modes being tried first.
+ [[-std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA]], [$1], [$2])[]dnl
+ ])# _AC_PROG_CXX_CXX11
++
++
++])# m4_version_prereq
diff --git a/net-libs/libgsasl/libgsasl-1.8.1.ebuild b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
index 6c8b8e053665..7afe85ddc406 100644
--- a/net-libs/libgsasl/libgsasl-1.8.1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 
 DEPEND="
@@ -25,7 +25,8 @@ RDEPEND="${DEPEND}
 	!net-misc/gsasl"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.8.1-gss-extra.patch"
+	"${FILESDIR}"/${PN}-1.8.1-gss-extra.patch
+	"${FILESDIR}"/${PN}-1.8.1-ac-270.patch
 )
 
 src_prepare() {
diff --git a/net-libs/libmrss/Manifest b/net-libs/libmrss/Manifest
index 650ff04379d9..46d132eac9b8 100644
--- a/net-libs/libmrss/Manifest
+++ b/net-libs/libmrss/Manifest
@@ -1,4 +1,3 @@
 DIST libmrss-0.19.2.tar.gz 375238 BLAKE2B e01682d9223d3f2cea444b5e6b5e9b6e476782ef0ae1c4a85d5ea8e8e5383d5317f2d35eff93347e6b5fde0778060c212b8e489915f50b20f098f7e94805e148 SHA512 0997ced472b767174977b7623484c57bfd0b901a9650cb7f7738ad7393153752ebfc1f717e2eacfb5f7eb319140599128d73de7e095327ee089cd1f85ab42b24
-EBUILD libmrss-0.19.2-r1.ebuild 1176 BLAKE2B a5647cf1b695fa5a61d1c0ce57b92f3b354ce7badbbc6d3b930d9a95cd2c7533416bc68eaf255ee8cbbc150abd19f59c5d57aad7fd4354ba3462841f25c5cf48 SHA512 e31e381d786a6a2e5b8e9a2d01eb1dfa7af30c44ca883c7aedfd2a19e097022624420117ca6d88f782a71bf577d584d893fa086b1a6656f6a4d9f9a76907e5b7
-EBUILD libmrss-0.19.2.ebuild 980 BLAKE2B 973b0eed41f64477fb7d00a55a0ef32dfe7d6e2f252dbad8a7c25453fdac8b7161aac4422348105a3d52dd4c1d258c0f22b6d45d0acca0f38fcd6829713ba7ab SHA512 f3fc8203513bddd479e496329cbc524670c2a0a81fa79e6b88758b69a1b5e0b746b14906d9b5f3dfce4d8041f992885f1805f204ac4d740aee07db967c1976c0
+EBUILD libmrss-0.19.2-r1.ebuild 1175 BLAKE2B ae200825669be6f1c6c28750413fee98ccc2b785fd1629c016bde5dc11a4214b02dfd127538bf25daeaf8621131ed88e4725a6a34b973443d48818c82d3a4206 SHA512 8e3f9ce923069fb626da50b2d6c28762d93440011c928b4b892bef0b830324d54ea65f450c04a87b7cec4a8a73780fd55fc50f09023be9c9943bd6ba3a97d4b3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
index 6c33d526b2c4..c36887130680 100644
--- a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
+++ b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~x86"
+KEYWORDS="amd64 ~arm ~mips ppc x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/net-libs/libmrss/libmrss-0.19.2.ebuild b/net-libs/libmrss/libmrss-0.19.2.ebuild
deleted file mode 100644
index 4676489f4776..000000000000
--- a/net-libs/libmrss/libmrss-0.19.2.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
-
-DESCRIPTION="A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or streams"
-HOMEPAGE="https://www.autistici.org/bakunin/libmrss/doc/"
-SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE="doc examples"
-
-RDEPEND="
-	net-libs/libnxml
-	net-misc/curl"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# TODO: php-bindings
-
-src_configure() {
-	econf --disable-static
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		ebegin "Creating documentation"
-		doxygen doxy.conf || die "generating docs failed"
-		# clean out doxygen gunk
-		rm doc/html/*.{md5,map} || die
-		HTML_DOCS=( doc/html/. )
-		eend 0
-	fi
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		docinto test
-		dodoc test/*.c
-	fi
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libnxml/Manifest b/net-libs/libnxml/Manifest
index 2f113edb0334..f985e688132a 100644
--- a/net-libs/libnxml/Manifest
+++ b/net-libs/libnxml/Manifest
@@ -1,4 +1,3 @@
 DIST libnxml-0.18.3.tar.gz 361977 BLAKE2B babe5773f102889d52d0d63511984201e220205925b703221559cf73c8e380b78b3788ff48bdc2da382746bb95acf4c9a70c69d689c4fd7db3be4bd65f44000d SHA512 fc420a4b773eca68608ac1d509930a0528c3a41b53fc7cc340c09fd53f92a88afb4091e810d97d59e73a8beeaaeed52dd3c880273ef512a5305800b3ef46717a
-EBUILD libnxml-0.18.3-r1.ebuild 1110 BLAKE2B c087c2b6cd842b3948473c6abe6823819b49bed69fc627828ad6220e997d05c5401ca7710d8ebe2e8224a10a951a5fd3c87ebad3c916366faaa803ed987a6294 SHA512 a43702f82021050cdd010b1226e3abc310809daa943669a64e780dde4307f3858047d9190eabd2377302d8bc034daeacf4c641806d28e2ec00afce94748cd081
-EBUILD libnxml-0.18.3.ebuild 914 BLAKE2B 38f973759899df9afe7145d82b18f4a3f7eb7a2235ffe96b347cea12a7e83670904c4a2e23a0c4e4b5ec4190d9f5c4500865961fe773a95d1f94647d7340d03f SHA512 cc55562815a60568fd34427304273830bf9a3d4eb85a8f4dd7db433dc6748aedabef84d5e2d40f3810b011f7bf502f5bd8b37ef80f0d5279f4dda0b14d04268f
+EBUILD libnxml-0.18.3-r1.ebuild 1109 BLAKE2B a0a741c24696d147b1d885a8e055e2654417a0be3df6c8ad4adf6b3ffb4a67bd67c3b37d4d6ff0933eeb8719a4b674a363e3939b2f449ac104863257125c27e3 SHA512 4d971f8e8a06fc4b5e48b2b15a7bea359eec459ccda47634ac4aee453e8fb11e176fad699e6ba5f3a5ad3532f480e8a25dee60fb4d8edfa078b09269f248d971
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
index a82ac270a330..0d411264df2f 100644
--- a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
+++ b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~mips ppc ~sparc x86"
 IUSE="doc examples"
 
 RDEPEND="net-misc/curl"
diff --git a/net-libs/libnxml/libnxml-0.18.3.ebuild b/net-libs/libnxml/libnxml-0.18.3.ebuild
deleted file mode 100644
index c153deafa5a7..000000000000
--- a/net-libs/libnxml/libnxml-0.18.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A C-library for parsing and writing XML 1.0/1.1 files or streams"
-HOMEPAGE="https://www.autistici.org/bakunin/libnxml/doc/"
-SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~sparc x86"
-IUSE="doc examples"
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		ebegin "Creating documentation"
-		doxygen doxy.conf || die "generating docs failed"
-		# clean out doxygen gunk
-		rm doc/html/*.{md5,map} || die
-		HTML_DOCS=( doc/html/. )
-		eend 0
-	fi
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		docinto test
-		dodoc test/*.c
-	fi
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 572040273cf5..6b73c4ef093a 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -11,5 +11,5 @@ DIST libproxy-0.4.15.tar.gz 93084 BLAKE2B 9aa86403eaf4e1791958013c2739e251c61f11
 DIST libproxy-0.4.16.tar.gz 95534 BLAKE2B 163f4fa359758a2186802683005b7d2bbd68933d2512f2c4a284912b6d07e3aa288613e3b473d1bd8d9fe941033da634490c78367692a489da31184dd4dc3cb8 SHA512 28bca7c86e486d08ddc1699e562dd98366b569ec9a7a965f7d15d265ede508575e6eae43abde1778f46d55c3304d32218d891d01ba6a8c360820412748ed5ca1
 EBUILD libproxy-0.4.15-r1.ebuild 2708 BLAKE2B a2f4f66d4fb604cf4d3bbd2ab3f7cc336f36152f00ce82028a677e9d269755f75dc118976394e0ad0fbf594f1d1e9d3f2445eeafd3fb7b61854e4a4c5ce4573f SHA512 774fe0a0356d7975a010667270923726a645dd9cd803fcb112e600e0de069282a5cd625f00f196e7112ac24b68e914e62baab5e09c9a9521dac0f540932aecac
 EBUILD libproxy-0.4.15-r2.ebuild 2749 BLAKE2B 731c5c169fdb244d023fe13c3a527ff5bab3e3d1ad06ebf133f7cb735ccfff5af55627def215ef6bc2caf1d2d33fb4c3fc71086e9bc6b0705c19e1bb59de81da SHA512 1923237894e97d2ff10bfde1a281718489b1dbd90883b27b1a0b30066923ff558c9ad3cc4b5e83696f01d92b92656bc7356877187efc242b212eadb840cf7fdb
-EBUILD libproxy-0.4.16.ebuild 2570 BLAKE2B 0a1c2f2d9f6459c0abaa7b1a331b4bbc933f8356fa53d7167d7ba5da951304a6b7daa1de88c00fa57b6a0792a4f3ee9f91ff83581a7f90410862745a5d0cd19d SHA512 a0549e16bace40beaaf9207da1de72f2e6d40f48583f595f6f8920b61a1f3fe1b27703e82f6e6f893124691df54dec12362171e372ae8d1a0517db6123d27f0d
+EBUILD libproxy-0.4.16.ebuild 2566 BLAKE2B 37d861f9c4e4ecb1c270ec6b6f0ab416a383ae81bec4b6e0ff11a0b17cad46f5d141ff24c6369ced463bb13aa9ae4c03a12f53c6959b54db8537df4537127d56 SHA512 35e50fe449aae44bbf11ba027dd8cd36ab058bee01669284ad5de5c5a7dc19af5f7b54bccd9a879ed31292bec6a05ab30f2d0a6e49c593d8fcf1c2b51af13150
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/libproxy-0.4.16.ebuild b/net-libs/libproxy/libproxy-0.4.16.ebuild
index 05a310fc7432..2b8c9c9cd3fe 100644
--- a/net-libs/libproxy/libproxy-0.4.16.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="gnome kde mono networkmanager spidermonkey test webkit"
 
 RESTRICT="!test? ( test )"
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index 7c29f6611dcc..05059383c8c8 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1,7 +1,6 @@
 AUX libslirp-4.3.1-bug-756910-check-pkt_len.patch 1404 BLAKE2B 6e9d046f5f25bbdb574534cdd26ab69c708a56893336a09a7e146d654c4e74af338ad178c0067662e696453930f627117f386f8d99d20a555b28452e309884b4 SHA512 2ebf8293aed6c09c1a03123e5b3acca602ad1fd293653f093e1c69d691e2d4db15c1f9d10262fc0e5019771f81e1812788b6e5234a602f13b3b73172d6f6419f
 DIST libslirp-4.3.1.tar.gz 127008 BLAKE2B de40980521a54367fda73b9a67a80159ff14e8ea073086d8df3b42028ffe778b62f0aabe2b3f0929e168c73c453a8eda3fe0bb866d22de5b0712775e9cece19f SHA512 fa38a5e508b00802538f8466b8b52fc4842d6f7f74caa399db1011c15bb37198678415147327a606e3f259fd5def9390012df1d4dc76e8869e9bb77ca6514005
 DIST libslirp-4.4.0.tar.gz 128453 BLAKE2B da747071c22522649627dd8b2e1cd621129a6898b2391d0da2a8f032068f129d11de3dc0e0f94ac38b36c79e2cc0c9508a3bd3e9a07beca914219146c82faec0 SHA512 27f5d41730a3070df4ead1af4ec42fdff141289e5072ec93053b9236d9197bc3f1a3a804c85eef08458ab47a0d4921457df57ece5aae42cab9f068ccda31f3ee
-EBUILD libslirp-4.3.1-r1.ebuild 940 BLAKE2B 8a1b1f8f43b6017df6749e9e0779c87ec8a21d96b93d74c98924cefa4271dcd2b9e29c9bd330688438ee881534b34436539737ceb6d93a06145656d4a539f493 SHA512 95d978f8def98d3065a27c9b8a8a9c650646edabe88f36bf1ad308708b0ec2429e53836d09a240b26a66ad019ada2ff8408287c233258a404a1effb043b4e92b
-EBUILD libslirp-4.3.1.ebuild 865 BLAKE2B cf25ff2e27f4220eba664b17cf08f300ee0e83c27a5c314944d0dde730d3dac8ddc8e4a2fa0f20cb90a635d262411f186ddd38b951c148ac54257f7ef2199ac8 SHA512 1e8701efac9726e608f6a42db0420a05be3e9654ac0c44610d6df6be74a1146d65cd32be97af2afba959482995d7fcb2cbd15012e009167fa17eb7282ba66a7a
+EBUILD libslirp-4.3.1-r1.ebuild 939 BLAKE2B 0861d47d6072ac25bcd3d723a94b64c11a8298c6c465f506ccfe3316fca3b0f9606233abe7ede127f9726ee01c22a14489528e2efa958248aef2f56a52b763c1 SHA512 96dd32c43a59807a2faba5762d48659b5412b12144085ce6a5f33b088e01f526b12ef4b8c94e4e2efb65a36f94123e390d6e7439858f15a9afcc181048058be7
 EBUILD libslirp-4.4.0.ebuild 869 BLAKE2B 211ef5a2ca98a996575cea4f5296844147dbeb785680fddd5439e137f55fe675f17300dd3c76eeddddfb8686fa675ecd0f5dbbb90586c9225aea6f7df40a08cb SHA512 f5fb6db7c131f0207f30a0aec51ff240eb3a10cde2f901d395ff71418c914a737e35caee43ce16789e9c9d60398eeb013fd5f2cdb58d0cd5f4e8ee3bf614a997
 MISC metadata.xml 346 BLAKE2B f8c280b0fc3fadde1f7d8524d281b6c818d0489c98a3d54e9bcb54cf576bf34648041ddd2a9635544378e18fff67d34036626ae4f74ddc8a850347858137b458 SHA512 b237a26cef7a0e4e023b953ad63505c00338d7aab0434bdb346ac3e9810f81813a3567f7dbc2d13b03e0c63d50b9f151a9ece7051a90a0568281e410da2ba9da
diff --git a/net-libs/libslirp/libslirp-4.3.1-r1.ebuild b/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
index a8d758fa596d..1ab7f75196c7 100644
--- a/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
+++ b/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit meson
 
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 MY_P="${PN}-v${PV}"
 SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
diff --git a/net-libs/libslirp/libslirp-4.3.1.ebuild b/net-libs/libslirp/libslirp-4.3.1.ebuild
deleted file mode 100644
index 5a87450fae43..000000000000
--- a/net-libs/libslirp/libslirp-4.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-MY_P="${PN}-v${PV}"
-SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
-HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/glib:="
-
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	echo "${PV}" > .tarball-version || die
-	echo -e "#!${BASH}\necho -n \$(cat '${S}/.tarball-version')" > build-aux/git-version-gen || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-	)
-	meson_src_configure
-}
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 0db340b79cf3..ae94df1fc391 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -2,5 +2,5 @@ AUX libsmi-0.4.8-CVE-2010-2891.patch 476 BLAKE2B d93f008527b01c2f9d1fed934c88632
 DIST libsmi-0.4.8.tar.gz 4104111 BLAKE2B af7fe812d8dd6cbd538fbb9d5671f9478b6c3bf4b251eb0729142f56aacc87fd8aa38927f92ebb4f546069e81391e85be338fec92979cd462efe614e16220754 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
 EBUILD libsmi-0.4.8-r1.ebuild 989 BLAKE2B c0e313ce7f28a9f4bd7154a65ca5a595b8ecb22bd90e4c8e13661813acc257fee594fb737aabed99b1b3cf231e5172177ef4b3e6f487aa8413adcf54f2cadbc8 SHA512 dc7aa0631fb98736d7bc2e9931780584843d4739a1a45aa293ca8c9afddaa2619f46301e127133d48387b787d354fc947368d92e64f25c8d770a936beb60b66e
-EBUILD libsmi-0.5.0-r1.ebuild 899 BLAKE2B f66a0085abb97bf1f087d0ed1cd3a5253d707d2ec13393da363a6ebd82e5024afa6bc2cf8d36915228855670a028248e5a5c941467227584a33f6f36f53ab811 SHA512 8a07b75a6023c47651b16dc97dc7df80c39387e54e19052d8c608a087825f0b0ddf62edacb666c922c9f6e6714208cc48e8e68ad3649eac7c049ad4da9d85c59
+EBUILD libsmi-0.5.0-r1.ebuild 898 BLAKE2B 9432c628324fd5d57242339e0ce07fc6bfdfa2e8457053fab177a05c1edf8e357c15483d6d9686eedfe24c798c22ea31fd3abe08bae28b34a1dd5ec551b19b99 SHA512 3ce94933bf9f64ed12d1c740645cb2979386d86ef595a229062d196900d1e44effd30b7e16ef9f30e583f519afb67ec06d561e60b4486045ac2c9156854e31f2
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
index 6b0294947d29..f36fbd9bb1e2 100644
--- a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 5d3d76df2dc0..417bb7e79f8a 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,7 +1,7 @@
-DIST miniupnpc-2.1.20201016.tar.gz 97682 BLAKE2B 2c98f71ff7262a24a69a9a4af411dbeb58c20ec4181bca8bbdd61c628bf5bd49f7e9b763b73ffb5d3508b5b545a0c918828ead2a376b57b8ea5051cd7b8e9c13 SHA512 d619f7e205cac68137020fab31e8bdaeebd09eeaca5e42e1e03a9e0085a64d635ec896862a488b0d57798d1e6ce96e2ba5652f60c0b8df9fc866eea90baea152
-DIST miniupnpc-2.1.20201016.tar.gz.sig 543 BLAKE2B b8ddcadb58e7b8dc4646ea1ac4e10331fe70a5b9a27902dd5ad09ac306605160b63f2e21d96eda4aa0f77485800cb9c5aa110f215dbe3536a9f6ec1c4a5e9ed9 SHA512 fb7886d4198bd2ae1eeff293152ff509e7ebe6ff0f9b3c20d5824f7ca9f65091a61db2bc0a8ac9fb0449994aba594cff3bf6c556876dbb47d593ecf8b7b26d10
 DIST miniupnpc-2.2.0.tar.gz 98348 BLAKE2B 3464dc7f0b5416b558d0dd49121f3b851d9808a516c19d4f99fdb205e20149f27ef495d9f8da09ad3a28656580bfc16d1cf99ef993e41e9600cfe427b4a776d2 SHA512 b5bb674f162cae3d9e0205a9cdf6acc1fb334ab8ac5330be924411a8fd46833fb916d09f947d1e40d05224df7df1ecf6d812037185690e5022287c2024eb183f
 DIST miniupnpc-2.2.0.tar.gz.sig 543 BLAKE2B c75dbc54debc77e63ea3534f8f424a3904131893fc31d6485163ee6ecdafdab02fc0db8e290d28c834ac0efc5a37c34cbca7f14e1c78f859d22abc4e0b2ae48f SHA512 54f8cccea5886e06fbdaa04d270c12bd95d219be0b275491d9168f1089b1efe96e8a6f30ebf428091a3bae4bc349c0b8c94a22e94d56845a0a8b9724b1f9f74d
-EBUILD miniupnpc-2.1.20201016.ebuild 1523 BLAKE2B 53a24a8767c864c6b82f54f2822e79b9670f632a872fb10f798af381001ea65d4a7de3f2f11dd8e6c5d82eab943f3b1a69fc7953868b2578fbf33dce0e253114 SHA512 2b60ca7a7b798953a969f28aef2a325175bff279996edc332423a9088f620c295c2879377cae3859244deafd7e9fa5c23cf6c28a487b8725723bff4e330ae061
-EBUILD miniupnpc-2.2.0.ebuild 1529 BLAKE2B 88bad5f4e0c3b14fb059c1c2c57c362afe684c7877dd9f702fef073a55ec7913f741a31058082ddf2ff69b2206aa41b2926ce3344ef5c7136d1a952869969497 SHA512 898fdf9ac7866ee79f5d19a75b23041c6ff38f22502574322e7951493ff150265a001a234f2e647d663a985f17a4ecc56553c5dc2ba28fdd781237212b468f32
+DIST miniupnpc-2.2.1.tar.gz 99595 BLAKE2B 07736eb15a985096178273c4578bb3f0cbf32a04632196e9c216d10751a6a5b1269af5fe2cbd447d85145746a7a8ce750ce13f674f5d8f9e4f6921b9d58204bf SHA512 62fc0098890980028199dd16e87b13ce23e78b2cc996433799792dc2a4fa9b5e230139593bde5c721f649c14fcee2e4d8a0558976c5506c21ff26deff6c7c907
+DIST miniupnpc-2.2.1.tar.gz.sig 543 BLAKE2B 19da35662cf75d47de9cd16d3d8f767119e3dc04370801bf8893a17cd0af47072456b75bc3415b587371972a7c5c36623665391bbf4b9c655d1da3c0e5b8beb7 SHA512 8b5d41556c66e6330673a63eb3be2397cb057c37f648d950e8dfa0bb00e646f343cfbcbd11a6547198d4fa6b1ca2a82b46724e284ce76e96d96ad6b3b5b41c3f
+EBUILD miniupnpc-2.2.0.ebuild 1523 BLAKE2B 53a24a8767c864c6b82f54f2822e79b9670f632a872fb10f798af381001ea65d4a7de3f2f11dd8e6c5d82eab943f3b1a69fc7953868b2578fbf33dce0e253114 SHA512 2b60ca7a7b798953a969f28aef2a325175bff279996edc332423a9088f620c295c2879377cae3859244deafd7e9fa5c23cf6c28a487b8725723bff4e330ae061
+EBUILD miniupnpc-2.2.1.ebuild 1532 BLAKE2B f2addd212049fc794f7d63e9d77ccf703bb1943662d475eb5bfd5c3fb9ef29327400d1628ff33eb5e2f280294668dfae6e5a1a6468f5605edf8f702820818376 SHA512 3635df1e464624500593db7ddcbd9744027b4867e17cdb930b36f142f610e5e5c6c6294786bbd57c1792f51a38bb676467f65b3d4d55f0e83cdd925b211b4aa8
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.0.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.0.ebuild
index bba803753354..939ae17cc4ef 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.0.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild
similarity index 95%
rename from net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild
rename to net-libs/miniupnpc/miniupnpc-2.2.1.ebuild
index 939ae17cc4ef..9e79fd0ac53e 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20201016.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 503da93ac282..93ad8cb46f27 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,6 +1,6 @@
 DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d
 DIST nghttp2-1.42.0.tar.xz 3973284 BLAKE2B 39431619bd3c9a66eb217065bb29ceba8f3fda376343687b4774ed5e73c634f51142b407f9515ae5ad4363af5cf57c0199f9bfddf5bc08dc587419ec03cf5b45 SHA512 1d93e6262c5538e26fbf36567230b4a239dbdfee26198b1e1d5862bf4459ae435679674c047407f5c604ddff91d7717d8515532e00bcdb2aa75f27ff97dce60c
 EBUILD nghttp2-1.41.0.ebuild 2009 BLAKE2B 4a7a37c6b445be8f5e84a5fba2a5982c33037ad04de4cca1bdd869d600f7416945277510803ad9fe657edf94bf6fee914d75ab4a5bcaa92dfcc223ac36a7ba32 SHA512 5e5dfb11026419e9dfa6101dbd5617ac77dbd3c2fd1877bbf73bf8a88b545aa29c7dbdd7551d54fdb2b07d0ea0d6c6342f0ec67be096f3fbb2766548c4aa3d94
-EBUILD nghttp2-1.42.0.ebuild 2052 BLAKE2B 064f1b52e42bd47777834317daf76b21d3a0c205940ff4fc1cb19349f6006d828631d408ac61edc6fb299e125300b51c19a0c00f8889b95c0baeb782e947f54f SHA512 0a998771304c01f2651fbe3f9435eb09feda3e363d8a8bb85ca075bb6301cf9925d551ff59aaa66cf2be47a61aaae8dc68076142c1e38509b85f3aaa3aae2d5a
-EBUILD nghttp2-9999.ebuild 2039 BLAKE2B 2df9cdf73d906d32ef462276456121786f8454c4c82890ec1a70a7fac3d6874d8be2c101027b1c85c4ff207c8597dd7afcb531bbc6c33e0af8da21f57da93f50 SHA512 7ae20b6d99f71462166dd2a15c5f408496714af33cd5644e3c73dea8757554b455f684b6ce8b412b4ecaefdd928b085a602f64626524fa2d70af9dd1680e6303
+EBUILD nghttp2-1.42.0.ebuild 2070 BLAKE2B c24af6d6e8172d24e4a5e15432c6101f6635cc9716d674e80ad685b6f7e1a11f4bf1167fba151fd5f5e81b72e9f2596ef98922138c1b4d2cb658e45106a2f8de SHA512 73ba9c34b5b6be48dc0f3c5749c265a6e888a1de78d14a6edc753b8f82e2b60f586fd71318a0af961e84450e361db97b6b022c8cad74dffc25da20190bac9f5a
+EBUILD nghttp2-9999.ebuild 2050 BLAKE2B 273e15faa5e5b28ed25865970e382c39403aa593bd9391ecb579a77585fbbffcca0342eab5d8e0f444338de6c6d1228be301c4c4e03667da9b601bd65489ba81 SHA512 20017f0c1183e58f4d76989c533c01eb202237b9c6cbf72776dca442b898bde08a375f8641bc2beefa70b687f2811501b06ff7e0dacca3a5df5f3e104c8e146e
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.42.0.ebuild b/net-libs/nghttp2/nghttp2-1.42.0.ebuild
index b868914d4119..5426a55b59df 100644
--- a/net-libs/nghttp2/nghttp2-1.42.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.42.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 6159ee00f9b6..ad61312be51f 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index b99d60d2e016..32c798dd286a 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -5,5 +5,7 @@ AUX 2.30.3-fix-noGL-build.patch 1005 BLAKE2B 644b114779d34f644168e3cd1e4fcb5827b
 AUX 2.30.3-icu68.patch 8277 BLAKE2B 7bb5a2d15a1006b7248a6a6fbde0a2e71df1aa4c02046e9c91fcb44ba218fc2e6d6655d53f478eeef3a3d77f4bfe35728155c524332841c2692ac165af48524a SHA512 02000d2759a599596946912e45978334eba0827c691ab4dfd313a7cd5fd71e148a59fd4cf61d9bf9a102a1a5922da5b4e473f03f46930f9e7dd6dcc36dc7dc95
 AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e70ceaad929b7321697488ec0021ee6d5e8d91f311d414f82a7806b5fc60156acdaaac491a47aa086a95c7ca0d4fce61dc9066ac2c255 SHA512 4eba604907966df59d3c0771a97c56fcb81f4ddf7adcc77a840350b3867dbbceb46590a7fc15243aa9e3ebf17664b3639bfa55ca3161b381d588e83690e99bf8
 DIST webkitgtk-2.30.3.tar.xz 22311704 BLAKE2B d5a8ba1fe7fbbcd3d8504ad98650ec685a41ddaa43e1392172cf7840100157a283e4ccf4cf62f2f581deffd8d860cf61b43fe59178b02306efb88c8e1a803520 SHA512 cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf
+DIST webkitgtk-2.30.4.tar.xz 22310784 BLAKE2B 648f03c929212b57f3197b0540e002dca5b277c44e9e73612b20ac1861747585aeb835ce25e98d5073d67a5ab5fc7c13985d280e6e658ac22619233db911ae97 SHA512 dff9e3bd17de8481d940a48b0697458a0c1c71a987f4d50ee7bc46b0203ed6802a9ec82c3a21ea9b7211ab900fa75b89b2a05b0ca6aed319ad66ec317d02c571
 EBUILD webkit-gtk-2.30.3.ebuild 9208 BLAKE2B 4927d235902d74747e3f41e22ceb0aaa5034bf10e662f719fe2d8ee46324a8c2b5255f539671e27453a97ff11030c3f1f1a13e8d5b3f80742cc93276a3de642c SHA512 be9eed6324bb1770fa1e686bd607276b64a15598b952039bb185234fb8c145c745e939ea01eca5765616ab2421fa9559c14b857a93fae44c74d42517d5bc3bd1
+EBUILD webkit-gtk-2.30.4.ebuild 9090 BLAKE2B c0e91a75395a18402236afa5defea630d0b8f1acd1d5b7b7c0dad0e8d8a07cd565f1b2ecacfd548badc041238e66e375bf91fff6fcaf84ef3ff76c2b4634ae1d SHA512 8fa68ba97f394d463b4f50553567b62b14bc84aa1308da50f6e32473369f9830506f8cb73aa0df5b8c108e25082db893e95f57e86a95f57ff308be8e896281b9
 MISC metadata.xml 575 BLAKE2B cfd9e50e79d0627b50f7eb968d0590a88afe55ee5ebccbd81bd5337fd2ea06355a34db909c18f53a388bd3c1d09d82c805284f7db43b71549f29124a5e0cfe39 SHA512 d7b45d4ac89607bfda20a30070194ebffce990784ad376739687680a08e203f570d5636224c37807bfbdca03ab9a3c745c7c41f4e632678acfa2cf60b4eecd30
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.4.ebuild
new file mode 100644
index 000000000000..ed189da55d77
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.4.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..8} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua +egl gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-60.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
+	eapply "${FILESDIR}"/2.30.3-fix-noGL-build.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index d40b31db9153..329091a4a13f 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 40660d54afca..05c237fc0a14 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -8,5 +8,5 @@ AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb66
 DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc825456ff5a3d1d14ff382ca0f40252d09eb355f92c2020c0a974cc99eda9af4323a3a5b9428375288bf8892dfba35602da4e SHA512 5cd066916797efb975cdb97720f65edc72d3fe82afbd78a26aa8369d95ae4ca09c0593dd4bec5521156c64ea38af7a13065f3b35447a76267dec93feb0ac6ac6
 DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
 EBUILD cyrus-imapd-3.0.13.ebuild 6068 BLAKE2B f6f8e1e4ed70120380a8115820fde63a86bf1eec1472ab58b3a382eb73fd643b87668fa5bb6af48b752d8f6df91b39b3e99083a0401b71bc36fa22399f8f5fb1 SHA512 dd16ecf950d4ef61c7cee53133d8890d940a2d91d10ff32bc56ce17b9a7fb9ae0da47a40d31e1435e9ed14d26579de1a4e6945b787b712f09e2773ed9316bf74
-EBUILD cyrus-imapd-3.0.14.ebuild 6030 BLAKE2B e7d0db2591288b58214176f1095180d3fe4b6ea2fb02747dc4d716e321b84f5ddb1265a91b404a3aa4e1966631705efc63a3ceeb41def4ed0a410968f5049ccc SHA512 425664231a5b1e38c8e67cf97e6d2c42e7b8a1f8692abc5ec7c4e537e625a0b9855d585e6394d9bdb9c4e40d628294be52308c708f8043cd12fe7bed4ee7ec4b
+EBUILD cyrus-imapd-3.0.14.ebuild 6029 BLAKE2B a42974b90673ee9d7306e21732fc2d98ddfb1e6e79a98fb10de8e5cc2062eb040f3840ab1c6d7804bf50a3845b6a6ef8b937fa74119eefe11830c46a7ce0dabb SHA512 ad87a1b5cab6503d30f8c0bd22c0ad67e22f4d09e1c6d5d859eaae741b140439af984d3b4943cdd707dc9683c144e3cc2e73b4fc5411be0927511afa6b982db3
 MISC metadata.xml 688 BLAKE2B 123d6658cc5bd6f9ac3c20dcc7a06cf6300dcb83129d59e8b275d82b64c1c3ff2c315891c0ee432e6cfb445f74c78f49195e89a20616a51d70ef8bf25aeb9092 SHA512 77075e3673b25f4b4c31815f0bfa8f112e6609a36b9c57a843be5bcf9d5d1ad743e05010fbb4809960b0b74498763bc69b6abbe16e8eced683268398a7be077b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
index c7bac016fb15..fb2128585464 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 81de961518ba..9192706ab249 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,4 +1,5 @@
 AUX dovecot-2.3.11.3-apop-fix.patch 2226 BLAKE2B 47971fc29ff3add43ca7ee253c4e1579dd22e603c6692f592c605a742330df80309ee06f8bb811e64de03392e0dee19efe1964229f61209b9f48fb0dd557b7d2 SHA512 6ebc10a6e0ca9f4790cbe57a9e9283838c5fbe124e9be305fcd16e472a5edea97a055700613fb6a1a43fe139537da80a603493f250b34f2179f969da2a09f2cc
+AUX dovecot-2.3.11.3-autoconf-lua-version.patch 538 BLAKE2B 3978ebff83cb42591f60fc1cc155bd67a743d78c24d7d7ddfc0776c8df53fbdfad5cee79d1377e6436d69f6ca429ccf33b154adf470f8fc9d6429a746d49788f SHA512 a3e7403fb636078607b5452a580d229ce1d2e240d30e24138f33c3964ff008d99fef6477605f3d64dbdd8fc53187c9c6ad4eb82c58375b329dc9f8be87192eb7
 AUX dovecot-fix-search-crash.patch 3417 BLAKE2B 3d3b63d7be8d19fea2f159b6191fb1dcb94be4abe6cbbde5984c0c6e55fcb56a6e32bbe07650a2d218b3ecc55ede620e95befff24dce3a562733b119142e216d SHA512 9cb34a7f6de6d19ec7d6e4c3206c5d15f6531f92027d7dbef21284206ddd9f3418d4a1266d2860789dfa56f97579a89f3cafc54f24152f321dddb9b470d9f473
 AUX dovecot-unwind-generic.patch 645 BLAKE2B 6598abbd2819f7109d4caacbce5123b8810b93b623956561a12a749cbc582667caa160eac62305067db6037f820c8e1a8bd8a22da09a454afcb9e21209cc5fd3 SHA512 6ede0edd5bd6d1123ff1567886898eee5795baa549c610ba8a3567c0f8fee27d69028aaf8b6067c2f37b915a07e165aa0d6a2d5fb8314deffd61a187b18de4ae
 AUX dovecot-userdb-passwd-fix.patch 500 BLAKE2B 133e7b13cf3dd1515db5694945abd2d00ecd89c4a766ea873099ebbdd450700e70b80696ba58b21cc4f7160fa3becde6453c9334d41cdad426e3f59bd9e5491e SHA512 18a26eed0c793b0ccee828dc5eafc6448dda94d705597b19c3333f21944e838b677af2884f5fb65eb2f6dc79158ad8b3143b24d3788d841038de6dd24885fc0d
@@ -14,6 +15,7 @@ DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1
 EBUILD dovecot-2.2.36.4.ebuild 8605 BLAKE2B b649cd8db3cc6ed5fe93a6013a16e7f99a121e35d684fdfa9fc74aec1487f571fb1f59f4433ad89a6bdcd33de0d916b111226a33bdacc084383580c881d98551 SHA512 811bd1cb2ebec984f98d02a975c7774e0449e1b87c26840107d2e93c79ba69f0c8714d2db5c63513233893c0230080d2fd002962aa6b536f12f6ba6d36f7b5a9
 EBUILD dovecot-2.3.10.1.ebuild 8630 BLAKE2B 225309f96696de58410097589fef31f07c3ae25d91d42577ec140a7ffb4ed6d7f230fe78e65cd330ae6cfa8b8d3a275d57984927755cbf99713e07ac72084c5e SHA512 4f806e5741cc787d6a5d15e052d126f7f187814502cd1879bf45bb174bf30a82c868305cc98c8cf91079101ee03905e9a8f37f7d2108ef937314ba473dcd75cf
 EBUILD dovecot-2.3.11.3-r1.ebuild 8838 BLAKE2B d2db4a8a2f3dd6d6ee2cd4ab6401dbddb34834fbc2bf60bfe27800b30560e42aefa9d977c2ccd8109c31208cbd4c95f5a435cedb50dc718c311a610cc74542e8 SHA512 796c4e3b0cf7677b52af6a8c03c68479c37b7ee797aff2222a09ffcfd24cccebd1ab8208c035ec8fa4f4d02ea1b58f7b29e43a08d8c060ca635ad77634d4490c
+EBUILD dovecot-2.3.11.3-r100.ebuild 9059 BLAKE2B bd8f4ebecbd5452c8ef6591455d0b8cec94d53c579a5b701b53a3113747b1501d475273259d20b9443bb728ce7d72f18d1950a744c79b3838b8f1d6c9b326204 SHA512 a23e69effb144d437b522136d3f024a1f4fb9cc237f00079af557b9e5e328e65282bb46481b64312a6e664cd92b89d3acdad3bda6bea973c3d32737753e123be
 EBUILD dovecot-2.3.11.3-r2.ebuild 8883 BLAKE2B c87d5ede5ed17d3fff195063dac545466964ca659cc2b6f09abc63965cf8c66ac0c4be7fb89ae8e88bf62aa69ad1d3bb6c511e326c3eed45272e891a9223d7a6 SHA512 e79953c4ef81d4551450cbf4df9c9b20151752291092ced4320fb3e43954367d8243927e37d02cc84dd36f7b95708f156b697e72d800f27c77da9eb68445cd25
 EBUILD dovecot-2.3.11.3.ebuild 8676 BLAKE2B ddede1b054dde5b42d23cccfb06f4e66060d720b934c49804edeee423191baae808ae34fb50c86caf0b5b953eb5a073408396f2504e9f32ccf9834a7490f4a99 SHA512 8ff4591d1b3122c084d644b19ba4e482490f7700b14fa20d680ab023e472d8d570528b568cf159b4949f24bbdb991b0bfecb6393cd714117ba5abf771b223b08
 EBUILD dovecot-2.3.7.2.ebuild 8718 BLAKE2B 5ef26dfdf336f8f81d23f9e74a79146f4fe796bf84a159645a4c074603702eb9240cfbf5f6dc6fd5279d3d8d7405ef3168b099edbb1d9d595149dfaaf180b0ad SHA512 2dfe8a18c6b4e006028c84ebf48ba0e8cc35fc33000db39becab5ed835a911e41b12360869a6ca9112030151708abed3e93f776041a0b3d79955f5cf4931ead7
diff --git a/net-mail/dovecot/dovecot-2.3.11.3-r100.ebuild b/net-mail/dovecot/dovecot-2.3.11.3-r100.ebuild
new file mode 100644
index 000000000000..abdea9f60035
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.11.3-r100.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools lua-single ssl-cert systemd toolchain-funcs
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.11"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="argon2? ( dev-libs/libsodium )
+	bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	suid? ( acct-group/mail )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	unwind? ( sys-libs/libunwind )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	acct-group/dovecot
+	acct-group/dovenull
+	acct-user/dovecot
+	acct-user/dovenull
+	net-mail/mailbase"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-apop-fix.patch
+	"${FILESDIR}/${P}"-autoconf-lua-version.patch
+	"${FILESDIR}/${PN}"-unwind-generic.patch
+	"${FILESDIR}/${PN}"-fix-search-crash.patch
+	)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+}
+
+src_prepare() {
+	default
+	# bug 657108
+	#elibtoolize
+	eautoreconf
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no LUAPC="${ELUA}" econf \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--without-libbsd \
+		--with-icu \
+		--with-ssl \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with argon2 sodium ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with unwind libunwind ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_with zstd ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="${S}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install() {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	# Let's not make a new certificate if we already have one
+	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+		einfo "Creating SSL	certificate"
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+		install_cert /etc/ssl/dovecot/server
+	fi
+
+	elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/files/dovecot-2.3.11.3-autoconf-lua-version.patch b/net-mail/dovecot/files/dovecot-2.3.11.3-autoconf-lua-version.patch
new file mode 100644
index 000000000000..5572271929ef
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-2.3.11.3-autoconf-lua-version.patch
@@ -0,0 +1,17 @@
+--- a/m4/want_lua.m4
++++ b/m4/want_lua.m4
+@@ -13,13 +13,12 @@
+   AC_MSG_RESULT([$with_lua])
+ 
+   AS_IF([test "x$with_lua" != "xno"],
+-    [for LUAPC in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do
++    [
+        PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [
+          AC_DEFINE([HAVE_LUA], [1], [Define to 1 if you have lua])
+          with_lua=yes
+        ], [LUAPC=""]) # otherwise pkg_check will fail
+        if test "x$LUA_LIBS" != "x"; then break; fi
+-     done
+   ])
+ 
+   AS_IF([test "x$with_lua" = "xyes"], [
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
index 3e0100238899..450c653ae672 100644
--- a/net-mail/lbdb/Manifest
+++ b/net-mail/lbdb/Manifest
@@ -1,5 +1,3 @@
-DIST lbdb_0.41.tar.gz 160632 BLAKE2B 7cbb0178f2983255eef8ce86146e104e33a1d31b6fd5cf3e5dea69cad8fa485424a5d8b89d1e2024f34a688bfb018724b05bf8e5e57ab5338c9973b78d203d4b SHA512 c99d8c4549d781252192e07dfb89adbae6daae5a4f4c94de692c4289848ba8599c2b0aeb28bac69313e6828995eac32acf3fbc76b1695c6464c6339236cdb341
 DIST lbdb_0.47.tar.gz 182477 BLAKE2B 9ac0073ea4151ae84f9aeafb1a6bde52a39809987da87bd252665f9ef729ad1a5ee4cf91e4c1ebec1f8be17e1a9a3e31dbfda5484ae114fc99cd273f93b39cf9 SHA512 95cae9b108d875203dce2a8243c3dcb979606529202fd9b4d1ddd211a3d617a421440f6532abd38432607b39da84a6da4d09b15e95cddc01f94e018b9e712078
-EBUILD lbdb-0.41.ebuild 1358 BLAKE2B ea4aab82df8950ae3881c4b9568fa142abfea76527e61f4772e8c74d6908d7ac3e70bd898f8839b9bc811ea7eb574747bb5398aae6705f60bbe2c9552c7fcdc6 SHA512 763463673da26cc678b93468702a3629a3294316bbfee7144616338359919a0611241a171f3676c021faf9b3b78ab3065dd1407fe134c535348d9901653cac4e
-EBUILD lbdb-0.47.ebuild 1485 BLAKE2B 63a26a6eedda8b9c23ed13ea8fd6a203d0b4fbcee5e1b15dc88793ac3e8a818d7f01cb9b45a9821dd35a4887f271eaede9f728156b0296b22c600474b3bc5a9e SHA512 fb8c7d50ea380ae98d15750b2d8f116d64ea980583ef9a6648c2ed2de549e7aed2129e39a4dfcaac4aa93a524ee6fd6691d5f2e3430c4e93d27aa8d6fc2f610b
+EBUILD lbdb-0.47.ebuild 1483 BLAKE2B befc891f045d6e9006af750ac91cc34b72bcb4f2d43acf5f2649e342a617244e1e9347107870e7bc68449aea3b36a54df6de4ec0258ba55cefa4f7c2c2bfd7ff SHA512 5d31c52eef6ddefd468bbc7bd11d0df522c5c083af325909c89448b4e200c0b8f5d1729e5ea9a7012f44ded3a34d196c7d462d72b47c0edc4bbded70dc99c402
 MISC metadata.xml 452 BLAKE2B fb14006c0ff46ee5b6e9c72682db885497f93a3b48e6852c87128a2b17b91a0459ccdb2d5fe94cf2e26459c9176251f79ac18ec31d3f03cf060c0ea2f8294c5f SHA512 38c22e435ea247d967a8d04092be6f0195436db16fc03d7fd7aa3cd0fe0f3dbfbda3ffe6a58cb7e8a5d1dfb18fb0a048b7d525300bd265a7d0522dc91d991a79
diff --git a/net-mail/lbdb/lbdb-0.41.ebuild b/net-mail/lbdb/lbdb-0.41.ebuild
deleted file mode 100644
index 82bcdb4c6e0f..000000000000
--- a/net-mail/lbdb/lbdb-0.41.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_P=${P/-/_}
-DESCRIPTION="Little Brother database"
-SRC_URI="http://www.spinnaker.de/debian/${MY_P}.tar.gz"
-HOMEPAGE="http://www.spinnaker.de/lbdb/"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-IUSE="pda ldap finger abook crypt evo"
-
-DEPEND="dev-libs/libvformat
-	evo? ( mail-client/evolution )
-	finger? ( net-misc/netkit-fingerd )
-	abook? ( app-misc/abook )
-	crypt? ( app-crypt/gnupg )"
-RDEPEND="${DEPEND}
-	pda? ( dev-perl/Palm )
-	ldap? ( dev-perl/perl-ldap )"
-
-src_configure() {
-	local evoversion
-	local evolution_addressbook_export
-
-	if use evo ; then
-		evoversion=$(best_version mail-client/evolution)
-		evoversion=${evoversion##mail-client/evolution-}
-		evolution_addressbook_export="/usr/libexec/evolution/$(get_version_component_range 1-2 ${evoversion})/evolution-addressbook-export"
-	fi
-
-	econf $(use_with finger) \
-		$(use_with abook) \
-		--without-ypcat \
-		$(use_with crypt gpg) \
-		$(use_with evo evolution-addressbook-export "${evolution_addressbook_export}" ) \
-		--enable-lbdb-dotlock \
-		--without-pgpk --without-pgp \
-		--without-niscat --without-addr-email --with-getent \
-		--libdir=/usr/$(get_libdir)/lbdb
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-	dodoc README TODO debian/changelog
-}
diff --git a/net-mail/lbdb/lbdb-0.47.ebuild b/net-mail/lbdb/lbdb-0.47.ebuild
index 724b8c323066..af873aceae50 100644
--- a/net-mail/lbdb/lbdb-0.47.ebuild
+++ b/net-mail/lbdb/lbdb-0.47.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.spinnaker.de/lbdb/"
 SRC_URI="https://www.spinnaker.de/lbdb/download/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 LICENSE="GPL-2"
 IUSE="abook bbdb crypt evo finger ldap pda test"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 11570ffbb6c9..f741aac0134b 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index e2f49a9c12fc..d33f1e7658ef 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,5 +1,6 @@
 AUX 1.6.2/asterisk.logrotate4 848 BLAKE2B b169368ad6893e2fc2680b788569cf8b74657531b9484664aae2869f6dfef3ff71cf64a3fa91e90c4fdbb275a8038751fff4087129e67f63b11b81a436e459b7 SHA512 8d661424838fd9500512290785a56af4364717df87d3423ab8dc3039affd1a26fa7aae6afe2ca4fe1ce668a0172b07a96f4cc9a73eced95f25d5848f3a3f2624
 AUX asterisk-13.33.0-nossl.patch 3176 BLAKE2B 1c225d3a4256e6bb69bac025adf3f21aec806cc864e55fcd1381244b68ef8a8d82d462d548a32dc9e1cec3b94f508bad09fbc3bd8602230fa79a916e6dededa5 SHA512 895e6bd770701fe25c389447f5a4454e9d5ead183c44fcc76c623f0140af1fac72ba12ad8331f7ef43ff926dbf3470646c99af93cf5f83cc70f9432ab1604e29
+AUX asterisk-16.14.0-autoconf-lua-version.patch 1064 BLAKE2B cdbd55a4058b9a971316c9608affe721c9a5155c1756d8844a15185a56c5f6d8d001957d3c7c62b6297c59f9fdd5ee5fb1f1ca3a19c69a2505fbff8ae2afb0e9 SHA512 9c25b8d89d72aa4849f6eb2f7491b912492f58d1a0c8114c5bf51c702d237c8357b442b273827ff95342b3a8b3ed6959c5377164fa60c4b7b9d88837d7eba873
 AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd
 AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
 AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
@@ -23,5 +24,6 @@ EBUILD asterisk-13.36.0.ebuild 9184 BLAKE2B 7a91118e4d0abbca316d7cfeb22b458dbde3
 EBUILD asterisk-13.37.0.ebuild 9186 BLAKE2B 933de7a389ff20b6f71b6b8a4eed6943a5a26217f744ac70b6b00394f4684e4eb8a7182095c05a094513fde4c65f0961a5512766ef41cf511e1fa95e47fd36a3 SHA512 5bf2dcb1ca6d14783b5745a2718466da783900ce923699a137d0ebe1ba99ca3aa424ae7f90013d2119861914dac2b41695825e3bb55520575fb8fb74e54f33e7
 EBUILD asterisk-16.12.0-r1.ebuild 9363 BLAKE2B beb1386217856dd1f215ff7ba9ea0dedfede09cea00abfff509703fd66dd924f5b2ce0ce8549dea3fdd3ae5349cad2ffde9fc5a110663b3682e6cf9dd24b608a SHA512 cf2bca2b143231e8875ee2a28465c7e3eeefe0d63436d8252fa5246799831ef66faad2c1e82250b5d00864364c78d6e977eb455c79d5a0351104375f59db10d1
 EBUILD asterisk-16.13.0.ebuild 9363 BLAKE2B beb1386217856dd1f215ff7ba9ea0dedfede09cea00abfff509703fd66dd924f5b2ce0ce8549dea3fdd3ae5349cad2ffde9fc5a110663b3682e6cf9dd24b608a SHA512 cf2bca2b143231e8875ee2a28465c7e3eeefe0d63436d8252fa5246799831ef66faad2c1e82250b5d00864364c78d6e977eb455c79d5a0351104375f59db10d1
+EBUILD asterisk-16.14.0-r100.ebuild 9541 BLAKE2B 6b7ccecd343749b7d7167093a58625baf1abe9d5f234237e5c244edf258446442b6445a6114634e48ae5215808909f1aab60622ea4ab2c868eb7fba6d07b5188 SHA512 f509aba8c2974a2a14ee93aaf659148f2c482a2f449e31316fb4d2ba811e8b91ff539902b52410a9e6fd1154361dcd3683bd8d908982982a14a45a7e1b1cee2e
 EBUILD asterisk-16.14.0.ebuild 9363 BLAKE2B beb1386217856dd1f215ff7ba9ea0dedfede09cea00abfff509703fd66dd924f5b2ce0ce8549dea3fdd3ae5349cad2ffde9fc5a110663b3682e6cf9dd24b608a SHA512 cf2bca2b143231e8875ee2a28465c7e3eeefe0d63436d8252fa5246799831ef66faad2c1e82250b5d00864364c78d6e977eb455c79d5a0351104375f59db10d1
 MISC metadata.xml 1301 BLAKE2B 0989c94d86393562384681c19a2809dc6ebedfcdd592543b606206a8bd7829a4ca6768cb74082f74e75635c72804dda9154df3a4d61dcdbcc43eda93aa881322 SHA512 009e4dba6f55b8ff08940aab4722df6b76a055add43c7634a49dbc0fb68fe11e6c102a7a27ac84a253a2853b0d719f3a73bb40c86c2d2faa186b707e773987e3
diff --git a/net-misc/asterisk/asterisk-16.14.0-r100.ebuild b/net-misc/asterisk/asterisk-16.14.0-r100.ebuild
new file mode 100644
index 000000000000..43d3c3dcdb5f
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.14.0-r100.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools linux-info lua-single systemd
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
+	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
+	"${FILESDIR}/${PN}-16.14.0-autoconf-lua-version.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9 )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		LUA_IMPL="${ELUA}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake NOISY_BUILD=yes menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			_menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
+}
+
+src_install() {
+	local d
+
+	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
+	emake DESTDIR="${ED}" NOISY_BUILD=yes install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
+	for conffile in "${ED}/etc/asterisk/"*
+	do
+		fowners root:root "${conffile#${ED}}"
+		fperms 0644 "${conffile#${ED}}"
+	done
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
+	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	if use doc; then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	fi
+}
diff --git a/net-misc/asterisk/files/asterisk-16.14.0-autoconf-lua-version.patch b/net-misc/asterisk/files/asterisk-16.14.0-autoconf-lua-version.patch
new file mode 100644
index 000000000000..6e4c8237e667
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk-16.14.0-autoconf-lua-version.patch
@@ -0,0 +1,31 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2553,20 +2553,15 @@
+ fi
+ AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])
+ 
+-for ver in 5.3 5.2 5.1; do
+-	AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm])
+-	if test "x${PBX_LUA}" = "x1" ; then
+-		if test x"${LUA_DIR}" = x; then
+-			LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${ver}"
+-		else
+-			LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${ver}"
+-		fi
+-		break;
++AST_EXT_LIB_CHECK([LUA], ${LUA_IMPL}, [luaL_newstate], ${LUA_IMPL}/lua.h, [-lm])
++if test "x${PBX_LUA}" = "x1" ; then
++	if test x"${LUA_DIR}" = x; then
++		LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/${LUA_IMPL}"
++	else
++		LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/${LUA_IMPL}"
+ 	fi
+-done
+-
+-# Some distributions (like openSUSE and NetBSD) remove the 5.x suffix.
+-AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm])
++	break;
++fi
+ 
+ # Accept either RADIUS client library, their APIs are fully compatible,
+ # just different header filenames and different SONAMEs
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 99f663901177..a13e039c6938 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -2,11 +2,8 @@ AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c32
 AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1e70565a8437f142f317abe81531c31e934af05eda5e3043f7874bc9b4592d44579ae1827ddba06c514b4b8124c899931ed0f SHA512 0a109e1b8367def620f5089b3fcb92d84e592eb1a2fced2b60f6c9295159a605d9605e837a06e118c8ba8095208da68592fb9cd537937a153d6eecfa0eb35eb4
 AUX chrony-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 4e441ea854dda077c68f05b420f50d5374436670270eca6ff5cde50c68ac4060ffd752628dc664eac5a1fc6c21ad42c4bae7df07f9a4963d186dfc41a68f3a77 SHA512 0e6c1ef2b346fa2a722e67d8cf1cbc5e4413c65bba8301e3d0d87590fd9b73489a23807e0f17fa365a66ed1dbf03d86d8c617d54d609bf435816b1266f30f170
 AUX chronyd.conf 390 BLAKE2B a0058c72ae04371aa273d71f01349a00dfc0d66c016e6c2d977b9499e2ded3072942bb21c468ca9263263d55f1cc35cca4a3a72ee058cc31cf982648552bc77d SHA512 6798d40da70921b95430371459a4b276a88c57ec79f99d0efd214770f5fffee5d80d20baf4313f210b6af46c4aafbb038920cd774d6c03ffbb0849229c431bdc
-AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be98b7d1d40b259fde5313dcb840c86a7d409ac811a5d854178af66ab82d851b66d27a2acf5f7575 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
-DIST chrony-3.5.1.tar.gz 459902 BLAKE2B 503402c0dd68a340eb5ecd8b57dcb83d90124f31e8deb6e20bd1e9ed19b5dc952fa7f40a697d0d0cb77c349c9f3297dcd32265d77670a71836ba8709dcc83053 SHA512 489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984
 DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9
-EBUILD chrony-3.5.1-r1.ebuild 4760 BLAKE2B 9764ff19b0a5740e4d535c713fceeecfe8ae11b9f694cb3b736d392a50df46480fea7ad511d39e8719dd4a8311bb101e8ca62940b26bb5b7218dc4d9d5c57bb4 SHA512 b56d4b1362f4b0c6ec71c9690aec2d7106e488cf8af65f04b0c3ab49267a2a1123c178430f1528a91f27f488f9f295d79c0fb3d42e3f247e1e44ca26f84d7796
 EBUILD chrony-4.0.ebuild 4279 BLAKE2B b8522b64bc098b45127e3637d6403969f42843e9099ba8acc0a6f39d782295d911993164ade4c766630c128c3ea4f6d8f99e120515b2a5cea0c1bd7552ae4ca1 SHA512 d84e0688e5cfdd8a145e579edbb18395f532c47a6efd75e5e6c15ba91f75d9d9a8383f5231938e7b2a2c911d08cd37ca0aea53f8341bc907617ef6eb52403dd5
 EBUILD chrony-9999.ebuild 4287 BLAKE2B d682d68657aab4b753b21963d0276688a16a84ad37dbafff885a7983cf0eb48bb8493251649feabe493be6393eb48fb68a8140b6459f3d224e078f80ae4ee0dd SHA512 044a352a2afa9e875244e9bfbb7b197bb2693c0ddc52e6d88296536fa6c15fa8811f45684ca8c594f2d1150f46e0ef6178e5e7dbedab4c602f56f7bc5cbd2bca
 MISC metadata.xml 1936 BLAKE2B 46778f29ab04904ff6aa5212e989d1384f40d1923a04323837845af7563cffcc652047dae4ab8c535dcf1d2986e851c96aad4160cd4910934b3ffc347f473a21 SHA512 1094233e25ad5630cf537888304bbfd16fb8c1da36873025b0b937070733d0adbeebedc4c04383f806f2dc825013f53133fb81cef597afad16874510fa45c10f
diff --git a/net-misc/chrony/chrony-3.5.1-r1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild
deleted file mode 100644
index ca404b746fd1..000000000000
--- a/net-misc/chrony/chrony-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="https://chrony.tuxfamily.org/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="
-	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
-	+rtc samba +seccomp +sechash selinux
-"
-REQUIRED_USE="
-	?? ( libedit readline )
-	sechash? ( nettle )
-"
-RESTRICT=test
-CDEPEND="
-	caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
-	libedit? ( dev-libs/libedit )
-	nettle? ( dev-libs/nettle:= )
-	readline? ( >=sys-libs/readline-4.1-r4:= )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="
-	${CDEPEND}
-	html? ( dev-ruby/asciidoctor )
-	pps? ( net-misc/pps-tools )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-chronyd )
-"
-BDEPEND="
-	nettle? ( virtual/pkgconfig )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
-	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
-)
-S="${WORKDIR}/${P/_/-}"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" virtual/w3m"
-fi
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
-		doc/* examples/* || die
-
-	sed -i \
-		-e 's|RELOADDNS||g' \
-		-e 's|pkg-config|${PKG_CONFIG}|g' \
-		configure || die
-
-	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die
-}
-
-src_configure() {
-	if ! use caps; then
-		sed -i \
-			-e 's/ -u ntp//' \
-			"${T}"/chronyd.conf examples/chronyd.service || die
-	fi
-
-	if ! use seccomp; then
-		sed -i \
-			-e 's/ -F 0//' \
-			"${T}"/chronyd.conf examples/chronyd.service || die
-	fi
-
-	tc-export CC PKG_CONFIG
-
-	local CHRONY_EDITLINE
-	# ./configure legend:
-	# --disable-readline : disable line editing entirely
-	# --without-readline : do not use sys-libs/readline (enabled by default)
-	# --without-editline : do not use dev-libs/libedit (enabled by default)
-	if ! use readline && ! use libedit; then
-		CHRONY_EDITLINE='--disable-readline'
-	else
-		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
-		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
-	fi
-
-	# Note: ncurses and nss switches are mentioned in the configure script but
-	# do nothing
-	# not an autotools generated script
-	local myconf=(
-		$(use_enable seccomp scfilter)
-		$(usex caps '' --disable-linuxcaps)
-		$(usex cmdmon '' --disable-cmdmon)
-		$(usex ipv6 '' --disable-ipv6)
-		$(usex nettle '' --without-nettle)
-		$(usex ntp '' --disable-ntp)
-		$(usex phc '' --disable-phc)
-		$(usex pps '' --disable-pps)
-		$(usex refclock '' --disable-refclock)
-		$(usex rtc '' --disable-rtc)
-		$(usex samba --enable-ntp-signd '')
-		$(usex sechash '' --disable-sechash)
-		${CHRONY_EDITLINE}
-		${EXTRA_ECONF}
-		--chronysockdir="${EPREFIX}/run/chrony"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--mandir="${EPREFIX}/usr/share/man"
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc/chrony"
-		--with-hwclockfile="${EPREFIX}/etc/adjtime"
-		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-		--without-nss
-		--without-tomcrypt
-	)
-
-	# print the ./configure call
-	echo sh ./configure "${myconf[@]}" >&2
-	sh ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	if [[ ${PV} == "9999" ]]; then
-		# uses w3m
-		emake -C doc man txt
-	fi
-
-	emake all docs $(usex html '' 'ADOC=true')
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
-	newconfd "${T}"/chronyd.conf chronyd
-
-	insinto /etc/${PN}
-	newins examples/chrony.conf.example1 chrony.conf
-
-	docinto examples
-	dodoc examples/*.example*
-
-	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
-
-	if use html; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	keepdir /var/{lib,log}/chrony
-
-	if use caps; then
-		# Prepare a directory for the chrony.drift file (a la ntpsec)
-		# Ensures the environment is sane on new installs
-		fowners ntp:ntp /var/{lib,log}/chrony
-		fperms 770 /var/lib/chrony
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
-
-	systemd_dounit examples/chronyd.service
-	systemd_dounit examples/chrony-wait.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}
-
-pkg_preinst() {
-	HAD_CAPS=false
-
-	if has_version 'net-misc/chrony[caps]'; then
-		HAD_CAPS=true
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process chronyd.conf
-
-	if [[ -n ${REPLACING_VERSIONS} ]] && use caps && ! ${HAD_CAPS}; then
-		ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
-		ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
-		ewarn "This is necessary for chrony to drop privileges"
-	fi
-}
diff --git a/net-misc/chrony/files/chronyd.init b/net-misc/chrony/files/chronyd.init
deleted file mode 100644
index 3a71fe748fd7..000000000000
--- a/net-misc/chrony/files/chronyd.init
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use dns
-}
-
-checkconfig() {
-	# Note that /etc/chrony/chrony.keys is *NOT* checked. This
-	# is because the user may have specified another key
-	# file, and we don't want to force the user to use that
-	# exact name for the key file.
-	if [ ! -f "${CFGFILE}" ] ; then
-		eerror "Please create ${CFGFILE} and the"
-		eerror "chrony key file (usually /etc/chrony/chrony.keys)"
-		eerror "by using the"
-		eerror ""
-		eerror "        chrony.conf.example"
-		eerror "        chrony.keys.example"
-		eerror ""
-		eerror "files (from the documentation directory)"
-		eerror "as templates."
-		return 1
-	else
-		# Actually, I tried it, and chrony seems to ignore the pidfile
-		# option. I'm going to leave it here anyway, since you never
-		# know if it might be handy
-		PIDFILE=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"`
-	fi
-	return 0
-}
-
-setxtrarg() {
-	if [ -c /dev/rtc ]; then
-		grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
-	fi
-	grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-	setxtrarg
-
-	[ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
-
-	ebegin "Starting chronyd"
-	start-stop-daemon --start --background --quiet \
-		--exec /usr/sbin/chronyd \
-		--pidfile "${PIDFILE}" \
-		-- -f "${CFGFILE}" ${ARGS}
-	eend $? "Failed to start chronyd"
-}
-
-stop() {
-	checkconfig || return $?
-
-	[ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
-
-	ebegin "Stopping chronyd"
-	start-stop-daemon --stop --quiet \
-		--pidfile "${PIDFILE}"
-	eend $? "Failed to stop chronyd"
-}
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index abe94531f208..76f4dd4d2048 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -6,5 +6,5 @@ DIST dropbox-lnx.x86-112.4.321.tar.gz 99004752 BLAKE2B adec5e29703d36ceadcaed144
 DIST dropbox-lnx.x86_64-111.4.472.tar.gz 102674853 BLAKE2B 13255b9737859b9594901955d3819499173b43f12a0eaf476a402bf4bbfe3f1ca5881bf3fda5bdf47d0936e2e9d4bed58abc89c58feeb907074d965739e75021 SHA512 f70a37e0a6fa4f56353d1482b8621b526ecba31a9fdc6da337f3c01e075c87c28728cfd80f7f1a1f74286e294652684e2b7e671c7a6b195cd96eee64f785b3c4
 DIST dropbox-lnx.x86_64-112.4.321.tar.gz 103084021 BLAKE2B 96c15e627434557663712bd6f679efd11b8a6e353757becf1a09830e6f16fb5652159af9601ae1ca84ec397aee277161bcaf1988589b782c43ec433b7ed69a66 SHA512 e22c5595ba5dc90e3fcc958be92ac5fb403f76d8567a03bcfb14e5ea058147f23564de6a2d020a37da4f5a0c34dc85ccbc528bf1f1c683b370899e22f6e652ab
 EBUILD dropbox-111.4.472.ebuild 2617 BLAKE2B 4c3c0dff5562ba9d40f10b6b5754a5f4ee8011bc7331a0ad9e2d89997a22e00752c8a062a24a4c49404fd6b2743f814b31e792c25ecbeecd0340a4edf33ddebb SHA512 3a89190dd79b8eb50e33262c3a76fd63476c09c42cdb7026abb72e4fd1eb109c92f0f6c09903af4874cb72c271998ceb21723a6f893fb954eade67c1be860765
-EBUILD dropbox-112.4.321.ebuild 2619 BLAKE2B 0d69bf03e5039bdb5ae193deda12ab1a77c7acf20622f90075d14e61be8b019b8551ec3727cfc37b2d36fd6eb063697840b983f42b3b03fe5efc5b87d61f0cd0 SHA512 aad780d3b5e3daac4126915cd1622025d1734dc83af04f3eef8965cc2c5948298e3c9fbb0dd173d846424a8a09d490150a6f5b69c0e23116fba6513854563bb5
+EBUILD dropbox-112.4.321.ebuild 2617 BLAKE2B 4c3c0dff5562ba9d40f10b6b5754a5f4ee8011bc7331a0ad9e2d89997a22e00752c8a062a24a4c49404fd6b2743f814b31e792c25ecbeecd0340a4edf33ddebb SHA512 3a89190dd79b8eb50e33262c3a76fd63476c09c42cdb7026abb72e4fd1eb109c92f0f6c09903af4874cb72c271998ceb21723a6f893fb954eade67c1be860765
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-112.4.321.ebuild b/net-misc/dropbox/dropbox-112.4.321.ebuild
index 7286be94a2dc..c4fb56f770ad 100644
--- a/net-misc/dropbox/dropbox-112.4.321.ebuild
+++ b/net-misc/dropbox/dropbox-112.4.321.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index e8781cc19d8b..a8795b71f4c2 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -5,9 +5,11 @@ DIST electrum-4.0.5.gh.tar.gz 4429965 BLAKE2B 1aad8c0407f1dbe085f7cef58078533582
 DIST electrum-4.0.6.gh.tar.gz 4430258 BLAKE2B 883e74d5224c24012d38b3730ef2138abd397500c0271b98938802d55d4ca50075e2e171779868ef4c789fc1feba5bfdecb295e032c2bec92da2d0d34e21987e SHA512 ae8caa827456a75a0e84e35477edf4b0ba28862438571ad54807062e54c673023b3767dd5bbe63f8bead8dc5a8b19a1e3fb1dbeee0c2141d59b8454eafb03965
 DIST electrum-4.0.7.gh.tar.gz 4431614 BLAKE2B bd0d0c4b52492ab439f5e5b6879edeafc0a9c45c3aa7b5fad340a702203a09da858fe7165c89e8c2e788d6e3f26002007012ea8f377f432d189018f9ac7c7e2e SHA512 2a036d19140b56947d374d1d64b6c51e12aba2eca7ad992d38305c884572ef7cf06c7bfa3bc89fa20e22e249cfda6de76dc006f86490e1af1d580c23406cb6f1
 DIST electrum-4.0.8.gh.tar.gz 4437153 BLAKE2B ae16db36f572c37e6640c5a6264d56f83dcf6f377da8493ec2ccbbe49007d41e5f14635e267e80da69a0025a1bdf478fae7479c9d7a677dc959e5146763c3cc1 SHA512 acc653162f706ee2bdb116d1a3e7f0bc5996c9d74bf634c395665fffac9ab4c15015aef8a10aff15621d9f712ee216eecf45a52bc718a56e6d8f65c71a7e92e0
+DIST electrum-4.0.9.gh.tar.gz 4435268 BLAKE2B e1dfe319f7b4beffd039164c97d247f5d267d9d99313480bf06f9b748d095b33859cd8ea5dd5a135b38a1a206858e08ce500af8982ef7a6e3b3f7ff0233b9637 SHA512 a9a04163c8d76006ca18e1c50f38cabd7c3d7d75b16c8504627b9eb49bf9dca91800e18a585e7afd0b98fafeeeb821b967bea29928a46d10f65f0abc3fb90887
 EBUILD electrum-4.0.4.ebuild 2400 BLAKE2B c579900e61c708b2f721fde772889488f0b43579517c34b21d24c1d665b1d7097a4cf367a52ea561bcd3856c2b7565dbd3c9044a3454ca04a3c1d5e198e94d38 SHA512 c45735ed759d721775892f5126a11038a7df85e616259c5627e6bade3654d85f1396bada52a240d1a02509ddfaa2b3711f0c4ad1c62b7c4e25b980dfb04f51d3
 EBUILD electrum-4.0.5.ebuild 2402 BLAKE2B 0049acbc9a0a618dfc2d9be7e7cd637bbf020e19f161e2235b17514f19e43f2f9ed7e29f65c93f946f4a4b14c5523ee417149b25b1fd09871d537b13caedd31b SHA512 c42acd9643cd26b9fcc32a880e7e8db211ced5b3bba22e7708bc7a0c019b6cdf88eaa4b9759b137365b39bad2e003403da46b92e6b839c1b020c7eb978ab38e2
 EBUILD electrum-4.0.6.ebuild 2402 BLAKE2B 0049acbc9a0a618dfc2d9be7e7cd637bbf020e19f161e2235b17514f19e43f2f9ed7e29f65c93f946f4a4b14c5523ee417149b25b1fd09871d537b13caedd31b SHA512 c42acd9643cd26b9fcc32a880e7e8db211ced5b3bba22e7708bc7a0c019b6cdf88eaa4b9759b137365b39bad2e003403da46b92e6b839c1b020c7eb978ab38e2
 EBUILD electrum-4.0.7.ebuild 2261 BLAKE2B d2d0417aff0306bbbca34802b8c710c605ff2b58890f52cc42c7a013cea66be51a72c3d1befd07976c3205a0a2ddcd099e7d6f5e35b55076341a3c84b3202295 SHA512 07151e3274e1cac0e6f64a1a064d245f9f6d54839390322e0532099eaa86a3d929eb37e8df60e9b9038cc1d18239ca5f53bba408877f305d50394fa39185fbf9
 EBUILD electrum-4.0.8.ebuild 2261 BLAKE2B d2d0417aff0306bbbca34802b8c710c605ff2b58890f52cc42c7a013cea66be51a72c3d1befd07976c3205a0a2ddcd099e7d6f5e35b55076341a3c84b3202295 SHA512 07151e3274e1cac0e6f64a1a064d245f9f6d54839390322e0532099eaa86a3d929eb37e8df60e9b9038cc1d18239ca5f53bba408877f305d50394fa39185fbf9
+EBUILD electrum-4.0.9.ebuild 2261 BLAKE2B d2d0417aff0306bbbca34802b8c710c605ff2b58890f52cc42c7a013cea66be51a72c3d1befd07976c3205a0a2ddcd099e7d6f5e35b55076341a3c84b3202295 SHA512 07151e3274e1cac0e6f64a1a064d245f9f6d54839390322e0532099eaa86a3d929eb37e8df60e9b9038cc1d18239ca5f53bba408877f305d50394fa39185fbf9
 MISC metadata.xml 653 BLAKE2B f58eed53ddc5608c39d763bef2b9543ce30c65a97afe157b84522b1367d19594855c5f8e39424af90c88934938601d98c5877f7d1d081aa5cc5be45cf19044a2 SHA512 a2d76c85cf2e409a1b0aa6449e43e82f1d88a4d7fa72c6282c7f7e55819d13b04dc733e3b297635aca1cb65136822b447feedf76358b948738489f8e0de97ea6
diff --git a/net-misc/electrum/electrum-4.0.9.ebuild b/net-misc/electrum/electrum-4.0.9.ebuild
new file mode 100644
index 000000000000..de86b6ef7b46
--- /dev/null
+++ b/net-misc/electrum/electrum-4.0.9.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="
+	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libsecp256k1
+	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/bitstring[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	<dev-python/dnspython-2[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+BDEPEND="
+	test? (
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+	eapply "${FILESDIR}/3.3.2-desktop.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons_dirname/d' setup.py || die
+
+	# use backwards-compatible cryptodome API
+	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 electrum/gui/icons/${PN}.png
+	dodoc RELEASE-NOTES
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index 37f0200c106f..d32013c2f972 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,5 +1,9 @@
+AUX gnome-remote-desktop-0.1.9-copy-pixels.patch 2770 BLAKE2B 6415c88173a375282a816a5d2b2c7e947dd53d4cd3b2bd4d49bf2365e6f4854f562dd0dff99cd3fc8eb0a3fa7b962cf9d38fc3e72218cf37dc1d350195147a67 SHA512 feb4c600b9225a8ffe82faa221c78aa199fb1e49cfad0b7031deff0188165e6244af64e233349786f9da414efd296074aed8749eeb0f15e1d9a43aeb564be88d
+AUX gnome-remote-desktop-0.1.9-drop-vnc-frames.patch 2637 BLAKE2B bf16767583e80fb0af8a0702e412f73c1cd9b1868446268a9e584db520fb22305d89f62bc165964116d39972d6946970da7c135120a18ad21e90a82cdc39b13e SHA512 e5634f7445d8933a010c1302363191873f55612e8ab272ed6b86b9a8043ce738e08ce3f23c98d32dacd2cc8c948340685843690f5d680d0eee410cb83d504ec3
 DIST gnome-remote-desktop-0.1.7.tar.xz 25636 BLAKE2B 00e389bc8887c3d43f9221a45c6c7154e4140fab560c5c568fe92f06794b736efcf2265c763d0d9d57d5343dd2f71b7a3a2c45b0466cdae608f0a609af53175d SHA512 dd20e5e6fd724ff03d8a32319c7145f1fef4331439e52921b812f087e6b83185bf318bb2fb9758fe083ec3cfea30448b601da4ed1aba85fa892ef7fbb794b9ed
 DIST gnome-remote-desktop-0.1.8.tar.bz2 28565 BLAKE2B 8c14200eb17503eb92c7a7db51d487f17bca7616848aa8f555d2c31a5b758b500d6bbcb78a4a75cebbe0220281079848517c58813783497b463b0a771f07229b SHA512 1e433a95c303ce82782c27412c4f4456f0ecf33eb1e63b61b11f1cde68b6113a765a0f7d7871f73af8a253f1d7b3d3d4dafd36c3e5e9fa6d6c97279747f584ab
+DIST gnome-remote-desktop-0.1.9.tar.xz 38040 BLAKE2B aac99424d9c11614f1fd3c9ce1ebe913212489b4c8f3cc22fe5d44b00483cba9cebae8974d221d81a1cbe3e53e85a24f2c5053714fb8b753ada1c034d031752c SHA512 6ac2962c824634cd5322785b6d251e899ea38668010b18b1b50124497895d9c00752904abf01490e27b74e1661aeae39d83fbbd77b841329b1e0fd381c3ea440
 EBUILD gnome-remote-desktop-0.1.7.ebuild 957 BLAKE2B ec9d93ae7954028f8a9ae96ea530418845e4a8ad8b9c8357bd70ae47ce092d18cb35ee7af6dcf3ac45bf90e3c70540b8780fd2219e71257baa59650ef1c8bf57 SHA512 04bd0aab7298411081b13fe1ee96cc3b27543472776cacee50a65d94e90acbbbe5198478ad023062a6733f2fc00437dec1bc17c3512fdcfd3559ce8a8df3f27c
 EBUILD gnome-remote-desktop-0.1.8.ebuild 917 BLAKE2B 36c0cf9e37dc9442fd00876254e93ea27ea5866df69ef4c67238945c2b556de6157e1b33f306c3c21f5b436428f324b0a44554520baa98cb9f239d8a3b34c9ec SHA512 97d1c72cdc13ecf6dcdacfa2fec232449e075b3ef5d0b0d9f9e4102955194df3cfc2cd621532efd1f6c0a7de851180031945f7201b1971ddec3f15c1321733f6
+EBUILD gnome-remote-desktop-0.1.9.ebuild 936 BLAKE2B ffa02d3616f1656654687a0d1f7bf1548dd0acff02ab4592367a757433c69aed4a109c94222b8c772da055fd8b25f3053350c37443e4bec532f28d835e0dcd1b SHA512 297bfd0e93505a60880acf28cac5d53f91bb44f2905d815e602233f09ffba30b81bd3350bd86945d5be942a474a2b4b1c56093bccfffc3838ce573b05100e132
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-copy-pixels.patch b/net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-copy-pixels.patch
new file mode 100644
index 000000000000..44cecbf6ad60
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-copy-pixels.patch
@@ -0,0 +1,71 @@
+From 4d358762948dccdcac6d01f4dd7b8635e53de979 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Mon, 12 Oct 2020 17:34:30 +0200
+Subject: [PATCH] vnc: Copy pixels using the right destination stride
+
+We're copying the pixels in a separate thread managed by PipeWire, and
+in this thread, accessing the VNC framebuffer dimension and stride is
+racy. Instead of fetching the dimension directly, pass the expected
+width and get the stride it will eventually have.
+
+Already before this patch, when the copied pixel end up on the main
+thread and the dimension still doesn't match up, the frame will be
+dropped.
+---
+ src/grd-session-vnc.c         | 5 +++--
+ src/grd-session-vnc.h         | 3 ++-
+ src/grd-vnc-pipewire-stream.c | 5 +++--
+ 3 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
+index a06d34d..ba3e5ce 100644
+--- a/src/grd-session-vnc.c
++++ b/src/grd-session-vnc.c
+@@ -519,9 +519,10 @@ check_rfb_password (rfbClientPtr  rfb_client,
+ }
+ 
+ int
+-grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc)
++grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
++                                      int            width)
+ {
+-  return session_vnc->rfb_screen->paddedWidthInBytes;
++  return width * BGRX_BYTES_PER_PIXEL;
+ }
+ 
+ static void
+diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
+index 07678c8..ee1f986 100644
+--- a/src/grd-session-vnc.h
++++ b/src/grd-session-vnc.h
+@@ -55,7 +55,8 @@ void grd_session_vnc_move_cursor (GrdSessionVnc *session_vnc,
+                                   int            x,
+                                   int            y);
+ 
+-int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc);
++int grd_session_vnc_get_stride_for_width (GrdSessionVnc *session_vnc,
++                                          int            width);
+ 
+ gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc);
+ 
+diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
+index 96dd7c9..82ceb9b 100644
+--- a/src/grd-vnc-pipewire-stream.c
++++ b/src/grd-vnc-pipewire-stream.c
+@@ -326,10 +326,11 @@ process_buffer (GrdVncPipeWireStream *stream,
+       int height;
+       int y;
+ 
+-      src_stride = buffer->datas[0].chunk->stride;
+-      dst_stride = grd_session_vnc_get_framebuffer_stride (stream->session);
+       height = stream->spa_format.size.height;
+       width = stream->spa_format.size.width;
++      src_stride = buffer->datas[0].chunk->stride;
++      dst_stride = grd_session_vnc_get_stride_for_width (stream->session,
++                                                         width);
+ 
+       frame->data = g_malloc (height * dst_stride);
+       for (y = 0; y < height; y++)
+-- 
+GitLab
+
diff --git a/net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-drop-vnc-frames.patch b/net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-drop-vnc-frames.patch
new file mode 100644
index 000000000000..56ea75ff466d
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/files/gnome-remote-desktop-0.1.9-drop-vnc-frames.patch
@@ -0,0 +1,80 @@
+From ab97841629f5f3f4fab9993b6255b6ae04828b9c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Wed, 9 Sep 2020 10:14:20 +0200
+Subject: [PATCH] vnc: Drop frames if client is gone
+
+Frames from PipeWire are posted asynchronously from a I/O thread to the
+main thread where they are turned into VNC frame updates and cursor
+movements. On the other hand, sessions are closed asynchronously when
+the VNC client disappears. If a frame ended up on the main thread after
+a client disappeared but before the session and stream was closed, we'd
+try to turn the new frames into VNC updates without a client being
+available, causing use after free.
+
+Fix this by dropping frames that happens during this time frame.
+
+Closes: https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/issues/43
+---
+ src/grd-session-vnc.c         | 7 +++++++
+ src/grd-session-vnc.h         | 2 ++
+ src/grd-vnc-pipewire-stream.c | 8 ++++++++
+ 3 files changed, 17 insertions(+)
+
+diff --git a/src/grd-session-vnc.c b/src/grd-session-vnc.c
+index 813838a..a06d34d 100644
+--- a/src/grd-session-vnc.c
++++ b/src/grd-session-vnc.c
+@@ -209,6 +209,12 @@ maybe_queue_close_session_idle (GrdSessionVnc *session_vnc)
+     g_idle_add (close_session_idle, session_vnc);
+ }
+ 
++gboolean
++grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc)
++{
++  return !session_vnc->rfb_client;
++}
++
+ static void
+ handle_client_gone (rfbClientPtr rfb_client)
+ {
+@@ -218,6 +224,7 @@ handle_client_gone (rfbClientPtr rfb_client)
+ 
+   grd_session_vnc_detach_source (session_vnc);
+   maybe_queue_close_session_idle (session_vnc);
++  session_vnc->rfb_client = NULL;
+ }
+ 
+ static void
+diff --git a/src/grd-session-vnc.h b/src/grd-session-vnc.h
+index 579a12a..07678c8 100644
+--- a/src/grd-session-vnc.h
++++ b/src/grd-session-vnc.h
+@@ -57,4 +57,6 @@ void grd_session_vnc_move_cursor (GrdSessionVnc *session_vnc,
+ 
+ int grd_session_vnc_get_framebuffer_stride (GrdSessionVnc *session_vnc);
+ 
++gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc);
++
+ #endif /* GRD_SESSION_VNC_H */
+diff --git a/src/grd-vnc-pipewire-stream.c b/src/grd-vnc-pipewire-stream.c
+index 78793c4..96dd7c9 100644
+--- a/src/grd-vnc-pipewire-stream.c
++++ b/src/grd-vnc-pipewire-stream.c
+@@ -234,6 +234,14 @@ do_render (struct spa_loop *loop,
+   if (!frame)
+     return 0;
+ 
++  if (grd_session_vnc_is_client_gone (stream->session))
++    {
++      g_free (frame->data);
++      g_clear_pointer (&frame->rfb_cursor, rfbFreeCursor);
++      g_free (frame);
++      return 0;
++    }
++
+   if (frame->rfb_cursor)
+     grd_session_vnc_set_cursor (stream->session, frame->rfb_cursor);
+ 
+-- 
+GitLab
+
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.9.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.9.ebuild
new file mode 100644
index 000000000000..622bb9d2a09c
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
+HOMEPAGE="https://gitlab.gnome.org/jadahl/gnome-remote-desktop"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND="
+	dev-libs/glib:2
+	media-video/pipewire:0/0.3
+	sys-apps/systemd
+	net-libs/libvncserver
+	app-crypt/libsecret
+	x11-libs/libnotify
+"
+RDEPEND="${DEPEND}
+	x11-wm/mutter[screencast]
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-drop-vnc-frames.patch"
+	"${FILESDIR}/${P}-copy-pixels.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 593e990f322d..403c43c8b31c 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -3,5 +3,5 @@ AUX gsasl-1.8.1-sasl-gss-extra.patch 944 BLAKE2B f48eba6d1b96ab5f7e1cdc5c2220f4a
 DIST gsasl-1.8.0.tar.gz 4914837 BLAKE2B 89cae140bb503556003036a92dfdca1ad7adb6ca46826a7309dcc39aca5a070669f4c24005ddaa1c5f5d4d56451d7a5c5164a4333542b0af1201f3fb210501e8 SHA512 711bd87d27656834ae7e19b22a76db2b1db37dd25999cd303fe8439e23e74e87fd1474c5db1b5f97e9ab75437eeeb6167a752e9191f364f530eeabb6cddda36f
 DIST gsasl-1.8.1.tar.gz 5774550 BLAKE2B 0144b0d7b2750686f3447a9d154a2d0b7fa5261b614bce74d8fdedaca140f9d964868b57f1a67cf2f5fc446c5715bae3dcdb4e06a7bedc5b66d50fa52f62e93b SHA512 8973f5af12cc17aae76a4a2ea887d17e74e48b1ce896dfd62fde8cb874ed965d77c62d671ff86ce3217158e58a7a521b7fde9ea606f73c3a912a8973f1b204cb
 EBUILD gsasl-1.8.0-r1.ebuild 1797 BLAKE2B 5919ec09d3f0c47dd7cb447639d91de50a0bb774e3a74fd30b965d7c6a68c87e46b5cbe4bb249d0acf99e2e5c0afacbfb5a060170933a7681893be6241f77039 SHA512 a445f4165baf5fe2e1f0cdb66e58c0d93173b654a85a4acb72863cdf7c25d96c62710a77db3642de9af7010ec28b946c2f687d92898e4919151c54570a87d217
-EBUILD gsasl-1.8.1.ebuild 1798 BLAKE2B 76113a6a9399032c223054299dc4d71588bddfaed19566fac3c202ac23e9c6079b4a07d1d78d2cd5de222594a897de1f66610b8e9d44d233d04383d962d0a666 SHA512 03a83c1d6fd9cbb2a25cdc94b736ae441646c18cf6db79b0dd86ccf6e4904d006adf31169b412d25d91372c2a9f570dffbdeb1cfb31f497617233c96d5529462
+EBUILD gsasl-1.8.1.ebuild 1797 BLAKE2B 8793ae17801be1417f1d294dc825a49195483703ee13a29e457dd169c4a3512954187dbe82aee5474a71a65b22e462045ddd29c511dec65d3a8a439feb2ea748 SHA512 2856a453b72e26561d6b0f2bee46829a2af992b0f37fb4c9c41d4c2bdca806c6a00b919a4e3e144a0e14ee62038d29cbc6a4b3a6d0b8dd6680aaa47716137641
 MISC metadata.xml 370 BLAKE2B cb234f93a667fd37ab122fbb8ae0926fd0bacda2d9e4f1e50de9e8793d6ed01f0165e16dd73931114aead2e408b2f019c06cdca7aa41d9e60c9d60cf9f7e9955 SHA512 c528d4a5f51ebcbc5917268964716d667b71e825815bdc0dbd627f1ef676b21312caf442de31e7912ad57f5c908471a7fad1617e129a2902134a081e91bcc4c0
diff --git a/net-misc/gsasl/gsasl-1.8.1.ebuild b/net-misc/gsasl/gsasl-1.8.1.ebuild
index 903d03e2ce86..b98f4c288359 100644
--- a/net-misc/gsasl/gsasl-1.8.1.ebuild
+++ b/net-misc/gsasl/gsasl-1.8.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
 
 DEPEND="
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 5e5ab5715362..30202c6061cd 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,5 +1,5 @@
-DIST httpie-2.1.0.tar.gz 1754801 BLAKE2B dabb6a1ce0cc4ecebbc7e933ed3084d7b75e0fac1fbf6968f41d37ee95cef684ee3603ddb5361e072328d13c9c98332b23bfdd0454da3399038307b124ea2e98 SHA512 39d56c9b9aad4871ce439a235377a930ad7c78b833f9bad568142efc9fd8af9123ac931e434c6ddb7fa6e0deb0acf8f5fd1ddf79f3b7a65467267cbf4629555b
 DIST httpie-2.2.0.tar.gz 1761927 BLAKE2B 3ce8acf4abf9cb189315e07e7f9c8dfc1b0a537696a2c9fd795e8e944c85c1df8e7e13fbaee68d3b93115296ba048e664d31245fe2c6b832123818292b4fac8d SHA512 00c1f34041854319816d7d643a79358723c27a3744f405d629b5361685745bfdd8ce0a0f127cb3d6746e46405d24562625ca37733a5955809d7bfc077ae5c533
-EBUILD httpie-2.1.0.ebuild 1049 BLAKE2B 14c805d3d274998fcd8dc8c559730024d38f54cd20b0dc8dbb585003330702f5c7bb4d549c5bf594810d00686dffde61abcb526649f1d021506a77c84841b526 SHA512 126244d16e874663315fe0ece6e7be2107f11974d8c7f0fd072860cc518eeef9705b7626ed95e12a4d218f51e30e4623c823c9c91e8f8e07fac66c2f45eead2f
+DIST httpie-2.3.0.tar.gz 1769401 BLAKE2B e9bb5ca9ebb5fde3bed66ba15c46cccff1f8d5d01841f954fe4d19be92d3282cd3c19e1fc34b42fe1c36798438aa116f5bb91147864be9d8ee37030cb7796e16 SHA512 d0c5b46075892e9d6df76c1e3b430fcd768238c7fbdeda51368dc1bc7c657efc901088ccb7f1e6fc6e4f54dde4c9bcbe626dfa926c8ca1a6bcfd12e522414505
 EBUILD httpie-2.2.0.ebuild 1049 BLAKE2B 14c805d3d274998fcd8dc8c559730024d38f54cd20b0dc8dbb585003330702f5c7bb4d549c5bf594810d00686dffde61abcb526649f1d021506a77c84841b526 SHA512 126244d16e874663315fe0ece6e7be2107f11974d8c7f0fd072860cc518eeef9705b7626ed95e12a4d218f51e30e4623c823c9c91e8f8e07fac66c2f45eead2f
-MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb
+EBUILD httpie-2.3.0.ebuild 1584 BLAKE2B c8d60fbff18093bf340e7c9daf0762620a0cb3e5b6da0728f877a12094adabc97398459ac5ba0a73d206fb2f87d7ea2e9d87588798dbeda863807b3bef719574 SHA512 1d4cccb1bedff4692cac69cc08a358ddffb1c907ad71f7247adb23220b0b0ea9251761102c7ce9be95a74582ca7b2e0268be772a470cf4a2f1f90d8645dc368b
+MISC metadata.xml 749 BLAKE2B cb920766146fcc33952835a6e2fff7aeb12dff221655b53550a5158679639256529d51165dc25697ceac13113c6b34e3b174f75fb34e448c0d3121790324c06b SHA512 c3da003a8f72ab4df475211a13c35d83b0cbae2883fa7babecc3325c16ad967f80c25e6c28b35d1a120dba627a82ff629dde26aae62ad6e86494579e2e3eff3d
diff --git a/net-misc/httpie/httpie-2.1.0.ebuild b/net-misc/httpie/httpie-2.3.0.ebuild
similarity index 56%
rename from net-misc/httpie/httpie-2.1.0.ebuild
rename to net-misc/httpie/httpie-2.3.0.ebuild
index bab02d0b537a..d0e3cc6c1872 100644
--- a/net-misc/httpie/httpie-2.1.0.ebuild
+++ b/net-misc/httpie/httpie-2.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit bash-completion-r1 distutils-r1
@@ -15,22 +15,38 @@ SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]"
-DEPEND="test? (
+	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]"
+BDEPEND="test? (
 		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
 
+python_test() {
+	local skipped_tests=()
+
+	if has network-sandbox ${FEATURES} ; then
+		skipped_tests+=(
+			tests/test_uploads.py::test_chunked_json
+			tests/test_uploads.py::test_chunked_form
+			tests/test_uploads.py::test_chunked_stdin
+			tests/test_uploads.py::TestMultipartFormDataFileUpload::test_multipart_chunked
+			tests/test_uploads.py::TestRequestBodyFromFilePath::test_request_body_from_file_by_path_chunked
+		)
+	fi
+
+	pytest -v ${skipped_tests[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
+}
+
 python_install_all() {
 	newbashcomp extras/httpie-completion.bash http
 	insinto /usr/share/fish/vendor_completions.d
diff --git a/net-misc/httpie/metadata.xml b/net-misc/httpie/metadata.xml
index a054286ef778..b354b85fdd30 100644
--- a/net-misc/httpie/metadata.xml
+++ b/net-misc/httpie/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@seichter.de</email>
-		<name>Ralph Seichter</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		HTTPie (pronounced aitch-tee-tee-pie) is a command line HTTP
 		client. Its goal is to make CLI interaction with web services as
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index a96913537661..8c7a73b37b7b 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,6 +1,8 @@
 AUX kea-confd-r1 289 BLAKE2B da62fc34c87d791f765a7077020f7ca1c224c2b2bc86880e4bacdbc12e60840675750e2c5c71dc90e99a1d11d1e5e725f59d1045d4b973d6155d22876314aeb5 SHA512 9f74344bc39fd2d85d2e305060e35e96a43ec9775793f29d4140a2a6ebf40cc0e8c6b2766fd6ad1fef531fc4be66b004ce0631ac76ac7646df4e655d9a2805e6
 AUX kea-initd-r1 2210 BLAKE2B 052fbbf03c6c1e8c66beb3161dbc8d46c6c704b7d931438039321177e792e1d7f08ccf17acb87d7c36af1878413c2f17cd00b951d4076c3be049cbe31de3e32a SHA512 051f4b86f083931c3934e2c63aeb45409bae5d50e6a91b29e642bf4cb609a539e2c23029b8dc70b48517a4646fa3db06961c823d804c514f05213be0b172cf9d
 DIST kea-1.8.1.tar.gz 9001243 BLAKE2B f121c173b915b82055048fb05dcde622ef3f7ee1d113604d94c7df737f9de1b15e5cedbe414ea583f6a6c9e9ceca615eaad2778a2736addc21b27fe45521aa3e SHA512 0f0972d63a1e146623dd30b8acab9a72af2d10c25fbdf9cf31e66ed25dee14f6b7602226c475f574a723415ba5569b04e13a97711bd933448e1045636ca6b96f
+DIST kea-1.8.2.tar.gz 9005645 BLAKE2B fec1118ca34adc4bdafea13dd6c1c3abcd42df80043b621d1ed994e7ec6906a5d13e86a1bbb6dcbdfee32a4d70281c751b46c57d4866bd92557448ab7c602c30 SHA512 7bea9eb30ee819bd350ba3f64da7dc46d1176363e7243e934ff0f0498fcd47ef4eccb7fe8d8dd4f883ab9e376174aaba4fae06b20405181d46b6b12cfbdf7dd0
 EBUILD kea-1.8.1-r1.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
+EBUILD kea-1.8.2.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
 EBUILD kea-9999.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-1.8.2.ebuild b/net-misc/kea/kea-1.8.2.ebuild
new file mode 100644
index 000000000000..3e20776fe7e7
--- /dev/null
+++ b/net-misc/kea/kea-1.8.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_p/-P}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
+HOMEPAGE="http://www.isc.org/kea/"
+if [[ ${PV} = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
+else
+	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
+		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
+	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+IUSE="mysql +openssl postgres samples"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-cpp/gtest
+	dev-libs/log4cplus
+	mysql? ( dev-db/mysql-connector-c )
+	!openssl? ( dev-libs/botan:2= )
+	openssl? ( dev-libs/openssl:0= )
+	postgres? ( dev-db/postgresql:* )
+"
+RDEPEND="${DEPEND}
+	acct-group/dhcp
+	acct-user/dhcp"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	[[ ${PV} = *9999 ]] && eautoreconf
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--enable-perfdhcp
+		--localstatedir="${EPREFIX}/var"
+		--without-werror
+		$(use_with mysql)
+		$(use_with openssl)
+		$(use_with postgres pgsql)
+		$(use_enable samples install-configurations)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN}
+	newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
+	keepdir /var/lib/${PN} /var/log
+	rm -rf "${ED}"/var/run || die
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index ba9ef5484ff0..bf5ad74159dd 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,14 +1,9 @@
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
-DIST miniupnpd-2.1.20200510.tar.gz 245426 BLAKE2B 17b5335bb4cfb55a517c1f0aeb1eabd7515c729480ee737a8ba525988e59f067e18d2de78393df2ff62cc15201a742d17a17d5632601c1d98ea2a943dcc4a393 SHA512 36a5d1844075a93e76f13aba8820b3747bcc8f562c8cbcc562f991ac154e91c951b5caaa9b7c7066cf80534066c3ee6e20a066012b830143f0a7352cb9f5d71b
-DIST miniupnpd-2.2.0-RC2.tar.gz 248756 BLAKE2B 428f353496f4410ae2ddce96d8edca1d4addf4f77c1e794ba48b5ac7fbe12368f994d91c04eb5d54fbddd24f5e6d36aa87e4cfb4f60b8e3f08f3bf96b5b7f094 SHA512 17dd31477c018f3f26b05a9ab5370819f763bcab6c00f3bb13ea87bc3781f5dcd190e294837b85a9e41b4fe7d1bfa0b475ef8da2f1fa48c3fe357c284f585508
-DIST miniupnpd-2.2.0-RC2.tar.gz.sig 543 BLAKE2B 678b76fcc994d66dad6988a272d99db1f1eb89096b72e171f9ee94c59734ff5a1885316ac2564119614b0a9c653cf7e7d88a6b9f291a6588d4577e669d2b4775 SHA512 fa6c93501b6bf5eef763d0ee637233458ddb6e2aac0ec92554c803ed29e6d3fb35e8618a7316fddc07a009a5a7b702351226ef2eaec6dd5404bea47d5fb0ebe2
-DIST miniupnpd-2.2.0-RC3.tar.gz 249879 BLAKE2B 718c40d9dadc17eca9544c499c75888ced5f058bb75e564d5bf17ef490200dd2055ba43cb265ec26381a14697e814524ca849deead4493b0e5de37bf6121e1b3 SHA512 2f946521e922016e58179dc9d6c5ce783a93dab9117066dea05d4f27a854dc9b7a92ea475df6565856294ecf82698a885968aa7b3325244ea87e695901bac3ed
-DIST miniupnpd-2.2.0-RC3.tar.gz.sig 543 BLAKE2B 4d11b6aa3e39f417e00e9aade4e5f2d0292595f64500a7d22fabc0e04e1784ebebb8616eaea5b7b93fd4ba1d83ee547cf2de7faac4578848b8bc213c54a9e264 SHA512 2fe3086103debbcb88774fc2428e09628aac3e0f686d1141f9c1bf38a8f0229e682bfa70bf939435bca6371750c601fd8b6fa2304b4f25fcc6cf4288ece1cf1d
 DIST miniupnpd-2.2.0.tar.gz 249858 BLAKE2B ef216c7703cb9806a3719b247d67c5c844879308eafbef0936fc501305dbdada7b32e6fc212e50ee093c6f5728709da3d2d5114e89de52a124c229c63ee03563 SHA512 ac8bc3c140f369d0f92d203b94a4f73dde682a486c4395cd25aafda3461577b4a2a1d3160cf8bd37fa8520cda4f86cbdaec925b2ef4e9054e7bf10e04a227d3c
 DIST miniupnpd-2.2.0.tar.gz.sig 543 BLAKE2B 11778dd70128ece1f80144bb229176c53f3cd89847a8eedd4fe1b75ac55d986ae7c4689edf40f80c4605ba42260bc41f8fd069e99b8c249226ab9e2981d15412 SHA512 5e0e053a2a3ab876da001589677b0f5e3a4df8511ea5185dbbaee9b80928f9cb9705029f1c83bd9d26b144e39721fce1c4c8c33983956b6731ae654bc094063c
-EBUILD miniupnpd-2.1.20200510.ebuild 1843 BLAKE2B 94c397a041d7d7b6bfbe31691e1b7bf41f8f653eea88ff9f463b02f3a325e9ffe834c430a9ee7b80b90884c05b2d07d65bf206096e7cf09fa7a73deaf2f9dcef SHA512 ef68c939cb847d712c7953c65e9913b9ede642c9f1aee5b6ea92975ae3193a376ff8562ecdc804d74774d81ff22b7136dc3048d6a5bb1fb3c738311433298c1a
+DIST miniupnpd-2.2.1.tar.gz 250023 BLAKE2B 67418a8480f7d3ac3d51a9c18fdcce4a85c33ff6c373051e1f9df121b00d936f02038ed0a5a5a848b7b2c145aa08dc1e2b954b211cc79fae1de09075f55a9f21 SHA512 211b608472a72065d892e9197f8bdd8c82e44296bb692244ec5e83ca9b076cbcc3426c806ff27d5e805505b1c82b1a7afd7b4030ddecdb60aa85c37062c10c8a
+DIST miniupnpd-2.2.1.tar.gz.sig 543 BLAKE2B fac8c2fd5c50e3201c5fc490d91aed5752bf70297bed101cb3d5ec53d891fdc8f893b3d83e0cf064eb9e9bf16ae9504a849187e18eabc8ed12055574d1e551f5 SHA512 da5b52b1c62bf433a165acf87a64195e27c71c98dfa086cfde19f7b1c4046a62926cca5eb2d10f4260eb1b97c428ba08b4b7fcbf280c2a7009c86279a7563e0f
 EBUILD miniupnpd-2.2.0.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80
-EBUILD miniupnpd-2.2.0_rc2.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80
-EBUILD miniupnpd-2.2.0_rc3.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80
+EBUILD miniupnpd-2.2.1.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80
 MISC metadata.xml 902 BLAKE2B ec10dab38256289a3445ad960eb869fe01ad009e21f77e61ffa4e45cac71120df285461cc3515de395918635b8f76a5448d761f9644172064e1eea79aa926947 SHA512 931799b28d6b7b1676d7ed0b94ce6760b550087785885635cb03c656c20e51c810a75dd8d675e17e5b8fdb87e7909f2a972ba11e168310eef4f58efd0a065135
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild
deleted file mode 100644
index b208d8cce8f8..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0=
-	!nftables? (
-		>=net-firewall/iptables-1.4.6:0=[ipv6?]
-		net-libs/libnfnetlink:=
-		net-libs/libmnl:=
-	)
-	nftables? (
-		net-firewall/nftables
-		net-libs/libnftnl:=
-		net-libs/libmnl:=
-	)"
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_configure() {
-	local opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-		--firewall=$(usex nftables nftables iptables)
-	)
-
-	# custom script
-	./configure "${opts[@]}" || die
-	# prevent gzipping manpage
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	local confd_seds=()
-	if use nftables; then
-		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
-	else
-		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
-	fi
-	if ! use ipv6 || use nftables; then
-		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
-	fi
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
-		"${FILESDIR}"/${PN}-conf.d-r2 || die)
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.2.0_rc3.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.0_rc3.ebuild
deleted file mode 100644
index 1c2981def4c4..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.2.0_rc3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs verify-sig
-
-MY_P=${P/_rc/-RC}
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz
-	verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0=
-	!nftables? (
-		>=net-firewall/iptables-1.4.6:0=[ipv6?]
-		net-libs/libnfnetlink:=
-		net-libs/libmnl:=
-	)
-	nftables? (
-		net-firewall/nftables
-		net-libs/libnftnl:=
-		net-libs/libmnl:=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-apps/lsb-release
-	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
-
-src_configure() {
-	local opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-		--firewall=$(usex nftables nftables iptables)
-	)
-
-	# custom script
-	./configure "${opts[@]}" || die
-	# prevent gzipping manpage
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	local confd_seds=()
-	if use nftables; then
-		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
-	else
-		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
-	fi
-	if ! use ipv6 || use nftables; then
-		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
-	fi
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
-		"${FILESDIR}"/${PN}-conf.d-r2 || die)
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.1.ebuild
similarity index 100%
rename from net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild
rename to net-misc/miniupnpd/miniupnpd-2.2.1.ebuild
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 85e39b1e10b3..f25607f37028 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -4,5 +4,5 @@ DIST ofono-1.30.tar.xz 1030428 BLAKE2B 94248b7eb7b48000333fdee38eaecf13c259adf2c
 DIST ofono-1.31.tar.xz 1049252 BLAKE2B f7b40d3aa7854369a7886a4b64bb66044e8f016682665935f7727bf219c084d266d8fd7f80c97e58234d845f7db3dc52133298697274745d115cf14c62769d82 SHA512 377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20
 EBUILD ofono-1.16.ebuild 1624 BLAKE2B 1948438d3150f5cdc848ce72c10fcd70105d1854bec2f0e941d5eb24aaf869826e6e7de8b7b46c92d4f9a5a56a537baacaecce29d406abf1302964b4ab46a2e7 SHA512 fafe6075e7c1abb6b513c0a09620c61ce8e1472b6972d69ec23bfc652b7b63d2e983affe67bad31a5160e885e40576d3c67230e4f67ab0c989714ece954457bd
 EBUILD ofono-1.30.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
-EBUILD ofono-1.31.ebuild 1635 BLAKE2B 76c8b68bd663de2e0ef75eb111fd931a709c638dcd759c826dd3ecbc911873dc0efd9e6fc8845bf600ca83b7897764db938d3abab27c4036cac54b775f17bcbe SHA512 8618347d9b2609698ed832dd8428c14c498e66a747a0987a087044d8bee3b407113e381639ebf62d6f3828bb91f47d0a9c70bf773b91c1c2e9d7231f66256e93
+EBUILD ofono-1.31.ebuild 1634 BLAKE2B f66b9d3dff61283584a2279a0a013fa659e30b8429ed1ccd807a3538d317b4ed4c43a46e084d5ccd1b5397713cc3f8ef0a54bb61de4e451e94603ee77dc2bc11 SHA512 f6a2d5428bf8232a5dc212d8130b36ea461aa35c8881956f1b9853276c2b670dbde88e07eead0f9c96bad02012263cbbb389088d1fdaf8cf2e2792323321315f
 MISC metadata.xml 951 BLAKE2B fd63ccff3b96dea1e770b7ec50c1a9e5e583fe81bcb2ca9c1915386a4fbd85a30c806f9ac3e163b1110e93b44f6714c555cee9273ecf90d5a9f9e209f0774897 SHA512 26f8b8b3ac43991d14534b4b1257a5c4dc1dd0eaca83c9f30aab74bbc721d9573e93e8f245a4ac2d0805ea9325aa759ca144951fef1b158b0b68f54df4df3e7e
diff --git a/net-misc/ofono/ofono-1.31.ebuild b/net-misc/ofono/ofono-1.31.ebuild
index 444df24a6f59..740ae9d7aa2c 100644
--- a/net-misc/ofono/ofono-1.31.ebuild
+++ b/net-misc/ofono/ofono-1.31.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
 
 REQUIRED_USE="dundee? ( bluetooth )"
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index faaf15c477a6..978e7899402e 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -1,10 +1,7 @@
-AUX radvd-1.9.1.init 1541 BLAKE2B fadbd829fdfe7e480e6142f07853e45ce1f11ed6ecaf2ea82a898dd6258a5d85c74c8b686130c6e48f7d78c1bd337e645ce5c0a95d85fbc96617ad9baf15fd56 SHA512 1c2bef4f39c14b4244f10b5ad5a5bebeba62bf3f60da78511151713d0f29a03a2736055f84bbcd18f0b3a5dd3fb02accb81ed078105b84ca34d0dca931348d65
-AUX radvd-2.14-headers.patch 724 BLAKE2B 88dd2ebaa50e627755650d0054c4240e5ab46059f5197cbdf3e031d377dde0d2e6ea61680b6544dcc60d9cc8135253210e920e2643caba9503869e064c8ea8a9 SHA512 758a25830eed2b10c5aab18b5a670a482ed312e54c105b449f904c88737afe437c015926841b3f78bc4095e824b9e6fb4e2cfc8eb7426a7cf14481f3f58af049
 AUX radvd-2.15.init 1537 BLAKE2B 6ca0db1eeeee77c345e4a5d9ee75d4e4fac188e3e19b153cff748c2b3a6c95960e8c360168b32a0f2b860bf40c21de86bcff1cfb69b2f70e7ce005e46f5d532f SHA512 cd3a6527d7b323266748cf674090419e89dc153daf883601604d040fceb55850d551e44371ba383a2bb98adaf361311969d1eea94a9f3ec1bf8c11aad54aac8e
 AUX radvd-2.17-nd_opt_6co.patch 2240 BLAKE2B 45c096fc406d31d9a9edca64c6e24005ac0b73b13acdf7a73fefe39f6212e574d3eca342d90211df65255763fe40771d4836b3f5b060e4e3875a865e571c2e49 SHA512 0732d403e416fc4b3ed3f322c90b3d5c98adaf7b4fe0af05fa5ffaf3845f5047b0997f03065889c6272e57d3a09088a6beb99692cb9e4efc660638f586c4dbf3
 AUX radvd.conf 337 BLAKE2B 67d50a761449b35389580ac956758f5c8c9373a14294a9e98e8238cce4ef2847694712e12296197ff196d58a9e5123aa6e27044a2137c36c34c6e2342ee7db63 SHA512 303a79c6e60293571f5cc868ba36f48a98658be8b6a9596c007461cbef2775d7deb67950fdacb3f37765cffdda164bc386e23bbb512cbabebd5173245841e401
 AUX radvd.service 603 BLAKE2B fb573b528050d772926f3cb3cf82984b946345f636b661583f3aa5ef720a664cc13b20b8435ad2bcdd5bbdbad6451530384cd869f6d33d4e6f2ccf014ff9871b SHA512 3371d18e71ddb7672e929152d9f93201b49c1ce08c77d59cbcac7654362690a9ab97db08519f5fbe210738595aa52f30f5972cacca988b9274e2218c21bc7dd2
-AUX radvd.tmpfilesd 30 BLAKE2B a1c207296debe31a4fb25c7ec52202b679e41fb9b73658d278e5e2599cc12b2b1b48ce53043ef89210cc18ef445c8c952e498bed43cc474b698581777843017f SHA512 d126bc90083e0f8aefda8cbd3cd01ecc9beb0eb05713c2d9fb5315bc10337d927b3c9e52c390e35799d1421078b365793772a712c33028be35280cd083cf65c3
 DIST radvd-2.17.tar.gz 214937 BLAKE2B 1eec22e09607c0396f9539aef203b76d5beca18d1fdf5aa0ff202dcb2ff0e36ed8af74fc7900eb7b16012bfb0672f9660f17c88c222ac0269947d3cf4a270db3 SHA512 117a42c2c007d730b956cf999ac281f50a1a9b57c9428fe0f860cb211ac234ec62f59fead244a80191aaa15ef4ce96fb7dba9bd1a3cb6c3b29f1b6897d7a6132
 DIST radvd-2.18.tar.gz 224183 BLAKE2B 4bacf9e17b78286a032ca5e6b6424aa8742d2e42b3a00a67e5d8beeda139a70a574e69c0d8fde2c2754b6e9c9e92a97dfb6a2a67b4b3ce91740aa8edee994c5e SHA512 b66068ec40d4f228f679946039d7c696bf611eb55b88cb37bbea5e748cf7cdda796dc0b12e0f1e54b26a6af21750c8714ea18a152ef932741c0f0a6a7a9de59a
 EBUILD radvd-2.17-r1.ebuild 1562 BLAKE2B 75040b986dbbe14656b4ab69aba82c99d2b85b6ca8f5968fa363bc123cb09acfea1d2864a8a2ded6ed767941e552ffdce7c77ecbe032c313e480003eb4304996 SHA512 fd3f2fe16b9f726a2d42bd3dd6abdf6d42fb62f58b48bbb375cb8a4f6e010247b2ea447b7f378e421cca2ec319d5ea2a0150a78ddf7aaabd5488ca467607e4da
diff --git a/net-misc/radvd/files/radvd-1.9.1.init b/net-misc/radvd/files/radvd-1.9.1.init
deleted file mode 100644
index cea880730008..000000000000
--- a/net-misc/radvd/files/radvd-1.9.1.init
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CONFIGFILE=/etc/radvd.conf
-PIDFILE=/var/run/radvd/radvd.pid
-SYSCTL_FORWARD=net.ipv6.conf.all.forwarding
-
-extra_started_commands="reload"
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -f "${CONFIGFILE}" ]; then
-		eerror "Configuration file ${CONFIGFILE} not found"
-		return 1
-	fi
-
-	if ! /usr/sbin/radvd -c -C "${CONFIGFILE}" ; then
-		eerror "Configuration file ${CONFIGFILE} failed test"
-		return 1
-	fi
-
-	checkpath -d -o radvd:radvd ${PIDFILE%/*}
-}
-
-start() {
-	if [ "${FORWARD}" != "no" ]; then
-		ebegin "Enabling IPv6 forwarding"
-		sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null
-		eend $?
-	fi
-
-	checkconfig || return 1
-
-	ebegin "Starting IPv6 Router Advertisement Daemon"
-	start-stop-daemon --start --exec /usr/sbin/radvd \
-		--pidfile "${PIDFILE}" \
-		-- -C "${CONFIGFILE}" -p "${PIDFILE}" -u radvd ${OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping IPv6 Router Advertisement Daemon"
-	start-stop-daemon --stop --exec /usr/sbin/radvd --pidfile "${PIDFILE}"
-	eend $?
-
-	if [ "${FORWARD}" != "no" ]; then
-		ebegin "Disabling IPv6 forwarding"
-		sysctl -w "${SYSCTL_FORWARD}=0" > /dev/null
-		eend $?
-	fi
-}
-
-reload() {
-	if [ "${FORWARD}" != "no" ]; then
-		ebegin "Enabling IPv6 forwarding"
-		sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null
-		eend $?
-	fi
-
-	checkconfig || return 1
-
-	ebegin "Reloading IPv6 Router Advertisement Daemon"
-	start-stop-daemon --signal HUP \
-		--exec /usr/sbin/radvd --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/net-misc/radvd/files/radvd-2.14-headers.patch b/net-misc/radvd/files/radvd-2.14-headers.patch
deleted file mode 100644
index 36f6c3b7de4e..000000000000
--- a/net-misc/radvd/files/radvd-2.14-headers.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix build failure:
-    recv.c:17: /usr/include/linux/if_arp.h:114:8: error: redefinition of 'struct
-on modern linux-headers.
-
-Patch by Murilo Morais
-Bug: https://bugs.gentoo.org/625236
---- a/includes.h	2015-11-19 10:58:52.000000000 -0300
-+++ b/includes.h	2017-07-15 09:32:17.024877205 -0300
-@@ -86,7 +86,7 @@
- #include <net/if_types.h>
- #endif
- 
--#if defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER)
-+#if (defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER)) || HAVE_LINUX_IF_ARP_H
- #include <net/if_arp.h>
- #endif				/* defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER) */
- 
-@@ -101,8 +101,3 @@
- #ifdef HAVE_IFADDRS_H
- #include <ifaddrs.h>
- #endif
--
--#ifdef HAVE_LINUX_IF_ARP_H
--#include <linux/if_arp.h>
--#endif
--
diff --git a/net-misc/radvd/files/radvd.tmpfilesd b/net-misc/radvd/files/radvd.tmpfilesd
deleted file mode 100644
index 26f203d1aaa7..000000000000
--- a/net-misc/radvd/files/radvd.tmpfilesd
+++ /dev/null
@@ -1 +0,0 @@
-d	/run/radvd	0755 radvd radvd
diff --git a/net-misc/websocat/Manifest b/net-misc/websocat/Manifest
new file mode 100644
index 000000000000..c4506ab1a629
--- /dev/null
+++ b/net-misc/websocat/Manifest
@@ -0,0 +1,235 @@
+DIST anymap-0.12.1.crate 14298 BLAKE2B a4f5f4f18263e0a6d5b67ac8fbb56cf410534a0fc3e670d57a3275d0efe318c98b9b594f0be44dd7ac9fd08cda1d05733489290884af25f76ea981e0ae61ad60 SHA512 88fbca9ff7482ecd338f9cd9a025499ed98b47eaa89ca8dcd1ccfb013b6c9ebe7a8eca5d7c873eb716c320af7ccda01f6d4c26bb333c8ff434416416ee64a774
+DIST arc-swap-0.4.3.crate 48193 BLAKE2B 4335a97b50f1adb2de484202373b004770a8d4c43eb34193e96953d9a926af5370ed288b30c0b0998e023decd4c76484766f20608d03fc7a0b40112748f737be SHA512 3e5ec14c30c2a061dde5bf1b61ffa753745d1b0fc31081c3a52e3c6b83593f790ce7c25d25bc35a50768a31e8f4dcbe63dd12a1606d2d6939f0096a5bdb6c877
+DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
+DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
+DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
+DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
+DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
+DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
+DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
+DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
+DIST cc-1.0.41.crate 48185 BLAKE2B 7fb7eba2079aed5bc7775e9e8585f9b1267066bf51cf7aa9f5ad25789f7b57021a457d2811f705d4e6bd0f38d033cea1c6be23894929df8df9f3bf1b2dcb6a20 SHA512 3a39bd28e16c3e7715e0588fb9eaef6b83075e68c1ad7aa0969d89baac1e2753f9e68b56492bf5df5b1a4882fd1b6a1df97ce559149873efacd5aa209a0bf352
+DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632
+DIST core-foundation-0.9.1.crate 25985 BLAKE2B 22e70b7b1cd1f39c4ac287f406dabc549e3ba750ecf17955f129ff83afe67bb4bdee7e7907287eac0c28597df971de27dae77619f44d0368864c08798def1ae2 SHA512 d6dae760082ef9dcfc37d18acfa9a6ad8ee491335d17ee17447c5bccad623564f1e8bdc54460fb260aebe9276ce5ea4d8a389a83b5c7d17193614906c3d2bea9
+DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
+DIST core-foundation-sys-0.8.2.crate 17461 BLAKE2B bafa6f6af67f55b34c20e50093a5426bed35c159058a97c03d28c99b6f0075305596907291d26b170ee2ce1bf0c74bd51e2c54f11ef021399791129de6cabb57 SHA512 1c66f2012c11185603a0e4c09311d32bc4ffe639ef7626e49bb15006306fbed4c963f2c53d3b853a254b29cda73c393e0236436575d217992268463441ac7348
+DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551
+DIST crossbeam-deque-0.7.3.crate 19888 BLAKE2B f83e6915624ed8d01e56ad28e0a40e84732d820fd07f0f0fa4aac9578aed0f4a980bdcd64d29811be2b5055f28135403faf091b902dd4c800d6d736452ab03d0 SHA512 7c6a42643b2eda7ffbe2d485de4d3723c6a37beaf77e81329e39c9300a80492ef46650fe5a6b18101d3f6b4ed031ddb06174624f5449998ec3a7808e979df131
+DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892
+DIST crossbeam-epoch-0.8.2.crate 39283 BLAKE2B eaad3cff833fb3672c93f6f0f4ca7073c709f9ea489c034da5fb2dab2da0676d493300c66bc746c8372369815aac3eec2ab9cb875dd9464cb59ae25c4ef4c6c9 SHA512 7406e92a768dee07c8d13b0fefd658e9eebfd3e89c782c4690740353c0de920013c345d6c112a78a2014396cc837ce4fdbf845dfcfacfd7a57172f483bb9b8e4
+DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444
+DIST crossbeam-queue-0.2.3.crate 14753 BLAKE2B 1dc60d5a48672f26f0c3afd0b14efc943fe9aea8fc9b10dc1e551a489a178899f1a82c0bc8bebf8511e112711ebb26170d1f76f9caaf06556bbe8b74242e97b6 SHA512 f53385dea0a2b0830372ee11b9d393022f501a79631a15696d641a812939faad62b61112f9da9dda381fe69ecc3c91462fad95f329eddb002aa941110297cd85
+DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c
+DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST derivative-1.0.3.crate 39909 BLAKE2B cf76a6a2a82917a09dac420057fa27d405aca3cc4403548633d4ed4f2fb2b8428feb1d76e15f64ca7d8e773b103739a2387495d3fbf9528abba23dfd52c0fc72 SHA512 897bac6fd81555684cecd7afc2a3b6546917562a7637ac0ea4833ab7d74c382383b3452fd554d8ed13a0cc150d9f4484e0c956c16a65404bfef866fc7bf5f0eb
+DIST derivative-1.0.4.crate 42508 BLAKE2B 9996bf596e7646a242acac394c9ec2f5be20b49ce3cc257c26d51fd676740c46114005b05d270e31235f59916ad90238cfc5d30728b5e114b908c74974254f55 SHA512 b6dd82e4ebacc5df58302d2baa8d47eb12aa6d87bb3fb9ef125bce17e163e5a6d921e99e88d9ac91fed402a912e80ff92067a9d6236a8e52f6f8e8435f790623
+DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
+DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa
+DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
+DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST futures-0.1.29.crate 158346 BLAKE2B 943336cf753166f852f9dcbeb8e0b76d1d26cf6d688449a99f9f1885912cbc79327115514ad93d28bbdf1b8a91b2d22f8f62d7e5f5feb61f3024e9a749e11da5 SHA512 16b16ff65c75cc565c5364406f5d9c0d120a07a520f6ea2dc86aaf4644b9ad6fb32bc021b44fb7c74246cb7a700b3df3bfa813908541eec079bd7eb7beee0200
+DIST futures-0.1.30.crate 158916 BLAKE2B cf85d054df3fed1f5b6ba8673db3685e714881b8f22bb7e86dba19de2e51f62d1bcf99fd9e5851c12c28ada71255782ab3f48b77234b2bf7e1d5aca9ddaf3fd7 SHA512 5fa77e2018ba44fce8c50f41ce0da1f8ac51d3ac4b190d138b4af6b3d7a40391eaefa27a36e68c6586519aed4f55717b3519ada900787b08236888e04d3208ef
+DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
+DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
+DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
+DIST hermit-abi-0.1.3.crate 6741 BLAKE2B 0a7edada6e7c834fdd20b804237d29558b9b413ab99b538de5647e485d36864749fba6b8f46b4a6de4c620cdaa2d711bcc6759b53f8d57438ec5c9b78da71ea8 SHA512 ca85d69192ddd2c1cf0f12d6abc7eaa70a71956df5b55aaf1d3780c6e40207c33bb188a92a5f4769478c4ce13bd93cfd6b4134a21e245781b4ab4e3cb3eabe87
+DIST http-0.1.19.crate 101834 BLAKE2B d3f557e34c93235353e170b472c37cc4de1c3814833205a8e8f1f747cbbe170bb94ec50bf0c62f8a539c518d5f163e34d30584e2680c5efcb94f3c70b0a75a0f SHA512 d24574664c9e6b766584b21c84df942110cdcf1afbe8a0ee242ebd030c431679b91265db76c439c4b5e931947fa507097d8df68e3b4fd9ca04139808bed25f76
+DIST http-0.1.21.crate 103053 BLAKE2B 78b888c4aeb641399bdf5696b53b596041b3d7236fb9596b6d6676f98563fbe8cda4d3f6fd5837d852b4235c862c42303977be5f092adfc00df1fe3634e0e859 SHA512 edb1ef74c8f73c89dc7b0ebc83a6c5985ee6b1223001403d1b8c1b2c3ffa3556c80df7f28575620c8145a35dc3846b05a263dbeafb3c62547c0f17c3ac6c82ab
+DIST http-bytes-0.1.0.crate 11513 BLAKE2B 50ac2039bbecdd17ee3057850dfcedd3999bc628053338935cadd7dc4f2d8d85cbc1ac4d4bdb7caceb64e2c113746691d18b3144cd0573b2224cfa774001c257 SHA512 c800062d0a12710c6101f2d4cb6363b999613a4d092baed5ebbfcfcf0d51ee042be9b48967ac61fb4624e95fea2b4acd4b4b5fb67461fe5c06e3e388051fdbeb
+DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
+DIST hyper-0.10.16.crate 113115 BLAKE2B 9276328c07d6bee7fc172d8104b6e8f30f0b0fd441937d2f4cb94e54c076a47e32db6a7c90827995c6c5c63e535d2cc6e597d52bca2bede17d117f038d971435 SHA512 22a9c31c490b002c8daf085536abec24cb01c0d63a16e6d153eb3cb165a7338d2109d6f88fa8d343942e2c6d7928d3c5ba62575a404b0dd7811f57e423eca4d9
+DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
+DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
+DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST language-tags-0.2.2.crate 12754 BLAKE2B ea59a130fa723b1537e451d5a51914391fc0d375d40df1d8b3ccda64819e918332e344585523d3ba61bb0394899fc1663cf7a452aafd4a7e694f8d70627f1bc1 SHA512 54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.65.crate 439610 BLAKE2B a6390172ac5a76bb13860ffe0793a40fd6a74c7947c164ab1a033401473caaf77cc85bd578a37411d5f40bdeb13358a4810ac358a76799b24f7b797b2bde9915 SHA512 a5df4f7efae9dfdedeb140e3fec545135c7533f665f4eec61f071d01f40a2079e104c6a837c2b385aac4b306e4ddde34aa857fabb4a7ea7d7780159bc0b83c40
+DIST libc-0.2.81.crate 513105 BLAKE2B 789a79faf2d5079f5c4248446fa7c07b11af647bbcc32521e7989928788bea7dc2f65204f396b4fe0c7b3a6cf5248882d7775b97c028a3af1ba35e8ecdb489f8 SHA512 8e121e0dcbd8218e02c2c6536ef6398cd002a92406d433c39bf84576e9b881c5b8a66fee826da6a6189f44b825f3a9d959075eeb0501d7f604bf9cc1a8b8d437
+DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde
+DIST lock_api-0.3.4.crate 18750 BLAKE2B 1aa7cb716efa665df7b09ee8d95c9fe0ef7ec108d89348e413e78e3af4d6274a49530ac03d5438a503a7c6dcfe20973c1c040d79b6cf228c5a15696a1caa4a8c SHA512 1517ec7cb1f9012da78be866e026be40465cc9befbbfff4a5f644ec19653baab6b171323c3fb8ef218df4a7bc4b305e42a6b9d6849654d0542a1c2dc8fe11fd8
+DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
+DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
+DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
+DIST memoffset-0.5.6.crate 7382 BLAKE2B 42ebb93b567b339822201e31830971c32452b3d6681787c6969360c8db54912ae511580d8c899a3b9cb7f2fba98099c8df4c17534b97e4f4b1902d9251296527 SHA512 6df8952d41f60fa0993fbc85d112a15c1f6ecfef66da29ebdab71f40cd8ee8722400693b6ea023344f1b5dc351cbe828f465a8cabd150377a62948cedeb5db6b
+DIST mime-0.2.6.crate 6719 BLAKE2B e9c859193c3360dc6a779640c4323129171a3e7f0ef07007b0cf8f38e9a745ac4f252ff7d2dda5a67348a98447e25d04f1909cae289db8c8e959dde6b118dc18 SHA512 30e0cd95c8961ddce61759fa2c7273dfd37d490f96a5715d558c6c7775457560268309c3ad1222ff8150beab8f328b3a958dc05729d9550233d3efa0a1e13137
+DIST mio-0.6.19.crate 128192 BLAKE2B 26c821eef0aa49c80e4919d80a795971655b9726c24ce0a5b0716d89c0e254bfdf3a7d4e591ab70474dd9bdb92a48be9d74ff4d7beb3ae158accedcf780525cc SHA512 a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097
+DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
+DIST mio-named-pipes-0.1.6.crate 14766 BLAKE2B a372fc2f2393917811bd56c35cfe6616b879e59b220c7a56b92caaf1d68227ea2b388f0507b696b738c7e470041e84ec86e422066738a3cc5c52ac90c9c057ce SHA512 02e33e7b2d33eba7865ddb158bbf5e72b8eebf728e4f06831d71db431d9e444307f42ca490ea2d9a0388fab1734e1ef4dda99127036e58fabd1f7186221a3b61
+DIST mio-named-pipes-0.1.7.crate 15140 BLAKE2B 5e19ee9baaac61efa0c683f46acec94dbb5a932a6012370976e444d265f71b7dc168c9de838389c5fd492c5bdb15dbc1f8e8956640b11fe5b4e3e09a5b7f12ea SHA512 bd78651d89c292c792c108ab5d199da436ad62097c0fa1563523b8fd5a3c7dc0a7a948df38a4ad05a8e97d7f30652de6ef15d9f0be9157653de11c790ed25c90
+DIST mio-uds-0.6.7.crate 14389 BLAKE2B b01fbe5ba2e2f58d2bc513ef577c70890ab0a556313dc8e980d4f51d4622be9180215e2e9655e3f02aced40823bdf69b94a8b63c6b2624e28cd24fb5dd89b0c4 SHA512 fe16c8702eef599c2379a2b72a0408970c3318e240d6ed59077c7fcae142bfcda4d9e342e3185338671b82719f7c2ab156bb28a54818a54c249216dbb0f8bb04
+DIST mio-uds-0.6.8.crate 11496 BLAKE2B e52d131f292c7c09fa116ec5c760d50e8389c27fd7b79a4418f0222ae124fba0e5943b5494866e9db75407ab9f6b1a9c7aa7fdf2c4d601e8c785dacd8166f6da SHA512 b6c752ae9f25c37fc7e23e06a8843089c5291d60e53a6e9093eed1d8baf64c9e0ff14bb2ea1c0c8815b00026b28fefab2aa34104bdbce7e99549786d0f507a73
+DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
+DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba
+DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
+DIST miow-0.3.6.crate 24533 BLAKE2B 232aac1d3449f2542c8fc21c9796932f478a4317a93e505de2113c6d980bba2c03a06f74d00a3abac79b689cbfbb06b5a4fa0b6778c9866bb67053111ee16d8c SHA512 13ef93e0965a2c5e561e7252407a0db03dd0811d076f20a6174a5c2ee28c49f1c340688d0ccb913736a1cab1c764cc719b61fa670f9b707f619b70797cb81ebe
+DIST native-tls-0.2.3.crate 29087 BLAKE2B 0304db852e3b1261a791a5a8aba5dc6fd2e13bc32e6ade5ab0f58403583ea45324a4ae4359061c2a9137cc7f127404ef663702a22fe64f2489691de71eafc914 SHA512 9964d627c922261ea730076a2c8447784e0ceebd8e6218f5a61093021f10682c2fa25815c10711831b7d41c84b7c77cc1128a663669058882b0af6d70ac0bc09
+DIST native-tls-0.2.6.crate 31552 BLAKE2B 43ff2c5abfa97ca44b0cd38090647adb97f6e2644334d3385f4405457d153c8b5867067657b68cb2212f99e996d57d022326eadc359a7f404a279835e398049a SHA512 9e20f126f680215904d4e4cd7ebb1800b941608b454562173b04d206c894dbae3019e5b296a3fa64ed6f3826230aaef01b0ccc509cc6ff2aec8c271e0fe7daa3
+DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9
+DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
+DIST num_cpus-1.11.0.crate 11776 BLAKE2B 00d57b8a05807837fefc6596463d6bd3e7815833189142b361f932fc25c78c7910c6d6c37ba43a56201f4ee0f3a27ee9ade7d00f22dc05974aba683273f5e8eb SHA512 b2a04b41c3f9aced42e23fa16db872afbb0a456b22b967e98826d22b4866da066633903d4a29d6e4af810513238062846c82e38989c74aee4607255c09929468
+DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
+DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
+DIST openssl-0.10.25.crate 185164 BLAKE2B 17cc67db6e4188d111f75f52fa03da910c86ae79d8211f6fa252d04c064ec90a1008efd2d69e0c8a54719d3d547a783bb6950c9bb0525840c31efe45bfe9c7b0 SHA512 db7a8af332c8db921cd07f778bb591a5d013d98848e1772cf5b9550562a5ae55e6459047f4b3263f813dc9a0b8f0bd302ad86dc620b71339bce3136f7daed029
+DIST openssl-0.10.31.crate 195472 BLAKE2B 9dececcfd2725471095f72108e70adda4d69877110f85b2ef186400e5b9fa19656f6c9fbe0ff3134d961812b3167e7ec3e77284011393c4d990591eb8474acd8 SHA512 b8844e982e012a084079b77de3de6729994b724d95b05731c3e134ce41669b3b7777d468e948bdcfa57324c4e2866b8d700e42b1da02e3e5d3d14a3c3b3b18aa
+DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-sys-0.9.52.crate 45059 BLAKE2B 3c82ea9c70d9e3c7b0959bdef835f6cbfaef89cdab7128fb0cc2fa008eabd5451ffc0495f41c6f0c252364e3826d4cb9fc3f0efc687cbef39c9a7f184a5349ab SHA512 4e0f5b4905d0ee2effa0fe5f44f15496b92cdc91c2abd9ee8a05249f1c1a7a579ab292bd3eb11d279689ce74344d8cca981b41f461b8c61ae33bece1c0446e16
+DIST openssl-sys-0.9.59.crate 51178 BLAKE2B c29fa2d5d18f0a3fed73d231ce663dbfcfa8bd71b4841dc7dec9ae0057de16d0b353582330f5bc290edf55c8dca57d7b43787d52c86f12fe4d79c9c311920304 SHA512 dfc51d3cd90978a3173f4242f5f1c1848092680a042fd0735d4ea4d5793eca435a733173110081ca50ccae5fd8f75109bd5337146b7930872edea0e84f655241
+DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
+DIST parking_lot-0.7.1.crate 32670 BLAKE2B 46faa97dd3e3e5625fc40de75eb75f17512ba63ff5ef3ee380fc549bc08b3a119a91622cc67014b9c072ae0f5ab05b10f52c24486fc03633d850ce22812dfe4f SHA512 d83d3c457e15ffce500d4fc82d0b9840ea2ed36d43d4eca841b05b0a9ee73ff6fcce07ccc3a6f0d06d950d7beff85db0c3d13dc1461adfef390d6b3d85367bed
+DIST parking_lot-0.9.0.crate 35170 BLAKE2B 3de9050c5dbbc7a0b98a5cad05dd485142bb2a22e65216a20f6e87deb6d124b4502cdb3837dbdc992ff5ea62c67e1545bab269237988832d365fba265149d245 SHA512 148da5edc08da3b27bfcc94a1c0578f228ccfbdf7a7a6f3aa73ac34e290d795f4169553bc7c2b20227e095e8ac75446db51979b595e4d77fa7c76f743138a331
+DIST parking_lot_core-0.4.0.crate 26817 BLAKE2B f8a733cd6e14a2ad40adf498a3aa23bf3ad06e788f440bb435c544e5ff9750dab963ce4fc673014e54a851ed541975116f18f102f935e21912fc5b65a6aaef19 SHA512 25c0389e9d3d88725398fb304d3a4c20a3da0bf0d67f12c7cdca38f8068dc6ea7b57341579136cf4792cbb92fd64dd33cd91412463f4df8902e1b8c87ca08d08
+DIST parking_lot_core-0.6.2.crate 30598 BLAKE2B 048e87b1a785da927afc368290c2e1dd762d98239d862a1aad4850d9498b91e8d64c399bfda0586c23f02fd8839723af1d5e2ef3e714cd932ac11a111b978543 SHA512 5de5d9cac290d7d6e6a3e1fbba2784cce8b4ed163481e1cc6ec36498884b5e3cf0225c718551289be164d1a4e192de390201a083560898e4a42a4068661c0689
+DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
+DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
+DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
+DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
+DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
+DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
+DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
+DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
+DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
+DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
+DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
+DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
+DIST rand_jitter-0.1.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a
+DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
+DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
+DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
+DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
+DIST readwrite-0.1.1.crate 2307 BLAKE2B 1df2d3df987384653d75e18358aefea5ccdc975096eb2f7c8a6aaa5818f42b8ba00890b5534fe07026c09ce705e9a85e29a47b52e2d3e4ccb1f3ca36c07a1dbe SHA512 5699553f350fbcb27a7f045f2157f7a34c5cbf498f0760dbd1c54564f9dfe6a5fe05ea086a54a9e175da294c3b2729c65786d62211dc7d0dcce5477e73788dba
+DIST readwrite-0.1.2.crate 6872 BLAKE2B e1626076fa42000faa6e12cf32e76f9feac00aba6f88024a786945ed0549819bf402dab1cebfab5fb325f901885d39e58a942f00331a7da47ce36f893dde46fa SHA512 f043f8176e202075dbecda73782fecf644d7246b7df9ba194d6caaf42a25f93941ca3a6bca4d2870357314e2a19c7f837de682763e167756247e1a96a0e8c22f
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
+DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
+DIST schannel-0.1.16.crate 39153 BLAKE2B f06cb0dcb3d93ac1debf396b23faf5df2b87ce98732ccf5c0ef78af0c36fc9825f2b716f0a5772dc71cd2b2e6ecb477a81c2dbfb6bbd4f84bf3d1187dd7cf187 SHA512 11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b
+DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
+DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
+DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST security-framework-0.3.3.crate 49844 BLAKE2B fae140b05d3ba618cc1072673913860a298e5592f4909533463083736ff75d9f1a9deecc1665732dd675fe76e8cff316c1723ad5d2dfdbd044e4c1f979b59749 SHA512 6234ab31093cacfc8d98ce91c29a030cb06eb48c2a22feb9c0e5a29824c95805ec36edd6e1c66fbf5014f70b94a66aac31e8f69c069784d25b361c7fb7c22cb3
+DIST security-framework-2.0.0.crate 54526 BLAKE2B 132382ee0dc0336ddc4b07417ef0613f44201d50b6f1ae6d6ae3cb1d53052521892bc8b4d4ad107071ea2c49a1d198b4f09b02d5982ca93eacef5d0e9139e9e8 SHA512 fa843a8638c7b4bc40041bff90cce422aec331a3b6c7ce8de32d2a817d2dbdf8689339a00236fc08d1669219ebbaf628be31693598b9574726ed06c22d3247e9
+DIST security-framework-sys-0.3.3.crate 9554 BLAKE2B 851c1c7e7d972b9f74d7278fc501c3894ffa0fea31954fdd2ef5e070c28c080cce04d35acfbdec9871c4544b218ad420ebd42bf6f426142046d805ea99dadc27 SHA512 a78a9affbdff5c44e63e555970748724a4cf1fb1e47a6a5645294f70b2c0960d3ef93d3289c3695d5de31c8f7a9b093e3ffb801a1631b474b5ac68e0b68bfe22
+DIST security-framework-sys-2.0.0.crate 10518 BLAKE2B 6e616e6099883bd0a55f972a81c8eae90d39cba9b36efe5c5bc612866984cdcd088bbb89ea81cc9f5f6b2ef1acb81f12ea106d9afce38662304cc04039db8a57 SHA512 43222d67cb51630575e1861470c55950b7c96db9708d70e97328198d25c858a05dbb0a19e6513cf9341c26f1dbfe534c6ddbf9cf71c4c3f8dd47290f06ec3931
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
+DIST signal-hook-0.1.11.crate 22255 BLAKE2B 09fe7f44808822e98c7fd1469a23e8f27da9fb2c8e17e118ce601b6b72c62398feb53e150c2916587a5b4a875e4972c5f5c3f52776cb4e3279a19faab4b3bd89 SHA512 852d2dc03ea4346a2f04ff553092e40d158e5ecf9b48b29167a0d2563bf64ae20fb56c8fee0aad963cf3aee136895d84acdc25b27d556d8babe134867f8e8d13
+DIST signal-hook-registry-1.1.1.crate 13795 BLAKE2B b87991a154d29d2bcd5ca64462eaba92edc7ed881e18ec0485fe3b6cf459da0499b236aa7daa3e8c714d45e59f7986f5e753ba1fd76ee348da2614c9c483af89 SHA512 3947e3249861ef50d2261080dd47fb400fded19d5c8555c4bc65f10ededc7102c6eb26a299de961308310a9856d2a757d7a981a24e3bafa0cec72b55b515fba7
+DIST signal-hook-registry-1.2.2.crate 18127 BLAKE2B a47342d3ad3539e69a0449d6a8e526d94b858f2ca7c0ce03c52c05d095ffbaa05b803c0c585cabfef498244c647584b102d98f2bbb2da072ea5abf2fbd315657 SHA512 1d595cd19fabbb687262a4892449011ea2f8edf2d295d7a37ab05b252116271ae9c9639c336a66be94ffc82b12bc6a2aca0db2b6f31a11bc7428b39c8ae1efbd
+DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
+DIST slab_typesafe-0.1.3.crate 5980 BLAKE2B 8ac675c6c313c13d2f8fc88b44c41314578c0c990335dae8f216daafc3cb0b122042cb54b65b4ca8264c0c6bdb3b6d07edac479f615f23fafc3417d7d6f4115a SHA512 f2dbece513c795f7fac857dfc060034bf61d0d51bb1891566d9c36be97308562033251c11e422020f67bc04bcd9111148f434b55051f69b9ea0d79b072cc410e
+DIST smallvec-0.6.13.crate 22760 BLAKE2B 83e573aadf1742122bbe1897bee09867d9225624474cf8c9a1bdd087a8e69eecf9567e8bdd2bcecdc8cc08f5f4c4f081bcf718ab062ee399c9a09b7f8c54948f SHA512 497e1a77414d545b44f099a69529c6c9a8be8cbc80a84bdc9e85428263518e6949b81498b9ce6ab2795508b1c3beb5e7e5aaa3623bbed2c041f8c3f4a0adfe33
+DIST smart-default-0.3.0.crate 6297 BLAKE2B b2e782a64802595b94c6e36b7365b4353ee0a16c5f9477d0222c9862991ebc6841d0f0ceb1dc671da139afe190fc15f3b1c0ece2fc62c897b4a351fee5523072 SHA512 022bfb5321d01cbcca95eb30bfe75bb80bc0f48538cd6434c5ae89252289e3f1daff0a7cd46532ad936f8714544451ac3138a0c3507e9de689dafbe396afd34d
+DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
+DIST socket2-0.3.18.crate 33513 BLAKE2B 83d42f6a96b9c4ae023079204a5f4a1506abc7f133c78dc4d659c8b46a6a04e5e6ac51cb4e28188d7ccb4f51cb268dad1a42adc88acfc9844deac3b00efbe48b SHA512 5820d1f2de59dad6545c356e111f6c40248763a8f432d696288c7996acbc73dbb0f3800f421a2c2ebf1e712e3db7fddc1280f8a889ecace2cb0ca2956a073514
+DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
+DIST structopt-0.2.16.crate 26165 BLAKE2B 3609dffe30adc12dd30b3acf6bc1722841ad0823f3199569c616b6cf9502a3b89def471571bdeddff4dbe1722e3b595de3c5b18408b4f4f2015a2db0b51bb517 SHA512 3154f168dabdb6476989970e75d43c8d730f73b567171c0d3bedaa1549ffa13dc543c28b25174efdbb90637b972e9e857dbf2422b95fb55ed9dabbde069e191e
+DIST structopt-derive-0.2.16.crate 12951 BLAKE2B 7b7eddb8854a5bc47b8d91103b2bceaab9057b553c72c4ee6c995dd4392cc9594124cc00562115bc0250b87499f8b8480fb34d8be1434bc55a668a79cfda6c75 SHA512 7ede89d104af3e57e9a78eae16cc8644622b1e83f8ea852ed3cad2e03d3ccb50e5fbd0f3f73cdc32b51bab6607b9b65266012fc7294d48ca0a234875c816a301
+DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
+DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
+DIST tinyvec-1.1.0.crate 39037 BLAKE2B 8033a336c2c346df70d5c6161233043a7e196a2994b62c15aa022b7053f7aee686092fc7e2db551cd1a09ee5e4a038e777120c5c33c891bb47b71c78cac60e92 SHA512 29830cec393506651b20d045c584e3df5ce5f13fdf70e866d4d6b7e97fe4f6b07ccf2a2c64ced5b092d5d963af74f826930d96d817db90bc0e4ad112a399926e
+DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
+DIST tk-listen-0.2.1.crate 14268 BLAKE2B c8381e66ad43a7649da2f84170ae45a4d04ddd7a9f10e085fd537edafc3a7ab5c3697f092e8fddabd92307c6757c8b8ddf1fd33c2479c375b812d99aba9517dd SHA512 134240c0cb3255c77aceed3e88ad95d63df8a0c2df1436925579dcc78c2ae9efeb1045a5f295c09e87d5c8e8aa8a5961fda411ff345ae74b8292f58884bf7344
+DIST tokio-0.1.22.crate 70031 BLAKE2B 44a6d1ff8bbedfea304e4f44b5c4bf998876a632adfe611c3d851aa64ad092b7b0150c2b39ebeae8bb34cca6824922300bb3fb762cce6b5a1fcfa852ed8d86f1 SHA512 d92b8527bbeec84bb306686a7d29b705c36b59e9c0995154ed95d483c84952c838691f8c11615f481abb6c4fba470ba8968860a74a88b77dd67ccf659bf4e4e1
+DIST tokio-codec-0.1.1.crate 7617 BLAKE2B 868f45ddaa16cef0ec7143ae7d25d422fa4fd7fe59bc99a7ae4b97f700dd6418610b917a880f1fa5c939799168d8c31901d7186a0195c7b72bd130a01c787b7a SHA512 9c868545e8adc234a51b81966836b786019181ea25907bf14887ce26ed1cf5866f5df8898bbf6bb7c8d3626f145ce0465d3a79050d53f8dcffe98f71886f9044
+DIST tokio-codec-0.1.2.crate 7850 BLAKE2B 68e196f0cfe2742f5bd6a4074eafb7cc83d80622f51743e9cda367c8fb26bcf3a6a10772963e75f86c3ef054270f22a13e58a3455ee316145b111a2d6ad00053 SHA512 69bb3a0ea81fc8437fd57c2ee533f0674770182207576e463c8a5859956175a4619500b832863cae9ba9d0d09d76c33441c7b3e929896a61304b25c9d2dd6c94
+DIST tokio-current-thread-0.1.6.crate 19339 BLAKE2B c3fe401178089864fe59286566b84a325d8a4101b0b72dda11fefef945d5e14b5e6b6c7de7d87cf222f0ea3d1c95aa65f2c43fe37c2e766f8d70da66c7d060ec SHA512 321d8b99ea18827400a6b7899755eea5a8299e53985f5640a6fd82bf6c3c5c45c68e9d125666968976d05be407d6c15401380870adc231233cc532eb979353f6
+DIST tokio-current-thread-0.1.7.crate 19690 BLAKE2B 1a6ccb40e59095df2e4ece5be501027a9975297c8606cbf107e8a365529d175415d1738e6770c31b586685fa0e573b6c4eade68fc83b1e01d89c2e22a3741e28 SHA512 4458eecddf552cc63dfb877976cdaa2060f8fd82a9cb6667f8fb3507aeffef4f3db38d649de55bd784f98828a12bc066d35e96c60ca07a42cf8f16a5fd7d58ea
+DIST tokio-executor-0.1.10.crate 12191 BLAKE2B 9efed875a669cc842d298d2ea5ec310a008707f5ec4b796d68fbcaa3ff47c3484630306116d6d36c71f4461869e63a11dd498cb680013f5a3c2a9a46fff9763f SHA512 e2101de6130d09c1a0cf750ea49f605db2933ee4d96943e111d550816ba6a67e4d662e0ba5fb548ae62d582b665239b27b8478f2364b6c46d038dbde8cc41754
+DIST tokio-executor-0.1.8.crate 11775 BLAKE2B 0cef2a4848f624ef8c3a450b06d8530ca64be193980cf1cf6f4c1c74b6602e9e0f47ac070caded410a843938d2c3defe8696e4a27329d42d04ca9cb4f6d7811c SHA512 b6340dfa0cb67da1b00288b3250cfa4f0b55907d3448768f99a7cfcd46ebd1155c84cd35659d740501f0575e9c5b660a2f769335acc14da7dd5cea59b10b6334
+DIST tokio-file-unix-0.5.1.crate 11181 BLAKE2B 42feb87903ce66953b7ff70c73ada3131342727046d0eeaaacdc46e47e2d27f59e2ec8443123e7fadef0461221cf0d922adfac10e17eeb402f235041adc5656c SHA512 7f40a8a90b26185058f13127d4361d50c9e78c78854821be79a899d45df0fa2a42f889623f9e0dee1824ea917086b42f90b84ac761f414e110413cfe65e7d766
+DIST tokio-fs-0.1.6.crate 16102 BLAKE2B 4b31d365a898ad0fb20c6ae315aa60236d6423357997e34a5069597d72b146d7528a7ab974ff2e7f62d60c46461c1bd6c4b74208f61b2452088c4d8f9bf63aaa SHA512 8a123bdee5f2a6cacbe68f25baa5810a7686fefef8262b0a6b67e217ca6594a585dca52de581d33f4b71725bf03e003dc500f75ace88dba5cda00a52ce544279
+DIST tokio-fs-0.1.7.crate 20881 BLAKE2B 08d22887c990149cd3aeefc3a9aef949124a2c3cb9edb5ec2b76a01b90f85a22226417f75319f92514d812b752ff7090854188e64d2c1af8cf8c773b7a97a8e5 SHA512 3a1023dd9537164c61ba07b4759d05136165274efed6cbb7bf868ccabc311353b0e221137d2be643970f4d710bff20251104344a7542a08ac3d60ef502624d2f
+DIST tokio-io-0.1.12.crate 33555 BLAKE2B 5646f1d0c226d223fdbf648d95cd690ad6f755c5dfa9a6bc4d5fe4b5df634029db6178d852d3a4c2d481d06eec763985186753088157557871e5ba6e8aa650af SHA512 57c675ade48f2885ab8f42dac7297bf4bc5f7abef2302f7964dc145ce29d503c09e3ff890de01aedcf0c860fe22d2161f9837d658457695b6205e601fac74149
+DIST tokio-io-0.1.13.crate 33665 BLAKE2B 4e9c6bda0d391ae685dfc89cc0137fc44b31a4a788f730ab632b73d92ab55dad871d68b03ae0899cba9f96e402f88a60d4b8be5d484947b8982a39e473e5b8ae SHA512 608341311f4bda9617634a2623033900bde1d6b9fc89ae52131838f033bdbdf8704114193d8409ea0e10bd53d6f7ab63d47e17b7abb41d3f8865ab36fd0532ef
+DIST tokio-process-0.2.4.crate 24856 BLAKE2B 7626c0800d53524679f36ddfaf70bb4245070ccf49e3fa5167b142258e201fd3cdef44561d24dcc0dc72e3ec5261970e58195296098f2c8675438b2bbe0f20a3 SHA512 a2018350db00f11499bbdd91a98ace58353a8363c464f11a4f517f9b63fb59113e963861bf61b34ca1f01184f31e501ed6e4133fa39852a2eb3246956cf9812f
+DIST tokio-process-0.2.5.crate 23688 BLAKE2B 555f3ffee5ccc574ea19a07c558af0ab735447695ed654cd94476387658c065ee8749883e716f07e11b75231aadbd28fc14ef1ec93d09b18086e9bb6398a2789 SHA512 aa22040bb26d23abab955903a7973020c596b07744d1d53c6b5ab425314dc96a03ccd0128ed5f531f0cb3202e64ab00976523b359c5bd8a863ba947f64b21d87
+DIST tokio-reactor-0.1.12.crate 21058 BLAKE2B c1a1842aeccc0d3f74dc4e588c485d326f74b652b8f504bf20cdd69c42dcf937c49bbd0c149f8da428dd12f5d8a1715bd39ad76d3b71f1e414c663093a437d26 SHA512 2db454c63f8965345997685baa9e4f1e7d2fad1c0087e7d79bcbdc5bf0176703de49c50180689db5f797aff6794748e01a28877d46f58cf453d7a4fe17d3f791
+DIST tokio-reactor-0.1.9.crate 20657 BLAKE2B 433b1302ab41d1c028c1fa726b796d41484526400801df2375de04faa1699cece0d55717f8ba4fc292d33fbc7fb343f766c1d474a36e36d72947bc7572e27a24 SHA512 134c78b449646f1b7cf9dc87de0f39ebfdb894103e0271a2b5115320add04de02aa1899206f332f111a9471f1f54776fe89e3ff879648fa206100b2be12e24e1
+DIST tokio-signal-0.2.7.crate 15122 BLAKE2B af992448564696dbbcc01d85aa88f247e6e480dc95ea9d9a720dbeb3fb7ea4aec23639f4c43f67bb0302dc0a34d21ca1245dffc72bf28753e488fcb29ada60df SHA512 60cc31f9ea58853498dd19d858a7ec72bbccb0255c7d7f316b55c7e4aa21291f5609611ce5ccd2751d505417d8a3860d7374d6377916cbacf52a18c649448d9f
+DIST tokio-signal-0.2.9.crate 19789 BLAKE2B b5fa30d457327031871150bc251cc1850b43b716ce650803d3a58ec130e885ed2e8ad901d955ea95af6a9dacada13321feae845374552f7ce504f09f2f7e5ffe SHA512 afdd91454c2da8f0b2fce65ffcf35dbb2f73cb5552f63fbb6e8bf1e125d9026840cf1ec895a91a4c69997ada17ab6abfa8aa43217c07d18591ab375aa49da180
+DIST tokio-stdin-stdout-0.1.5.crate 6661 BLAKE2B 1279776134a9e46de5a45c0561b95154fd55b0c965e00f5422000bf7a2fff94447aa504b57318e2a80dccdacfc6f0bed3582208278384e0808e2f8454712ef37 SHA512 f37d52b667243220fd44400bfd659721559d673bfe934a717abf59da35478192732127e0fbd33863754211a45777b548e90e32d18fbb9f84b147181d39251bd2
+DIST tokio-sync-0.1.7.crate 41666 BLAKE2B 80a29da76709a7d2ca7c1c2bb1a18e25218ded0383006f5be2f518c1abdbb476974709c16111b42820050e66f75bc3498a1bb835cfcefb76be302d5977476ab3 SHA512 041803a7e6056c7c3a0218e754a7ac2104ebe2ac9953a7ad7f0dfe6fa9c8f23cdefec0941912df3bef11ed129e85a13206279e3ed0d88424b18b367c2494b973
+DIST tokio-sync-0.1.8.crate 41830 BLAKE2B 20e61e5e5360f54446ad60de050a4156d3e975f4e246f51b308ea1def48c51f8f1b28fcfd81362b00e0f6f9c40382abb71a4c9e799e81cfd7b0c7b085c42cc27 SHA512 b3665476629ecc8d513d53169beebe090818c6b76ca99f0a508c730bde0ca3c49b828942fc3b9d76fa9cad1b6766237e18a329607ca2314c7ad4b343dd785371
+DIST tokio-tcp-0.1.3.crate 12629 BLAKE2B 16a2763eeb2b65edd07f9b998535812efaa25584bfed5fd66fb1b2952893fa3ed330f597032b4140daf9635ba4f49e77aeabc2cea82c997dfc971bd97fa4f5d0 SHA512 ae42facabed1589764a8e4f789dabf5c7adfb3a67880a8bb6d7b0b6c082302a84b6acd8ec5f444dc59284407acad61518d60818eaeb34f874380f9593d540336
+DIST tokio-tcp-0.1.4.crate 12745 BLAKE2B b11b76b94ac5fee26c83537d9c169fa775539c90703fd9ae2c5565c99bbb56305c474710a3b90ed2e8cc2010ac00de77023ecc04e5cb4a653d7b5e0f0e21e23d SHA512 e33168e12ab9cf448f75ccc1662f54b287db0961dd472da3a86f400d6b80159cce290b9a4b948d216b86284e5bd61c14db8750fc2d0ac16d3937418c1260d2f4
+DIST tokio-threadpool-0.1.16.crate 53347 BLAKE2B 801de9f2caa5da692eb8366bbaec870c00aa949c80ef5ea95fb651c46af22df9ebd41f2b826294b80121fa69a36695b9a47b4b66f0e61bed329254f88357ed64 SHA512 b767b2364a50d6fdba3eb049698a561f1a76b32a585dc5fe7101f8bed97145a81460a37c346a3b2e99c0a5cfe960795793cfa3ccf3f8324b2ab6b193247c55da
+DIST tokio-threadpool-0.1.18.crate 54825 BLAKE2B b1c202bb8aa453f3af56d82713c175dbe0b3b2c1a8efd8ba849b0afb243f48a4f76b994095e4c490b37710d6a1c33eab2f1a2dddcfe15bd9887ad8bfa9c76f8b SHA512 163aea96e536f670e5536c728b159da52585805a721a18ee42e9324320df4e93a9baa5b31072e5a12af7cfe3968bb57f0a5864e17a758f66e71e31f7f02d7b27
+DIST tokio-timer-0.2.11.crate 37578 BLAKE2B e9dd19db8bbba5edf74f7354d4d5e489780b5dbf009be095e7f00bb9e2276e10ebb643605beb6ffb035d1a7a0cfb23eede14e5ebdd228ee05ad9244ac3d1273d SHA512 2bb534417425b88dd1b90231cffb89a8ab97512f1ea9e26cd4afeab5f3aa691433062f093a6789222d1892532a9cf29e1016fc668ce2939536f89e0441740d57
+DIST tokio-timer-0.2.13.crate 37873 BLAKE2B 0a1c1e07b941919dc5d1c1a425ba84d6d954b52932933e521fe5e8c76f36c9c2bef9b93eb710e79490c3082519f385f7737454ed884fc7d11ca92ca44b4fe5ca SHA512 9813e5e74cf210eb3fc29268483da32272852c79b23d4b09ad7ee012687c910848b9b8fa5638d4d71cf62d2722f29093f2324ccd4f2e65db5c111ed6f9142d04
+DIST tokio-tls-0.2.1.crate 16354 BLAKE2B 120f2839ba7e4666dbd75db26b52eb5fe6498ced7f7b46708699ec0cd42624b0b504b2503a72b5ba0c75c64c1062967813c13d964ac79e7cd94f3e1cff2cf6d0 SHA512 d657d331ac14b98738fd828acfe543fc2ead7f57a6c35380de55863369a8302b55b7356b75db67baf894749a26956e05abd4499bb453708aebaba6456712ae12
+DIST tokio-udp-0.1.5.crate 11529 BLAKE2B 4782a2d75852bcc972f7049e40f3f56927052a27e912f3126903a1438ab4be8b949d223baf4d30c68ceb1c9d1f14a3a0f85d58d4f9c08236beb189cfde4a753d SHA512 24b5eba25117ba3344d90329134f15be8631d1d9bae06a94f4df7f05b1bf6e1b309b776a0f2685fff2b7567a80331450a2027cb4bd264dbd5fd202913db6055f
+DIST tokio-udp-0.1.6.crate 11677 BLAKE2B 6a2e871f385be1fb7bc597fc00a20f0086e7fbdb0b5fd2785e3bb3c01d5c41f0b1c46b29d9735f5a0176e1560225346a4ae394b7552d4d5668277ca7053b82b3 SHA512 404d2418c2e78c5e693514b181a782cd41d313f62b29186b9f30796d5fa48d7d223156d665dab39fded5b7ff5c2a47c0d08ae320b003063aa22112bc8857f62a
+DIST tokio-uds-0.2.5.crate 11808 BLAKE2B 03f37a5f68479955176d1df673c43d6e3d77a84025620fd83bfeee6439046a1c1b62bc9606164690ac21da5fab8de12cbd534664481c3d530d0ec178ad9c4e46 SHA512 964648b9ada5e072ce90bb7a20deed48a517a0e4c6b808b1fb8440755efdc35269b5a30ad312a5e228603e8f1f8d4b8e2f19f4aab10f75ea5b569ad402bfeb61
+DIST tokio-uds-0.2.7.crate 11942 BLAKE2B 5c74cf32de1c047f75175fbff9af0cadda1a74673f5b2e3b2e652ef5724f0d428b9caade0c474411c5308559103972e19344adc97822f930d1dd31edb048d1db SHA512 c06818507ebbfc53c34b7afffe5b16c682749371a9dd7db9fffb3800b5d63fdd1d7e646bdb0c84c3b86228f86c54d2b95f61942cdcf087c9f5a1491fcb764102
+DIST traitobject-0.1.0.crate 1957 BLAKE2B 0ce6e870f29a7a67e8e8db7516dba85ba4a15fbeabca4c44b655778f9a012a525c671cb3d6841477642f7ec4157cf5c8ed754169b44cef708da988000549e9fc SHA512 aa23140652ecb3397ea989da0c2c58da88d22a816a2bb9fbd90db4299b773275d20a68411d8d300d2fefb2b508f561978c12b95f88d178f9401fe2230f9f795f
+DIST typeable-0.1.2.crate 901 BLAKE2B cf5fede9fe91f61df1b99b346ebd56145519f2121d027b72f1ccfa9cc24752c80dcc20166327d9ee751c5b344186a36d0f1a119e0b7f941de9739559557c2578 SHA512 336083ea6c8cc64fce1cf14443b1afa955a71302cc0a2023e3c52aeadbf3832c59aa8b8ae0c87d3062658cb7c98e9f79dfac9db7f5831642075ae8f9c0bbebc9
+DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
+DIST unicase-1.4.2.crate 3907 BLAKE2B 0800a061c30d4d32e36ba0f07045e8d6073eb1fc492c3e4130e9a08e9e3fcc0c4f971bc928a2bd35590d51a9c432b34a5f2e95fad41b3e89d1e357787c55a6a3 SHA512 f92ceb4b9b4757a813fcf23949c8a9770e5169aec19d43c7ea9c3b49b365a2d4ef619255693b5dc30b974e6fe5bed857fa0743caec0ad88abd5b5c80df96fcac
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.16.crate 92805 BLAKE2B 556b0b95b6d21f95ad99181e999d2f2a1291951db14e95cdaa4596b159323e999a135380ca0f795c996f97ffaa0c25465bfe5884bebc8903130bfd7437d4b86a SHA512 c1f83a79b0fffd2f0e1b8a579ae4e5021c4cffd74c259d065919b937bdd78b9ef83650cfd777010e7008ceb51e072777b195dd2483e1a85798a98b72f8648ead
+DIST unicode-normalization-0.1.9.crate 89492 BLAKE2B 75fc4a6ba6ae3d9e72380eafd50a727ec049f986a58dedd4854a086af844966701463ef8940fa477685096ed2961e2f044d6a308fc3bccc3046bc92554b7a94f SHA512 f1a96c0687d6394fed55e400183bc37a8f0ab4dc2568eb114f86dda3f504fd9768bf58e1ac87f2ff732dc58041de2f2cb8d9b65faf767243830ddd159ae36d81
+DIST unicode-segmentation-1.5.0.crate 90262 BLAKE2B d13421cfca9e7de0d538dbbc3e44be67abcc3147b847db90d473bbccbfb813788b1cb7ada4f8acfd5646cf83c82bbc47832da893aa06313250ce5f483bffa8b0 SHA512 9f9dfaa6692fbf8dc3f2c22815f79a0eb887eb4706dda9469999826a46999942eec44a608a27858221642fad1591ea9cd5162857c0cc673b45bf648d9ea9b7c4
+DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
+DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
+DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02ed256e6b08407b17066ed949f03bda42645d56e1227b50dc4c0e3865f10856605c2eadab3b74f55f005789b SHA512 d67bc244c81827165bf976808f79fd02f9149a19006898e60ff8ef11df2d72657c56bc9fc14c8f91b091075ceb23c3f96a3df81be345bb01881679eb47a0e6e9
+DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b
+DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
+DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST websocat-1.6.0-libressl-3.3.patch.xz 13912 BLAKE2B b20dd647ae01f6ed697c84774587013c101a463808e7b050fc52e9d4e6d6510d40b7a8aa96b03c91e225cbd31134bcf92c49cfc451e3c92aaa219de7dbf69f0d SHA512 017053b95cd526052c93580d2ece90552f6505388c714c6b7e3092663c77f25b67f13b99c8376760974aa82bef8b17a0b7e016a2c35757bc81a51f6dcb452a0f
+DIST websocat-1.6.0.crate 100266 BLAKE2B a96c5924c61339f4136b69346fdcbfab84a4c3fa21a9b5172434544b7b381c498938972a28bb009f0ff6d8a80eda10199cb5b089ab6911ea4bc9e5ed7f6b7d92 SHA512 6baf95e922891b8bd601768a4193dd9e219339a1a68f6f3280186c2907df54d5239413a09bf8ee48f7faba0e0d62fef6e09a3b871dd48ece831dde8f8a0111f7
+DIST websocket-0.26.2.crate 63281 BLAKE2B 2392a1e73a932323db224240f386a739f287ea3fc085c0b1d71dbdc3bb2b3f38b3de456701a2e816623de60b8feb0b80c133e439481152c1e67caf986c7185da SHA512 eb732830ca62cb3e90e2fcce54fa00cc7ed9d85be0fc77df8caab2656ce123d35b6c4c0fe9985a18dd080121bd7bdfde82594cb80cec6f72676e4f9829455212
+DIST websocket-base-0.26.2.crate 18804 BLAKE2B c0bbd98ae3fb3cc3b3776f435ca2849edeba0a19ec9567fed83f6608fc4be033ea1a3f28cdac95ecdccb320584c3d91e40a512bb5159f057cd5da6ba97cd4481 SHA512 a4c543fcf5845e4c3191b48f888d55a3ccc8f711f50b76fc64835514604b937f311df454a588cf4ea7b79e40510e6322177dc6e3dc45de091642e03fdeef1cf1
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
+EBUILD websocat-1.6.0-r1.ebuild 3896 BLAKE2B 54f2ab7305878d95c810c8592ea066b67740e4b346cefc96755f6b4b4fce127e6489ffe20fde199fa04d0e8604a9ba6d4d554e562629a6341a1f28e07348b363 SHA512 c6a6a054b0769d3976af0dce5c0b78ad0adee66c6e4de807aa2f6f87d8b7d8501d393707ec1acaeabbec8ef2b13740c484a052ecd2bbd9ed214b0ba376ee9df5
+EBUILD websocat-1.6.0.ebuild 3565 BLAKE2B 903d9ac2fab67b73fec55e526e6b4dfeae114838238a9b02c478035abc6aacfc55520d800b37f6480090ebb6ba488478c115704efdecd88eeca968629543977c SHA512 ebd52127dbb1fbb75d18ef7a32c2cf744136211a9c86c50c79497489d998a8d055e3ba5d0330d72031efeb9a88c00c4748ff6ca4cb035adcd2f460f39ad097d2
+MISC metadata.xml 450 BLAKE2B 138d55f4a3e48d5b654f6fb91e576eb01918dab2439e60f199a852a2145ebf216b95ad6cd71d42f9b72e4dd29f4c30cce2597bedeff896e9f0e66b8c0cd38c94 SHA512 e799d12db980316a57be8bef0dcaa05400e31f3a38650c5731d05355144ba5044e9994115e5e48f684bca926859775eb8990748e707610babeef078c7ac77ac3
diff --git a/net-misc/websocat/metadata.xml b/net-misc/websocat/metadata.xml
new file mode 100644
index 000000000000..5ee26062f994
--- /dev/null
+++ b/net-misc/websocat/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/vi/websocat/issues</bugs-to>
+		<changelog>https://github.com/vi/websocat/commits/master</changelog>
+		<remote-id type="github">vi/websocat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/websocat/websocat-1.6.0-r1.ebuild b/net-misc/websocat/websocat-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..e05614dae164
--- /dev/null
+++ b/net-misc/websocat/websocat-1.6.0-r1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+anymap-0.12.1
+autocfg-0.1.7
+autocfg-1.0.1
+base64-0.10.1
+base64-0.9.3
+bitflags-1.2.1
+block-buffer-0.7.3
+block-padding-0.1.5
+byte-tools-0.3.1
+byteorder-1.3.4
+bytes-0.4.12
+cc-1.0.66
+cfg-if-0.1.10
+cfg-if-1.0.0
+clap-2.33.3
+cloudabi-0.0.3
+core-foundation-0.9.1
+core-foundation-sys-0.8.2
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
+crossbeam-queue-0.1.2
+crossbeam-queue-0.2.3
+crossbeam-utils-0.6.6
+crossbeam-utils-0.7.2
+derivative-1.0.4
+digest-0.8.1
+env_logger-0.6.2
+fake-simd-0.1.2
+fnv-1.0.7
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-cprng-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.30
+generic-array-0.12.3
+getrandom-0.1.15
+heck-0.3.1
+hermit-abi-0.1.17
+http-0.1.21
+http-bytes-0.1.0
+httparse-1.3.4
+hyper-0.10.16
+idna-0.1.5
+iovec-0.1.4
+itoa-0.4.6
+kernel32-sys-0.2.2
+language-tags-0.2.2
+lazy_static-1.4.0
+libc-0.2.81
+lock_api-0.3.4
+log-0.3.9
+log-0.4.11
+matches-0.1.8
+maybe-uninit-2.0.0
+memoffset-0.5.6
+mime-0.2.6
+mio-0.6.23
+mio-named-pipes-0.1.7
+mio-uds-0.6.8
+miow-0.2.2
+miow-0.3.6
+native-tls-0.2.6
+net2-0.2.37
+num_cpus-1.13.0
+opaque-debug-0.2.3
+openssl-0.10.31
+openssl-probe-0.1.2
+openssl-sys-0.9.59
+parking_lot-0.9.0
+parking_lot_core-0.6.2
+percent-encoding-1.0.1
+pkg-config-0.3.19
+ppv-lite86-0.2.10
+proc-macro2-0.4.30
+quote-0.6.13
+rand-0.6.5
+rand-0.7.3
+rand_chacha-0.1.1
+rand_chacha-0.2.2
+rand_core-0.3.1
+rand_core-0.4.2
+rand_core-0.5.1
+rand_hc-0.1.0
+rand_hc-0.2.0
+rand_isaac-0.1.1
+rand_jitter-0.1.4
+rand_os-0.1.3
+rand_pcg-0.1.2
+rand_xorshift-0.1.1
+rdrand-0.4.0
+readwrite-0.1.2
+redox_syscall-0.1.57
+remove_dir_all-0.5.3
+rustc_version-0.2.3
+safemem-0.3.3
+schannel-0.1.19
+scopeguard-1.1.0
+security-framework-2.0.0
+security-framework-sys-2.0.0
+semver-0.9.0
+semver-parser-0.7.0
+sha-1-0.8.2
+signal-hook-registry-1.2.2
+slab-0.4.2
+slab_typesafe-0.1.3
+smallvec-0.6.13
+smart-default-0.3.0
+socket2-0.3.18
+structopt-0.2.16
+structopt-derive-0.2.16
+syn-0.15.44
+tempfile-3.1.0
+textwrap-0.11.0
+time-0.1.44
+tinyvec-1.1.0
+tinyvec_macros-0.1.0
+tk-listen-0.2.1
+tokio-0.1.22
+tokio-codec-0.1.2
+tokio-current-thread-0.1.7
+tokio-executor-0.1.10
+tokio-file-unix-0.5.1
+tokio-fs-0.1.7
+tokio-io-0.1.13
+tokio-process-0.2.5
+tokio-reactor-0.1.12
+tokio-signal-0.2.9
+tokio-stdin-stdout-0.1.5
+tokio-sync-0.1.8
+tokio-tcp-0.1.4
+tokio-threadpool-0.1.18
+tokio-timer-0.2.13
+tokio-tls-0.2.1
+tokio-udp-0.1.6
+tokio-uds-0.2.7
+traitobject-0.1.0
+typeable-0.1.2
+typenum-1.12.0
+unicase-1.4.2
+unicode-bidi-0.3.4
+unicode-normalization-0.1.16
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.1.0
+url-1.7.2
+vcpkg-0.2.11
+version_check-0.1.5
+wasi-0.10.0+wasi-snapshot-preview1
+wasi-0.9.0+wasi-snapshot-preview1
+websocat-1.6.0
+websocket-0.26.2
+websocket-base-0.26.2
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo
+
+DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions"
+HOMEPAGE="https://github.com/vi/websocat"
+SRC_URI="$(cargo_crate_uris ${CRATES})
+	https://dev.gentoo.org/~zmedico/dist/websocat-1.6.0-libressl-3.3.patch.xz"
+LICENSE="MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 ISC Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="
+	${RUST_DEPEND}
+	${RDEPEND}
+"
+QA_FLAGS_IGNORED="/usr/bin/websocat"
+
+src_prepare() {
+	default
+	local patch=${WORKDIR}/websocat-1.6.0-libressl-3.3.patch
+	patch "${WORKDIR}/cargo_home/gentoo/websocat-1.6.0/Cargo.lock" < "${patch}" || die
+	patch "${S}/Cargo.lock" < "${patch}" || die
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usex ssl ssl '')
+		seqpacket
+		signal_handler
+		tokio-process
+		unix_stdio
+	)
+	cargo_src_configure --no-default-features
+}
+
+src_install() {
+	cargo_src_install
+	dodoc *.md
+}
diff --git a/net-misc/websocat/websocat-1.6.0.ebuild b/net-misc/websocat/websocat-1.6.0.ebuild
new file mode 100644
index 000000000000..e3351547bede
--- /dev/null
+++ b/net-misc/websocat/websocat-1.6.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+anymap-0.12.1
+arc-swap-0.4.3
+autocfg-0.1.7
+base64-0.10.1
+base64-0.9.3
+bitflags-1.2.1
+block-buffer-0.7.3
+block-padding-0.1.5
+byte-tools-0.3.1
+byteorder-1.3.2
+bytes-0.4.12
+c2-chacha-0.2.3
+cc-1.0.41
+cfg-if-0.1.9
+clap-2.33.0
+cloudabi-0.0.3
+core-foundation-0.6.4
+core-foundation-sys-0.6.2
+crossbeam-deque-0.7.2
+crossbeam-epoch-0.8.0
+crossbeam-queue-0.1.2
+crossbeam-utils-0.6.6
+crossbeam-utils-0.7.0
+derivative-1.0.3
+digest-0.8.1
+env_logger-0.6.2
+fake-simd-0.1.2
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-cprng-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.29
+generic-array-0.12.3
+getrandom-0.1.13
+heck-0.3.1
+hermit-abi-0.1.3
+http-0.1.19
+http-bytes-0.1.0
+httparse-1.3.4
+hyper-0.10.16
+idna-0.1.5
+iovec-0.1.4
+itoa-0.4.4
+kernel32-sys-0.2.2
+language-tags-0.2.2
+lazy_static-1.4.0
+libc-0.2.65
+lock_api-0.1.5
+log-0.3.9
+log-0.4.8
+matches-0.1.8
+maybe-uninit-2.0.0
+memoffset-0.5.3
+mime-0.2.6
+mio-0.6.19
+mio-named-pipes-0.1.6
+mio-uds-0.6.7
+miow-0.2.1
+miow-0.3.3
+native-tls-0.2.3
+net2-0.2.33
+num_cpus-1.11.0
+opaque-debug-0.2.3
+openssl-0.10.25
+openssl-probe-0.1.2
+openssl-sys-0.9.52
+owning_ref-0.4.0
+parking_lot-0.7.1
+parking_lot_core-0.4.0
+percent-encoding-1.0.1
+pkg-config-0.3.17
+ppv-lite86-0.2.6
+proc-macro2-0.4.30
+quote-0.6.13
+rand-0.6.5
+rand-0.7.2
+rand_chacha-0.1.1
+rand_chacha-0.2.1
+rand_core-0.3.1
+rand_core-0.4.2
+rand_core-0.5.1
+rand_hc-0.1.0
+rand_hc-0.2.0
+rand_isaac-0.1.1
+rand_jitter-0.1.4
+rand_os-0.1.3
+rand_pcg-0.1.2
+rand_xorshift-0.1.1
+rdrand-0.4.0
+readwrite-0.1.1
+redox_syscall-0.1.56
+remove_dir_all-0.5.2
+rustc_version-0.2.3
+safemem-0.3.3
+schannel-0.1.16
+scopeguard-0.3.3
+scopeguard-1.0.0
+security-framework-0.3.3
+security-framework-sys-0.3.3
+semver-0.9.0
+semver-parser-0.7.0
+sha-1-0.8.2
+signal-hook-0.1.11
+signal-hook-registry-1.1.1
+slab-0.4.2
+slab_typesafe-0.1.3
+smallvec-0.6.13
+smart-default-0.3.0
+socket2-0.3.11
+stable_deref_trait-1.1.1
+structopt-0.2.16
+structopt-derive-0.2.16
+syn-0.15.44
+tempfile-3.1.0
+textwrap-0.11.0
+time-0.1.42
+tk-listen-0.2.1
+tokio-0.1.22
+tokio-codec-0.1.1
+tokio-current-thread-0.1.6
+tokio-executor-0.1.8
+tokio-file-unix-0.5.1
+tokio-fs-0.1.6
+tokio-io-0.1.12
+tokio-process-0.2.4
+tokio-reactor-0.1.9
+tokio-signal-0.2.7
+tokio-stdin-stdout-0.1.5
+tokio-sync-0.1.7
+tokio-tcp-0.1.3
+tokio-threadpool-0.1.16
+tokio-timer-0.2.11
+tokio-tls-0.2.1
+tokio-udp-0.1.5
+tokio-uds-0.2.5
+traitobject-0.1.0
+typeable-0.1.2
+typenum-1.12.0
+unicase-1.4.2
+unicode-bidi-0.3.4
+unicode-normalization-0.1.9
+unicode-segmentation-1.5.0
+unicode-width-0.1.5
+unicode-xid-0.1.0
+url-1.7.2
+vcpkg-0.2.7
+version_check-0.1.5
+wasi-0.7.0
+websocat-1.6.0
+websocket-0.26.2
+websocket-base-0.26.2
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo
+
+DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions"
+HOMEPAGE="https://github.com/vi/websocat"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+LICENSE="MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 ISC Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="
+	${RUST_DEPEND}
+	${RDEPEND}
+"
+QA_FLAGS_IGNORED="/usr/bin/websocat"
+
+src_configure() {
+	local myfeatures=(
+		$(usex ssl ssl '')
+		seqpacket
+		signal_handler
+		tokio-process
+		unix_stdio
+	)
+	cargo_src_configure --no-default-features
+}
+
+src_install() {
+	cargo_src_install
+	dodoc *.md
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index a30a16532451..87bd9f5f6f47 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,17 +1,4 @@
-AUX youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch 854 BLAKE2B 31c948c2fa82ba431c2b31eab9c29a55cbf5bb59ee2eff7a683c5549d30935bbf96be479cc920196408027c34dff818d409e5aee875855ba56be42aa879f5079 SHA512 7bb9a264dcf4a5691460fe537fcb64e11f7f02a54d29590375e5630489688ae940d66818966690916aa0b6ec8b54be730b0f39efa168554e644a1b68bcba33a6
-DIST youtube-dl-2020.09.20.tar.gz 3188480 BLAKE2B c12ee589d112155207b59da9f710b2c776c07464d5c64a5d8355b963a81765b0dbc65df4f9564504fb963f30d5a11dc7e662c14d58ddf9fe6347352363cf70a5 SHA512 ed511016d0cfcbbee0cd651f793cb31cdb46d80243f86186de1cc54cb2a2055fae2f5cc3e16f838fc2ba47f3ff6f3b484219c8a707904fbc30193a2b28a1e30c
-DIST youtube-dl-2020.11.26.tar.gz 3218922 BLAKE2B 4e8ac926a7cef9d8a9f53de1002464e4d3a632d09c6564e1451a7bc49fe4cdf72e206f98df58a4025d55718f46d84fe4f1f6e23268ef19ad3ebd11725d5a0fcc SHA512 126c299c3db654ad3c88ced44bfc1a34bd73a439d8d3fd64720bb5d06fe84df817182a9e0b38d1def2eb4f1de26c7e2b8b6d3d6b4282f973db548c9868938a41
-DIST youtube-dl-2020.11.29.tar.gz 3222467 BLAKE2B 6b699689f55fb5b24d9a3fa9b500461076d9cac58a111fde5f07f4df45113d40cb2cfbec2b86777b92277fbe16467c1516fdd5bb49e30f8361dd7fe3479eca57 SHA512 e3b4e7e7a776a608d2ee34c5395108445ea43fc999b0364a686eddb5d5977591d2c625b2a97955fd565631da070921f3196cd98ce58cf9aebf4e504636645a3d
-DIST youtube-dl-2020.12.02.tar.gz 3225560 BLAKE2B 953de14c6801a853091625753c0f918e7c6f88b1631ed2d41427fc36cc615830161f860e043ca784b31b1845ecfd0f5a88afcaeca40dc797cd89d36d4762d637 SHA512 5e48e272d957be391cb18960e0b1864b0f2202e26a53491f5c15f6c40bc36e720d80e95955a5a2f889e05f11a999fd311d095b18e5082bb951739c63ffe7565a
-DIST youtube-dl-2020.12.05.tar.gz 3228845 BLAKE2B 6186a7d788bb839a7beceb708ddcc629bf111403ac003baa68422122a77d3793148769b0062f8ca2b1d24348d203ba7cd0b1841c2a16f95e0620423b881a83c2 SHA512 c58baa8a95a9bfc09a8f37299fd3061101d29a0662bd1c35f5b4d3d030ac1f06b47ec2f42fdec1759005556a81c43f7d067e9a43622ba06f8817b1a63c52c4a2
-DIST youtube-dl-2020.12.12.tar.gz 3225195 BLAKE2B da14fb941fd81f0596a590e7690c2f4786a57d9fbe057743ab2a4a4cabad9978df3352ae1389b89e42673c3ea99e43488741f2d22cbb6274f1fadc5cbb923a47 SHA512 388722cadf500cbcd97b8d92b1ae67d091a5fe79e6bdf19e3a3f94476ef926f7ab57b35ee6d14e2d7a7bf1c72db37535de6c9c6affd32f4c1403902b813d5530
 DIST youtube-dl-2020.12.14.tar.gz 3229047 BLAKE2B 5a54ce2f7f754640c29c9183495c5933340f6d2b94e4bc958eb6590ada08b12b8333d7c61106e1c00d1ef039a7d203382930833d2734f80bf361cf6858ef09f8 SHA512 8a7d96656ef6803afdff90a2c528cdac5354a10996a631c54c722615ccbf879fd5e89b85f9e369cb9d1fd239fc095db4e232a5c420cdd902f5ffbe76f4e3d1a5
-EBUILD youtube-dl-2020.09.20.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c
-EBUILD youtube-dl-2020.11.26.ebuild 2234 BLAKE2B b77ce7a214ccaf5b4512402f406cecf6f770832cb1ac99fb9ad3f7d087b985a0c9d4db1de7e661e9a0bc583d2548286221c6402911d190f8ac77d0ea8065136c SHA512 e7416bca93ff11567f98bf293a1adc66bfcc9dbd6c9be39c6e292b46cdadc96e68ae03710cb42cd521e0893793e19db86e4e90e5376c37ef5172be464226e3cc
-EBUILD youtube-dl-2020.11.29.ebuild 2092 BLAKE2B 2c69d94533f26f1b54012ffceb3f23ff8c7bb120887bccf7a752198130aae7da87d532e4bd782d15388eb69985dfc37ada6bce314a891285f36dec185873433d SHA512 1648a6832708d2a641a76d1bde23380624967a689264b0a57b16d2b131600791eeac5e0faf3a7f958a0b95f346f8785a3b11d7933608a5dc384204ef8fe2185f
-EBUILD youtube-dl-2020.12.02.ebuild 2092 BLAKE2B 2c69d94533f26f1b54012ffceb3f23ff8c7bb120887bccf7a752198130aae7da87d532e4bd782d15388eb69985dfc37ada6bce314a891285f36dec185873433d SHA512 1648a6832708d2a641a76d1bde23380624967a689264b0a57b16d2b131600791eeac5e0faf3a7f958a0b95f346f8785a3b11d7933608a5dc384204ef8fe2185f
-EBUILD youtube-dl-2020.12.05.ebuild 2092 BLAKE2B 2c69d94533f26f1b54012ffceb3f23ff8c7bb120887bccf7a752198130aae7da87d532e4bd782d15388eb69985dfc37ada6bce314a891285f36dec185873433d SHA512 1648a6832708d2a641a76d1bde23380624967a689264b0a57b16d2b131600791eeac5e0faf3a7f958a0b95f346f8785a3b11d7933608a5dc384204ef8fe2185f
-EBUILD youtube-dl-2020.12.12.ebuild 2147 BLAKE2B d2758deb69b6c5506a58b425e0e77fe7e84daf8fb245634b49fd45096b06ce0350441eeb76855edbd1f0a94f45a3646098f28b977c639c4d4a5c185c1a8f9457 SHA512 3ca31b7f03ef50f58ea77d0338ca65b62e33879edfabab5da1b04acd239db3e101aadc02de379c90605f56e8548443afec289cacb96150bc3e3d7f6e92bcb313
-EBUILD youtube-dl-2020.12.14.ebuild 2147 BLAKE2B d2758deb69b6c5506a58b425e0e77fe7e84daf8fb245634b49fd45096b06ce0350441eeb76855edbd1f0a94f45a3646098f28b977c639c4d4a5c185c1a8f9457 SHA512 3ca31b7f03ef50f58ea77d0338ca65b62e33879edfabab5da1b04acd239db3e101aadc02de379c90605f56e8548443afec289cacb96150bc3e3d7f6e92bcb313
+EBUILD youtube-dl-2020.12.14.ebuild 2141 BLAKE2B 5db35465043ec68d3b363c045a0369a07e2bc7c07e8e1d6360b4077cb64aa2f63caa2ee828e1154e6c6ed68750edcd169e89b524a607ab2d58a54c39592f7888 SHA512 fff697c16e91a51e24ae4315b6d7896bf0215414fe71824bd1d5ca6708ab66a051bd3db768c6705e4fbeb828a74c4781f5c6641146258ae7ed72ed11d74f2a84
 EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B 7eb91fceeba248ff2a1b40ab97139da9a33211b2fe79c66ae6aa29a2b6fe1f2b4e400f4dcc655573d46b6fa9a7f3cb7baddc75a32739b89507db9d4f4f96eba3 SHA512 f9768251f05033b9df5a0ea82d9e62f6d8fcf651dbbcf72a300bba4caf22ca5b99af73b830eba2d5483ae9b227d99f02bfa015319303f7f7300e6106f1e0b342
-MISC metadata.xml 353 BLAKE2B 53a5a71088d6c6ba1785f245c36c8c7551eb800b308313a053cfb5f292df1adce321383522528a06742aabee8f5d7fe8d2d9805c28632fce1d50f6a938b163a0 SHA512 01570d01232abde7a0d3983e307197cd07ad010f57f5df49048405b45fe2e1f2aeb0594260014bd4d95a6f234885e29ac802111402df3707d41b4b0f75b7457b
+MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/files/youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch b/net-misc/youtube-dl/files/youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch
deleted file mode 100644
index c48760a4c41c..000000000000
--- a/net-misc/youtube-dl/files/youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 99de2f38d375f794ffdc4f5a110a5227310f3ab0 Mon Sep 17 00:00:00 2001
-From: Remita Amine <remitamine@gmail.com>
-Date: Wed, 25 Nov 2020 21:39:17 +0100
-Subject: [PATCH] [spreaker] fix SpreakerShowIE test URL
-
----
- youtube_dl/extractor/spreaker.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/youtube_dl/extractor/spreaker.py b/youtube_dl/extractor/spreaker.py
-index beee6670c..6c7e40ae4 100644
---- a/youtube_dl/extractor/spreaker.py
-+++ b/youtube_dl/extractor/spreaker.py
-@@ -126,7 +126,7 @@ def _real_extract(self, url):
- class SpreakerShowIE(InfoExtractor):
-     _VALID_URL = r'https?://api\.spreaker\.com/show/(?P<id>\d+)'
-     _TESTS = [{
--        'url': 'https://www.spreaker.com/show/3-ninjas-podcast',
-+        'url': 'https://api.spreaker.com/show/4652058',
-         'info_dict': {
-             'id': '4652058',
-         },
diff --git a/net-misc/youtube-dl/metadata.xml b/net-misc/youtube-dl/metadata.xml
index 5a459dba5f89..5cbaf15f03cc 100644
--- a/net-misc/youtube-dl/metadata.xml
+++ b/net-misc/youtube-dl/metadata.xml
@@ -9,4 +9,5 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/net-misc/youtube-dl/youtube-dl-2020.09.20.ebuild b/net-misc/youtube-dl/youtube-dl-2020.09.20.ebuild
deleted file mode 100644
index 9dc88dfb1591..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.09.20.ebuild
+++ /dev/null
@@ -1,74 +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 bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-LICENSE="public-domain"
-
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-	)
-"
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. ${PN} will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild
deleted file mode 100644
index 82be3f810520..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild
+++ /dev/null
@@ -1,76 +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 bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-# Only needed by this specific release, already fixed upstream
-PATCHES=(
-	"${FILESDIR}"/${PN}-2020.11.26-fix_spreakershowie_test_url.patch
-)
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. ${PN} will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild
deleted file mode 100644
index 47f8343b521a..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.11.29.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..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. ${PN} will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.02.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.02.ebuild
deleted file mode 100644
index 47f8343b521a..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.12.02.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..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. ${PN} will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.05.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.05.ebuild
deleted file mode 100644
index 47f8343b521a..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.12.05.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..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. ${PN} will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.12.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.12.ebuild
deleted file mode 100644
index 04afa74ada09..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.12.12.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..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.14.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.14.ebuild
index 04afa74ada09..b710767233e1 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.12.14.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.12.14.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 3e6d6a824a50..bb5aca3d5e0f 100644
Binary files a/net-nds/Manifest.gz and b/net-nds/Manifest.gz differ
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index e56e0a49eb0a..360ab98cfd0a 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -21,11 +21,7 @@ AUX slapd-initd-2.4.40-r2 1726 BLAKE2B 998248677dfec0d71e89cde7233596ec95f017392
 AUX slapd.service 284 BLAKE2B 27e3863a8b0e854e5b6b1efce50da624acbfe0d2416af1eedfbc225b5e8307f79441bb4b9afddc7736857a8fd289db65e04e297e314cad48996ab6e3ecca43f6 SHA512 450c93b320101e1c28681cad6694c24332fbe424ac98283b621a2f6e1eb01e9e2dbd80a4142e6e8d01d95c55018b44e847d4f4c55f11d7e0e0a11ae1827daa82
 AUX slapd.service.conf 443 BLAKE2B 7cf9d3935ea100006fe4f8667b792d32627c933c72220a91e4d9bf99fab4af9c590834f9aaed57d80eadd2fdf75e49f55739ef6027d11f012f8da3a711707c27 SHA512 be9cf4bf19111bd77c0ce481428e6f3cc183a6939775ed1a2d7606a5162da34178cb139d666288f6a35b8413bd4dc5f8f1bd60b39f3cca8f749557674b93910b
 AUX slapd.tmpfilesd 90 BLAKE2B f9cdde975b45c61c18773e4a3b30e3cb3c2a7d979bfef6d0513cd33ee5d31acdbe19c0af72a6478576acfaa88a2f063213cb9fd3025f4dda6ac401a8b9488719 SHA512 c462c92911635a2a6a30eb7239e74b529062224f9798351f53dca9a2e25cbc7f9fbb3743f98a015b7ccac0823ab85adb42d91d980f053bc3f12fdce760ce4bec
-DIST openldap-2.4.53.tgz 5883013 BLAKE2B 09d17d2a5438b09a4aa7f4a815e858d8b17ae7873580e5b3bc81d9569e97174703600472b9ecf79a28b7df561ba8214dfb6d08b467c823feeeae7d0cbdd37c6b SHA512 32dcbf18ffa53b3c2c5399f726c7a8970154d40fb88de85896d18ea2abd79c55ebe28fcf5fbfd52771f95561d70ab364db5f667fe2ec0e67b21e281f5112ec99
-DIST openldap-2.4.54.tgz 5885717 BLAKE2B 804fec18146d673c78c414914fe37903976de6e1b0b1456f20c545665c9a78d15640e34cebfc4576d7781e67df377c33fed6de1deb984c2be2c9aeeaf4fcfacb SHA512 30cbe23f310f1901a0300ac0d123fc2e6fcc5bde8b15692f2fd8291d1f1e5b7e97426823eb1be9977a15d728fd175c8938c6790a57582a72d10be0b497c3ef5f
 DIST openldap-2.4.56.tgz 5885444 BLAKE2B cebb189346f9114ed6e2dbb11a836c0b802e28f42d49351d6e807cba9c0f49e85ab3dbb34260b7c5eb3849c181eb51046ef48f555083647e3ce83209d6224bbb SHA512 cf371db5595d5b6643db3e6788ce56e34fe271c244dd39d781cadd2a7f85cec421a51c11a4857a7e286ba94a27c1f0dab0ff27e8de20208587471f4a589588e6
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
-EBUILD openldap-2.4.53-r1.ebuild 29200 BLAKE2B 6364a190f481e0da3c8fa9a802b1e033f3abce7a31e8a9aedaeb5ec0291dbbd07fbda88004d556ac061744ab5200b4f0f54733896f97187f84f9706085946436 SHA512 7c4f620ad5359b70f5f385da54a4f4954777627295c13da6abd6d069a7fc101dd1d73cdb02993c0735a010918eb0278c8024c82be3f2de467c6cf4d27c822ac1
-EBUILD openldap-2.4.54.ebuild 29208 BLAKE2B 28ea08ec78593a00b69ef04ffbd588ce1b61dce57b405d242d0791c03fc5253df672c83aa195e7ad2aa68883cf70fa0250edd53c046f9178f7a8f34d1d253039 SHA512 337697e1d3900e1e2d99dac833a3cab6e9f2c1d70d657d913f4a42f5ab4386a5a2c221673304b21ca9bcf7af54742427f60ac6f41fae1b174ceffe23930a85e2
-EBUILD openldap-2.4.56.ebuild 29208 BLAKE2B 28ea08ec78593a00b69ef04ffbd588ce1b61dce57b405d242d0791c03fc5253df672c83aa195e7ad2aa68883cf70fa0250edd53c046f9178f7a8f34d1d253039 SHA512 337697e1d3900e1e2d99dac833a3cab6e9f2c1d70d657d913f4a42f5ab4386a5a2c221673304b21ca9bcf7af54742427f60ac6f41fae1b174ceffe23930a85e2
+EBUILD openldap-2.4.56.ebuild 29199 BLAKE2B 6d693fef69dbdfeb0d9484422cc46c27293a773f19db39844c6271dcb783c3cf76884dd6d4d0d3629957260a03261d99412d46b8a30699489e179b386272e437 SHA512 c76272db30ea30b78f689eaedfa49d36805e95a9772e42c94ab031a3c8a9555c6081ccbdd717ff624d5e05591e34069378b07da74f3059d811715b6a7ccedbf9
 MISC metadata.xml 1030 BLAKE2B b940261c1e1fac05fceffc80673100d3102e53b532b8936b2e51bbf5a6bdf2ff5cfe633c53b494856d973a86c8d0f2b5acf8f2c26d2c62d16f1313fb8dab798a SHA512 c031e0cbe8d8f6d5fcdd8d4c4e036e5087068c35ae44264b5e244c0d6dee429836f493d75f6bb2cb422d14ccd0a7934b13748cf83517791e61c51fd6d924deb3
diff --git a/net-nds/openldap/openldap-2.4.53-r1.ebuild b/net-nds/openldap/openldap-2.4.53-r1.ebuild
deleted file mode 100644
index ad2d09e1404b..000000000000
--- a/net-nds/openldap/openldap-2.4.53-r1.ebuild
+++ /dev/null
@@ -1,910 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools db-use flag-o-matic multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd
-
-BIS_PN=rfc2307bis.schema
-BIS_PV=20140524
-BIS_P="${BIS_PN}-${BIS_PV}"
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="https://www.OpenLDAP.org/"
-
-# upstream mirrors are mostly not working, using canonical URI
-SRC_URI="
-	https://openldap.org/software/download/OpenLDAP/openldap-release/${P}.tgz
-	http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/${P}.tgz
-	http://repository.linagora.org/OpenLDAP/openldap-release/${P}.tgz
-	http://mirror.eu.oneandone.net/software/openldap/openldap-release/${P}.tgz
-	mirror://gentoo/${BIS_P}"
-
-LICENSE="OPENLDAP GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE_DAEMON="crypt samba tcpd experimental minimal"
-IUSE_BACKEND="+berkdb"
-IUSE_OVERLAY="overlays perl"
-IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test"
-IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
-IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
-IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="cxx? ( sasl )
-	pbkdf2? ( ssl )
-	test? ( berkdb )
-	?? ( test minimal )"
-
-# always list newer first
-# Do not add any AGPL-3 BDB here!
-# See bug 525110, comment 15.
-# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
-BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
-BDB_PKGS=''
-for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
-
-# openssl is needed to generate lanman-passwords required by samba
-COMMON_DEPEND="
-	ssl? (
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		)
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:= )
-	!minimal? (
-		sys-devel/libtool
-		sys-libs/e2fsprogs-libs
-		>=dev-db/lmdb-0.9.18:=
-		tcpd? ( sys-apps/tcp-wrappers )
-		odbc? ( !iodbc? ( dev-db/unixODBC )
-			iodbc? ( dev-db/libiodbc ) )
-		perl? ( dev-lang/perl:=[-build(-)] )
-		samba? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-		berkdb? (
-			<sys-libs/db-6.0:=
-			|| ( ${BDB_PKGS} )
-			)
-		smbkrb5passwd? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-			kerberos? ( app-crypt/heimdal )
-			)
-		kerberos? (
-			virtual/krb5
-			kinit? ( !app-crypt/heimdal )
-			)
-		cxx? ( dev-libs/cyrus-sasl:= )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/groff
-"
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-ldap )
-"
-
-# The user/group are only used for running daemons which are
-# disabled in minimal builds, so elide the accounts too.
-# for tracking versions
-
-BDEPEND="!minimal? (
-		acct-group/ldap
-		acct-user/ldap
-)
-"
-
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# USE=cxx
-	/usr/include/LDAPAsynConnection.h
-	/usr/include/LDAPAttrType.h
-	/usr/include/LDAPAttribute.h
-	/usr/include/LDAPAttributeList.h
-	/usr/include/LDAPConnection.h
-	/usr/include/LDAPConstraints.h
-	/usr/include/LDAPControl.h
-	/usr/include/LDAPControlSet.h
-	/usr/include/LDAPEntry.h
-	/usr/include/LDAPEntryList.h
-	/usr/include/LDAPException.h
-	/usr/include/LDAPExtResult.h
-	/usr/include/LDAPMessage.h
-	/usr/include/LDAPMessageQueue.h
-	/usr/include/LDAPModList.h
-	/usr/include/LDAPModification.h
-	/usr/include/LDAPObjClass.h
-	/usr/include/LDAPRebind.h
-	/usr/include/LDAPRebindAuth.h
-	/usr/include/LDAPReferenceList.h
-	/usr/include/LDAPResult.h
-	/usr/include/LDAPSaslBindResult.h
-	/usr/include/LDAPSchema.h
-	/usr/include/LDAPSearchReference.h
-	/usr/include/LDAPSearchResult.h
-	/usr/include/LDAPSearchResults.h
-	/usr/include/LDAPUrl.h
-	/usr/include/LDAPUrlList.h
-	/usr/include/LdifReader.h
-	/usr/include/LdifWriter.h
-	/usr/include/SaslInteraction.h
-	/usr/include/SaslInteractionHandler.h
-	/usr/include/StringList.h
-	/usr/include/TlsOptions.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.17-gcc44.patch
-
-	"${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch
-	"${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
-
-	# bug #116045 - still present in 2.4.28
-	"${FILESDIR}"/${PN}-2.4.35-contrib-smbk5pwd.patch
-	# bug #408077 - samba4
-	"${FILESDIR}"/${PN}-2.4.35-contrib-samba4.patch
-
-	# bug #189817
-	"${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
-
-	# bug #233633
-	"${FILESDIR}"/${PN}-2.4.45-fix-lmpasswd-gnutls-symbols.patch
-
-	# bug #281495
-	"${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
-
-	# bug #294350
-	"${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch
-
-	# unbreak /bin/sh -> dash
-	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
-
-	# bug #420959
-	"${FILESDIR}"/${PN}-2.4.31-gcc47.patch
-
-	# unbundle lmdb
-	"${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch
-
-	# bug #622464
-	"${FILESDIR}"/${PN}-2.4.47-libressl.patch
-
-	# fix some compiler warnings
-	"${FILESDIR}"/${PN}-2.4.47-warnings.patch
-)
-
-openldap_filecount() {
-	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
-}
-
-openldap_find_versiontags() {
-	# scan for all datadirs
-	local openldap_datadirs=()
-	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
-		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
-	fi
-	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
-
-	einfo
-	einfo "Scanning datadir(s) from slapd.conf and"
-	einfo "the default installdir for Versiontags"
-	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
-	einfo
-
-	# scan datadirs if we have a version tag
-	openldap_found_tag=0
-	have_files=0
-	for each in ${openldap_datadirs[@]} ; do
-		CURRENT_TAGDIR="${ROOT}$(sed "s:\/::" <<< ${each})"
-		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
-		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
-			einfo "- Checking ${each}..."
-			if [[ -r "${CURRENT_TAG}" ]] ; then
-				# yey, we have one :)
-				einfo "   Found Versiontag in ${each}"
-				source "${CURRENT_TAG}"
-				if [[ "${OLDPF}" == "" ]] ; then
-					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
-					eerror "Please delete it"
-					eerror
-					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
-				fi
-
-				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
-
-				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
-
-				# are we on the same branch?
-				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
-					ewarn "   Versiontag doesn't match current major release!"
-					if [[ "${have_files}" == "1" ]] ; then
-						eerror "   Versiontag says other major and you (probably) have datafiles!"
-						echo
-						openldap_upgrade_howto
-					else
-						einfo "   No real problem, seems there's no database."
-					fi
-				else
-					einfo "   Versiontag is fine here :)"
-				fi
-			else
-				einfo "   Non-tagged dir ${each}"
-				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
-				if [[ "${have_files}" == "1" ]] ; then
-					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
-					echo
-
-					eerror
-					eerror "Your OpenLDAP Installation has a non tagged datadir that"
-					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
-					eerror
-					eerror "Please export data if any entered and empty or remove"
-					eerror "the directory, installation has been stopped so you"
-					eerror "can take required action"
-					eerror
-					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
-					eerror
-					openldap_upgrade_howto
-					die "Please move the datadir ${CURRENT_TAGDIR} away"
-				fi
-			fi
-			einfo
-		fi
-	done
-	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
-
-	# Now we must check for the major version of sys-libs/db linked against.
-	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
-	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
-		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
-			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
-		if use berkdb; then
-			# find which one would be used
-			for bdb_slot in ${BDB_SLOTS} ; do
-				NEWVER="$(db_findver "=sys-libs/db-${bdb_slot}*")"
-				[[ -n "${NEWVER}" ]] && break
-			done
-		fi
-		local fail=0
-		if [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			:
-			# Nothing wrong here.
-		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was not built against"
-			eerror "	any version of sys-libs/db, but the new one will build"
-			eerror "	against	${NEWVER} and your database may be inaccessible."
-			echo
-			fail=1
-		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
-			eerror "	built against any version and your database may be"
-			eerror "	inaccessible."
-			echo
-			fail=1
-		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
-			eerror "	${NEWVER} and your database would be inaccessible."
-			echo
-			fail=1
-		fi
-		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
-	fi
-
-	echo
-	einfo
-	einfo "All datadirs are fine, proceeding with merge now..."
-	einfo
-}
-
-openldap_upgrade_howto() {
-	local d l i
-	eerror
-	eerror "A (possible old) installation of OpenLDAP was detected,"
-	eerror "installation will not proceed for now."
-	eerror
-	eerror "As major version upgrades can corrupt your database,"
-	eerror "you need to dump your database and re-create it afterwards."
-	eerror
-	eerror "Additionally, rebuilding against different major versions of the"
-	eerror "sys-libs/db libraries will cause your database to be inaccessible."
-	eerror ""
-	d="$(date -u +%s)"
-	l="/root/ldapdump.${d}"
-	i="${l}.raw"
-	eerror " 1. /etc/init.d/slapd stop"
-	eerror " 2. slapcat -l ${i}"
-	eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
-	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/${PF}"
-	eerror " 6. etc-update, and ensure that you apply the changes"
-	eerror " 7. slapadd -l ${l}"
-	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
-	eerror " 9. /etc/init.d/slapd start"
-	eerror "10. check that your data is intact."
-	eerror "11. set up the new replication system."
-	eerror
-	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
-		die "You need to upgrade your database first"
-	else
-		eerror "You have the magical FORCE_UPGRADE=1 in place."
-		eerror "Don't say you weren't warned about data loss."
-	fi
-}
-
-pkg_setup() {
-	if ! use sasl && use cxx ; then
-		die "To build the ldapc++ library you must emerge openldap with sasl support"
-	fi
-	# Bug #322787
-	if use minimal && ! has_version "net-nds/openldap" ; then
-		einfo "No datadir scan needed, openldap not installed"
-	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
-		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-	else
-		openldap_find_versiontags
-	fi
-}
-
-src_prepare() {
-	# ensure correct SLAPI path by default
-	sed -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \
-		-i include/ldap_defaults.h || die
-
-	default
-	rm -r libraries/liblmdb || die
-
-	pushd build &>/dev/null || die "pushd build"
-	einfo "Making sure upstream build strip does not do stripping too early"
-	sed -i.orig \
-		-e '/^STRIP/s,-s,,g' \
-		top.mk || die "Failed to block stripping"
-	popd &>/dev/null || die
-
-	# wrong assumption that /bin/sh is /bin/bash
-	sed \
-		-e 's|/bin/sh|/bin/bash|g' \
-		-i tests/scripts/* || die "sed failed"
-
-	AT_NOEAUTOMAKE=yes eautoreconf
-}
-
-build_contrib_module() {
-	# <dir> <sources> <outputname>
-	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
-	einfo "Compiling contrib-module: $3"
-	# Make sure it's uppercase
-	local define_name="$(LC_ALL=C tr '[:lower:]' '[:upper:]' <<< "SLAPD_OVER_${1}")"
-	"${lt}" --mode=compile --tag=CC \
-		"${CC}" \
-		-D${define_name}=SLAPD_MOD_DYNAMIC \
-		-I"${BUILD_DIR}"/include \
-		-I../../../include -I../../../servers/slapd ${CFLAGS} \
-		-o ${2%.c}.lo -c $2 || die "compiling $3 failed"
-	einfo "Linking contrib-module: $3"
-	"${lt}" --mode=link --tag=CC \
-		"${CC}" -module \
-		${CFLAGS} \
-		${LDFLAGS} \
-		-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-		-o $3.la ${2%.c}.lo || die "linking $3 failed"
-	popd &>/dev/null || die
-}
-
-src_configure() {
-	# Bug 408001
-	use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
-
-	# connectionless ldap per bug #342439
-	append-cppflags -DLDAP_CONNECTIONLESS
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	use debug && myconf+=( $(use_enable debug) )
-
-	# ICU exists only in the configure, nowhere in the codebase, bug #510858
-	export ac_cv_header_unicode_utypes_h=no ol_cv_lib_icu=no
-
-	if ! use minimal && multilib_is_native_abi; then
-		local CPPFLAGS=${CPPFLAGS}
-
-		# re-enable serverside overlay chains per bug #296567
-		# see ldap docs chaper 12.3.1 for details
-		myconf+=( --enable-ldap )
-
-		# backends
-		myconf+=( --enable-slapd )
-		if use berkdb ; then
-			einfo "Using Berkeley DB for local backend"
-			myconf+=( --enable-bdb --enable-hdb )
-			DBINCLUDE=$(db_includedir ${BDB_SLOTS})
-			einfo "Using ${DBINCLUDE} for sys-libs/db version"
-			# We need to include the slotted db.h dir for FreeBSD
-			append-cppflags -I${DBINCLUDE}
-		else
-			myconf+=( --disable-bdb --disable-hdb )
-		fi
-		for backend in dnssrv ldap mdb meta monitor null passwd relay shell sock; do
-			myconf+=( --enable-${backend}=mod )
-		done
-
-		myconf+=( $(use_enable perl perl mod) )
-
-		myconf+=( $(use_enable odbc sql mod) )
-		if use odbc ; then
-			local odbc_lib="unixodbc"
-			if use iodbc ; then
-				odbc_lib="iodbc"
-				append-cppflags -I"${EPREFIX}"/usr/include/iodbc
-			fi
-			myconf+=( --with-odbc=${odbc_lib} )
-		fi
-
-		# slapd options
-		myconf+=(
-			$(use_enable crypt)
-			--disable-slp
-			$(use_enable samba lmpasswd)
-			$(use_enable syslog)
-		)
-		if use experimental ; then
-			myconf+=(
-				--enable-dynacl
-				--enable-aci=mod
-			)
-		fi
-		for option in aci cleartext modules rewrite rlookups slapi; do
-			myconf+=( --enable-${option} )
-		done
-
-		# slapd overlay options
-		# Compile-in the syncprov, the others as module
-		myconf+=( --enable-syncprov=yes )
-		use overlays && myconf+=( --enable-overlays=mod )
-
-	else
-		myconf+=(
-			--disable-backends
-			--disable-slapd
-			--disable-bdb
-			--disable-hdb
-			--disable-mdb
-			--disable-overlays
-			--disable-syslog
-		)
-	fi
-
-	# basic functionality stuff
-	myconf+=(
-		$(use_enable ipv6)
-		$(multilib_native_use_with sasl cyrus-sasl)
-		$(multilib_native_use_enable sasl spasswd)
-		$(use_enable tcpd wrappers)
-	)
-
-	# Some cross-compiling tests don't pan out well.
-	tc-is-cross-compiler && myconf+=(
-		--with-yielding-select=yes
-	)
-
-	local ssl_lib="no"
-	if use ssl || ( ! use minimal && use samba ) ; then
-		ssl_lib="openssl"
-		use gnutls && ssl_lib="gnutls"
-	fi
-
-	myconf+=( --with-tls=${ssl_lib} )
-
-	for basicflag in dynamic local proctitle shared; do
-		myconf+=( --enable-${basicflag} )
-	done
-
-	tc-export AR CC CXX
-	CONFIG_SHELL="/bin/sh" \
-	ECONF_SOURCE="${S}" \
-	STRIP=/bin/true \
-	econf \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	emake depend
-}
-
-src_configure_cxx() {
-	# This needs the libraries built by the first build run.
-	# So we have to run it AFTER the main build, not just after the main
-	# configure.
-	local myconf_ldapcpp=(
-		--with-ldap-includes="${S}"/include
-	)
-
-	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die
-	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-
-	local LDFLAGS=${LDFLAGS} CPPFLAGS=${CPPFLAGS}
-	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \
-		-L"${BUILD_DIR}"/libraries/libldap/.libs
-	append-cppflags -I"${BUILD_DIR}"/include
-	ECONF_SOURCE=${S}/contrib/ldapc++ \
-	econf "${myconf_ldapcpp[@]}" \
-		CC="${CC}" \
-		CXX="${CXX}"
-	popd &>/dev/null || die
-}
-
-multilib_src_compile() {
-	tc-export AR CC CXX
-	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/sh
-	local lt="${BUILD_DIR}/libtool"
-	export echo="echo"
-
-	if ! use minimal && multilib_is_native_abi ; then
-		if use cxx ; then
-			einfo "Building contrib library: ldapc++"
-			src_configure_cxx
-			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-			emake CC="${CC}" CXX="${CXX}"
-			popd &>/dev/null || die
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Building contrib-module: smbk5pwd"
-			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
-
-			MY_DEFS="-DDO_SHADOW"
-			if use samba ; then
-				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
-				MY_KRB5_INC=""
-			fi
-			if use kerberos ; then
-				MY_DEFS="${MY_DEFS} -DDO_KRB5"
-				MY_KRB5_INC="$(krb5-config --cflags)"
-			fi
-
-			emake \
-				DEFS="${MY_DEFS}" \
-				KRB5_INC="${MY_KRB5_INC}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use overlays ; then
-			einfo "Building contrib-module: samba4"
-			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
-
-			emake \
-				LDAP_BUILD="${BUILD_DIR}" \
-				CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use kerberos ; then
-			if use kinit ; then
-				build_contrib_module "kinit" "kinit.c" "kinit"
-			fi
-			pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
-			einfo "Compiling contrib-module: pw-kerberos"
-			"${lt}" --mode=compile --tag=CC \
-				"${CC}" \
-				-I"${BUILD_DIR}"/include \
-				-I../../../include \
-				${CFLAGS} \
-				$(krb5-config --cflags) \
-				-DHAVE_KRB5 \
-				-o kerberos.lo \
-				-c kerberos.c || die "compiling pw-kerberos failed"
-			einfo "Linking contrib-module: pw-kerberos"
-			"${lt}" --mode=link --tag=CC \
-				"${CC}" -module \
-				${CFLAGS} \
-				${LDFLAGS} \
-				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-				-o pw-kerberos.la \
-				kerberos.lo || die "linking pw-kerberos failed"
-			popd &>/dev/null || die
-		fi
-
-		if use pbkdf2; then
-			pushd "${S}/contrib/slapd-modules/passwd/pbkdf2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/pbkdf2"
-			einfo "Compiling contrib-module: pw-pbkdf2"
-			"${lt}" --mode=compile --tag=CC \
-				"${CC}" \
-				-I"${BUILD_DIR}"/include \
-				-I../../../../include \
-				${CFLAGS} \
-				-o pbkdf2.lo \
-				-c pw-pbkdf2.c || die "compiling pw-pbkdf2 failed"
-			einfo "Linking contrib-module: pw-pbkdf2"
-			"${lt}" --mode=link --tag=CC \
-				"${CC}" -module \
-				${CFLAGS} \
-				${LDFLAGS} \
-				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-				-o pw-pbkdf2.la \
-				pbkdf2.lo || die "linking pw-pbkdf2 failed"
-			popd &>/dev/null || die
-		fi
-
-		if use sha2 ; then
-			pushd "${S}/contrib/slapd-modules/passwd/sha2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/sha2"
-			einfo "Compiling contrib-module: pw-sha2"
-			"${lt}" --mode=compile --tag=CC \
-				"${CC}" \
-				-I"${BUILD_DIR}"/include \
-				-I../../../../include \
-				${CFLAGS} \
-				-o sha2.lo \
-				-c sha2.c || die "compiling pw-sha2 failed"
-			"${lt}" --mode=compile --tag=CC \
-				"${CC}" \
-				-I"${BUILD_DIR}"/include \
-				-I../../../../include \
-				${CFLAGS} \
-				-o slapd-sha2.lo \
-				-c slapd-sha2.c || die "compiling pw-sha2 failed"
-			einfo "Linking contrib-module: pw-sha2"
-			"${lt}" --mode=link --tag=CC \
-				"${CC}" -module \
-				${CFLAGS} \
-				${LDFLAGS} \
-				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-				-o pw-sha2.la \
-				sha2.lo slapd-sha2.lo || die "linking pw-sha2 failed"
-			popd &>/dev/null || die
-		fi
-
-		# We could build pw-radius if GNURadius would install radlib.h
-		pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
-		einfo "Compiling contrib-module: pw-netscape"
-		"${lt}" --mode=compile --tag=CC \
-			"${CC}" \
-			-I"${BUILD_DIR}"/include \
-			-I../../../include \
-			${CFLAGS} \
-			-o netscape.lo \
-			-c netscape.c || die "compiling pw-netscape failed"
-		einfo "Linking contrib-module: pw-netscape"
-		"${lt}" --mode=link --tag=CC \
-			"${CC}" -module \
-			${CFLAGS} \
-			${LDFLAGS} \
-			-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-			-o pw-netscape.la \
-			netscape.lo || die "linking pw-netscape failed"
-
-		#build_contrib_module "acl" "posixgroup.c" "posixGroup" # example code only
-		#build_contrib_module "acl" "gssacl.c" "gss" # example code only, also needs kerberos
-		build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
-		build_contrib_module "allop" "allop.c" "overlay-allop"
-		build_contrib_module "allowed" "allowed.c" "allowed"
-		build_contrib_module "autogroup" "autogroup.c" "autogroup"
-		build_contrib_module "cloak" "cloak.c" "cloak"
-		# build_contrib_module "comp_match" "comp_match.c" "comp_match" # really complex, adds new external deps, questionable demand
-		build_contrib_module "denyop" "denyop.c" "denyop-overlay"
-		build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
-		build_contrib_module "dupent" "dupent.c" "dupent"
-		build_contrib_module "lastbind" "lastbind.c" "lastbind"
-		# lastmod may not play well with other overlays
-		build_contrib_module "lastmod" "lastmod.c" "lastmod"
-		build_contrib_module "noopsrch" "noopsrch.c" "noopsrch"
-		#build_contrib_module "nops" "nops.c" "nops-overlay" https://bugs.gentoo.org/641576
-		#build_contrib_module "nssov" "nssov.c" "nssov-overlay" RESO:LATER
-		build_contrib_module "trace" "trace.c" "trace"
-		popd &>/dev/null || die
-		# build slapi-plugins
-		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
-		einfo "Building contrib-module: addrdnvalues plugin"
-		"${CC}" -shared \
-			-I"${BUILD_DIR}"/include \
-			-I../../../include \
-			${CFLAGS} \
-			-fPIC \
-			${LDFLAGS} \
-			-o libaddrdnvalues-plugin.so \
-			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
-		popd &>/dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cd tests || die
-		emake tests
-	fi
-}
-
-multilib_src_install() {
-	local lt="${BUILD_DIR}/libtool"
-	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
-
-	if ! use minimal && multilib_is_native_abi; then
-		# openldap modules go here
-		# TODO: write some code to populate slapd.conf with moduleload statements
-		keepdir /usr/$(get_libdir)/openldap/openldap/
-
-		# initial data storage dir
-		keepdir /var/lib/openldap-data
-		use prefix || fowners ldap:ldap /var/lib/openldap-data
-		fperms 0700 /var/lib/openldap-data
-
-		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-
-		# use our config
-		rm "${ED}"/etc/openldap/slapd.conf
-		insinto /etc/openldap
-		newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf
-		configfile="${ED}"/etc/openldap/slapd.conf
-
-		# populate with built backends
-		ebegin "populate config with built backends"
-		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
-			einfo "Adding $(basename ${x})"
-			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
-		done
-		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
-		use prefix || fowners root:ldap /etc/openldap/slapd.conf
-		fperms 0640 /etc/openldap/slapd.conf
-		cp "${configfile}" "${configfile}".default || die
-		eend
-
-		# install our own init scripts and systemd unit files
-		einfo "Install init scripts"
-		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
-		doinitd "${T}"/slapd
-		newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
-
-		einfo "Install systemd service"
-		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die
-		systemd_dounit "${T}"/slapd.service
-		systemd_install_serviced "${FILESDIR}"/slapd.service.conf
-		systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
-
-		# If built without SLP, we don't need to be before avahi
-			sed -i \
-				-e '/before/{s/avahi-daemon//g}' \
-				"${ED}"/etc/init.d/slapd \
-				|| die
-
-		if use cxx ; then
-			einfo "Install the ldapc++ library"
-			cd "${BUILD_DIR}/contrib/ldapc++" || die
-			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			cd "${S}"/contrib/ldapc++ || die
-			newdoc README ldapc++-README
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Install the smbk5pwd module"
-			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			newdoc README smbk5pwd-README
-		fi
-
-		if use overlays ; then
-			einfo "Install the samba4 module"
-			cd "${S}/contrib/slapd-modules/samba4" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="/usr/$(get_libdir)/openldap" install
-			newdoc README samba4-README
-		fi
-
-		einfo "Installing contrib modules"
-		cd "${S}/contrib/slapd-modules" || die
-		for l in */*.la */*/*.la; do
-			[[ -e ${l} ]] || continue
-			"${lt}" --mode=install cp ${l} \
-				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
-				die "installing ${l} failed"
-		done
-
-		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
-		docinto contrib
-		doman */*.5
-		#newdoc acl/README*
-		newdoc addpartial/README addpartial-README
-		newdoc allop/README allop-README
-		newdoc allowed/README  allowed-README
-		newdoc autogroup/README autogroup-README
-		newdoc dsaschema/README dsaschema-README
-		newdoc passwd/README passwd-README
-		cd "${S}/contrib/slapi-plugins" || die
-		insinto /usr/$(get_libdir)/openldap/openldap
-		doins  */*.so
-		docinto contrib
-		newdoc addrdnvalues/README addrdnvalues-README
-
-		insinto /etc/openldap/schema
-		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
-
-		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
-		docinto back-shell ; dodoc "${S}"/servers/slapd/back-shell/searchexample*
-		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
-
-		dosbin "${S}"/contrib/slapd-tools/statslog
-		newdoc "${S}"/contrib/slapd-tools/README README.statslog
-	fi
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
-	docinto rfc ; dodoc doc/rfc/*.txt
-}
-
-pkg_preinst() {
-	# keep old libs if any
-	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0)
-	# bug 440470, only display the getting started help there was no openldap before,
-	# or we are going to a non-minimal build
-	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
-	OPENLDAP_PRINT_MESSAGES=$((! $?))
-}
-
-pkg_postinst() {
-	if ! use minimal ; then
-		# You cannot build SSL certificates during src_install that will make
-		# binary packages containing your SSL key, which is both a security risk
-		# and a misconfiguration if multiple machines use the same key and cert.
-		if use ssl; then
-			install_cert /etc/openldap/ssl/ldap
-			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "add 'TLS_REQCERT allow' if you want to use them."
-		fi
-
-		if use prefix; then
-			# Warn about prefix issues with slapd
-			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
-			eerror "to start up, and requires that certain files directories be owned by"
-			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
-			eerror "directories, you will have to manually fix this yourself."
-		fi
-
-		# These lines force the permissions of various content to be correct
-		if [[ -d "${EROOT}"/var/run/openldap ]]; then
-			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
-			chmod 0755 "${EROOT}"/var/run/openldap || die
-		fi
-		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
-		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
-		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
-	fi
-
-	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
-		elog "Getting started using OpenLDAP? There is some documentation available:"
-		elog "Gentoo Guide to OpenLDAP Authentication"
-		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
-		elog "---"
-		elog "An example file for tuning BDB backends with openldap is"
-		elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0)
-}
diff --git a/net-nds/openldap/openldap-2.4.54.ebuild b/net-nds/openldap/openldap-2.4.54.ebuild
deleted file mode 100644
index f8eedca45d4f..000000000000
--- a/net-nds/openldap/openldap-2.4.54.ebuild
+++ /dev/null
@@ -1,910 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools db-use flag-o-matic multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd
-
-BIS_PN=rfc2307bis.schema
-BIS_PV=20140524
-BIS_P="${BIS_PN}-${BIS_PV}"
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="https://www.OpenLDAP.org/"
-
-# upstream mirrors are mostly not working, using canonical URI
-SRC_URI="
-	https://openldap.org/software/download/OpenLDAP/openldap-release/${P}.tgz
-	http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/${P}.tgz
-	http://repository.linagora.org/OpenLDAP/openldap-release/${P}.tgz
-	http://mirror.eu.oneandone.net/software/openldap/openldap-release/${P}.tgz
-	mirror://gentoo/${BIS_P}"
-
-LICENSE="OPENLDAP GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE_DAEMON="crypt samba tcpd experimental minimal"
-IUSE_BACKEND="+berkdb"
-IUSE_OVERLAY="overlays perl"
-IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test"
-IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
-IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
-IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="cxx? ( sasl )
-	pbkdf2? ( ssl )
-	test? ( berkdb )
-	?? ( test minimal )"
-
-# always list newer first
-# Do not add any AGPL-3 BDB here!
-# See bug 525110, comment 15.
-# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
-BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
-BDB_PKGS=''
-for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
-
-# openssl is needed to generate lanman-passwords required by samba
-COMMON_DEPEND="
-	ssl? (
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		)
-		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:= )
-	!minimal? (
-		sys-devel/libtool
-		sys-libs/e2fsprogs-libs
-		>=dev-db/lmdb-0.9.18:=
-		tcpd? ( sys-apps/tcp-wrappers )
-		odbc? ( !iodbc? ( dev-db/unixODBC )
-			iodbc? ( dev-db/libiodbc ) )
-		perl? ( dev-lang/perl:=[-build(-)] )
-		samba? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-		berkdb? (
-			<sys-libs/db-6.0:=
-			|| ( ${BDB_PKGS} )
-			)
-		smbkrb5passwd? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-			kerberos? ( app-crypt/heimdal )
-			)
-		kerberos? (
-			virtual/krb5
-			kinit? ( !app-crypt/heimdal )
-			)
-		cxx? ( dev-libs/cyrus-sasl:= )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/groff
-"
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-ldap )
-"
-
-# The user/group are only used for running daemons which are
-# disabled in minimal builds, so elide the accounts too.
-# for tracking versions
-
-BDEPEND="!minimal? (
-		acct-group/ldap
-		acct-user/ldap
-)
-"
-
-OPENLDAP_VERSIONTAG=".version-tag"
-OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# USE=cxx
-	/usr/include/LDAPAsynConnection.h
-	/usr/include/LDAPAttrType.h
-	/usr/include/LDAPAttribute.h
-	/usr/include/LDAPAttributeList.h
-	/usr/include/LDAPConnection.h
-	/usr/include/LDAPConstraints.h
-	/usr/include/LDAPControl.h
-	/usr/include/LDAPControlSet.h
-	/usr/include/LDAPEntry.h
-	/usr/include/LDAPEntryList.h
-	/usr/include/LDAPException.h
-	/usr/include/LDAPExtResult.h
-	/usr/include/LDAPMessage.h
-	/usr/include/LDAPMessageQueue.h
-	/usr/include/LDAPModList.h
-	/usr/include/LDAPModification.h
-	/usr/include/LDAPObjClass.h
-	/usr/include/LDAPRebind.h
-	/usr/include/LDAPRebindAuth.h
-	/usr/include/LDAPReferenceList.h
-	/usr/include/LDAPResult.h
-	/usr/include/LDAPSaslBindResult.h
-	/usr/include/LDAPSchema.h
-	/usr/include/LDAPSearchReference.h
-	/usr/include/LDAPSearchResult.h
-	/usr/include/LDAPSearchResults.h
-	/usr/include/LDAPUrl.h
-	/usr/include/LDAPUrlList.h
-	/usr/include/LdifReader.h
-	/usr/include/LdifWriter.h
-	/usr/include/SaslInteraction.h
-	/usr/include/SaslInteractionHandler.h
-	/usr/include/StringList.h
-	/usr/include/TlsOptions.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.17-gcc44.patch
-
-	"${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch
-	"${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
-
-	# bug #116045 - still present in 2.4.28
-	"${FILESDIR}"/${PN}-2.4.35-contrib-smbk5pwd.patch
-	# bug #408077 - samba4
-	"${FILESDIR}"/${PN}-2.4.35-contrib-samba4.patch
-
-	# bug #189817
-	"${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
-
-	# bug #233633
-	"${FILESDIR}"/${PN}-2.4.45-fix-lmpasswd-gnutls-symbols.patch
-
-	# bug #281495
-	"${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
-
-	# bug #294350
-	"${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch
-
-	# unbreak /bin/sh -> dash
-	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
-
-	# bug #420959
-	"${FILESDIR}"/${PN}-2.4.31-gcc47.patch
-
-	# unbundle lmdb
-	"${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch
-
-	# bug #622464
-	"${FILESDIR}"/${PN}-2.4.47-libressl.patch
-
-	# fix some compiler warnings
-	"${FILESDIR}"/${PN}-2.4.47-warnings.patch
-)
-
-openldap_filecount() {
-	local dir="$1"
-	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
-}
-
-openldap_find_versiontags() {
-	# scan for all datadirs
-	local openldap_datadirs=()
-	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
-		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
-	fi
-	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
-
-	einfo
-	einfo "Scanning datadir(s) from slapd.conf and"
-	einfo "the default installdir for Versiontags"
-	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
-	einfo
-
-	# scan datadirs if we have a version tag
-	openldap_found_tag=0
-	have_files=0
-	for each in ${openldap_datadirs[@]} ; do
-		CURRENT_TAGDIR="${ROOT}$(sed "s:\/::" <<< ${each})"
-		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
-		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
-			einfo "- Checking ${each}..."
-			if [[ -r "${CURRENT_TAG}" ]] ; then
-				# yey, we have one :)
-				einfo "   Found Versiontag in ${each}"
-				source "${CURRENT_TAG}"
-				if [[ "${OLDPF}" == "" ]] ; then
-					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
-					eerror "Please delete it"
-					eerror
-					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
-				fi
-
-				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
-
-				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
-
-				# are we on the same branch?
-				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
-					ewarn "   Versiontag doesn't match current major release!"
-					if [[ "${have_files}" == "1" ]] ; then
-						eerror "   Versiontag says other major and you (probably) have datafiles!"
-						echo
-						openldap_upgrade_howto
-					else
-						einfo "   No real problem, seems there's no database."
-					fi
-				else
-					einfo "   Versiontag is fine here :)"
-				fi
-			else
-				einfo "   Non-tagged dir ${each}"
-				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
-				if [[ "${have_files}" == "1" ]] ; then
-					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
-					echo
-
-					eerror
-					eerror "Your OpenLDAP Installation has a non tagged datadir that"
-					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
-					eerror
-					eerror "Please export data if any entered and empty or remove"
-					eerror "the directory, installation has been stopped so you"
-					eerror "can take required action"
-					eerror
-					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
-					eerror
-					openldap_upgrade_howto
-					die "Please move the datadir ${CURRENT_TAGDIR} away"
-				fi
-			fi
-			einfo
-		fi
-	done
-	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
-
-	# Now we must check for the major version of sys-libs/db linked against.
-	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
-	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
-		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
-			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
-		if use berkdb; then
-			# find which one would be used
-			for bdb_slot in ${BDB_SLOTS} ; do
-				NEWVER="$(db_findver "=sys-libs/db-${bdb_slot}*")"
-				[[ -n "${NEWVER}" ]] && break
-			done
-		fi
-		local fail=0
-		if [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			:
-			# Nothing wrong here.
-		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was not built against"
-			eerror "	any version of sys-libs/db, but the new one will build"
-			eerror "	against	${NEWVER} and your database may be inaccessible."
-			echo
-			fail=1
-		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
-			eerror "	built against any version and your database may be"
-			eerror "	inaccessible."
-			echo
-			fail=1
-		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
-			eerror "	Your existing version of OpenLDAP was built against"
-			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
-			eerror "	${NEWVER} and your database would be inaccessible."
-			echo
-			fail=1
-		fi
-		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
-	fi
-
-	echo
-	einfo
-	einfo "All datadirs are fine, proceeding with merge now..."
-	einfo
-}
-
-openldap_upgrade_howto() {
-	local d l i
-	eerror
-	eerror "A (possible old) installation of OpenLDAP was detected,"
-	eerror "installation will not proceed for now."
-	eerror
-	eerror "As major version upgrades can corrupt your database,"
-	eerror "you need to dump your database and re-create it afterwards."
-	eerror
-	eerror "Additionally, rebuilding against different major versions of the"
-	eerror "sys-libs/db libraries will cause your database to be inaccessible."
-	eerror ""
-	d="$(date -u +%s)"
-	l="/root/ldapdump.${d}"
-	i="${l}.raw"
-	eerror " 1. /etc/init.d/slapd stop"
-	eerror " 2. slapcat -l ${i}"
-	eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
-	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/${PF}"
-	eerror " 6. etc-update, and ensure that you apply the changes"
-	eerror " 7. slapadd -l ${l}"
-	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
-	eerror " 9. /etc/init.d/slapd start"
-	eerror "10. check that your data is intact."
-	eerror "11. set up the new replication system."
-	eerror
-	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
-		die "You need to upgrade your database first"
-	else
-		eerror "You have the magical FORCE_UPGRADE=1 in place."
-		eerror "Don't say you weren't warned about data loss."
-	fi
-}
-
-pkg_setup() {
-	if ! use sasl && use cxx ; then
-		die "To build the ldapc++ library you must emerge openldap with sasl support"
-	fi
-	# Bug #322787
-	if use minimal && ! has_version "net-nds/openldap" ; then
-		einfo "No datadir scan needed, openldap not installed"
-	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
-		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
-	else
-		openldap_find_versiontags
-	fi
-}
-
-src_prepare() {
-	# ensure correct SLAPI path by default
-	sed -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \
-		-i include/ldap_defaults.h || die
-
-	default
-	rm -r libraries/liblmdb || die
-
-	pushd build &>/dev/null || die "pushd build"
-	einfo "Making sure upstream build strip does not do stripping too early"
-	sed -i.orig \
-		-e '/^STRIP/s,-s,,g' \
-		top.mk || die "Failed to block stripping"
-	popd &>/dev/null || die
-
-	# wrong assumption that /bin/sh is /bin/bash
-	sed \
-		-e 's|/bin/sh|/bin/bash|g' \
-		-i tests/scripts/* || die "sed failed"
-
-	AT_NOEAUTOMAKE=yes eautoreconf
-}
-
-build_contrib_module() {
-	# <dir> <sources> <outputname>
-	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
-	einfo "Compiling contrib-module: $3"
-	# Make sure it's uppercase
-	local define_name="$(LC_ALL=C tr '[:lower:]' '[:upper:]' <<< "SLAPD_OVER_${1}")"
-	"${lt}" --mode=compile --tag=CC \
-		"${CC}" \
-		-D${define_name}=SLAPD_MOD_DYNAMIC \
-		-I"${BUILD_DIR}"/include \
-		-I../../../include -I../../../servers/slapd ${CFLAGS} \
-		-o ${2%.c}.lo -c $2 || die "compiling $3 failed"
-	einfo "Linking contrib-module: $3"
-	"${lt}" --mode=link --tag=CC \
-		"${CC}" -module \
-		${CFLAGS} \
-		${LDFLAGS} \
-		-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-		-o $3.la ${2%.c}.lo || die "linking $3 failed"
-	popd &>/dev/null || die
-}
-
-src_configure() {
-	# Bug 408001
-	use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
-
-	# connectionless ldap per bug #342439
-	append-cppflags -DLDAP_CONNECTIONLESS
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	use debug && myconf+=( $(use_enable debug) )
-
-	# ICU exists only in the configure, nowhere in the codebase, bug #510858
-	export ac_cv_header_unicode_utypes_h=no ol_cv_lib_icu=no
-
-	if ! use minimal && multilib_is_native_abi; then
-		local CPPFLAGS=${CPPFLAGS}
-
-		# re-enable serverside overlay chains per bug #296567
-		# see ldap docs chaper 12.3.1 for details
-		myconf+=( --enable-ldap )
-
-		# backends
-		myconf+=( --enable-slapd )
-		if use berkdb ; then
-			einfo "Using Berkeley DB for local backend"
-			myconf+=( --enable-bdb --enable-hdb )
-			DBINCLUDE=$(db_includedir ${BDB_SLOTS})
-			einfo "Using ${DBINCLUDE} for sys-libs/db version"
-			# We need to include the slotted db.h dir for FreeBSD
-			append-cppflags -I${DBINCLUDE}
-		else
-			myconf+=( --disable-bdb --disable-hdb )
-		fi
-		for backend in dnssrv ldap mdb meta monitor null passwd relay shell sock; do
-			myconf+=( --enable-${backend}=mod )
-		done
-
-		myconf+=( $(use_enable perl perl mod) )
-
-		myconf+=( $(use_enable odbc sql mod) )
-		if use odbc ; then
-			local odbc_lib="unixodbc"
-			if use iodbc ; then
-				odbc_lib="iodbc"
-				append-cppflags -I"${EPREFIX}"/usr/include/iodbc
-			fi
-			myconf+=( --with-odbc=${odbc_lib} )
-		fi
-
-		# slapd options
-		myconf+=(
-			$(use_enable crypt)
-			--disable-slp
-			$(use_enable samba lmpasswd)
-			$(use_enable syslog)
-		)
-		if use experimental ; then
-			myconf+=(
-				--enable-dynacl
-				--enable-aci=mod
-			)
-		fi
-		for option in aci cleartext modules rewrite rlookups slapi; do
-			myconf+=( --enable-${option} )
-		done
-
-		# slapd overlay options
-		# Compile-in the syncprov, the others as module
-		myconf+=( --enable-syncprov=yes )
-		use overlays && myconf+=( --enable-overlays=mod )
-
-	else
-		myconf+=(
-			--disable-backends
-			--disable-slapd
-			--disable-bdb
-			--disable-hdb
-			--disable-mdb
-			--disable-overlays
-			--disable-syslog
-		)
-	fi
-
-	# basic functionality stuff
-	myconf+=(
-		$(use_enable ipv6)
-		$(multilib_native_use_with sasl cyrus-sasl)
-		$(multilib_native_use_enable sasl spasswd)
-		$(use_enable tcpd wrappers)
-	)
-
-	# Some cross-compiling tests don't pan out well.
-	tc-is-cross-compiler && myconf+=(
-		--with-yielding-select=yes
-	)
-
-	local ssl_lib="no"
-	if use ssl || ( ! use minimal && use samba ) ; then
-		ssl_lib="openssl"
-		use gnutls && ssl_lib="gnutls"
-	fi
-
-	myconf+=( --with-tls=${ssl_lib} )
-
-	for basicflag in dynamic local proctitle shared; do
-		myconf+=( --enable-${basicflag} )
-	done
-
-	tc-export AR CC CXX
-	CONFIG_SHELL="/bin/sh" \
-	ECONF_SOURCE="${S}" \
-	STRIP=/bin/true \
-	econf \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	emake depend
-}
-
-src_configure_cxx() {
-	# This needs the libraries built by the first build run.
-	# So we have to run it AFTER the main build, not just after the main
-	# configure.
-	local myconf_ldapcpp=(
-		--with-ldap-includes="${S}"/include
-	)
-
-	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die
-	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-
-	local LDFLAGS=${LDFLAGS} CPPFLAGS=${CPPFLAGS}
-	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \
-		-L"${BUILD_DIR}"/libraries/libldap/.libs
-	append-cppflags -I"${BUILD_DIR}"/include
-	ECONF_SOURCE=${S}/contrib/ldapc++ \
-	econf "${myconf_ldapcpp[@]}" \
-		CC="${CC}" \
-		CXX="${CXX}"
-	popd &>/dev/null || die
-}
-
-multilib_src_compile() {
-	tc-export AR CC CXX
-	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/sh
-	local lt="${BUILD_DIR}/libtool"
-	export echo="echo"
-
-	if ! use minimal && multilib_is_native_abi ; then
-		if use cxx ; then
-			einfo "Building contrib library: ldapc++"
-			src_configure_cxx
-			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
-			emake CC="${CC}" CXX="${CXX}"
-			popd &>/dev/null || die
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Building contrib-module: smbk5pwd"
-			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
-
-			MY_DEFS="-DDO_SHADOW"
-			if use samba ; then
-				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
-				MY_KRB5_INC=""
-			fi
-			if use kerberos ; then
-				MY_DEFS="${MY_DEFS} -DDO_KRB5"
-				MY_KRB5_INC="$(krb5-config --cflags)"
-			fi
-
-			emake \
-				DEFS="${MY_DEFS}" \
-				KRB5_INC="${MY_KRB5_INC}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use overlays ; then
-			einfo "Building contrib-module: samba4"
-			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
-
-			emake \
-				LDAP_BUILD="${BUILD_DIR}" \
-				CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap"
-			popd &>/dev/null || die
-		fi
-
-		if use kerberos ; then
-			if use kinit ; then
-				build_contrib_module "kinit" "kinit.c" "kinit"
-			fi
-			pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
-			einfo "Compiling contrib-module: pw-kerberos"
-			"${lt}" --mode=compile --tag=CC \
-				"${CC}" \
-				-I"${BUILD_DIR}"/include \
-				-I../../../include \
-				${CFLAGS} \
-				$(krb5-config --cflags) \
-				-DHAVE_KRB5 \
-				-o kerberos.lo \
-				-c kerberos.c || die "compiling pw-kerberos failed"
-			einfo "Linking contrib-module: pw-kerberos"
-			"${lt}" --mode=link --tag=CC \
-				"${CC}" -module \
-				${CFLAGS} \
-				${LDFLAGS} \
-				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-				-o pw-kerberos.la \
-				kerberos.lo || die "linking pw-kerberos failed"
-			popd &>/dev/null || die
-		fi
-
-		if use pbkdf2; then
-			pushd "${S}/contrib/slapd-modules/passwd/pbkdf2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/pbkdf2"
-			einfo "Compiling contrib-module: pw-pbkdf2"
-			"${lt}" --mode=compile --tag=CC \
-				"${CC}" \
-				-I"${BUILD_DIR}"/include \
-				-I../../../../include \
-				${CFLAGS} \
-				-o pbkdf2.lo \
-				-c pw-pbkdf2.c || die "compiling pw-pbkdf2 failed"
-			einfo "Linking contrib-module: pw-pbkdf2"
-			"${lt}" --mode=link --tag=CC \
-				"${CC}" -module \
-				${CFLAGS} \
-				${LDFLAGS} \
-				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-				-o pw-pbkdf2.la \
-				pbkdf2.lo || die "linking pw-pbkdf2 failed"
-			popd &>/dev/null || die
-		fi
-
-		if use sha2 ; then
-			pushd "${S}/contrib/slapd-modules/passwd/sha2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/sha2"
-			einfo "Compiling contrib-module: pw-sha2"
-			"${lt}" --mode=compile --tag=CC \
-				"${CC}" \
-				-I"${BUILD_DIR}"/include \
-				-I../../../../include \
-				${CFLAGS} \
-				-o sha2.lo \
-				-c sha2.c || die "compiling pw-sha2 failed"
-			"${lt}" --mode=compile --tag=CC \
-				"${CC}" \
-				-I"${BUILD_DIR}"/include \
-				-I../../../../include \
-				${CFLAGS} \
-				-o slapd-sha2.lo \
-				-c slapd-sha2.c || die "compiling pw-sha2 failed"
-			einfo "Linking contrib-module: pw-sha2"
-			"${lt}" --mode=link --tag=CC \
-				"${CC}" -module \
-				${CFLAGS} \
-				${LDFLAGS} \
-				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-				-o pw-sha2.la \
-				sha2.lo slapd-sha2.lo || die "linking pw-sha2 failed"
-			popd &>/dev/null || die
-		fi
-
-		# We could build pw-radius if GNURadius would install radlib.h
-		pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
-		einfo "Compiling contrib-module: pw-netscape"
-		"${lt}" --mode=compile --tag=CC \
-			"${CC}" \
-			-I"${BUILD_DIR}"/include \
-			-I../../../include \
-			${CFLAGS} \
-			-o netscape.lo \
-			-c netscape.c || die "compiling pw-netscape failed"
-		einfo "Linking contrib-module: pw-netscape"
-		"${lt}" --mode=link --tag=CC \
-			"${CC}" -module \
-			${CFLAGS} \
-			${LDFLAGS} \
-			-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
-			-o pw-netscape.la \
-			netscape.lo || die "linking pw-netscape failed"
-
-		#build_contrib_module "acl" "posixgroup.c" "posixGroup" # example code only
-		#build_contrib_module "acl" "gssacl.c" "gss" # example code only, also needs kerberos
-		build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
-		build_contrib_module "allop" "allop.c" "overlay-allop"
-		build_contrib_module "allowed" "allowed.c" "allowed"
-		build_contrib_module "autogroup" "autogroup.c" "autogroup"
-		build_contrib_module "cloak" "cloak.c" "cloak"
-		# build_contrib_module "comp_match" "comp_match.c" "comp_match" # really complex, adds new external deps, questionable demand
-		build_contrib_module "denyop" "denyop.c" "denyop-overlay"
-		build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
-		build_contrib_module "dupent" "dupent.c" "dupent"
-		build_contrib_module "lastbind" "lastbind.c" "lastbind"
-		# lastmod may not play well with other overlays
-		build_contrib_module "lastmod" "lastmod.c" "lastmod"
-		build_contrib_module "noopsrch" "noopsrch.c" "noopsrch"
-		#build_contrib_module "nops" "nops.c" "nops-overlay" https://bugs.gentoo.org/641576
-		#build_contrib_module "nssov" "nssov.c" "nssov-overlay" RESO:LATER
-		build_contrib_module "trace" "trace.c" "trace"
-		popd &>/dev/null || die
-		# build slapi-plugins
-		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
-		einfo "Building contrib-module: addrdnvalues plugin"
-		"${CC}" -shared \
-			-I"${BUILD_DIR}"/include \
-			-I../../../include \
-			${CFLAGS} \
-			-fPIC \
-			${LDFLAGS} \
-			-o libaddrdnvalues-plugin.so \
-			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
-		popd &>/dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cd tests || die
-		emake tests
-	fi
-}
-
-multilib_src_install() {
-	local lt="${BUILD_DIR}/libtool"
-	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
-
-	if ! use minimal && multilib_is_native_abi; then
-		# openldap modules go here
-		# TODO: write some code to populate slapd.conf with moduleload statements
-		keepdir /usr/$(get_libdir)/openldap/openldap/
-
-		# initial data storage dir
-		keepdir /var/lib/openldap-data
-		use prefix || fowners ldap:ldap /var/lib/openldap-data
-		fperms 0700 /var/lib/openldap-data
-
-		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
-
-		# use our config
-		rm "${ED}"/etc/openldap/slapd.conf
-		insinto /etc/openldap
-		newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf
-		configfile="${ED}"/etc/openldap/slapd.conf
-
-		# populate with built backends
-		ebegin "populate config with built backends"
-		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
-			einfo "Adding $(basename ${x})"
-			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
-		done
-		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
-		use prefix || fowners root:ldap /etc/openldap/slapd.conf
-		fperms 0640 /etc/openldap/slapd.conf
-		cp "${configfile}" "${configfile}".default || die
-		eend
-
-		# install our own init scripts and systemd unit files
-		einfo "Install init scripts"
-		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
-		doinitd "${T}"/slapd
-		newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
-
-		einfo "Install systemd service"
-		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die
-		systemd_dounit "${T}"/slapd.service
-		systemd_install_serviced "${FILESDIR}"/slapd.service.conf
-		systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
-
-		# If built without SLP, we don't need to be before avahi
-			sed -i \
-				-e '/before/{s/avahi-daemon//g}' \
-				"${ED}"/etc/init.d/slapd \
-				|| die
-
-		if use cxx ; then
-			einfo "Install the ldapc++ library"
-			cd "${BUILD_DIR}/contrib/ldapc++" || die
-			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			cd "${S}"/contrib/ldapc++ || die
-			newdoc README ldapc++-README
-		fi
-
-		if use smbkrb5passwd ; then
-			einfo "Install the smbk5pwd module"
-			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
-			newdoc README smbk5pwd-README
-		fi
-
-		if use overlays ; then
-			einfo "Install the samba4 module"
-			cd "${S}/contrib/slapd-modules/samba4" || die
-			emake DESTDIR="${D}" \
-				LDAP_BUILD="${BUILD_DIR}" \
-				libexecdir="/usr/$(get_libdir)/openldap" install
-			newdoc README samba4-README
-		fi
-
-		einfo "Installing contrib modules"
-		cd "${S}/contrib/slapd-modules" || die
-		for l in */*.la */*/*.la; do
-			[[ -e ${l} ]] || continue
-			"${lt}" --mode=install cp ${l} \
-				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
-				die "installing ${l} failed"
-		done
-
-		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
-		docinto contrib
-		doman */*.5
-		#newdoc acl/README*
-		newdoc addpartial/README addpartial-README
-		newdoc allop/README allop-README
-		newdoc allowed/README  allowed-README
-		newdoc autogroup/README autogroup-README
-		newdoc dsaschema/README dsaschema-README
-		newdoc passwd/README passwd-README
-		cd "${S}/contrib/slapi-plugins" || die
-		insinto /usr/$(get_libdir)/openldap/openldap
-		doins  */*.so
-		docinto contrib
-		newdoc addrdnvalues/README addrdnvalues-README
-
-		insinto /etc/openldap/schema
-		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
-
-		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
-		docinto back-shell ; dodoc "${S}"/servers/slapd/back-shell/searchexample*
-		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
-
-		dosbin "${S}"/contrib/slapd-tools/statslog
-		newdoc "${S}"/contrib/slapd-tools/README README.statslog
-	fi
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
-	docinto rfc ; dodoc doc/rfc/*.txt
-}
-
-pkg_preinst() {
-	# keep old libs if any
-	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0)
-	# bug 440470, only display the getting started help there was no openldap before,
-	# or we are going to a non-minimal build
-	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
-	OPENLDAP_PRINT_MESSAGES=$((! $?))
-}
-
-pkg_postinst() {
-	if ! use minimal ; then
-		# You cannot build SSL certificates during src_install that will make
-		# binary packages containing your SSL key, which is both a security risk
-		# and a misconfiguration if multiple machines use the same key and cert.
-		if use ssl; then
-			install_cert /etc/openldap/ssl/ldap
-			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
-			ewarn "add 'TLS_REQCERT allow' if you want to use them."
-		fi
-
-		if use prefix; then
-			# Warn about prefix issues with slapd
-			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
-			eerror "to start up, and requires that certain files directories be owned by"
-			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
-			eerror "directories, you will have to manually fix this yourself."
-		fi
-
-		# These lines force the permissions of various content to be correct
-		if [[ -d "${EROOT}"/var/run/openldap ]]; then
-			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
-			chmod 0755 "${EROOT}"/var/run/openldap || die
-		fi
-		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
-		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
-		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
-	fi
-
-	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
-		elog "Getting started using OpenLDAP? There is some documentation available:"
-		elog "Gentoo Guide to OpenLDAP Authentication"
-		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
-		elog "---"
-		elog "An example file for tuning BDB backends with openldap is"
-		elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0)
-}
diff --git a/net-nds/openldap/openldap-2.4.56.ebuild b/net-nds/openldap/openldap-2.4.56.ebuild
index f8eedca45d4f..019498b6bf95 100644
--- a/net-nds/openldap/openldap-2.4.56.ebuild
+++ b/net-nds/openldap/openldap-2.4.56.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt samba tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index d40b879e5158..8bfebcbdb352 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 875e1ef503b4..2bbc841458d6 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -3,5 +3,5 @@ DIST nicotine+-2.1.2.tar.gz 5091941 BLAKE2B 2fcfcc25645a194e1161502c1836d075732a
 DIST nicotine+-2.2.0.tar.gz 3382047 BLAKE2B 64e83aee32f16ff8fcd298a4f876eca1903a37879918bdf3d1e4684d17b1815caf991ffc0264273fb3b84ab77a300382050039b3c5977a38d1e94ba060f7b58e SHA512 1a3aa24fe09564dbd2cd454e081eb5198279a968a4ab8df0b7f42ea1da63b24ac28ea4000fabf4cf00c6b37d4395b927321d27c1502de3447001285d0c942439
 EBUILD nicotine+-2.0.1-r1.ebuild 873 BLAKE2B 077b529f6a880d238122952fc0d49cb75cfc5742bd533d650f12c5a96c85efd7d3786fea0ca71e40f1223db37f8f0841ad43766190c447d3f2a55d5f9c4ed9aa SHA512 42b4d6da425430544e42027afe647da0a1b6c556fb3513b032fce0f2fd794c55a85bb709019c2bf085ba1f84f37c485cfb73574ab818fc7a7be45c72d4d30d6f
 EBUILD nicotine+-2.1.2.ebuild 912 BLAKE2B 26b89d4276aa9f49c6593fc40392f0d3f6d00d8abe6559e480004c4de5c04de7994cd63a152d099bee44b5610f6f9f5a16edc6573224b58d7446a41a453ca3d1 SHA512 080960a43cf346a13e78d67e9bce1a91b6be329ebee2f5bcd762f1ff2562def006145d0ea89e6fc0cf8e12c3851cf6bbecfb342c6c598a45927237d1a82a3250
-EBUILD nicotine+-2.2.0.ebuild 912 BLAKE2B 26b89d4276aa9f49c6593fc40392f0d3f6d00d8abe6559e480004c4de5c04de7994cd63a152d099bee44b5610f6f9f5a16edc6573224b58d7446a41a453ca3d1 SHA512 080960a43cf346a13e78d67e9bce1a91b6be329ebee2f5bcd762f1ff2562def006145d0ea89e6fc0cf8e12c3851cf6bbecfb342c6c598a45927237d1a82a3250
+EBUILD nicotine+-2.2.0.ebuild 917 BLAKE2B 9737d9bd4e24ecdc7d036cf56964f6c16a4846b07a2408f1e028a9f9786ee9be405131a17e0a804416955058a41b73be0f8531ff7d4eae6424e79dafa1338c3c SHA512 3b4bfc2310d8b32ee88f88f5fc7adb78fed2875bd27b6853e7054a1bf2f900a4cdebee86ea7ce08b1cc57007282da9de8041d99aa3117329494558258bd513de
 MISC metadata.xml 344 BLAKE2B 3e990579dbb468a2dc76bf5ea791367f8009fd3a21508de4ec40e7cc5d4ddca825488a139a63f7424a05e92246ed7e8d193eb6d2aa58a68244169ae77f588472 SHA512 a62b54ffb9368e5a5aa8a119146ae5330797ac7034b1d403bed87550b976daa25bcc7d68b2089122f287c8ecb1ca3f3679609eee3bfac518abbd251545adc3f2
diff --git a/net-p2p/nicotine+/nicotine+-2.2.0.ebuild b/net-p2p/nicotine+/nicotine+-2.2.0.ebuild
index 96b50ea7f31d..c33364d48dd7 100644
--- a/net-p2p/nicotine+/nicotine+-2.2.0.ebuild
+++ b/net-p2p/nicotine+/nicotine+-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz ->
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 3744ea611ba9..df00bd7e8e95 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 1606838be0e7..07f1e601fb87 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -9,6 +9,6 @@ DIST cups-filters-1.28.3.tar.xz 1501824 BLAKE2B b4f493681ac2a701648b3b9b071f4ebf
 EBUILD cups-filters-1.27.4.ebuild 3599 BLAKE2B eb2b2f3dce938b6516342c4926f962f35b51fcc8eb6d1ff5c3d2311515c78c68febfd1fd59633d120cc3fee71b2ed6119d1503e1937e1084560b10b2b4527abe SHA512 78120456764f960f89ae41405286f7b1105be5db5c3cf6cd852bb620120bb56a96798d08a469580947616851d3d23d4f47e5d28830476c8833a8194c6d9e2f8e
 EBUILD cups-filters-1.27.5.ebuild 3611 BLAKE2B b99ea19205844335e42753ae5dd3d443fa327b533293594aa4d2ed43cd20f29691539fd095268f30cf9dfec435ce09941c4761b8263eeadb774117bec10f7ef3 SHA512 f1404c9aa04f7fa5c49ffa1836666f4d3b044f617c4983af273f50d6258fc4a095fe91b93c72cadb1ab2e5e07e5bf57acb8be4544283adb294a58fc871bc353b
 EBUILD cups-filters-1.28.2.ebuild 3608 BLAKE2B 38a5c3f7d865315a8c2780a408b9d77cd043f144368aef425ee44b829f3ea7ae2cc660ff68cc2d46fb9eab799257cd65cb631a58ad59bc9d5d21c4dcac4e8a1b SHA512 77c1cf7be7f6a346d404ee2cbd82da3a8dab8715ae63ed66efede88e841928196a0fbdf2f71972a62b74cf145359aa89e05866eb79d37a9328761f8d666b7f79
-EBUILD cups-filters-1.28.3.ebuild 3608 BLAKE2B 38a5c3f7d865315a8c2780a408b9d77cd043f144368aef425ee44b829f3ea7ae2cc660ff68cc2d46fb9eab799257cd65cb631a58ad59bc9d5d21c4dcac4e8a1b SHA512 77c1cf7be7f6a346d404ee2cbd82da3a8dab8715ae63ed66efede88e841928196a0fbdf2f71972a62b74cf145359aa89e05866eb79d37a9328761f8d666b7f79
+EBUILD cups-filters-1.28.3.ebuild 3601 BLAKE2B 3d8d0213eaf3078026f605fc0019b80f196aa77afe9dcf6bc7939c9bfd3f680484a74252c2ac09d684e17f89e9745791a4251cccc1bd82efef0df6c71877c324 SHA512 619204151d91c263d31db65446b4c1c38dd24b8595fecad329613d3fd8d90a5cf8cc365365c9a7a769824dc42c33ffbc946fa1768ad574fe89912a98ab8f7fc1
 EBUILD cups-filters-9999.ebuild 3537 BLAKE2B b632ca69c758df9a0a3c77a3f410b2212288f945cce61d3782249325eaf04cc5885172cb0f7e02b4f953c608a296889c13f4c16b9be0cd6994bcdad4b6c2b4e1 SHA512 6f506cbfb556e3a0d5e404a6cd802ce63d6bdf90ef7bbbbdd6ce5b6d45f12dd025e4324ee30df36d1d2ce23684550512743cb3ca95f04023ac945ae72aaa5999
 MISC metadata.xml 444 BLAKE2B 43542e8e11bcce56517af18fe24258495e3032a72bec385a513c741bb1b48f9b77d83b2d8ebcd52f83a16b099762e9e85ff4a91e688203cbfc4461b4a68a34fb SHA512 8eafb557741f3d771b445424c4bfeef6e4de60c7aca36c1a1e3541d234d2bcd5e459602bbb7b3b5327403993486d803f8e837ec51dfde64fcdbfa522ad131950
diff --git a/net-print/cups-filters/cups-filters-1.28.3.ebuild b/net-print/cups-filters/cups-filters-1.28.3.ebuild
index d3c34b7f443d..abc6e99329d4 100644
--- a/net-print/cups-filters/cups-filters-1.28.3.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.3.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 7e5d8446ef1b..7932697fb494 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/tailscale/Manifest b/net-vpn/tailscale/Manifest
index 7413224e3273..dc1a7539073c 100644
--- a/net-vpn/tailscale/Manifest
+++ b/net-vpn/tailscale/Manifest
@@ -249,6 +249,6 @@ DIST tailscale_0.98-0_arm.tgz 11276678 BLAKE2B 06e176c8fcd68761b8c3a9399e189b779
 DIST tailscale_0.98-0_arm64.tgz 11288963 BLAKE2B 4244bcb6ff79dfaece4c82917a39804b6d58ce6a5f0572d19f62d9ba4cd40a0031eb723aee5a12dedc1303fbb8e9926d1b6eb9964080c5f162149dd049f8322b SHA512 b81c90a5a4a999a03c7edeaf65a0a2900771ade17a888ee03c29762c491d9fce605ce77f812949cbc36ad113d8a5ce5d2e21d69e91a7b4b8a87a8fc93129aaf4
 EBUILD tailscale-0.98.ebuild 9501 BLAKE2B dda4f99520356e8eb9b1fad56593ae966c1e9e9048aac8ecb5db3e35873d8e75dee606414f4dbdcbd8bfa4bac83411de03266994d07051a6454db34bd68300de SHA512 47db15b8e28d6a7c719d971bf2a1320f7e06b79eec1c992e7de0ec0677106ded6aabe0c5aecfb852955bdbc8d864eab2d494b371a8e6aa96489e451e0bd428c6
 EBUILD tailscale-0.98_p0.ebuild 1149 BLAKE2B 1521c4a30ee1380cb3b0317a0a23d0002a6a6f5ebf9bcc11e719e223d5eb908e4d50dbce367e9a0cac36688e7a83b5f94250c2c5395cac9df8c3a56f7b8db79a SHA512 bfe31ac24857f4840c4c2549256a9ea9567f979f217a4f9c7ce6bedb2e2e30f588074540eacf0ca2b14845eddbca67fabfdd48c8ffa7fe2d7b12ac7736f91f5c
-EBUILD tailscale-1.2.10-r1.ebuild 12373 BLAKE2B e50c2c622463136b8611b0fd38cb63bb2ce1aeb9155a60d0bfaf19d358cd134332767fcfd193b821e16306a4e6a3036a759d4513ff8fe11b30b82175533883bb SHA512 4b3315472522c2e925d5ed200f640bad4176271152842814019a8ed42cdea71ebfd8aa9549c8a3afd4468181b2434489efde81cc676ba97932f28538c954b0c4
+EBUILD tailscale-1.2.10-r1.ebuild 12383 BLAKE2B 682bbe986b7132a56706e0306cd611e72ffff91e24ae3d9584644ce03c51d9fb02e93e2d0095623b12d2122245f893cff7e23813e92f2a40ab501b9825e76117 SHA512 03145d0951c085f862ff577fce866f348b312d75f312fd5a204a9ad92ccf05e66678e0fc9ef42daa71865a23017a8bafdc7abd7e471e46d1029193a76fb057cb
 EBUILD tailscale-1.2.10.ebuild 11850 BLAKE2B a1a8624136edf8027651f9134200dd954bd177571413e1f173255802c3cd635c79183ea76254b6b7c58fcdf07ef60cae5f9d1e690193f4ab6fd8d13a2dd77a14 SHA512 e73b5cd28893479da1e08da5ba5f233e75cc8a4c7d272162b99b06019b227b242c82ecd98286338edfbc703b7d7cdbd0fce8cdbd447866987a25f99cf1cd254d
 MISC metadata.xml 358 BLAKE2B 22d5d18f91742e203070183a10f77a34a2d76c2cb0146a1d5115c168eae27c9030c2ea852a43090bd3a060e45f0b32b1ed00df43c98895a378926ca6ba226825 SHA512 2e84721353876b58131a9b68e832517be62a9ef2d14e8bd7ad4169c4480fdc630ca11c4c9e62cb1ec986913a7531f3efa209cb1ab4538408c0a337650064f789
diff --git a/net-vpn/tailscale/tailscale-1.2.10-r1.ebuild b/net-vpn/tailscale/tailscale-1.2.10-r1.ebuild
index 4b3d61ed3d1e..80f856d571af 100644
--- a/net-vpn/tailscale/tailscale-1.2.10-r1.ebuild
+++ b/net-vpn/tailscale/tailscale-1.2.10-r1.ebuild
@@ -220,7 +220,7 @@ SRC_URI="https://github.com/tailscale/tailscale/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="net-firewall/iptables"
 
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 9a888d72ab11..4511e68af7ac 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 6b6f3ddc9926..8008b0979a52 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -4,6 +4,6 @@ AUX gnuradio-3.8.2.0-lamda-gr-uhd.patch 3748 BLAKE2B bfda3afe8dcc5b872a86379d6d3
 AUX gnuradio-3.8.2.0-lamda-most-components.patch 14122 BLAKE2B 30e63140ced2fdfd9712051ae6d758f2de57511bfdea972364c37d70c1eaf6e41921ad4e14e8f005be53016d8613e1c524b529c7b0e2476afc103edb49cfd946 SHA512 86f5f3ed6856fd183e71af1e6a94bc7e4310842f48a1ae7ed85b79d7a1ff86ebe84027bf24c3dc14a47c28335cc5edc321a7fce1ce24bcb26c0d7432e7aab4f7
 AUX gnuradio-3.8.2.0-lamda-set-msg-handlers.patch 14027 BLAKE2B 5a4a248264df514991343c4eb134c3f3fca2c2e11a5b4eeb63eaa1d0d16a45d87b9a9edebbe30dafeec6488926a7be7ab44d8c15b3c5529000fb488dc7b2dff4 SHA512 6d62d0fc8c06d0df6c046fc69c0280ba1dd2a2f409694c48af67cc6ee72b82d492ef86d10f6d44e4a053f54da187a5dcdc370a82358f2a8595bd37dd8d15eb02
 DIST gnuradio-3.8.2.0.tar.xz 2438736 BLAKE2B 93eabff578cd6b3b6587a6aa083095c787323ebf87a447d61999813e7e5e48b414d080a4fc02d01dabaa9378d42e3a210451a9109fc202991ebda8d1c9669676 SHA512 33930f62762cd9e3d1038b4a903f01e7ab33129732d207c126a89c1f1e719e9d656a94cdcbf3f6010f8476fedacee639c8a12444c41cdd56ad9fbace7863a170
-EBUILD gnuradio-3.8.2.0.ebuild 6244 BLAKE2B 77e64db618f040ce327270754ce00fd475b85af05d1d92acd9344492aebcffdece71bd5b309d3dbe6db020a7b3fc0d728a228f3f377c82f5c7313cfaea4d1674 SHA512 a16d8b41c491cd20a1d006615a94b80cf99f6d89b80d65a62a6d59e14ca99be279d25a95e77a3cd448deb5e997c03b8ad5bcca190f9ef8e89199083862719784
+EBUILD gnuradio-3.8.2.0-r1.ebuild 6374 BLAKE2B 7254a8afa26163c695efab606d2440f2b166d21d9bbf96df5075a29e25cc672e93d0ffbaa3b9c6468d7499e66447a5c3f203dcbe3e71beffac1816d7f11c29f3 SHA512 4a7d97523de00fe42ac658374d303af6aa8cd70df224a968c6e736763663de084ed4b48d5c014edb28cb95029189a925663c9c7cbb607b1074392ffab7ab655d
 EBUILD gnuradio-9999.ebuild 5963 BLAKE2B 80edb3e39b870a933927b52cafc95eef2a2ec29e0bd271bc2ced894fd49bae82c805df8010ff3df358221dfcab545b7d04788750017655f7cd02a7576f4046c7 SHA512 1ca5b9a03688bfea06f83202c34b53adcf5763670b51fd31cfea856d04d568c417d73c2d2145008d35805f19a1a3debc4cf73a607d5e098f4ba2aec08961f523
-MISC metadata.xml 1532 BLAKE2B 0e5d971ca6a16064f0c250b3577bed7196c01089279821adb4d30523a850dc84a9f88936a8ff3471e468b36cf42942c34098e59351e9b97fcd97c6be110213b9 SHA512 636c94dab0303842c19cdb3aaccc354cdb5f14d758ee601e921e3d0bbcd6c7b2080abc16ba04ae9882129711312acfb58edfbd44b2619723cd01a989cafcd204
+MISC metadata.xml 1593 BLAKE2B 75fa7c4bde9843a9e1ff24eb3311a605abf00eeb6624216cc1fb0c6b425f013cf0c26c71076a9eb1d2bf65b6739e9c52a97f47a4bbcceff2640128dbb5c489b8 SHA512 6f9bce6f28289c43a814ae9ee7204c1a74afe85e1758a22b309e55b20e24e00815dbe2f6b6e964d564e79546ca5fce2351c14a099f839653419e62214b51ea30
diff --git a/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.2.0-r1.ebuild
similarity index 94%
rename from net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
rename to net-wireless/gnuradio/gnuradio-3.8.2.0-r1.ebuild
index 72ff39cee8c8..95ad272d2873 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.2.0-r1.ebuild
@@ -21,7 +21,7 @@ else
 	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"
+IUSE="+audio +alsa +analog +digital channels ctrlport 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
@@ -51,8 +51,9 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
 	sci-libs/fftw:3.0=
 	sci-libs/mpir
-	sci-libs/volk
+	sci-libs/volk:=
 	alsa? ( media-libs/alsa-lib:= )
+	ctrlport? ( $(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]') )
 	fec? (
 		sci-libs/gsl
 		dev-python/scipy
@@ -100,7 +101,7 @@ RDEPEND="${PYTHON_DEPS}
 #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
+	!!<net-wireless/gnuradio-3.8
 	app-text/docbook-xml-dtd:4.2
 	>=dev-lang/swig-3.0.5
 	virtual/pkgconfig
@@ -144,6 +145,7 @@ src_configure() {
 		-DENABLE_GR_AUDIO=ON
 		-DENABLE_GR_ANALOG="$(usex analog)"
 		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_CTRLPORT="$(usex ctrlport)"
 		-DENABLE_GR_DIGITAL="$(usex digital)"
 		-DENABLE_DOXYGEN="$(usex doc)"
 		-DENABLE_GR_DTV="$(usex dtv)"
diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index f3386a84a9e2..39b806501e07 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="analog">enable analog signal processing blocks</flag>
 		<flag name="audio">enable blocks to connect to audio sources (mic-in) and sinks (speaker-out) ports on a computer</flag>
 		<flag name="channels">enable channel mode blocks</flag>
+		<flag name="ctrlport">enable control port interface</flag>
 		<flag name="digital">enable digital signal processing blocks</flag>
 		<flag name="dtv">enable digital tv signal processing blocks</flag>
 		<flag name="fec">enable block for convolutional encoding using the CCSDS standard polynomial ("Voyager")</flag>
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index cfee60d9c0b3..477b52c01694 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,5 +1,5 @@
 AUX gqrx-bladerf-samplerate.patch 1197 BLAKE2B 1496903e5ae8ce0cba7b0fc30a34d42afe5e76adefc4ab4566fdd5e6c7e88994843c1ba3462be5f30740e35ddbea451317e0910fc5c6fe3f4564d3afc5bff2e4 SHA512 40e02bdaa7af30ae30eb447f01b79776f792a5f30fe3e1d3317d3a40ff8dedb3f19ef13b1e8566781c07ff1086bc919723c2aed940b7fbe88dff9c124116e73f
 DIST gqrx-2.14.3.tar.gz 1343813 BLAKE2B 19bb721a355f4b61c6a048aa5c2f1e2415ea2447fb6e6b2a0c1913d3dd0b1971523c51b5e27e0f07e671ce90e15996de8d22f54fdeb9873f08229cce50c5f9ab SHA512 436080f18a560a817921e451c2d5784b48b0e2e59ae1485578fe8d2afac9ad052b899fc0e3bb84976519ebaf2e061df31e6215d8957a5d06cc2e8431b9b55bef
-EBUILD gqrx-2.14.3.ebuild 1224 BLAKE2B 6698c8084603cac9ffa4075097ded605d8e8f505a24a1fb1f18792b4429115cbfeada988abff06d3d1566ab7dd3cad215ef1a7ed5083883eefbf0a51a13dd9d9 SHA512 95204bc851a13f35dd6dbbb00657530a135393b066396fe19df50bb5473bc6954ba60c9b47ea27b4edda88539f83d3785875a8bcf7ace661be10b4510f715bfc
-EBUILD gqrx-9999.ebuild 1490 BLAKE2B f0f5bd7edea78f4c31b25122afb2b5434c03081fcf310c508547e1a5c7065cecd9ec75a4daf8c726510ddfd9e42d7d5422151e00a19f42e6c3163cce9d52bd43 SHA512 8162527686dfd3063efa02b9437b359f76b3aebe8ae41409134b4e4697f06b099ec36387d35cdb8baac74659a7ead58eb566a42769ac55956ff44a788ed343ee
+EBUILD gqrx-2.14.3-r1.ebuild 1226 BLAKE2B 247da437a3e740c67eb7345c9c6a8afea176576012c96ac3350b764e199dc9fc48f6e62e1f0e224d405825e2b432a5c9abf343396208b86facb62d15af7c807f SHA512 af94fd78c359ff8b0d0839ec6df771c2a11fc404bc1177180a8528005a36d7f4ae670c9f834443eb6867c71e459ec6d55cdf16ef4c1bd1bc40579ce4cb120e25
+EBUILD gqrx-9999.ebuild 1492 BLAKE2B 8b0006db9383bc4ed07283190e6bb3dfd6eeffb6c06b1c9ccfa1c8033582d765b3666a9bb141b273007845da3660cbb5a77d230325eda5ffc62d019e0340c6a6 SHA512 fd067021d092b0c13f67cc1987aec52d36a57f1b079a6ba9573587c0afe8f63ac17791474fec6bdb546a5127fe8bbe9a9a4cd2f93b4817651e2d7e64929af1fb
 MISC metadata.xml 523 BLAKE2B e40faae08e17b5c9c887870f51a9ea731c60037fa023d85ef386483108047c05b7a1cca299d1d9f92e8933957949b818d5c58c784d0032bb62031348f396dfe7 SHA512 26a1e52770090a69982939ebff1ec4ee26f7c637abf2748c5de5997087e17c0624871e311b17b1b5857ba9ac0bdc8113fd71e13975404462cc84946535adecd8
diff --git a/net-wireless/gqrx/gqrx-2.14.3.ebuild b/net-wireless/gqrx/gqrx-2.14.3-r1.ebuild
similarity index 98%
rename from net-wireless/gqrx/gqrx-2.14.3.ebuild
rename to net-wireless/gqrx/gqrx-2.14.3-r1.ebuild
index 9556937d851a..d1886c3e3d01 100644
--- a/net-wireless/gqrx/gqrx-2.14.3.ebuild
+++ b/net-wireless/gqrx/gqrx-2.14.3-r1.ebuild
@@ -29,7 +29,7 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	sci-libs/volk
+	sci-libs/volk:=
 	pulseaudio? ( media-sound/pulseaudio:= )
 	portaudio? ( media-libs/portaudio:= )"
 RDEPEND="${DEPEND}"
diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-9999.ebuild
index a008cc56721e..eaec3c59f547 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-9999.ebuild
@@ -29,7 +29,7 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	sci-libs/volk
+	sci-libs/volk:=
 	pulseaudio? ( media-sound/pulseaudio:= )
 	portaudio? ( media-libs/portaudio:= )"
 RDEPEND="${DEPEND}"
diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest
index 891bddd9d72c..bea5921b861d 100644
--- a/net-wireless/gr-ieee802154/Manifest
+++ b/net-wireless/gr-ieee802154/Manifest
@@ -1,4 +1,4 @@
 DIST gr-ieee802154-0.0_p20191006.tar.gz 94443 BLAKE2B f561b401b97741e6a06d36b97be765f66778002c6ea7814ffcc08e7aa93d6236705a25c1f32d536d3e2d2193b92608cdd469ba086f459f0f8290c74f52297d6a SHA512 1c552cfe3739165382c36aeb8f556b17ee7925459d74c96d36a7b1f821e177860ddab601c87184cd33db9c97d1231edeb4267bbfbf9df198708db692e27a1a86
-EBUILD gr-ieee802154-0.0_p20191006.ebuild 1477 BLAKE2B 073a9067e81be3fdae9241348d525cef835d7c89766e84fe76a78319ccb951d7f072be1532d927f136f570bc8533d61a6e6de4a55a2d925cfb24563df16f6c12 SHA512 c05ac91dfccbe2ef6da651f9e7578fef44626256dbdb912dc049e16ae801a176e4092514f713b30ae1c1d3b3dc3fc91b3b62fea1211d80be65b172dc4863a39a
-EBUILD gr-ieee802154-9999.ebuild 1477 BLAKE2B 073a9067e81be3fdae9241348d525cef835d7c89766e84fe76a78319ccb951d7f072be1532d927f136f570bc8533d61a6e6de4a55a2d925cfb24563df16f6c12 SHA512 c05ac91dfccbe2ef6da651f9e7578fef44626256dbdb912dc049e16ae801a176e4092514f713b30ae1c1d3b3dc3fc91b3b62fea1211d80be65b172dc4863a39a
+EBUILD gr-ieee802154-0.0_p20191006-r1.ebuild 1455 BLAKE2B 1573cd7361a91412dd0ec3410fd6284977295fb57608f7361ce5ec7270aee23363012d11581c845d0e81f59145c0727bd9468a847423563fe9cb44df78e6ce52 SHA512 259ab5bcad3fc2c840a4e1f93ab8133b0be7196463afaa0f12a38a42073b46f37a24b51028a202009dafe07cc691c66d12eb06a481bcd10714b805ffe7c7b6cd
+EBUILD gr-ieee802154-9999.ebuild 1455 BLAKE2B 1573cd7361a91412dd0ec3410fd6284977295fb57608f7361ce5ec7270aee23363012d11581c845d0e81f59145c0727bd9468a847423563fe9cb44df78e6ce52 SHA512 259ab5bcad3fc2c840a4e1f93ab8133b0be7196463afaa0f12a38a42073b46f37a24b51028a202009dafe07cc691c66d12eb06a481bcd10714b805ffe7c7b6cd
 MISC metadata.xml 326 BLAKE2B 0c715a85a0e2a4aa2ff0ac84318ea552eab5731a60b9b8391ec2540cd30c0f28e13e0b9aa17c45169d335bd10f457b79b11cd2c81538f6b3b11773223ca13364 SHA512 725d903a1befe5e9b41eae5478f65f11dd30a42c5c73597cd8a613347a271528357a176d5e88359ff6cd1074070e6ff413cb70f23d21b9467dd53a5b0d2d65a9
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006-r1.ebuild
similarity index 91%
rename from net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild
rename to net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006-r1.ebuild
index 48499a6bf347..22dfebd48335 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="IEEE 802.15.4 ZigBee Transceiver"
 HOMEPAGE="https://github.com/bastibl/gr-ieee802-15-4"
@@ -28,7 +28,7 @@ RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-libs/gmp
-	sci-libs/volk
+	sci-libs/volk:=
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-lang/swig:0"
@@ -41,7 +41,7 @@ src_prepare() {
 	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
 	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
 	sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -49,10 +49,10 @@ src_configure() {
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	python_optimize "${ED}/$(python_get_sitedir)"
 }
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
index 48499a6bf347..22dfebd48335 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="IEEE 802.15.4 ZigBee Transceiver"
 HOMEPAGE="https://github.com/bastibl/gr-ieee802-15-4"
@@ -28,7 +28,7 @@ RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-libs/gmp
-	sci-libs/volk
+	sci-libs/volk:=
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-lang/swig:0"
@@ -41,7 +41,7 @@ src_prepare() {
 	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
 	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
 	sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -49,10 +49,10 @@ src_configure() {
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	python_optimize "${ED}/$(python_get_sitedir)"
 }
diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest
index d32a4894e1eb..81b0c5f24165 100644
--- a/net-wireless/gr-iio/Manifest
+++ b/net-wireless/gr-iio/Manifest
@@ -1,4 +1,4 @@
 DIST gr-iio-0.3_p20191219.tar.gz 56149 BLAKE2B 9f95d3eadd1e7c87145093571442064d66a9ae72b2d49bdfb8a437757ede3ea7968184686741de45d9d5cadfd95d87c098f6262ff642a37cd5efbd0d14be061b SHA512 9664ce7e45c91389ce9bca0224451c592101a99f2a5ac6122ab822df8e0e8fb595fb8d0f55589237e76e9d3c49534c14902c1d991b75141decfa2e5cf983527c
-EBUILD gr-iio-0.3_p20191219-r1.ebuild 985 BLAKE2B 605ee9494affec56200e04a799672e40ed0e04910dc4e2eaa9469cee9ab8906b247ec85b929e268756ab17f96fb338790bfec31302538cd23ea30b293c3c8db5 SHA512 c7ac95c53ba1d70a9e86a09bbf668209f3d37ea9e1b96f5217869ef5d85ad876d6a5cbf327a4c268bf3931ecb4a2807c76dfb839db3e611af6ec93d0421582aa
-EBUILD gr-iio-9999.ebuild 985 BLAKE2B 605ee9494affec56200e04a799672e40ed0e04910dc4e2eaa9469cee9ab8906b247ec85b929e268756ab17f96fb338790bfec31302538cd23ea30b293c3c8db5 SHA512 c7ac95c53ba1d70a9e86a09bbf668209f3d37ea9e1b96f5217869ef5d85ad876d6a5cbf327a4c268bf3931ecb4a2807c76dfb839db3e611af6ec93d0421582aa
+EBUILD gr-iio-0.3_p20191219-r2.ebuild 987 BLAKE2B 01b27649a47457867c6df8e52929b79574dc7be8d75746c59ec3ebb30a6480172e1c3028544b8a83b7a87d7f7a6127dd6c2c8643344f95c6bc36d12a79547a4d SHA512 4684386fbf7df9601df603c875ba1980f6ff208f3f249afbfcd69e4c7c4eda66b416f05b82ea0b87e821c2da5447aee374399b9a53c354bfcb7bc896e15f230e
+EBUILD gr-iio-9999.ebuild 987 BLAKE2B 01b27649a47457867c6df8e52929b79574dc7be8d75746c59ec3ebb30a6480172e1c3028544b8a83b7a87d7f7a6127dd6c2c8643344f95c6bc36d12a79547a4d SHA512 4684386fbf7df9601df603c875ba1980f6ff208f3f249afbfcd69e4c7c4eda66b416f05b82ea0b87e821c2da5447aee374399b9a53c354bfcb7bc896e15f230e
 MISC metadata.xml 434 BLAKE2B 565c3b42597436890ea7bc2d5b13d16720480e8932878c73bc3efe0708ca6ad2e900b7595248dfc0e25fbca17ad3f216bdfc02c0f29519013db5ac8137a09a7c SHA512 1e970d2cfc935f25ad3cde099739a9574c8bcae6a4e8c59d7aba6bd01319155d9bfc80124d2dad649f24aa7a937bdad7cc843525282f72b10e5e999eca7a4f49
diff --git a/net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild b/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild
similarity index 98%
rename from net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild
rename to net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild
index b86aad9b816d..4c0884935b0f 100644
--- a/net-wireless/gr-iio/gr-iio-0.3_p20191219-r1.ebuild
+++ b/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild
@@ -29,7 +29,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	net-libs/libiio:=
 	dev-libs/gmp
-	sci-libs/volk
+	sci-libs/volk:=
 	net-libs/libad9361-iio:="
 
 DEPEND="${RDEPEND}
diff --git a/net-wireless/gr-iio/gr-iio-9999.ebuild b/net-wireless/gr-iio/gr-iio-9999.ebuild
index b86aad9b816d..4c0884935b0f 100644
--- a/net-wireless/gr-iio/gr-iio-9999.ebuild
+++ b/net-wireless/gr-iio/gr-iio-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	net-libs/libiio:=
 	dev-libs/gmp
-	sci-libs/volk
+	sci-libs/volk:=
 	net-libs/libad9361-iio:="
 
 DEPEND="${RDEPEND}
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 20f3293518fd..34e157af0739 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,6 +1,7 @@
+AUX gr-osmosdr-0.2.3-use_xtrx_open_string.patch 931 BLAKE2B 21df3d2ef163f7216ad8b34c86877b65b4909523bd80bf1d1a7ab86fa1676f777a49a670a456a2b4babdcbbee7063e6fd8b6a24a025b92d43632d580fa8ab329 SHA512 0d763dbbd510f273fbe937bf51a07cda2f2d9e53dcfdb64d210f3c85c51e6995223cf13d81d94b90dc7dc0fddde8fc8ea6f30d23b652edf8945fee08c494b1f0
 DIST gr-osmosdr-0.2.0.tar.gz 251163 BLAKE2B 036a4439c5c27ae3143ef3be6e76f94bf3e0524509ffc58ad19379fa0adc9477bd704b7e88fffd46ed9e5528ae539d875b4e496a77ea392e8eef117fc57a3af1 SHA512 96eb8ff0a05cf0d5b49384cdc80e0a3d924ba452485acbe852266fd73a5335668b40454421d9f5a52ea610f7100557e51d6a5d9cf6931fe68e8757eb5f02d126
-DIST gr-osmosdr-0.2.2.tar.gz 251425 BLAKE2B e1e29280b84139bf4b1b25ee35553f48abe7f26f9f240852c25f883ec6df406157d9b734035fd6df87e50b6d6f8ddab679ea91430558716acba05a9a64844c3d SHA512 42aef6efd35fd9184a371202398455de7cac3a88374e761359ab837a329495b653a95f5641f0a9533daeaa08c0d7fd5649b1b33359009dd4e8a3b9b24aedd2af
+DIST gr-osmosdr-0.2.3.tar.gz 252727 BLAKE2B 04fe86496c09a274058bfd812fc14d7843d7e9db2648cf2cf5292e50494a859e22b1ab211f7078f2b6964c786c5f5ad5c3c9d2dd44ec5fc96d240b96f2cb63f4 SHA512 3c82a39972a309aa5b023b9c5e61f1fc80b797380b7a6c6c23cd4fe278cfaba3ab3019f32d38ebc01300868bb892f6aaaa7f12c9ee9b7ab5ba3e38817a40bf3e
 EBUILD gr-osmosdr-0.2.0.ebuild 1966 BLAKE2B ae9b27b1b420dbda5d612aa75c67451008cad32e852da3765d25ae64e11d1202f3911d293ab45dd5fa88b854ba447705299f3412ea2e52f88060d5952116e731 SHA512 8e5882f21cbfe98f2bfae8f6e8c6fd8827e18234150f1557e28f4d53cd1778757b3a160ed1cbf6608e6de3de564c92c9e5d58ce4e435f2db21ee5caeef00af59
-EBUILD gr-osmosdr-0.2.2.ebuild 2199 BLAKE2B 90a673c1a90268b367a93f593a22e905d1a83ad4e43597564b8b10142cd8898996621851c1ca45a50bd2d892234b0467e6bf145ae08aba8d31fb309f02ee6a8a SHA512 141a81ca92922bbdf69f2731e1e20200a61372abb8b32d0be26ccb8679627b8b8b64d53a2e17147635df3a804700cf64118d39b48c69026efd911ddbcf73b28e
-EBUILD gr-osmosdr-9999.ebuild 1870 BLAKE2B e2146fd7533be269ecd9ebb06db93fee74fd41a1c9b01fdb9f4e9941ba8880d414686aff305c44d5a2803f8f2e2f924254053417305b59f43b9a176e203bc109 SHA512 3fa2aebcfee0cdc93ecd56a1a045d94d6bdf7e4e514cc25c10c0b4ad25b3d075a42cdd0695be7243f23c150da2ee37431e3d47d86c99b530f5f6d913c515021c
-MISC metadata.xml 906 BLAKE2B 7c95ce3b8aa4159311da0d1b52be2bbe8f455035a4b35a7e93b45beb0cd064c57520dcf1fb9e28578ee631d9f18fd76e6f88885adc4fd8518cf413eb39e0cce0 SHA512 4774699e05eb13ac4a006a68f8d5f173ddb5528561b71cee5e2e2e3a84b7ae843f0be621df245933e3ac250b6bc7b03494f6435b1d940c9e78844a563f449ef3
+EBUILD gr-osmosdr-0.2.3.ebuild 2086 BLAKE2B c80e97c924ad2bdc00eca42e599d3cc798d918e17b5bd3838b91161a30abe76fc746b637ff412b46eccdb1065c32b8cacd00b2a827f107475a234c256d700865 SHA512 510e50573c6cf0a1503c37b499f876e0ac4bfb580c2d4b9c6d1b53a0d3998e4746a1ce09b147d9bbfe43c232d4c9648999f147aa9fa24546f96fb1dd5448bf9d
+EBUILD gr-osmosdr-9999.ebuild 2041 BLAKE2B baff49fcc2d1c9498847d2321a9c8db37139132b712cdfabe7fbe1ee063e28084679f18ebb39ead6291d9af10291be6f4c0a415456f21592304b38987e5c1bfd SHA512 fc14f90b62b810404a2d3229b22dad9d13f3672d38ddc72991142c0b61719d394747d9fee1d73e25f4b15bf7058ff87ea929620b9ee924eede10630e916d3ff1
+MISC metadata.xml 972 BLAKE2B f74851bbd10231ba483924bac8c7610096905bfc6e045b23456d74956a2b0f6dcb27c9ea9cc05902b06b2e2efde3aa49905f733045e4a3c1c13e95842edcc1a7 SHA512 d8861f09b73ae23ba92d49339d662b738abbaab0428c20509c347cb852432842352f22a6beb764e2118679db3a22fd6892261dd8093ab4cd1c5b7a7cd19e8276
diff --git a/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch
new file mode 100644
index 000000000000..7699c81fed32
--- /dev/null
+++ b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch
@@ -0,0 +1,23 @@
+From ecca19615c588f771a131432f7161156efc274c2 Mon Sep 17 00:00:00 2001
+From: lain <code@hacktheinter.net>
+Date: Tue, 30 Jul 2019 15:59:38 -0700
+Subject: [PATCH] Quick patch to use xtrx_open_string() instead of the removed
+ xtrx_open_list().
+
+---
+ lib/xtrx/xtrx_obj.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/xtrx/xtrx_obj.cc b/lib/xtrx/xtrx_obj.cc
+index 1d58de5..5c73259 100644
+--- a/lib/xtrx/xtrx_obj.cc
++++ b/lib/xtrx/xtrx_obj.cc
+@@ -68,7 +68,7 @@ xtrx_obj::xtrx_obj(const std::string &path, unsigned loglevel, bool lmsreset)
+   unsigned xtrxflag = (loglevel & XTRX_O_LOGLVL_MASK) | ((lmsreset) ? XTRX_O_RESET : 0);
+   std::cerr << "xtrx_obj::xtrx_obj = " << xtrxflag << std::endl;
+ 
+-  int res = xtrx_open_list(path.c_str(), NULL, &_obj);
++  int res = xtrx_open_string(path.c_str(), &_obj);
+   if (res < 0) {
+     std::stringstream message;
+     message << "Couldn't open "  ": Error: " << -res;
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
similarity index 58%
rename from net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild
rename to net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
index af9ebaa516aa..127e46a60320 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.2.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
@@ -19,47 +19,47 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
+IUSE="airspy bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
-	sci-libs/volk
+	sci-libs/volk:=
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
-	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
+	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )
+	xtrx? ( net-wireless/libxtrx )
+	"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-src_prepare() {
-	cmake_src_prepare
-	sed -i "s:\${GR_DOC_DIR}/\${CMAKE_PROJECT_NAME}:\${GR_DOC_DIR}/${PF}:" CMakeLists.txt || die
-}
+PATCHES=(
+	"${FILESDIR}/${P}-use_xtrx_open_string.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DENABLE_FILE=ON
-		-DENABLE_AIRSPY="$(usex airspy)"
-		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_HACKRF="$(usex hackrf)"
-		-DENABLE_IQBALANCE="$(usex iqbalance)"
-		-DENABLE_MIRI="$(usex mirisdr)"
-		-DENABLE_PYTHON="$(usex python)"
-		-DENABLE_RTL="$(usex rtlsdr)"
-		-DENABLE_RTL_TCP="$(usex rtlsdr)"
-		-DENABLE_SOAPY="$(usex soapy)"
-		-DENABLE_UHD="$(usex uhd)"
-		-DENABLE_SDRPLAY="$(usex sdrplay)"
-		-DENABLE_NONFREE="$(usex sdrplay)"
+		-DENABLE_AIRSPY="$(usex airspy ON OFF)"
+		-DENABLE_BLADERF="$(usex bladerf ON OFF)"
+		-DENABLE_HACKRF="$(usex hackrf ON OFF)"
+		-DENABLE_IQBALANCE="$(usex iqbalance ON OFF)"
+		-DENABLE_PYTHON="$(usex python ON OFF)"
+		-DENABLE_RTL="$(usex rtlsdr ON OFF)"
+		-DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)"
+		-DENABLE_SDRPLAY="$(usex sdrplay ON OFF)"
+		-DENABLE_NONFREE="$(usex sdrplay ON OFF)"
+		-DENABLE_SOAPY="$(usex soapy ON OFF)"
+		-DENABLE_UHD="$(usex uhd ON OFF)"
+		-DENABLE_XTRX="$(usex xtrx ON OFF)"
 	)
 
 	cmake_src_configure
@@ -68,10 +68,8 @@ src_configure() {
 src_install() {
 	cmake_src_install
 	if use python; then
-		# Remove incorrectly byte-compiled Python files and replace
-		# https://github.com/gnuradio/gnuradio/issues/2944
-		find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
 		python_fix_shebang "${ED}"/usr/bin
 		python_optimize
 	fi
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
 }
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index 00b281ec6758..33c1a0233fa8 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -21,10 +21,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="airspy bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd"
 
+#xtrx? ( net-wireless/libxtrx )
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
-	sci-libs/volk
+	sci-libs/volk:=
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
@@ -32,27 +33,30 @@ RDEPEND="${PYTHON_DEPS}
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
+	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )
+	"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_configure() {
+	#-DENABLE_XTRX="$(usex xtrx ON OFF)"
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DENABLE_FILE=ON
-		-DENABLE_AIRSPY="$(usex airspy)"
-		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_HACKRF="$(usex hackrf)"
-		-DENABLE_IQBALANCE="$(usex iqbalance)"
-		-DENABLE_PYTHON="$(usex python)"
-		-DENABLE_RTL="$(usex rtlsdr)"
-		-DENABLE_RTL_TCP="$(usex rtlsdr)"
-		-DENABLE_SOAPY="$(usex soapy)"
-		-DENABLE_UHD="$(usex uhd)"
-		-DENABLE_SDRPLAY="$(usex sdrplay)"
-		-DENABLE_NONFREE="$(usex sdrplay)"
+		-DENABLE_AIRSPY="$(usex airspy ON OFF)"
+		-DENABLE_BLADERF="$(usex bladerf ON OFF)"
+		-DENABLE_HACKRF="$(usex hackrf ON OFF)"
+		-DENABLE_IQBALANCE="$(usex iqbalance ON OFF)"
+		-DENABLE_PYTHON="$(usex python ON OFF)"
+		-DENABLE_RTL="$(usex rtlsdr ON OFF)"
+		-DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)"
+		-DENABLE_SDRPLAY="$(usex sdrplay ON OFF)"
+		-DENABLE_NONFREE="$(usex sdrplay ON OFF)"
+		-DENABLE_SOAPY="$(usex soapy ON OFF)"
+		-DENABLE_UHD="$(usex uhd ON OFF)"
+		-DENABLE_XTRX=OFF
 	)
 
 	cmake_src_configure
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index 39125bb505e6..cc8249dcdf23 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -15,5 +15,6 @@
 	<flag name="sdrplay">Enable support for SDRplay devices through <pkg>net-wireless/sdrplay</pkg></flag>
 	<flag name="soapy">Build with SoapySDR support</flag>
 	<flag name="uhd">Build with Ettus Research USRP Hardware Driver support</flag>
+	<flag name="xtrx">Build with xtrx Hardware Driver support</flag>
 </use>
 </pkgmetadata>
diff --git a/net-wireless/gr-paint/Manifest b/net-wireless/gr-paint/Manifest
index a635ef0ad95b..8ee5fd263695 100644
--- a/net-wireless/gr-paint/Manifest
+++ b/net-wireless/gr-paint/Manifest
@@ -1,4 +1,4 @@
 DIST gr-paint-0.0_p20200517.tar.gz 1588114 BLAKE2B dffae6fdd6832ef7a39911b5f20d385e1691021e49659c36244c4aa1086fa74f4f59aceb4f208a24dd76854455183644c8f7db7e6ed0600664dc02f08e6682c5 SHA512 00b508b08baafd02e69197028a6408da81f5d1bf3dfe6d3229f248d60503ccec48f3fa0491bb785ed1ece40ea90d34544bc3b62e4506459488d56540b9d519c2
-EBUILD gr-paint-0.0_p20200517.ebuild 1239 BLAKE2B 064df4e230b2fba16170e10b2802d61d0bd72ebea664d8a8eb4d4fda7bf00362198f28dee6edca2eef9c6c5e2b3ed9dcfc6f2a3b2630ded73b7106899e28a860 SHA512 a4da87078dd0297af87953bac720f160d92f58e33dedc669e150a5c3acf6af87ab1cb0692a246123bf5bd06b9e726e3f1b8cea938bcb7e64008563a0bb900c23
-EBUILD gr-paint-9999.ebuild 1239 BLAKE2B 064df4e230b2fba16170e10b2802d61d0bd72ebea664d8a8eb4d4fda7bf00362198f28dee6edca2eef9c6c5e2b3ed9dcfc6f2a3b2630ded73b7106899e28a860 SHA512 a4da87078dd0297af87953bac720f160d92f58e33dedc669e150a5c3acf6af87ab1cb0692a246123bf5bd06b9e726e3f1b8cea938bcb7e64008563a0bb900c23
+EBUILD gr-paint-0.0_p20200517-r1.ebuild 1241 BLAKE2B a3fd58f7314e6415b42a6344b687a56629c96d06e233ef3180093171091f95bda50cfd2ba7ce27835ebf3e08cb956482521c8487e227d736650befcb11442bfb SHA512 833175a829ddf8107c7b14a45314cc58851144059ed4987cb01121a79a6f63c6fabdf5c20b40c362450422eaf9df5132d6c8a48a12e066079e28f6f73446dfef
+EBUILD gr-paint-9999.ebuild 1241 BLAKE2B a3fd58f7314e6415b42a6344b687a56629c96d06e233ef3180093171091f95bda50cfd2ba7ce27835ebf3e08cb956482521c8487e227d736650befcb11442bfb SHA512 833175a829ddf8107c7b14a45314cc58851144059ed4987cb01121a79a6f63c6fabdf5c20b40c362450422eaf9df5132d6c8a48a12e066079e28f6f73446dfef
 MISC metadata.xml 426 BLAKE2B c0655dfe4af8bc17dc267dcadf37625b86e4830bc565044fe43b0911d166a19d6ab56dc73d2ad37890e5d0f83ca52fd078034fd6675310447361cebd2730b704 SHA512 10082af73f8e1acbf8a97062d4802b8ae6a3f187034933c7a14fe932aac3e654b3dde399ec33b3cf174c528ac77d41f2ab75969e39cb6e2f9c343ce52f7d0b64
diff --git a/net-wireless/gr-paint/gr-paint-0.0_p20200517.ebuild b/net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild
similarity index 98%
rename from net-wireless/gr-paint/gr-paint-0.0_p20200517.ebuild
rename to net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild
index 132442bd9f33..b96da1e6659c 100644
--- a/net-wireless/gr-paint/gr-paint-0.0_p20200517.ebuild
+++ b/net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="${PYTHON_DEPS}
 		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-libs/gmp
-	sci-libs/volk
+	sci-libs/volk:=
 	=net-wireless/gnuradio-3.8*:=[${PYTHON_SINGLE_USEDEP}]
 "
 RDEPEND="${DEPEND}
diff --git a/net-wireless/gr-paint/gr-paint-9999.ebuild b/net-wireless/gr-paint/gr-paint-9999.ebuild
index 132442bd9f33..b96da1e6659c 100644
--- a/net-wireless/gr-paint/gr-paint-9999.ebuild
+++ b/net-wireless/gr-paint/gr-paint-9999.ebuild
@@ -32,7 +32,7 @@ DEPEND="${PYTHON_DEPS}
 		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-libs/gmp
-	sci-libs/volk
+	sci-libs/volk:=
 	=net-wireless/gnuradio-3.8*:=[${PYTHON_SINGLE_USEDEP}]
 "
 RDEPEND="${DEPEND}
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 0d10f253989f..18cdda043f5c 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -4,7 +4,6 @@ AUX hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
 AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 BLAKE2B fa9fb5db77955095e083a98a067072fccde02bf55f27af226c8aec515b047f28ab37d9f7c9a1bcc18e584ad3e582bc4dd59beabfcf15b5305394b05e687980a6 SHA512 63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38
 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01 SHA512 66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c
-EBUILD hostapd-2.9-r1.ebuild 6803 BLAKE2B 8651030448176873599cf48122c958fbd48130506be543f674a5811cbf1fbca224e6b70610d737aba40d4880f9db976771df314e917b93f84edb1ef3a2bf2379 SHA512 c25fff3e0767cdaadb8f8c181916422b127f0851f66150333a2c1cda89493f1b162f63975f3eca6eb2d181121201a8b74a55436a4b540005bb9918f8c2180253
 EBUILD hostapd-2.9-r3.ebuild 7437 BLAKE2B a5f58c2e465cec4b95d945c078c3695fa86c1b5372458bf32465daadfc7ef912489db1ba148c842deaf94db9ef655ed7943ad0bb06414427ed43c932116abb8a SHA512 956b2344bb31ced7059cb16a22b0f653497c5c502bcbd66c2ca76483f025beaca9257b5824c7925edc9b54fd05deae8424ca6f0de0a43909d27ab9f2b920eec8
 EBUILD hostapd-9999.ebuild 7018 BLAKE2B e764ca677e98783701319bda67b8d7b1efb21994db193b07de71a775a6d2638ee0e78c32d4749de247a120f61a6fda47583cd3003baaacff21c5c0c88d86abb3 SHA512 d393440cdf12fefbb98e2e0aeb4001fc91fe456589d5cf4dca656906c66dc95b2eb8cfd3ab2bd7b50b68fa85751e5cc4140f2a7d4291bb00d61880cd6e8f41e9
 MISC metadata.xml 1116 BLAKE2B 658e8397f7ebf2f5f265e1376ee87f29ed9fa81012f0269bf655f4f2647c58f27f7cafc3bcd61ddf312039cef59ad525baf8dcb52dccff8e16842952294da839 SHA512 451d5d71930a4624d2ffc70ee69671d2a2400b0b715a19d0b7f4c14e7ec0457147b068e6ca65fbcc6ff3d75eeb721047f399f55e01fa8d7072dc02c57985813d
diff --git a/net-wireless/hostapd/hostapd-2.9-r1.ebuild b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
deleted file mode 100644
index 379f8c74ea7c..000000000000
--- a/net-wireless/hostapd/hostapd-2.9-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs systemd savedconfig
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://w1.fi"
-EXTRAS_VER="2.7-r2"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
-
-if [[ $PV == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://w1.fi/hostap.git"
-else
-	if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
-		SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz"
-	else
-		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
-	fi
-	# Never stabilize snapshot ebuilds please
-	KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
-
-DEPEND="
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? (
-		internal-tls? ( dev-libs/libtommath )
-		!internal-tls? ( dev-libs/openssl:0=[-bindist] )
-	)
-	kernel_linux? (
-		dev-libs/libnl:3
-		crda? ( net-wireless/crda )
-	)
-	netlink? ( net-libs/libnfnetlink )
-	sqlite? ( >=dev-db/sqlite-3 )"
-
-RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"
-
-pkg_pretend() {
-	if use internal-tls; then
-		if use libressl; then
-			elog "libressl flag takes precedence over internal-tls"
-		else
-			ewarn "internal-tls implementation is experimental and provides fewer features"
-		fi
-	fi
-}
-
-src_unpack() {
-	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
-	default
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	# Allow users to apply patches to src/drivers for example,
-	# i.e. anything outside ${S}/${PN}
-	pushd ../ >/dev/null || die
-	default
-	#CVE-2019-16275 bug #696032
-	eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
-	popd >/dev/null || die
-
-	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-		"${S}/hostapd.conf" || die
-}
-
-src_configure() {
-	local CONFIG="${S}/.config"
-
-	restore_config "${CONFIG}"
-	if [[ -f "${CONFIG}" ]]; then
-		default_src_configure
-		return 0
-	fi
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# EAP authentication methods
-	echo "CONFIG_EAP=y" >> ${CONFIG}
-	echo "CONFIG_ERP=y" >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-
-	if use internal-tls && ! use libressl; then
-		echo "CONFIG_TLS=internal" >> ${CONFIG}
-	else
-		# SSL authentication methods
-		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-		echo "CONFIG_TLSV11=y" >> ${CONFIG}
-		echo "CONFIG_TLSV12=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
-	fi
-
-	if use wps; then
-		# Enable Wi-Fi Protected Setup
-		echo "CONFIG_WPS=y" >> ${CONFIG}
-		echo "CONFIG_WPS2=y" >> ${CONFIG}
-		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-		echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
-		einfo "Enabling Wi-Fi Protected Setup support"
-	fi
-
-	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
-	echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
-	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
-
-	einfo "Enabling drivers: "
-
-	# drivers
-	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
-	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
-	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
-	einfo "  None driver enabled"
-
-	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
-
-	# epoll
-	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
-
-	# misc
-	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
-	echo "CONFIG_PKCS12=y" >> ${CONFIG}
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
-	echo "CONFIG_IAPP=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
-	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
-	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
-	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
-	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
-	echo "CONFIG_HS20=y" >> ${CONFIG}
-	echo "CONFIG_WNM=y" >> ${CONFIG}
-	echo "CONFIG_FST=y" >> ${CONFIG}
-	echo "CONFIG_FST_TEST=y" >> ${CONFIG}
-	echo "CONFIG_ACS=y" >> ${CONFIG}
-
-	if use netlink; then
-		# Netlink support
-		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
-	fi
-
-	if use ipv6; then
-		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
-	fi
-
-	if use sqlite; then
-		# Sqlite support
-		echo "CONFIG_SQLITE=y" >> ${CONFIG}
-	fi
-
-	# If we are using libnl 2.0 and above, enable support for it
-	# Removed for now, since the 3.2 version is broken, and we don't
-	# support it.
-	if has_version ">=dev-libs/libnl-3.2"; then
-		echo "CONFIG_LIBNL32=y" >> .config
-	fi
-
-	# TODO: Add support for BSD drivers
-
-	default_src_configure
-}
-
-src_compile() {
-	emake V=1
-
-	if use libressl || ! use internal-tls; then
-		emake V=1 nt_password_hash
-		emake V=1 hlr_auc_gw
-	fi
-}
-
-src_install() {
-	insinto /etc/${PN}
-	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
-
-	fperms -R 600 /etc/${PN}
-
-	dosbin ${PN}
-	dobin ${PN}_cli
-
-	if use libressl || ! use internal-tls; then
-		dobin nt_password_hash hlr_auc_gw
-	fi
-
-	newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
-	newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
-	systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
-
-	doman ${PN}{.8,_cli.1}
-
-	dodoc ChangeLog README
-	use wps && dodoc README-WPS
-
-	docinto examples
-	dodoc wired.conf
-
-	if use logwatch; then
-		insinto /etc/log.d/conf/services/
-		doins logwatch/${PN}.conf
-
-		exeinto /etc/log.d/scripts/services/
-		doexe logwatch/${PN}
-	fi
-
-	save_config .config
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you are running openRC you need to follow this instructions:"
-	einfo "In order to use ${PN} you need to set up your wireless card"
-	einfo "for master mode in /etc/conf.d/net and then start"
-	einfo "/etc/init.d/${PN}."
-	einfo
-	einfo "Example configuration:"
-	einfo
-	einfo "config_wlan0=( \"192.168.1.1/24\" )"
-	einfo "channel_wlan0=\"6\""
-	einfo "essid_wlan0=\"test\""
-	einfo "mode_wlan0=\"master\""
-	einfo
-	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
-	#	einfo "This package now compiles against the headers installed by"
-	#	einfo "the kernel source for the mac80211 driver. You should "
-	#	einfo "re-emerge ${PN} after upgrading your kernel source."
-	#fi
-
-	if use wps; then
-		einfo "You have enabled Wi-Fi Protected Setup support, please"
-		einfo "read the README-WPS file in /usr/share/doc/${P}"
-		einfo "for info on how to use WPS"
-	fi
-}
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 00b2bcbee151..2827dc9c3241 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -3,6 +3,6 @@ AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540
 DIST kismet-2020-09-R4.tar.xz 8692520 BLAKE2B 68098080cfca6968538ecf4840a3ab06f95bfe9b72829dc7ea551b1a5f15d5b65fbfaa8cecfef19a537abf081d0c4e2b2ffdedc0e34023a3393013227c898d97 SHA512 4f2dd641999dd2675d2c4dfbe28caf5a8476d5d7bd9dedeefb7b1420b48b9155a4d576123832974586d51c61ca4d77d8572ab7038da3ec6fa2a7791f3e1a1479
 DIST kismet-2020-12-R2.tar.xz 9888412 BLAKE2B 6228c7c760d4e35cfbedcbd93e5b461bf81821832ea1bdcc3645a5770ddbbd83dbe9d69d6c7b88e3e279fbd1d52306217283e4307b71d8cdb7679506bf2f4c69 SHA512 c31fa1e603a3c6f533b2df13b9b676c82ab48e933078649840e7a0fdaa79227f05dd5b69c1381761a57f81293780b94ded1a69859173972815c30f004086fb58
 EBUILD kismet-2020.09.4.ebuild 5268 BLAKE2B 9dfbea58df8d91bfdc448c2b2632803427defccdbd02ec64925a39a9541b393d2b1138976f19682cc8e3e77e741d975c123ae696b7c19e762ab63883cea1d744 SHA512 d928be999f4352102cb5c066f561914aeb8f6e3fa3a46cd3ae9bec432104ce7f257ed7abbfc2e2813d879f76b577b17726c1a883331461e17e59297885447410
-EBUILD kismet-2020.12.2.ebuild 5407 BLAKE2B 7f6f6ed9148263761ab4a84d406bc38c3b55f4666f60c37e412ea9527608fd7801da587264bda1cf4c53b787a5c462c98c5171f6186bd3141b6074011f959d19 SHA512 30f79e7040048e9994dac0b65637a33f4ea305a1d79c8d0c410d90f635cd003dc4490196798bdc8eb0ca8111dbaf54d18ab4b274b584b1e4e9cbbe73c5a58e8d
+EBUILD kismet-2020.12.2.ebuild 5417 BLAKE2B 1422dc5cc63eb688e0098290b0dd468dafa6e1c78b8f133a62a6da6727f1e49bb17bca1f33832afa4c2681b75281a5d45475e75e7688f94791d20aad8b54ba60 SHA512 38a0e72101c659bc2c717246fe6bfd06ff82bd21aa49a23372eefd0aa48e28f9ec00e305ccc13ab7de121f5d64c37e9232488acb1b0d8dba51877ef552e56136
 EBUILD kismet-9999.ebuild 5353 BLAKE2B 021a715e070f8d03aaf4fa02c8e45eac65c26c73c8997d908cf37b832b6c4cd6c9372e688c30580012e8c52c9bdd1b2c028f1250c5765967bc122b9bfa71b186 SHA512 956d4ca0b78278de7cff8815eecfbadb703924cd3e894bcbb5a01933dce10ead7dbad7b82da463dab48194b49ded34ce2e5418532c3802319a2525485682fb1f
 MISC metadata.xml 786 BLAKE2B 86f38600535248d3b03f57ea796b57d7cc5ea04c2e35095702b586574740105efdd3710ab05e15c2faef640c7a5ddeb835cd4055e3426591129ab5802a2708b2 SHA512 a6ff91e31ed15b2e6fb381210b654c1a1195699c466d36af838c9ec4d560d632a194ff7597f167cd8281ad9908d75eb39aef5a73d7dc59fdf2020aaf5359a0f8
diff --git a/net-wireless/kismet/kismet-2020.12.2.ebuild b/net-wireless/kismet/kismet-2020.12.2.ebuild
index 35f0b45d87e0..0bae15f58323 100644
--- a/net-wireless/kismet/kismet-2020.12.2.ebuild
+++ b/net-wireless/kismet/kismet-2020.12.2.ebuild
@@ -27,7 +27,7 @@ else
 
 	#Desired (minimum) keywords
 	#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
diff --git a/net-wireless/liblms7002m/Manifest b/net-wireless/liblms7002m/Manifest
new file mode 100644
index 000000000000..2282c1243698
--- /dev/null
+++ b/net-wireless/liblms7002m/Manifest
@@ -0,0 +1,4 @@
+DIST liblms7002m-0.0_p20200518.tar.gz 31413 BLAKE2B 8365734a60bba43597a8337d186021d92685dce068049817800176801aacf50f2eea0bc2cec62d406eb33393fd2252b22789a6b5b38b88748a5ae94d28c9243a SHA512 c684dca2652680f25c6ac089f0283899976b7f1075cfa11ff230ac4b2307357c3ef66e601eb8c97de5315738e08ff14a6dbd345d8c50df91e91ded2bb41f8988
+EBUILD liblms7002m-0.0_p20200518.ebuild 866 BLAKE2B b37cf13308a1663b8fb97d885e0d62f17584f40d6e30fcc4d23262bc8982aabdb7d36af6ffa0821fe345b9e8162795cecd41e78bacd7ef680cd3ade8513489f9 SHA512 462fb4f5e5822e70c8ce1fb935ebfca8437487ebd32a3d14bace79be32085f6e7ca84a3e05ce99be15ab97da413a8804edc41fe030b3e274b47566111792222a
+EBUILD liblms7002m-9999.ebuild 867 BLAKE2B ac98bd46e8111c1f2cc4b6d5beb5b678fa935a9ca238f25aafab2a86353a0cc38995ce35836cf00b2e121f6b733fa3e9bdbeb9c1ddaab90cb25944f06e580ada SHA512 2797113256f60b0213dd340aa399a3952c2ebffcf552dbe52c514e89b903bd1c99d5d1f14c9381e7d2a9d7b51c434a1bf8a8c279146e0b66ada80ae91e2d85ac
+MISC metadata.xml 236 BLAKE2B 73f8e0f032b7abedeac605a57f521a00392b26928d004b85cf8fcc361dc1990a7613b9af17a90128b08bfeb4e20b7e0c06513015364f3fd7ee4827ab1cdfcc92 SHA512 cea0eb2ba613122981274bbdad968381934f4db4b7313a788c2bf19e4156219d603e4fffb5ec1f66cc5ebc5338624b4c5de70f6174d9485c951972fc91f95825
diff --git a/net-wireless/liblms7002m/liblms7002m-0.0_p20200518.ebuild b/net-wireless/liblms7002m/liblms7002m-0.0_p20200518.ebuild
new file mode 100644
index 000000000000..cd7d613bfdbe
--- /dev/null
+++ b/net-wireless/liblms7002m/liblms7002m-0.0_p20200518.ebuild
@@ -0,0 +1,35 @@
+# 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-single-r1
+
+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/xtrx-sdr/liblms7002m.git"
+	inherit git-r3
+else
+	COMMIT="b07761b7386181f0e6a35158456b75bce14f2aca"
+	SRC_URI="https://github.com/xtrx-sdr/liblms7002m/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/cheetah3[${PYTHON_USEDEP}]')"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
diff --git a/net-wireless/liblms7002m/liblms7002m-9999.ebuild b/net-wireless/liblms7002m/liblms7002m-9999.ebuild
new file mode 100644
index 000000000000..3ba717f5c72d
--- /dev/null
+++ b/net-wireless/liblms7002m/liblms7002m-9999.ebuild
@@ -0,0 +1,35 @@
+# 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-single-r1
+
+DESCRIPTION="Compact LMS7002M library suitable for resource-limited MCUs"
+HOMEPAGE="https://github.com/xtrx-sdr/liblms7002m"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/xtrx-sdr/liblms7002m.git"
+	inherit git-r3
+else
+	COMMIT="b07761b7386181f0e6a35158456b75bce14f2aca"
+	SRC_URI="https://github.com/xtrx-sdr/liblms7002m/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/cheetah3[${PYTHON_USEDEP}]')"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
diff --git a/virtual/cdrtools/metadata.xml b/net-wireless/liblms7002m/metadata.xml
similarity index 58%
rename from virtual/cdrtools/metadata.xml
rename to net-wireless/liblms7002m/metadata.xml
index 6f49eba8f496..1f2eaaafc142 100644
--- a/virtual/cdrtools/metadata.xml
+++ b/net-wireless/liblms7002m/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="project">
+	<email>radio@gentoo.org</email>
+	<name>Radio</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-wireless/libusb3380/Manifest b/net-wireless/libusb3380/Manifest
new file mode 100644
index 000000000000..f62c3430e0d8
--- /dev/null
+++ b/net-wireless/libusb3380/Manifest
@@ -0,0 +1,4 @@
+DIST libusb3380-0.0_p20190125.tar.gz 30572 BLAKE2B 95da2e1e9355f781293a01b2ee4535df931d9cbdc67c204c6ba3bc4f66c7a3dc9d9b8f1883ce92a35e350ea881a4e855926837ab4aa211c1fecd63721386b963 SHA512 e433d40b4176fe5e884035e9364d1a52b40f8495a34034f68f196bbad48d344eff1674f45f7e5afbd3045bf50285c8c0dd021e405ff764b638a4b3640d29fd9a
+EBUILD libusb3380-0.0_p20190125.ebuild 629 BLAKE2B 165112a1128ac5866f3cd7f5417bc916bd06e582c752252dbd54b8ce46578c5d7b53119f6f8d73991dc5a7e747819e4878d6c3542e194eb7d7c5ca3191a6f860 SHA512 48db096c05c66c09650c8b0bef42088ee503c1f81215c968c38a99945213dd9649fca57dff1b5749349d0a5ff6a45e892d7bd80c33ea1624666df342c3005412
+EBUILD libusb3380-9999.ebuild 629 BLAKE2B 165112a1128ac5866f3cd7f5417bc916bd06e582c752252dbd54b8ce46578c5d7b53119f6f8d73991dc5a7e747819e4878d6c3542e194eb7d7c5ca3191a6f860 SHA512 48db096c05c66c09650c8b0bef42088ee503c1f81215c968c38a99945213dd9649fca57dff1b5749349d0a5ff6a45e892d7bd80c33ea1624666df342c3005412
+MISC metadata.xml 236 BLAKE2B 73f8e0f032b7abedeac605a57f521a00392b26928d004b85cf8fcc361dc1990a7613b9af17a90128b08bfeb4e20b7e0c06513015364f3fd7ee4827ab1cdfcc92 SHA512 cea0eb2ba613122981274bbdad968381934f4db4b7313a788c2bf19e4156219d603e4fffb5ec1f66cc5ebc5338624b4c5de70f6174d9485c951972fc91f95825
diff --git a/net-wireless/libusb3380/libusb3380-0.0_p20190125.ebuild b/net-wireless/libusb3380/libusb3380-0.0_p20190125.ebuild
new file mode 100644
index 000000000000..938bde8c3140
--- /dev/null
+++ b/net-wireless/libusb3380/libusb3380-0.0_p20190125.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+DESCRIPTION="USB3380 abstraction layer for libusb"
+HOMEPAGE="https://github.com/xtrx-sdr/libusb3380"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xtrx-sdr/libusb3380.git"
+else
+	COMMIT="c83d1e93eb3a5b8b6a9db41c2613b206f344f825"
+	SRC_URI="https://github.com/xtrx-sdr/libusb3380/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/net-wireless/libusb3380/libusb3380-9999.ebuild b/net-wireless/libusb3380/libusb3380-9999.ebuild
new file mode 100644
index 000000000000..938bde8c3140
--- /dev/null
+++ b/net-wireless/libusb3380/libusb3380-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+DESCRIPTION="USB3380 abstraction layer for libusb"
+HOMEPAGE="https://github.com/xtrx-sdr/libusb3380"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xtrx-sdr/libusb3380.git"
+else
+	COMMIT="c83d1e93eb3a5b8b6a9db41c2613b206f344f825"
+	SRC_URI="https://github.com/xtrx-sdr/libusb3380/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-python/backports/metadata.xml b/net-wireless/libusb3380/metadata.xml
similarity index 58%
rename from dev-python/backports/metadata.xml
rename to net-wireless/libusb3380/metadata.xml
index 6c49200e959f..1f2eaaafc142 100644
--- a/dev-python/backports/metadata.xml
+++ b/net-wireless/libusb3380/metadata.xml
@@ -2,10 +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>radio@gentoo.org</email>
+	<name>Radio</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="pypi">backports</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/libxtrx/Manifest b/net-wireless/libxtrx/Manifest
new file mode 100644
index 000000000000..6e04159a3110
--- /dev/null
+++ b/net-wireless/libxtrx/Manifest
@@ -0,0 +1,4 @@
+DIST libxtrx-0.0_p20201202.tar.gz 78058 BLAKE2B 5d2bcd3857226208158abfd8a6790ecc1204e59336f81cac90368da2f7628c9fe2ec3b8b794afe66720aa53455f1b7ead9b2f6fc36edd36718452c294b6e7aa5 SHA512 bc32c0cdc9d19bda62582081b950b50698e000c42cbfd46904287bb12d216d875d636579cfbd68d94d83e67df655825c0f88697854cc134d2cef5a20d614f73f
+EBUILD libxtrx-0.0_p20201202.ebuild 872 BLAKE2B 9727a4d020f4a51b204ced2230739b4e93eb8034f52597eb203389241bbf0291bf36998e1897c8735d209b8ad49294df7c67159af7ea9a5395aa01682585e2ce SHA512 46d4a1575d738729079b1cdff0d1d021127723140994e5551bfc5508c1b80b5108ba512bc63798de303ad36ed121efc6ffb635fa6ae32c4ecc001f5e416191bf
+EBUILD libxtrx-9999.ebuild 872 BLAKE2B 9727a4d020f4a51b204ced2230739b4e93eb8034f52597eb203389241bbf0291bf36998e1897c8735d209b8ad49294df7c67159af7ea9a5395aa01682585e2ce SHA512 46d4a1575d738729079b1cdff0d1d021127723140994e5551bfc5508c1b80b5108ba512bc63798de303ad36ed121efc6ffb635fa6ae32c4ecc001f5e416191bf
+MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild b/net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild
new file mode 100644
index 000000000000..5277ce0e5d1f
--- /dev/null
+++ b/net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="High-level XTRX API library"
+HOMEPAGE="https://github.com/xtrx-sdr/libxtrx"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/xtrx-sdr/libxtrx.git"
+	inherit git-r3
+else
+	COMMIT="acb0b1cf7ab92744034767a04c1d4b4c281b840f"
+	SRC_URI="https://github.com/xtrx-sdr/libxtrx/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+		net-wireless/libxtrxll:=
+		net-wireless/libxtrxdsp:=
+		net-wireless/liblms7002m:=
+"
+#		soapy? ( net-wireless/soapysdr )
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	#fails to build, not sure why
+	#-DENABLE_SOAPY="$(usex soapy ON OFF)"
+	mycmakeargs=(
+		-DENABLE_SOAPY=OFF
+	)
+	cmake_src_configure
+}
diff --git a/net-wireless/libxtrx/libxtrx-9999.ebuild b/net-wireless/libxtrx/libxtrx-9999.ebuild
new file mode 100644
index 000000000000..5277ce0e5d1f
--- /dev/null
+++ b/net-wireless/libxtrx/libxtrx-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="High-level XTRX API library"
+HOMEPAGE="https://github.com/xtrx-sdr/libxtrx"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/xtrx-sdr/libxtrx.git"
+	inherit git-r3
+else
+	COMMIT="acb0b1cf7ab92744034767a04c1d4b4c281b840f"
+	SRC_URI="https://github.com/xtrx-sdr/libxtrx/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+		net-wireless/libxtrxll:=
+		net-wireless/libxtrxdsp:=
+		net-wireless/liblms7002m:=
+"
+#		soapy? ( net-wireless/soapysdr )
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	#fails to build, not sure why
+	#-DENABLE_SOAPY="$(usex soapy ON OFF)"
+	mycmakeargs=(
+		-DENABLE_SOAPY=OFF
+	)
+	cmake_src_configure
+}
diff --git a/net-wireless/libxtrx/metadata.xml b/net-wireless/libxtrx/metadata.xml
new file mode 100644
index 000000000000..1570f891c6a3
--- /dev/null
+++ b/net-wireless/libxtrx/metadata.xml
@@ -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>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-wireless/libxtrxdsp/Manifest b/net-wireless/libxtrxdsp/Manifest
new file mode 100644
index 000000000000..ad3c73f957ef
--- /dev/null
+++ b/net-wireless/libxtrxdsp/Manifest
@@ -0,0 +1,4 @@
+DIST libxtrxdsp-0.0_p20200830.tar.gz 27269 BLAKE2B 8d62b46467c5f4714acaeb0c828281061a77c0ba5bd2c774989b826c14d11b999076f9ca4c5b970771011ccd2d6438cb1c32c27dc5ade727d125e3577541aa3c SHA512 ad2bea31ab348d8c27c951813bff97ff5411b4f908d880f6e592290390b442d7827aae876d70e2cac7304f1d20a9d8c320867b92b9bc3df7b3f27c439bdc0a8e
+EBUILD libxtrxdsp-0.0_p20200830.ebuild 638 BLAKE2B 33c65a7c4854ddafb45b3e0bc729c75d7e333d6db67ea58b59775debcc792b064f969ab1e195e5366b0be02af2555acdeb4843f550f224e125e49b0e79eb63f1 SHA512 570004c689718ae8dc8eb7f01d8f0f91a650a65436036e25b37df6be3aa250fd2a0d2a109177c65f94efac4e35d450c9d6b0d669d846a74f772ac9138ab8159f
+EBUILD libxtrxdsp-9999.ebuild 638 BLAKE2B 33c65a7c4854ddafb45b3e0bc729c75d7e333d6db67ea58b59775debcc792b064f969ab1e195e5366b0be02af2555acdeb4843f550f224e125e49b0e79eb63f1 SHA512 570004c689718ae8dc8eb7f01d8f0f91a650a65436036e25b37df6be3aa250fd2a0d2a109177c65f94efac4e35d450c9d6b0d669d846a74f772ac9138ab8159f
+MISC metadata.xml 236 BLAKE2B 73f8e0f032b7abedeac605a57f521a00392b26928d004b85cf8fcc361dc1990a7613b9af17a90128b08bfeb4e20b7e0c06513015364f3fd7ee4827ab1cdfcc92 SHA512 cea0eb2ba613122981274bbdad968381934f4db4b7313a788c2bf19e4156219d603e4fffb5ec1f66cc5ebc5338624b4c5de70f6174d9485c951972fc91f95825
diff --git a/net-wireless/libxtrxdsp/libxtrxdsp-0.0_p20200830.ebuild b/net-wireless/libxtrxdsp/libxtrxdsp-0.0_p20200830.ebuild
new file mode 100644
index 000000000000..6f8a227e202e
--- /dev/null
+++ b/net-wireless/libxtrxdsp/libxtrxdsp-0.0_p20200830.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+DESCRIPTION="DSP specific function for SDR in general and XTRX in specific"
+HOMEPAGE="https://github.com/xtrx-sdr/libxtrxdsp"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xtrx-sdr/libxtrxdsp.git"
+else
+	COMMIT="eec28640c0ebd5639b642f07b310a0a0d02d9834"
+	SRC_URI="https://github.com/xtrx-sdr/libxtrxdsp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/net-wireless/libxtrxdsp/libxtrxdsp-9999.ebuild b/net-wireless/libxtrxdsp/libxtrxdsp-9999.ebuild
new file mode 100644
index 000000000000..6f8a227e202e
--- /dev/null
+++ b/net-wireless/libxtrxdsp/libxtrxdsp-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+DESCRIPTION="DSP specific function for SDR in general and XTRX in specific"
+HOMEPAGE="https://github.com/xtrx-sdr/libxtrxdsp"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xtrx-sdr/libxtrxdsp.git"
+else
+	COMMIT="eec28640c0ebd5639b642f07b310a0a0d02d9834"
+	SRC_URI="https://github.com/xtrx-sdr/libxtrxdsp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/net-wireless/libxtrxdsp/metadata.xml b/net-wireless/libxtrxdsp/metadata.xml
new file mode 100644
index 000000000000..1f2eaaafc142
--- /dev/null
+++ b/net-wireless/libxtrxdsp/metadata.xml
@@ -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>radio@gentoo.org</email>
+	<name>Radio</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-wireless/libxtrxll/Manifest b/net-wireless/libxtrxll/Manifest
new file mode 100644
index 000000000000..7bb70b351345
--- /dev/null
+++ b/net-wireless/libxtrxll/Manifest
@@ -0,0 +1,4 @@
+DIST libxtrxll-0.0_p20201202.tar.gz 68732 BLAKE2B f1eeeb3cd9368224a512ade5389cd5f289613e47736f2577cf9a3a7266ee6a8159e60b1523414277fb8dbdcc206d2a8b53b6a72a591af54d40f3175f2192c139 SHA512 b9c32db32e7782db5831b73ea34d801f2b09cc42773db0ea3504f500717c11303083e1b9808ef9d0c6efd19ce0dab2f97f79ef20e9b892fa15a42c52cdeb4db1
+EBUILD libxtrxll-0.0_p20201202.ebuild 787 BLAKE2B 35408dba13b2a025e1c4aa0b12fd503ab872fe632b3ddcb410be7ae4b6a39fb7323416e99de34b0f325053f27df120f67593218bcba00132550fd175642a2c10 SHA512 7953c02abedba0618a29076c9dedd54860f71ed6b145a6c6d61d0d894a815bfd91fffdea5063b186a420b0a0769c43a4ff3d5cf06ca6eca5369766b8888474dc
+EBUILD libxtrxll-9999.ebuild 787 BLAKE2B 35408dba13b2a025e1c4aa0b12fd503ab872fe632b3ddcb410be7ae4b6a39fb7323416e99de34b0f325053f27df120f67593218bcba00132550fd175642a2c10 SHA512 7953c02abedba0618a29076c9dedd54860f71ed6b145a6c6d61d0d894a815bfd91fffdea5063b186a420b0a0769c43a4ff3d5cf06ca6eca5369766b8888474dc
+MISC metadata.xml 306 BLAKE2B 00589291a79926d6d234d062057f9e5356ed9e3e6b05880605f66cb71604251a5863d98533cbf384568e69ba51763d13e36ed476d3c12b136208493c629c836b SHA512 22b19c03224b61c872015136228b7c9e4d66e7e3741ca24105d24704a1327438cf2e925929b42e87ca52420fe61d604b1224a0ac0cf5c151a2937483590c55b1
diff --git a/net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild b/net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild
new file mode 100644
index 000000000000..6e0b7183d221
--- /dev/null
+++ b/net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Low-level XTRX hardware abstraction library"
+HOMEPAGE="https://github.com/xtrx-sdr/libxtrxll"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/xtrx-sdr/libxtrxll.git"
+	inherit git-r3
+else
+	COMMIT="1b6eddfbedc700efb6f7e3c3594e43ac6ff29ea4"
+	SRC_URI="https://github.com/xtrx-sdr/libxtrxll/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="usb3380"
+
+RDEPEND="usb3380? ( net-wireless/libusb3380 )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_PCIE=ON
+		-DENABLE_USB3380="$(usex usb3380 ON OFF)"
+	)
+	cmake_src_configure
+}
diff --git a/net-wireless/libxtrxll/libxtrxll-9999.ebuild b/net-wireless/libxtrxll/libxtrxll-9999.ebuild
new file mode 100644
index 000000000000..6e0b7183d221
--- /dev/null
+++ b/net-wireless/libxtrxll/libxtrxll-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Low-level XTRX hardware abstraction library"
+HOMEPAGE="https://github.com/xtrx-sdr/libxtrxll"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/xtrx-sdr/libxtrxll.git"
+	inherit git-r3
+else
+	COMMIT="1b6eddfbedc700efb6f7e3c3594e43ac6ff29ea4"
+	SRC_URI="https://github.com/xtrx-sdr/libxtrxll/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="usb3380"
+
+RDEPEND="usb3380? ( net-wireless/libusb3380 )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_PCIE=ON
+		-DENABLE_USB3380="$(usex usb3380 ON OFF)"
+	)
+	cmake_src_configure
+}
diff --git a/net-wireless/libxtrxll/metadata.xml b/net-wireless/libxtrxll/metadata.xml
new file mode 100644
index 000000000000..e711f2c752d9
--- /dev/null
+++ b/net-wireless/libxtrxll/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>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<use>
+		<flag name="usb3380">support xtrx usb model</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index a574a668c151..bbf01b41482d 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -11,7 +11,7 @@ DIST unifi-6.1.26.zip 243498936 BLAKE2B 72a17f02279ecedd8f876df85167824a03abebb2
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
 EBUILD unifi-6.0.41.ebuild 1565 BLAKE2B f2c97c8425ddbf3d8e6be92076993feb7da2c1c60802f0ef544c05be197dedec07cf2593e5d998464aeaf299ea13283524570dd1e3ff59c4bc285603e2406b16 SHA512 c9811f60745c408409638b4d334eb91da016a83e77f1b0ab417b7c6da4f0ade8b8883d263e501ef0b32f375ceacf7d4e05b0c515c965adbfdc41c3d47962aa2c
 EBUILD unifi-6.0.42.ebuild 1566 BLAKE2B ffd3e28a82be97ee19bc0b1e9b233043e188efe974ac66d07da76d6e8404d4d81dcde9f697f0b78e31f9ea1e1e01143bb3d389c59cae75fb8da7b3fe42a7818d SHA512 ca96322294cc453a364d736be4ea5159232612eabf98f16a8486a52a14dab1fb1549ea7601aaca13d1940a1e0d509aed89c29bcdfe9258b5428a3294d88f2109
-EBUILD unifi-6.0.43.ebuild 1566 BLAKE2B 928c0575362660c2e20de6dd7647bbc60d65f70a1b512328ac5926983b23cd11b408db51fcf2d0546b67c0eff38e36600e26ee8175bf050e705d84ef15497a76 SHA512 73bfe70d67d64fcb4d86a46fb3e20c03b2f5a35df13986f17b764cb7cbb9739a13c87a95c62389c087f718ea8dd8986c4f95c1841c2466d9d13905e6e17b739a
+EBUILD unifi-6.0.43.ebuild 1565 BLAKE2B 8b55f4c16cd19b6e34d86c8efae53bff61d80c55e2dc351927d6f5860e6e0db8ebcfd02cf1aff2c1c5998f41da165a53f6e71ba184d705fa6c178c62140726ae SHA512 1fc10fb07c246c9d5b7f6d22dca402c6a79af60c6f450b4ada3b724855092a5eb9af94a1077a2e64cd4d3623ada7d1ba26fff131e04bdfa834e6b6e8c70f331a
 EBUILD unifi-6.1.25.ebuild 1566 BLAKE2B e59fb68b8f475fe749a31cf89adcc03d52a9de40348f4f62a84a761afa8a883c787f6f4b8254da00ba712fa3adcfb76e901f94525b294b364f47ccfa31ead4f2 SHA512 d1563a980e956e414e414ec1ff544c7a952bbe9bfb8e433be52ea81cf45124ddc75f10d67973b1a940bff593aa0c43b3149215a2b8bc2d1bed5709bc7ee9d497
 EBUILD unifi-6.1.26.ebuild 1566 BLAKE2B 1e7c0b6b4dffc76041f23daa3d6523a7e4b088f4cf3be529bf1acc7bf48c94049d51e351c425bf6a488bb253708bcb62983c2918364ac8f0792231e67c486023 SHA512 f1b22181098927c83c0cefd7359c112ea38f1b4c096edbb4eaee97cbc0ef56261292ddc19e5208319bdfa85908d5203dfaf91f4dc9b893052fc6047f6ff73a9a
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-6.0.43.ebuild b/net-wireless/unifi/unifi-6.0.43.ebuild
index 398ae438bf38..eac3e4e11b51 100644
--- a/net-wireless/unifi/unifi-6.0.43.ebuild
+++ b/net-wireless/unifi/unifi-6.0.43.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
 HOMEPAGE="https://www.ubnt.com"
 SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
 SLOT="0/6.0"
 IUSE="systemd"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 25d990a827e2..de8b57dbbb7f 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch.list b/profiles/arch.list
index 2822f0292434..b790001fa259 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -20,6 +20,7 @@ arm-linux
 arm64-linux
 ppc64-linux
 x86-linux
+arm64-macos
 ppc-macos
 x86-macos
 x64-macos
@@ -31,4 +32,3 @@ x86-solaris
 x64-winnt
 x86-winnt
 x64-cygwin
-x86-cygwin
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index fc79664a2729..1063049785bc 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Rick Farina <zerochaos@gentoo.org> (2020-12-18)
+# net-wireless/libxtrx et all needs testing
+net-wireless/gr-osmosdr xtrx
+
+# Rick Farina <zerochaos@gentoo.org> (2020-12-18)
+# dev-python/thrift not keyworded
+net-wireless/gnuradio ctrlport
+
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
 # app-i18n/fcitx:4 not keyworded.
 media-libs/libsdl2 fcitx4
diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults
index 0470aeb57c3a..0f4d4bedc582 100644
--- a/profiles/arch/base/make.defaults
+++ b/profiles/arch/base/make.defaults
@@ -3,6 +3,6 @@
 
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 arm64-macos hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
 
 PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH"
diff --git a/profiles/arches.desc b/profiles/arches.desc
index cb185e0c9e5b..264149975db6 100644
--- a/profiles/arches.desc
+++ b/profiles/arches.desc
@@ -30,6 +30,7 @@ arm-linux	testing
 arm64-linux	testing
 ppc64-linux	testing
 x86-linux	testing
+arm64-macos	testing
 ppc-macos	testing
 x86-macos	testing
 x64-macos	testing
@@ -41,6 +42,5 @@ x86-solaris	testing
 x64-winnt	testing
 x86-winnt	testing
 x64-cygwin	testing
-x86-cygwin	testing
 
 # vim: set ts=8 noet ft=conf:
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index a4d6231ed7bc..381cadc2d597 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # 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-12-18)
+# app-text/ots is masked for removal.  Bug #648964.
+app-office/abiword ots
+
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-12-07)
 # Waiting for unmasking of slotted Lua.
 >=app-i18n/fcitx-4.2.9.8:4 lua
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index d5337bc35a2b..43106d8c28e4 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -23,7 +23,7 @@ LINGUAS="en"
 IUSE_IMPLICIT="prefix prefix-guest prefix-stack"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
 USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
 USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"
diff --git a/profiles/license_groups b/profiles/license_groups
index 3e9a99a6c618..102f625154ec 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JNIC JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LPPL-1.3 LPPL-1.3b lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay SVFL symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
+MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JNIC JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LPPL-1.3 LPPL-1.3b lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay SVFL symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE Amazon Atmel AVASYS bh-luxi bonnie Broadcom freedis
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA 2dboy-EULA AdobeFlash-11.x AMD-GPU-PRO-EULA AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA MakeMKV-EULA Mendeley-terms Microsemi Mojang ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
+EULA 2dboy-EULA AdobeFlash-11.x AMD-GPU-PRO-EULA AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA MakeMKV-EULA Microsemi Mojang microsoft-edge ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2018 Oracle-BCLA-JavaSE PAPERS-PLEASE Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index bbd3875e6369..ad5f5d56081d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,70 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2020-12-20)
+# Requires old dev-python/unidecode.  Last commit in 2017.  No revdeps.
+# Suggested replacement: dev-python/python-slugify.
+# Removal in 30 days.  Bug #714718.
+dev-python/awesome-slugify
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-12-20)
+# Needs a port to haskell-src-exts compatible with ghc-8.8.
+# https://github.com/ndmitchell/derive/pull/37
+dev-haskell/derive
+app-forensics/quickfuzz
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-19)
+# Made redundant by compiler-rt's crt implementation.  No revdeps left.
+# Removal in 30 days.  Bug #760711.
+sys-libs/netbsd-csu
+
+# Mike Pagano <mpagano@gentoo.org> (2020-12-18)
+# Serious data corruption bug when using F2FS,
+# see https://bugzilla.kernel.org/show_bug.cgi?id=210765
+# Feel free to manually unmask when not using F2FS.
+=sys-kernel/gentoo-sources-5.10.0
+=sys-kernel/gentoo-sources-5.10.1
+=sys-kernel/vanilla-sources-5.10.1
+=sys-kernel/vanilla-sources-5.10.0
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Unmaintained.  Last bumped in 2008.  Last upstream (beta) in 2014.
+# The current Gentoo version fails to install.
+# Removal in 30 days.  Bug #701044.
+net-mail/vacation
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Unmaintained.  Homepage gone.  Last bumped in 2008.  Carries multiple
+# patches.  Fails to build again.
+# Removal in 30 days.  Bug #675364.
+net-ftp/tlswrap
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Upstream gone.  Last bumped in 2007.  Fails to build, again.
+# Removal in 30 days.  Bug #648964.
+app-text/ots
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Unmaintained.  The current Gentoo version fails to build, it needs
+# a version bump.
+# Removal in 30 days.  Bug #669452.
+net-misc/dhcpd-pools
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Unmaintained.  Last bumped in 2018.  Vulnerable.  No revdeps.
+# Removal in 30 days.  Bug #736050.
+dev-db/aerospike-server-community
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Abandoned upstream, circa 2013.  Vulnerable.  No revdeps.
+# Removal in 30 days.  Bug #744217.
+app-text/peg-markdown
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Abandoned in 2008.  No reverse dependencies left.
+# Removal in 30 days.  Bug #652192.
+dev-libs/ustr
+
 # Jack Todaro <solpeth@posteo.org> (2020-12-17)
 # Old and redundant package. Has not been kept
 # up to date and no longer works. Masked for removal.
@@ -50,11 +114,6 @@ mail-filter/dovecot_deleted_to_trash
 # Removal in 30 days.  Bug #720066.
 dev-python/sphinxcontrib-issuetracker
 
-# Michael Palimaka <kensington@gentoo.org> (2020-12-13)
-# Buggy. Uncooperative upstream.
-# Masked for removal in 30 days.
-x11-misc/albert
-
 # Sam James <sam@gentoo.org> (2020-12-13)
 # This new version of libcap-ng seems to (still)
 # break consumers.
@@ -115,18 +174,6 @@ net-wireless/qradiolink
 net-libs/liba53
 app-emulation/qt-virt-manager
 
-# Michał Górny <mgorny@gentoo.org> (2020-12-03)
-# Explicit namespace support was necessary for Python 2 only.  Empty
-# directories work best for Python 3.
-# Removal in 14 days.
-dev-python/backports
-dev-python/namespace-jaraco
-
-# Aaron Bauman <bman@gentoo.org> (2020-12-02)
-# Deprecated. Functionality is native to dev-python/pytest now
-# Removal in 14 days
-dev-python/pytest-catchlog
-
 # Joonas Niilola <juippis@gentoo.org> (2020-12-01)
 # Not maintained in Gentoo, multiple versions behind, unsafe, EAPI-5,
 # Use other kernel source / binary packages instead,
@@ -236,11 +283,6 @@ dev-libs/libmissing
 # #697444, #699320, #708058, #746230, Removal in 30 days.
 games-emulation/fakenes
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-21)
-# Dead upstream, depends on deprecated kde-frameworks/kmediaplayer
-# Masked for removal in 30 days.
-media-video/kmplayer
-
 # Michał Górny <mgorny@gentoo.org> (2020-11-19)
 # These packages are maintained by the Python project, or have
 # no maintainer.  They have not been ported to Python 3.8 yet.
@@ -279,13 +321,6 @@ dev-python/vcversioner
 dev-python/xlutils
 dev-python/zict
 
-# Matt Turner <mattst88@gentoo.org> (2020-11-19)
-# Ancient packages long since deprecated in the age of udev.
-# Removal in 30 days. Bug #755617
-sys-apps/hwdata-gentoo
-sys-apps/hwsetup
-sys-libs/libkudzu
-
 # Jonas Stein <jstein@gentoo.org> (2020-11-12)
 # Adobe will stop distributing Flash Player after 2020-12-31.
 # Masked for removal after 2020-12-31
@@ -467,7 +502,7 @@ kde-apps/kdebase-meta:5
 >=games-engines/love-0.8.0-r100:0.8
 >=games-engines/love-11.3-r100:0
 >=games-engines/solarus-1.3.1-r100
->=games-engines/stratagus-2.4.3-r100
+=games-engines/stratagus-2.4.3-r100
 >=games-puzzle/fish-fillets-1.0.1-r100
 >=games-roguelike/crossfire-client-1.71.0-r100
 >=games-roguelike/stone-soup-0.25.1-r100
@@ -491,10 +526,18 @@ kde-apps/kdebase-meta:5
 >=net-analyzer/rrdtool-1.7.2-r100
 >=net-analyzer/snort-2.9.16-r100
 >=net-analyzer/suricata-6.0.1-r100
+>=net-analyzer/wireshark-3.4.2-r100
 >=net-im/prosody-0.11.7-r100
 >=net-im/swift-4.0.2-r100
+>=net-irc/hexchat-2.14.3-r100
+>=net-irc/weechat-3.0-r100
+>=net-libs/axtls-2.1.5-r100
+>=net-misc/asterisk-16.14.0-r100
+>=net-mail/dovecot-2.3.11.3-r100
 >=net-p2p/eiskaltdcpp-2.2.10-r100
 >=sci-astronomy/celestia-1.7.0_pre20200316-r100
+>=sci-libs/libsc-2.2-r100
+>=sci-libs/p4est-2.2-r100
 >=sci-libs/plplot-5.15.0-r100
 =sci-visualization/gnuplot-5.4.0-r100
 =sci-visualization/gnuplot-5.4.1-r1
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.mask b/profiles/prefix/darwin/macos/10.5/ppc/package.mask
deleted file mode 100644
index ba9daf5618b6..000000000000
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2018-06-18)
-# FSF GCC is our system compiler here
--sys-devel/gcc
diff --git a/profiles/prefix/sunos/solaris/5.10/eapi b/profiles/prefix/darwin/macos/11.0/arm64/eapi
similarity index 100%
rename from profiles/prefix/sunos/solaris/5.10/eapi
rename to profiles/prefix/darwin/macos/11.0/arm64/eapi
diff --git a/profiles/prefix/darwin/macos/11.0/arm64/make.defaults b/profiles/prefix/darwin/macos/11.0/arm64/make.defaults
new file mode 100644
index 000000000000..6de9f160caa6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/arm64/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="arm64-apple-darwin20"
+CHOST_arm64="${CHOST}"
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/parent b/profiles/prefix/darwin/macos/11.0/arm64/parent
similarity index 100%
rename from profiles/prefix/sunos/solaris/5.10/x64/parent
rename to profiles/prefix/darwin/macos/11.0/arm64/parent
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/eapi b/profiles/prefix/darwin/macos/arch/arm64/eapi
similarity index 100%
rename from profiles/prefix/sunos/solaris/5.10/sparc/eapi
rename to profiles/prefix/darwin/macos/arch/arm64/eapi
diff --git a/profiles/prefix/darwin/macos/arch/arm64/make.defaults b/profiles/prefix/darwin/macos/arch/arm64/make.defaults
new file mode 100644
index 000000000000..3ceab05d32e1
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/make.defaults
@@ -0,0 +1,11 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="arm64-macos"
+ACCEPT_KEYWORDS="~x64-macos"  # this is a hack whilst we don't have full system
+
+# multilib build stuff, single ABI (no multilib)
+ABI="arm64"
+DEFAULT_ABI="arm64"
+MULTILIB_ABIS="arm64"
+LIBDIR_arm64="lib"
diff --git a/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
new file mode 100644
index 000000000000..6bfe36915c9d
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pre_src_configure() {
+	# catch when multiple pkgs are in one ebuild
+	pushd "${WORKDIR}" > /dev/null
+
+	# macOS Big Sur (11.x, darwin20) supports Apple Silicon (arm64),
+	# which config.sub currently doesn't understand about.  It is,
+	# however, Apple who seem to use arm64-apple-darwin20 CHOST
+	# triplets, so patch that for various versions of autoconf
+	# This bit should be kept in sync with fix_config_sub in
+	# bootstrap-prefix.sh
+	if [[ ${CHOST} == arm64-apple-darwin* ]] ; then
+		# Apple Silicon doesn't use aarch64, but arm64
+		find . -name "config.sub" | \
+			xargs sed -i -e 's/ arm\(-\*\)* / arm\1 | arm64\1 /'
+		find . -name "config.sub" | \
+			xargs sed -i -e 's/ aarch64 / aarch64 | arm64 /'
+	fi
+
+	popd > /dev/null
+}
diff --git a/profiles/prefix/darwin/macos/arch/arm64/use.force b/profiles/prefix/darwin/macos/arch/arm64/use.force
new file mode 100644
index 000000000000..b4557bfe8498
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.force
@@ -0,0 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Force the flag corresponding to the default ABI
+x64-macos
+arm64-macos
+abi_arm64
diff --git a/profiles/prefix/sunos/solaris/5.10/package.mask b/profiles/prefix/darwin/macos/arch/arm64/use.mask
similarity index 55%
rename from profiles/prefix/sunos/solaris/5.10/package.mask
rename to profiles/prefix/darwin/macos/arch/arm64/use.mask
index 3e3cc3434f46..c0d406b47c49 100644
--- a/profiles/prefix/sunos/solaris/5.10/package.mask
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.mask
@@ -1,3 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Unmask the flag corresponding to the default ABI
+-x64-macos
+-arm64-macos
+-abi_arm64
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
index 90c1048e4022..bcc732c3eb55 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
@@ -5,11 +5,6 @@
 # able to compile binutils-apple
 sys-devel/binutils-apple
 -sys-devel/native-cctools
-# and unmask FSF GCC itself of course
--sys-devel/gcc
 
 # packages which link to framework and therefore fail (blocks)
 dev-util/pkgconfig
-
-# cmake-3.19.1 works for us
-->=dev-util/cmake-3.14
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 831cbe6cf8a8..4f8cc88126e6 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,17 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2020-12-20)
+# we need to establish this darwin-xcode version can really be our
+# linker once we figure out TAPI support
+=sys-devel/binutils-apple-8.2.1-r100
+
 # Fabian Groffen <grobian@gentoo.org> (2020-11-23)
 # no symbols from libopenbsd-compat
 =net-misc/openssh-8.3_p1-r5
 =net-misc/openssh-8.4_p1-r2
-
-# Fabian Groffen <grobian@gentoo.org> (2020-06-09)
-# fails to compile, needs fixing
-=sys-apps/gentoo-functions-0.13
-
-# Fabian Groffen <grobian@gentoo.org> (2019-03-22)
-# Newer versions break because they insist on sysroot usage lacking
-# -lSystem as looked for by clang/llvm.  If your system got this
-# package, you have to emerge -C cmake and re-emerge it.
->=dev-util/cmake-3.14
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index a0cd86ce4ca8..fbda04428af4 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -5,14 +5,6 @@
 # util-linux has no business on Darwin systems
 sys-apps/util-linux
 
-# Fabian Groffen <grobian@gentoo.org> (2012-02-19)
-# Using FSF GCC on Mac OS X is not supported by Gentoo Prefix.  While
-# the FSF GCC compiler is certainly useful, some - if not many -
-# packages expect the Apple branch of GCC, and its (sometimes peculiar)
-# behaviour.  Do not file bugs for packages that fail to compile with
-# FSF GCC, if you have patches, please send them directly to upstream.
-sys-devel/gcc
-
 # Fabian Groffen <grobian@gentoo.org> (2011-12-30)
 # Does not support Darwin, http://mj.ucw.cz/pciutils.html
 sys-apps/pciutils
diff --git a/profiles/prefix/sunos/solaris/5.10/parent b/profiles/prefix/sunos/solaris/5.10/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/sunos/solaris/5.10/profile.bashrc b/profiles/prefix/sunos/solaris/5.10/profile.bashrc
deleted file mode 100644
index 199976276664..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/profile.bashrc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [[ ${EBUILD_PHASE} == setup ]] ; then
-	if [[ ${CATEGORY}/${PN} == sys-devel/flex ]] ; then
-		# Solaris 10's <stdbool.h> requires the C99 standard
-		[[ " ${CFLAGS} "   == *" -std=c99 "* ]] || CFLAGS="-std=c99 ${CFLAGS}"
-		[[ " ${CXXFLAGS} " == *" -std=c99 "* ]] || CXXFLAGS="-std=c99 ${CXXFLAGS}"
-	fi
-fi
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults b/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults
deleted file mode 100644
index 9557d14f8d44..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="sparc-solaris"
-CHOST="sparc-sun-solaris2.10"
-ACCEPT_KEYWORDS="~sparc-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/package.mask b/profiles/prefix/sunos/solaris/5.10/sparc/package.mask
deleted file mode 100644
index 1a1871bef0cb..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask b/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask
deleted file mode 100644
index f7ac4607b395..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/parent b/profiles/prefix/sunos/solaris/5.10/sparc/parent
deleted file mode 100644
index 356d2b757b15..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../arch/sparc
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/eapi b/profiles/prefix/sunos/solaris/5.10/sparc64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults b/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults
deleted file mode 100644
index cf284c55f436..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="sparc64-solaris"
-CHOST="sparcv9-sun-solaris2.10"
-ACCEPT_KEYWORDS="~sparc64-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask b/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask
deleted file mode 100644
index 1a1871bef0cb..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask b/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask
deleted file mode 100644
index f7ac4607b395..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/parent b/profiles/prefix/sunos/solaris/5.10/sparc64/parent
deleted file mode 100644
index 6321d7e3ecda..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../arch/sparc64
diff --git a/profiles/prefix/sunos/solaris/5.10/use.mask b/profiles/prefix/sunos/solaris/5.10/use.mask
deleted file mode 100644
index 416b754cad05..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2017-08-22)
-# PIE is basically not supported on non-Linux
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57409
-pie
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/eapi b/profiles/prefix/sunos/solaris/5.10/x64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/make.defaults b/profiles/prefix/sunos/solaris/5.10/x64/make.defaults
deleted file mode 100644
index 78dfad702e41..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x64/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x64-solaris"
-CHOST="x86_64-pc-solaris2.10"
-ACCEPT_KEYWORDS="~x64-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/package.mask b/profiles/prefix/sunos/solaris/5.10/x64/package.mask
deleted file mode 100644
index 0cc0ba14627f..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x64/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask b/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask
deleted file mode 100644
index bddf5edb63e4..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
diff --git a/profiles/prefix/sunos/solaris/5.10/x86/eapi b/profiles/prefix/sunos/solaris/5.10/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/sunos/solaris/5.10/x86/make.defaults b/profiles/prefix/sunos/solaris/5.10/x86/make.defaults
deleted file mode 100644
index 43ada07c78a7..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x86/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86-solaris"
-CHOST="i386-pc-solaris2.10"
-ACCEPT_KEYWORDS="~x86-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.10/x86/parent b/profiles/prefix/sunos/solaris/5.10/x86/parent
deleted file mode 100644
index 93220d096824..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../arch/x86
diff --git a/profiles/prefix/sunos/solaris/5.9/eapi b/profiles/prefix/sunos/solaris/5.9/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/sunos/solaris/5.9/package.mask b/profiles/prefix/sunos/solaris/5.9/package.mask
deleted file mode 100644
index 20d65461b562..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/package.mask
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
-# Jeremy Olexa <darkside@gentoo.org> (2008-08-26)
-# Requires that pthread.h defines pthread_atfork() but it doesn't on Solaris 9
-# SPARC.
-dev-libs/nss
-
-# Jeremy Olexa <darkside@gentoo.org> (2008-08-26)
-# Massive header errors. SIZE_MAX is defined in limits.h, getopt_long.c requires
-# getopt.h and err.h which don't seem to be present. Might be salvageable with
-# gnulib but I don't know much about that yet. Old versions still work.
->=sys-apps/file-4.25
diff --git a/profiles/prefix/sunos/solaris/5.9/package.use.mask b/profiles/prefix/sunos/solaris/5.9/package.use.mask
deleted file mode 100644
index 19ae00c853ea..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/package.use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2011-11-16)
-# jit not supported on sparc
-dev-libs/libpcre jit
-
diff --git a/profiles/prefix/sunos/solaris/5.9/parent b/profiles/prefix/sunos/solaris/5.9/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/eapi b/profiles/prefix/sunos/solaris/5.9/sparc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/sparc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults b/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults
deleted file mode 100644
index 670f50b71e18..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="sparc-solaris"
-CHOST="sparc-sun-solaris2.9"
-ACCEPT_KEYWORDS="~sparc-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/package.mask b/profiles/prefix/sunos/solaris/5.9/sparc/package.mask
deleted file mode 100644
index 1a1871bef0cb..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/sparc/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/parent b/profiles/prefix/sunos/solaris/5.9/sparc/parent
deleted file mode 100644
index 356d2b757b15..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/sparc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../arch/sparc
diff --git a/profiles/prefix/sunos/solaris/5.9/use.mask b/profiles/prefix/sunos/solaris/5.9/use.mask
deleted file mode 100644
index 416b754cad05..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2017-08-22)
-# PIE is basically not supported on non-Linux
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57409
-pie
diff --git a/profiles/prefix/windows/cygwin/x86/eapi b/profiles/prefix/windows/cygwin/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/windows/cygwin/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/windows/cygwin/x86/make.defaults b/profiles/prefix/windows/cygwin/x86/make.defaults
deleted file mode 100644
index 1b849ae1b953..000000000000
--- a/profiles/prefix/windows/cygwin/x86/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86-cygwin"
-CHOST="i686-pc-cygwin"
-ACCEPT_KEYWORDS="~x86-cygwin ~x86-linux"
-
-# multilib build stuff, single ABI (no multilib)
-MULTILIB_ABIS="x86"
-DEFAULT_ABI="x86"
-ABI="x86"
-IUSE_IMPLICIT="abi_x86_32"
-LIBDIR_x86="lib"
diff --git a/profiles/prefix/windows/cygwin/x86/parent b/profiles/prefix/windows/cygwin/x86/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/windows/cygwin/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/packages b/profiles/prefix/windows/winnt/packages
index 7ffc61e1574f..614ae274d292 100644
--- a/profiles/prefix/windows/winnt/packages
+++ b/profiles/prefix/windows/winnt/packages
@@ -3,7 +3,7 @@
 
 # those are packages not available/required on winnt, since
 # winnt can be a child EPREFIX only, which tears it's DEPENDS
-# from a parent (e.g. x86-cygwin) prefix.
+# from a parent (e.g. x64-cygwin) prefix.
 
 -*sys-apps/grep
 -*app-arch/gzip
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index b34b6e6c78d8..46295140523b 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -316,13 +316,9 @@ x64-macos		prefix/darwin/macos/10.15/x64			exp
 x64-macos		prefix/darwin/macos/10.15/x64/gcc		exp
 x64-macos		prefix/darwin/macos/11.0/x64			exp
 x64-macos		prefix/darwin/macos/11.0/x64/gcc		exp
+arm64-macos		prefix/darwin/macos/11.0/arm64			exp
 
 # Solaris Profiles
-sparc-solaris		prefix/sunos/solaris/5.9/sparc			exp
-sparc-solaris		prefix/sunos/solaris/5.10/sparc			exp
-sparc64-solaris		prefix/sunos/solaris/5.10/sparc64		exp
-x86-solaris		prefix/sunos/solaris/5.10/x86			exp
-x64-solaris		prefix/sunos/solaris/5.10/x64			exp
 sparc-solaris		prefix/sunos/solaris/5.11/sparc			exp
 sparc64-solaris		prefix/sunos/solaris/5.11/sparc64		exp
 x86-solaris		prefix/sunos/solaris/5.11/x86			exp
@@ -340,7 +336,6 @@ x86-winnt		prefix/windows/winnt/x86			exp
 x64-winnt		prefix/windows/winnt/x64			exp
 
 # Cygwin Profiles
-x86-cygwin		prefix/windows/cygwin/x86			exp
 x64-cygwin		prefix/windows/cygwin/x64			exp
 
 # FreeMiNT
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b4237375e8c7..45a820512b70 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1313,8 +1313,6 @@ dev-db/oracle-instantclient:sdk - Header files and an example makefile for devel
 dev-db/oracle-instantclient:sqlplus - The SQL*Plus command line tool for SQL and PL/SQL queries
 dev-db/oracle-instantclient:tools - Data Pump, SQL*Loader and Workload Replay Client
 dev-db/percona-server:cjk - Add CJK support for InnoDB fulltext search using app-text/mecab
-dev-db/percona-server:client-libs - Build the libmysqlclient libraries
-dev-db/percona-server:experimental - Build experimental features aka "rapid" plugins
 dev-db/percona-server:latin1 - Use LATIN1 encoding instead of UTF8
 dev-db/percona-server:libressl - Enable SSL connections and crypto functions using dev-libs/libressl
 dev-db/percona-server:numa - Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)
@@ -1322,10 +1320,8 @@ dev-db/percona-server:profiling - Add support for statement profiling (requires
 dev-db/percona-server:rocksdb - Add support for RocksDB; a key/value, LSM database optimized for flash storage
 dev-db/percona-server:router - Build the MySQL router program
 dev-db/percona-server:server - Build the server program
-dev-db/percona-server:systemtap - Build support for profiling and tracing using dev-util/systemtap
 dev-db/percona-server:tokudb - Add support for TokuDB storage engine
 dev-db/percona-server:tokudb-backup-plugin - Builds the TokuDB backup plugin
-dev-db/percona-server:yassl - Enable SSL connections and crypto functions using the bundled yaSSL
 dev-db/pgbouncer:c-ares - Use c-ares as the DNS backend instead of evdns (libevent).
 dev-db/pgbouncer:udns - Use udns as the DNS backend instead of evdns (libevent). Supports IPv4 only.
 dev-db/pgpool2:memcached - Use memcached for query caching.
@@ -2156,6 +2152,8 @@ dev-libs/libsodium:asm - Enables assembly implementations
 dev-libs/libsodium:urandom - Use /dev/urandom instead of /dev/random
 dev-libs/libtasn1:valgrind - Enable usage of dev-util/valgrind in debug
 dev-libs/libtermkey:demos - Install demos, which pulls in dev-libs/glib
+dev-libs/libtomcrypt:libtommath - Uses dev-libs/libtommath for mathematical operations
+dev-libs/libtomcrypt:tomsfastmath - Uses dev-libs/tomsfastmath for mathematical operations
 dev-libs/libucl:regex - Enable regex support
 dev-libs/libucl:sign - Enable signatures check
 dev-libs/libucl:urls - Enable URLs fetch
@@ -2801,7 +2799,7 @@ dev-util/diffoscope:gpg - Use app-crypt/gnupg
 dev-util/diffoscope:haskell - Use dev-lang/ghc
 dev-util/diffoscope:hdf5 - Use sci-libs/hdf5
 dev-util/diffoscope:hex - Use app-editors/vim-core
-dev-util/diffoscope:iso - Use virtual/cdrtools
+dev-util/diffoscope:iso - Use app-cdr/cdrtools
 dev-util/diffoscope:llvm - Use sys-devel/llvm
 dev-util/diffoscope:opendocument - Use app-text/odt2txt
 dev-util/diffoscope:pascal - Use dev-lang/fpc
@@ -3274,6 +3272,7 @@ games-strategy/ufoai:server - Build the dedicated server
 games-strategy/uqm:music - download and install music files (large)
 games-strategy/uqm:remix - download and install music remix files (large)
 games-strategy/uqm:voice - download and install voice files (large)
+games-strategy/wargus:bne - Support extracting data from the Battle.net Edition
 games-strategy/wesnoth:fribidi - Support for right-to-left languages
 games-strategy/wesnoth:server - Enable compilation of server
 games-util/deutex:man - Build and install man pages
@@ -6921,6 +6920,7 @@ net-wireless/dump1090:rtlsdr - Build with Realtek RTL2832U (rtlsdr) support
 net-wireless/gnuradio:analog - enable analog signal processing blocks
 net-wireless/gnuradio:audio - enable blocks to connect to audio sources (mic-in) and sinks (speaker-out) ports on a computer
 net-wireless/gnuradio:channels - enable channel mode blocks
+net-wireless/gnuradio:ctrlport - enable control port interface
 net-wireless/gnuradio:digital - enable digital signal processing blocks
 net-wireless/gnuradio:dtv - enable digital tv signal processing blocks
 net-wireless/gnuradio:fec - enable block for convolutional encoding using the CCSDS standard polynomial ("Voyager")
@@ -6944,6 +6944,7 @@ net-wireless/gr-osmosdr:rtlsdr - Build with Realtek RTL2832U (rtlsdr) support
 net-wireless/gr-osmosdr:sdrplay - Enable support for SDRplay devices through net-wireless/sdrplay
 net-wireless/gr-osmosdr:soapy - Build with SoapySDR support
 net-wireless/gr-osmosdr:uhd - Build with Ettus Research USRP Hardware Driver support
+net-wireless/gr-osmosdr:xtrx - Build with xtrx Hardware Driver support
 net-wireless/horst:pcap - Add support for network packet capture via net-libs/libpcap
 net-wireless/hostapd:crda - Add CRDA support
 net-wireless/hostapd:internal-tls - Use internal TLSv1 implementation instead of depending on OpenSSL, LibreSSL or GnuTLS
@@ -6963,6 +6964,7 @@ net-wireless/kismet:pcre - Build with pcre support
 net-wireless/kismet:rtlsdr - Enable rtlsdr based kismet capture sources
 net-wireless/kismet:suid - Install a setuid root helper binary with limited functionality; this allows running kismet as a normal user, significantly reducing security risks
 net-wireless/kismet:ubertooth - Enable capture source for ubertooth to sniff bluetooth low energy
+net-wireless/libxtrxll:usb3380 - support xtrx usb model
 net-wireless/neard:tools - build and install extra helper utilities
 net-wireless/rtl-sdr:zerocopy - may cause a bus error on some ARM systems
 net-wireless/rtl_433:rtlsdr - Build with Realtek RTL2832U (rtlsdr) support
@@ -7702,7 +7704,6 @@ sys-apps/fwupd:tpm - Install Trusted Platform Module plugin
 sys-apps/fwupd:uefi - Enable UEFI support
 sys-apps/gawk:mpfr - use mpfr for high precision arithmetic (-M / --bignum)
 sys-apps/gnome-disk-utility:fat - Include FAT16/FAT32 support (sys-fs/dosfstools)
-sys-apps/hwdata-gentoo:binary-drivers - Adds support for ATI/NVIDIA binary drivers
 sys-apps/hwids:net - Install the oui.txt and iab.txt databases
 sys-apps/hwids:pci - Install the pci.ids database
 sys-apps/hwids:udev - Install hwdb.d rules for udev
@@ -8270,7 +8271,6 @@ sys-fs/ntfs3g:ntfsdecrypt - Build and install the ntfsdecrypt application.
 sys-fs/ntfs3g:ntfsprogs - Include internal version of ntfsprogs.
 sys-fs/quota:netlink - Compile daemon receiving quota messages via netlink
 sys-fs/quota:rpc - Enable quota interaction via RPC
-sys-fs/squashfs-tools:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils
 sys-fs/squashfs-tools-ng:tools - Build the gensquashfs, rdsquashfs, sqfs2tar, sqfsdiff, and tar2sqfs tools
 sys-fs/squashfs-tools-ng:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils
 sys-fs/udev:kmod - Enable kernel module loading/unloading support using sys-apps/kmod
@@ -8534,6 +8534,7 @@ www-client/chromium:js-type-check - Enable JavaScript type-checking for Chrome's
 www-client/chromium:official - Enable Official build instead of Developer build.
 www-client/chromium:pic - Disable optimized assembly code that is not PIC friendly
 www-client/chromium:proprietary-codecs - Enable codecs for patent-encumbered audio and video formats.
+www-client/chromium:screencast - Enable support for remote desktop and screen cast using media-video/pipewire
 www-client/chromium:suid - Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels
 www-client/chromium:system-ffmpeg - Use system ffmpeg instead of the bundled one
 www-client/chromium:system-icu - Use system icu instead of the bundled one
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 189d6982ff52..c2ff6ee2e11a 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/openbabel/Manifest b/sci-chemistry/openbabel/Manifest
index 1bc2a5d30284..a2ee606653dd 100644
--- a/sci-chemistry/openbabel/Manifest
+++ b/sci-chemistry/openbabel/Manifest
@@ -2,6 +2,6 @@ AUX openbabel-2.3.2-gcc-6_and_7-backport.patch 635 BLAKE2B 4e98dedd149b14d5bb02f
 AUX openbabel-2.4.1-gcc-8.patch 707 BLAKE2B 2b40d3e573664d036ef961e0298d34e093370485a07790ec2bb9628b02928f3977c70381ba1337e1394601300c2b7b1f05306476302ef0b894ebfadcd01322d9 SHA512 c23fc09ea9cc72c84782a95cfcc59cba5270bbeb24bc50e8aa5349bb22d691c59684c9ca8fdc870733432429e3d9e0a5c660317ee19fa7e8f3fb62c9ebc2dbbd
 DIST openbabel-2.4.1.tar.gz 11618304 BLAKE2B 8fc051e83add9be6456e281a109bd6bbec282a64ffc83309819f0decbf167b4914fbb7f1966e95e103f268754045b804317f51c79a952ace707c6af2bd320125 SHA512 427e678f0a911bd27b9a8a05e60b6e09f113be4e5dd180daaf80c28d06368e52b57501261755ab3817a8d31f2754db24471fd0ceee706d029386d6f70800e9c6
 DIST openbabel.png 29060 BLAKE2B 8d217d92125cc73462437411dd4e0cc05179cb0934f5ed15a307acc6b549b8ebab250a48a05ef7657f48c6df394f37da9b659de61efb1477b79b573a5b393ad3 SHA512 bbcaaa37663b526c9038ccb9edaf05ccc3ad1a861739a737f05f363098d8402a10b36e341fcc0aca636e809c6c32db99bf987b41719a0c756bf5e31444d3eb70
-EBUILD openbabel-2.4.1-r1.ebuild 2227 BLAKE2B aafac15a98d53f80fc3e9e256ff9621d049a4fdbafdc4bb1c8fc1fe83fbb1e97f95ae65706c82536afdf63f022a3e4f9ccdebf6745d14f28c5bc8ce3f1a7298b SHA512 6857dce88ba3c350ddf4b41b639512d9ba19422cee654cf477484198ce66a98685ebc1001fe4e55a4426c149094dec961790a61a14f27dea068b2ec7cbe445b4
+EBUILD openbabel-2.4.1-r1.ebuild 2226 BLAKE2B 1342b61d567112528a5d574e0529837d96b53e98ca96a71b05336079f2caf7489b74cf98a83d15d884f19ed24090f1284313cd1b5df552f6482fe6dfa045a40d SHA512 1566ba69f27e97acfbb2950b65844987dc9a21410f42d540e0e3a6c732c151395b80cc6fa371b70414ffcc5b61c445efb6f893653b2b5d353579c73f6804f247
 EBUILD openbabel-2.4.1.ebuild 2057 BLAKE2B 265cc20a061747321c4a15b25cb98dbaed80fcca5be79af17fc7a5e391082f4c9df665d0aba15083d70f2511359e88bf119f960bed39d720f3f8d23df0130545 SHA512 f2a276d04439bc9b195c32e528f9ced7d4be7127f8088c45963e91d6220020dfc918b14dc76238e1e10a9fdfeec043dd45460af6766514d3fc5e954f5f85ff05
 MISC metadata.xml 665 BLAKE2B 4657b85c826c006b6d69e06240dd908a72397a32cb0c0512810e22d1b02478eaa3ab460535b300eba653a334a79c81a102007da1a901d6d1dbd04fc5e795df73 SHA512 0555e7c7401dfd5fbeee339302f8eb7a104ad6538db2839d8e89c20ac5ad2184070335677671a58eb91be2780ae485467d33302f3a14d0caab4ae8c0148f03bb
diff --git a/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild b/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild
index e894bd98ef3d..db8203212fa9 100644
--- a/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild
+++ b/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 # See src/CMakeLists.txt for LIBRARY_VERSION
 SLOT="0/5.0.0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc openmp test wxwidgets"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 4ffac79d38ab..ef02dbc8ba37 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 9812efbdef23..998e5b273e59 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,6 +1,8 @@
 DIST osm2pgsql-0.96.0.tar.gz 1219163 BLAKE2B a89e40e74ea52bf46593e48dd1f9047b958b645ce38aeb554c930e2d9efdf4f0bb9b6fd7a9b209342d59ca8a0d3ada3023f14324bf8b02b060d8dfd987763528 SHA512 6c6bb00c17995b9a99975076ad3af35a99678a7780db144f7fdd1f5c856b777883f1b1dac7e1c3ca9a2a490d3774f62c8aa9f8742c955c377c28d5b827657372
 DIST osm2pgsql-1.3.0.tar.gz 2460451 BLAKE2B ac52523bf6d35a06528ad22a51465388e70baf9f94bb3664c39c301b429ff453370d9cd44549781e4ee50d698094ddfe83f0e39a7c3d6c01556ea95e10feaf75 SHA512 e643f3a1987ead36763c96d34b5dd7e170273b77a521106c21311dc7b01d2b34470b2e00e3214050f2cbdd3d89703a1827ee6c35928ed77cc7f35fc4e20331f3
+DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e
 EBUILD osm2pgsql-0.96.0.ebuild 930 BLAKE2B 7a5b8e4557fc0aaa76bbb34abc4dc431e4bf7a8d115fa457a538b0ab124f81cb246d0f340abe7d5366ad63cad42fe875aac570bf3c0cc89357863b0edef3d1de SHA512 3741889922dd3cbebadf15083b56a8a6611c9cec3402f36367f2fc1c510538e05856d8b610e1da06c69f077e67533a909a7a6136cbd5a06c472362c2135b6585
 EBUILD osm2pgsql-1.3.0.ebuild 864 BLAKE2B 333b7649760e69a2fc371faf51c6c7440732ddf882fb08ef10f6b163574de63a402fe36c5a94f1587e7d5e8f4ac3a70cdbeb31fe3ed501f7ea1e05feb9d61e11 SHA512 f4ecde80b4f06ef8594a32410db8848e79e431bbb229f6331aa7d191d71a50d3be6f3c9bba7c747f87b187c2c8d365ea8ced95140e7b66b2c81601901f13b966
+EBUILD osm2pgsql-1.4.0.ebuild 864 BLAKE2B 333b7649760e69a2fc371faf51c6c7440732ddf882fb08ef10f6b163574de63a402fe36c5a94f1587e7d5e8f4ac3a70cdbeb31fe3ed501f7ea1e05feb9d61e11 SHA512 f4ecde80b4f06ef8594a32410db8848e79e431bbb229f6331aa7d191d71a50d3be6f3c9bba7c747f87b187c2c8d365ea8ced95140e7b66b2c81601901f13b966
 EBUILD osm2pgsql-99999999.ebuild 846 BLAKE2B 83328ed6e17271591e806e74c6f5053903b61c8606258fa2b0687ef3bb91392a1c885b290a2fc1dc36cb115f455f8b987f942bd200491e275afc4e3fb9296883 SHA512 c1953aeb701043590b204f830a190a3a482173bef58c8796156d6ce2f6f62e44bc11078a5cecf67f2dc744c486f5419411aa5e83888a45a3192cbad5aee8d95e
 MISC metadata.xml 793 BLAKE2B d74e55e2b2cd946a65cba5bd3f0ba953edf8528d6d30037fbd69640d7379ced6e07a0e81e57f02f2e49afde4a55b07c21cb5430de1d42a682e10bfd964ab7939 SHA512 2f76c2c5946179da213b0bf193e89f110c46818ab77a4dea41df1fc78d1527ace8ff81a3887ebb47e6ee0a799e0ee037364e22bfdd5ce72feb765209b6a3fcd6
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0.ebuild
new file mode 100644
index 000000000000..736fa938d656
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.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
+
+DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
+HOMEPAGE="https://osm2pgsql.org/"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lua luajit"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	dev-db/postgresql:=
+	dev-libs/expat
+	sci-libs/proj:=
+	sys-libs/zlib
+	lua? ( dev-lang/lua:0= )
+	luajit? ( dev-lang/luajit:= )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-db/postgis
+"
+
+# Tries to connect to local postgres server and other shenanigans
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_LUA=$(usex lua)
+		-DWITH_LUAJIT=$(usex luajit)
+		-DBUILD_TESTS=OFF
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index be4a16d4a241..105222cf47cb 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 7b54d6051855..8e89e1379504 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,3 +1,3 @@
 DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc SHA512 912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f
-EBUILD cartopy-0.18.0.ebuild 1675 BLAKE2B 24883ad6128afb55d51980fc7af6d2a7b2230928a6806da4c09079471ada2a0af9a5ad40bcee3864c390eafd752e1dc9766c2219dcb5b9d30fdaf0e4bf92baa8 SHA512 c7f2fb3a2307f59a8b0a0b257f0364a67319b2feb6b586c27467ec8d7457b0af842a1e10babd52e01d43fb52ba124f01b21d3af92829e15ca8f62f95789dd629
+EBUILD cartopy-0.18.0.ebuild 1674 BLAKE2B f50f63ce93119c04e31829f7c54b450e47634e606e222ae7d79cd0c46346b98415c81547513cd02c4b8a205238c72d1f2f2949912072e8102dcbff6617de881a SHA512 97f3346365bacc36d70dd4505da3df0710964a55d9dc3c466207f87c74a59257dc451378e95939d2914dab9525f3e2af1bd61e48817228637c2ccb840abbdf48
 MISC metadata.xml 602 BLAKE2B 92e179b5503c84c6e567e7adb48917ca6140a7c04a0f5613b5aa3a9c19623d61abed95c325b41ca0d5a99b046c2891511796de49c3117c4ce9c969069bb2c5f0 SHA512 8677cb5685dee0b5868c1b14ffc13ac93e3b26ab741ceb684c7c48caf02f159a7a6613402e0396b9b0bc256c39b6446cbb7779521324447d96ed524fb8ca664d
diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index d4fd00b90fcd..fbbee50514c9 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1 virtualx
 
 MY_PV=${PV/_beta/b}
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 41e0a609c8f3..9236cc8a8959 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,5 +1,5 @@
 DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
-DIST geos-3.9.0.tar.bz2 4760200 BLAKE2B f4d610ac4693fea1c10bbb3b9d328b3d4eded15efc740cb1577a516f399f23e42e22d88130479d94722a2867c1b787c7c266d5e976ec823ea17f63045db2ae54 SHA512 518be112b2e05063d97c09d0e568b784e6c65b0a7be1368cefbd481b3f4ac2d8fc89611e6e205a95f4d1740ab4f47b3929fb4c801bcf9a9e9b6ae86a54e62933
+DIST geos-3.9.0-r1.tar.bz2 4710957 BLAKE2B dab0f4e0bfb1bd244c2faf5ee6149b65d142eea78e87490025f90b672eee0d25d4ba9bc4c3b223e78ea0c9d34625b4750c7ba03852e5ea9540ad5c479d84b995 SHA512 1081f2aa20e671450953f7bb53b17c703804a1c9f4987c9da0987ff24339af5811b2c8b79c8e438d04ca38e4d06164dc5a4206f266f7efc19af3f9d9ea8f71f8
 EBUILD geos-3.8.1.ebuild 1113 BLAKE2B 7e7529e6272b6d9eeeec6230c0f945a368b55b3094e304372dceeab5e846c80350331b687300243a24c92e3b265ef5fbf136a972abecf28e940a31e71399dfda SHA512 c95a5d2a6d67b2abb3fb2d227abacf836496404220e67008dda3e28f60fa4aefd5e9fb86a96380445a97442ee16f937cf2c2d368c9581b968af8dfc58ab09619
-EBUILD geos-3.9.0.ebuild 1119 BLAKE2B 80e26dd303e9c9e6f15bf38b93f64097cf151ecae82e4f86ae72e9b3c96796d85cfd397e6511f7ac942340b9be97c1ee7881898fdc44ee5448a370035c1a45b1 SHA512 d9e2a8bcf83e6bfcb44deba54b72d8da897dc5deafecb4f6ce477dc40e2eeb6c3d7f405ef5a7a2f5c0000ea29fe70efb36612b45018b552738a59505679454b5
+EBUILD geos-3.9.0-r2.ebuild 1090 BLAKE2B 8665710cf735ed54471ffc0d70cf1f02d8cd6092cd1bc6e37ff155720975ed230a8f3562d4502f0aacdf6900bc136dc5878de707d32568398180dcf88f5b3858 SHA512 66dd501a604f6864a1ea722fb3b701bcfa2cd0f8d589f9d9c3af0acfb3487e94c0004810da5c8054e38d54fce3a537d8333cd97348a1bad39c1b95939005ffda
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.9.0.ebuild b/sci-libs/geos/geos-3.9.0-r2.ebuild
similarity index 65%
rename from sci-libs/geos/geos-3.9.0.ebuild
rename to sci-libs/geos/geos-3.9.0-r2.ebuild
index dd73711e579f..d767867da2b1 100644
--- a/sci-libs/geos/geos-3.9.0.ebuild
+++ b/sci-libs/geos/geos-3.9.0-r2.ebuild
@@ -5,35 +5,23 @@ EAPI=7
 
 DESCRIPTION="Geometry engine library for Geographic Information Systems"
 HOMEPAGE="https://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${PN}-${PV}.tar.bz2"
+
+# Arrow can be removed at next version bump. Upstream mistakenly
+# released rc1 as 3.9.0. So, we need(ed) a new Manifest entry to get the
+# real 3.9.0
+SRC_URI="https://download.osgeo.org/geos/${PN}-${PV}.tar.bz2 -> ${PN}-${PV}-r1.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc ruby static-libs"
+IUSE="doc static-libs"
 
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	ruby? ( dev-lang/swig:0 )
-"
-RDEPEND="
-	ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 RESTRICT="test"
 
-src_prepare() {
-	default
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
 src_configure() {
-	local myeconfargs=(
-		--disable-python
-		$(use_enable ruby)
-		$(use_enable static-libs static)
-	)
+	local myeconfargs=(	$(use_enable static-libs static) )
 	use arm && myeconfargs+=( --disable-inline ) # bug 709368
 
 	econf "${myeconfargs[@]}"
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 9311d8fcee44..950a14c4480a 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,3 +1,3 @@
 DIST gmsh-4.6.0-source.tgz 12048076 BLAKE2B 2de1ded477ec675fa7bcb56c1e2a1352f6f6d642b9872dd5c167bafac0e7648cbbce6921b556d59796e035f40bc24e9ce38ccedb690ca54cbeab5f3ab94eeeea SHA512 9d6dde6b1f6b6193eb859cc6425a0161d42ccf449aeb84f43e1dba661b0ccb593821b9371272e06351c4dd26b7b8b6a5c39475c0f5b1332be188551abc88ae45
-EBUILD gmsh-4.6.0.ebuild 1809 BLAKE2B e212bf210728211947d9d006f05a78f63ea8f6e1e3ae13a5ba3e92cb1c320d6e4a77d4b49610ff81336268560533a3df5459a1d3bcb01345a95fd04e4c742965 SHA512 1dc00ca367679f42009d78a70d40d23c1e8e0fef559418e6df228835595d80a9c0a28aa538772706b81bd6e6ea03b7d8614e0b71ecfef6f2768f667d243406f4
+EBUILD gmsh-4.6.0.ebuild 1780 BLAKE2B 7109579b2372d8bffcb73de6125137308d63926dae546e7b56606a3a01b0f3ced8f4bcb4568ae747d9f40d81b2fc23ceb48d8df5bbffb05645c5c22606d17b29 SHA512 6f05e9a422a4b8de0f5479b00eb5effda34b3556c7dc25a803d7827242ceb2af83e9d582dd69988bf1c01bb25fb2d940ccc07945bc6ff3c8e1b4830be405ccf2
 MISC metadata.xml 737 BLAKE2B fc604a0966c3106fabcd1379cf0cecbd28bd80c9068330206127cd35e134436a5ec3f43b19dfe0793e2a7a299a4b8f335b11cf2f723b6451a3b341077d27a6c7 SHA512 03f6a246c66264a58638c5ef89ec10737cbb15bd6d443f2f866fc77d21bf052c3ff4e00ca919546aa0da5b91c31a96af8dea5609a72dbb92a20c534e6a6f639b
diff --git a/sci-libs/gmsh/gmsh-4.6.0.ebuild b/sci-libs/gmsh/gmsh-4.6.0.ebuild
index 9e50b09d3047..a4df1e0d12e0 100644
--- a/sci-libs/gmsh/gmsh-4.6.0.ebuild
+++ b/sci-libs/gmsh/gmsh-4.6.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3 free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 ## cgns is not compiling ATM, maybe fix cgns lib first
-IUSE="blas cgns examples jpeg lua med metis mpi netgen opencascade petsc png python X zlib"
+IUSE="blas cgns examples jpeg med metis mpi netgen opencascade petsc png python X zlib"
 
 REQUIRED_USE="med? ( mpi )"
 
@@ -25,7 +25,6 @@ RDEPEND="
 	blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
 	cgns? ( sci-libs/cgnslib )
 	jpeg? ( virtual/jpeg:0 )
-	lua? ( dev-lang/lua:0 )
 	med? ( sci-libs/med[mpi] )
 	opencascade? ( sci-libs/opencascade:* )
 	png? ( media-libs/libpng:0 )
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index a07b16c66c0a..bf4b417dd5e4 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,6 +1,9 @@
+AUX libsc-2.2-autoconf_lua_version.patch 1310 BLAKE2B 5d6ced3339ced04b9681cb4940dc5b0bc130b87dc7fa357f91fffc3deb8316ecd1f3f504b578cdf105b533772e8ba9ec34f4410960721ace1ac7e5fba3a04a65 SHA512 51c417011b481712d3469fe86591c903e16cce2c06b83cc7e3ee663d75ad4910b60f8893f589fdd6a38282e1668a1f97d93c50fc360a5919379dec5520a8905c
+AUX libsc-9999_20201220-autoconf_lua_version.patch 1449 BLAKE2B 7212839168ab69f115cd177fa998cb8352f9c0abb06c4a89916a1e14b5d99695d15602700f891a8985f74ba19114e62da152bda3c74810d7b307762dadff837a SHA512 4993bc99cd7e88ee4fc523b14d859745fbc06ff3e89a80a96a2f33ba64e782c2c25ffd5620b93537056b17fe02a2648de54eee276174147d776c6747230b476c
 DIST libsc-2.0.tar.gz 296392 BLAKE2B b5e1ca5cf6802ed38c32db5e7a77aec2fc636d88f2562314088dc16d13a0dccd24706276b05f8ddd70bc3769270a378c0089873fb2a21ebc93d6ca2622d7a58e SHA512 e4cfe42a1c1fe17412e1ffb6ebebe1f760861a7fb707a6f8fd01cdebda96b166ee05e7ff034f3b9e30de5e9baa82c9a2cebe93d40772dbd206603321de40559c
 DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
-EBUILD libsc-2.0.ebuild 2105 BLAKE2B 27cea0578aaf9ae971a98435f3cc9e7349de5e9c9bf75efd54b370c2f94b9b49b2ce416aefb7a7e57708ff7ea6cfe6733ef2b7ffa3a9605b247bb12ea8afc854 SHA512 0002f1222d5ed89e1123e563d5687eb92cc762a62531255e69ba343791e07c62c1a7d6a4cefe0e63b8e54c662f35d2b71bb16ff083099114aa611f8c324bc508
-EBUILD libsc-2.2.ebuild 2102 BLAKE2B 89ab98266cc11cf4aee9ca900758d1e42bb7fecb61b1a99c62228eedc3d9d44fa4ca7d287fed93b7bba91fee80cb1c8a590f5be3b280156bc0be4488809c8b6a SHA512 b7290fa7078dc8957edfcd545787b57698cb62219a3df13b5e8165bdaec8bbd5900d5e2459fe654c462a5ad0c3ffd7618c6fc27b719aaa81d4670499e98312cc
-EBUILD libsc-9999.ebuild 2105 BLAKE2B 27cea0578aaf9ae971a98435f3cc9e7349de5e9c9bf75efd54b370c2f94b9b49b2ce416aefb7a7e57708ff7ea6cfe6733ef2b7ffa3a9605b247bb12ea8afc854 SHA512 0002f1222d5ed89e1123e563d5687eb92cc762a62531255e69ba343791e07c62c1a7d6a4cefe0e63b8e54c662f35d2b71bb16ff083099114aa611f8c324bc508
+EBUILD libsc-2.0.ebuild 2103 BLAKE2B 927bf1d55667b156777f5833b287e6b0dd4344e0edb62b5106b7566d897919b9286d898956a2ad935e1993f80188779b83ef8bde30d82b4986ac92e909cad7f6 SHA512 6726b23ea21064fc5c848138137a2e05632f064f089a8e74cf57f2a8e9a5962699c26297807de5577f1a79400ec5a1987202acdd8cc8e3c85b5fc44d58ee2b31
+EBUILD libsc-2.2-r100.ebuild 2311 BLAKE2B 8d0b691c72bef42dde074f7ad5b020b7b5afd0f6ffe0240f087652934df743054390ec7593f11b10c577a26d436101594d015542947b7703e009f4fd8f08e025 SHA512 48a7eb9ef3125b454509d0911100e72059d49f1a44d5187f1f1aebb5b1d810b2ca86e535cf88ca87a4dabf34f76f1bfd07ff20c6b2ced090617e72eb1c91ed18
+EBUILD libsc-2.2.ebuild 2103 BLAKE2B 4471ed0611a957d6cef11a6ce24fdafafc8ea3660d5c293885c8bc1027f9b604c5e2790495b067048cb16f47cb7dca6fe8a385f148087ef6a88cd124bbe0bfd4 SHA512 7d8c63b652a8eb7efbd7cb94039d2b2df87357670d8140a1f767d229144aac1b8a56ecbed302a1d7f68379fd1b6b90447db10e2be20d1d1cacd52a9db4b57a2f
+EBUILD libsc-9999.ebuild 2321 BLAKE2B f0e3a41dd5d5aca28ef444e8291272e9b15eb5f69e6af3e77b99c8b3ce4efc113606c66002e1e7932980ee80ad5b7ba60d388c9f64a861ea3f5ff693fab46100 SHA512 9fb34025294f64d13097d4c66fd8bec2aaa388401c7cda320c6fd66bc7b37b3c42496b43b6790288ac5249cfb16280c95bd0d45e1eae86af6db7931f55d5d678
 MISC metadata.xml 712 BLAKE2B c1586f49aaa6c7d9a7bb45d1bbfc823efbc80e1032db8d6e4fc53bde10fe6a4d43b6f8e448f33683c6f47897a9ea575272678a50e63308f74b8e60ceb8e9bea2 SHA512 b00a3c5abc40f77724fa766c7b4cc386eec78a81396f6014eab6fb66618c9d11f08687b6f8d73bc24cc3b2deed8e88f44d69b4f7afe31ebbbad9308a99c586c2
diff --git a/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch
new file mode 100644
index 000000000000..c2cbdb1b003b
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch
@@ -0,0 +1,51 @@
+--- a/config/sc_include.m4
++++ b/config/sc_include.m4
+@@ -281,7 +281,7 @@ AC_DEFUN([SC_CHECK_LIBRARIES],
+ [
+ SC_REQUIRE_LIB([m], [fabs])
+ SC_CHECK_LIB([z], [adler32_combine], [ZLIB], [$1])
+-SC_CHECK_LIB([lua52 lua5.2 lua51 lua5.1 lua lua5], [lua_createtable],
++SC_CHECK_LIB([$LUA_IMPL], [lua_createtable],
+ 	     [LUA], [$1])
+ SC_CHECK_BLAS_LAPACK([$1])
+ SC_BUILTIN_ALL_PREFIX([$1])
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,7 +74,7 @@ echo "| Checking headers"
+ echo "o---------------------------------------"
+ 
+ AC_CHECK_HEADERS([execinfo.h signal.h sys/time.h sys/types.h time.h])
+-AC_CHECK_HEADERS([lua.h lua5.1/lua.h lua5.2/lua.h lua5.3/lua.h])
++AC_CHECK_HEADERS([$LUA_IMPL/lua.h])
+ 
+ echo "o---------------------------------------"
+ echo "| Checking functions"
+--- a/src/sc_lua.h
++++ b/src/sc_lua.h
+@@ -30,23 +30,9 @@
+ 
+ SC_EXTERN_C_BEGIN;
+ 
+-#ifdef SC_HAVE_LUA5_2_LUA_H
+-#include <lua5.2/lua.h>
+-#include <lua5.2/lualib.h>
+-#include <lua5.2/lauxlib.h>
+-#else
+-#ifdef SC_HAVE_LUA5_1_LUA_H
+-#include <lua5.1/lua.h>
+-#include <lua5.1/lualib.h>
+-#include <lua5.1/lauxlib.h>
+-#else
+-#ifdef SC_HAVE_LUA_H
+-#include <lua.h>
+-#include <lualib.h>
+-#include <lauxlib.h>
+-#endif
+-#endif
+-#endif
++#include <@LUA_IMPL@/lua.h>
++#include <@LUA_IMPL@/lualib.h>
++#include <@LUA_IMPL@/lauxlib.h>
+ 
+ SC_EXTERN_C_END;
+ 
diff --git a/sci-libs/libsc/files/libsc-9999_20201220-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-9999_20201220-autoconf_lua_version.patch
new file mode 100644
index 000000000000..c138bb3fc4ba
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-9999_20201220-autoconf_lua_version.patch
@@ -0,0 +1,57 @@
+--- a/config/sc_include.m4
++++ b/config/sc_include.m4
+@@ -281,7 +281,7 @@ AC_DEFUN([SC_CHECK_LIBRARIES],
+ [
+ SC_REQUIRE_LIB([m], [fabs])
+ SC_CHECK_LIB([z], [adler32_combine], [ZLIB], [$1])
+-SC_CHECK_LIB([lua53 lua5.3 lua52 lua5.2 lua51 lua5.1 lua lua5], [lua_createtable],
++SC_CHECK_LIB([$LUA_IMPL], [lua_createtable],
+ 	     [LUA], [$1])
+ SC_CHECK_BLAS_LAPACK([$1])
+ SC_BUILTIN_ALL_PREFIX([$1])
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,7 +74,7 @@ echo "| Checking headers"
+ echo "o---------------------------------------"
+ 
+ AC_CHECK_HEADERS([execinfo.h signal.h sys/time.h sys/types.h time.h])
+-AC_CHECK_HEADERS([lua.h lua5.1/lua.h lua5.2/lua.h lua5.3/lua.h])
++AC_CHECK_HEADERS([$LUA_IMPL/lua.h])
+ 
+ echo "o---------------------------------------"
+ echo "| Checking functions"
+--- a/src/sc_lua.h
++++ b/src/sc_lua.h
+@@ -30,29 +30,9 @@
+ 
+ SC_EXTERN_C_BEGIN;
+ 
+-#ifdef SC_HAVE_LUA5_3_LUA_H
+-#include <lua5.3/lua.h>
+-#include <lua5.3/lualib.h>
+-#include <lua5.3/lauxlib.h>
+-#else
+-#ifdef SC_HAVE_LUA5_2_LUA_H
+-#include <lua5.2/lua.h>
+-#include <lua5.2/lualib.h>
+-#include <lua5.2/lauxlib.h>
+-#else
+-#ifdef SC_HAVE_LUA5_1_LUA_H
+-#include <lua5.1/lua.h>
+-#include <lua5.1/lualib.h>
+-#include <lua5.1/lauxlib.h>
+-#else
+-#ifdef SC_HAVE_LUA_H
+-#include <lua.h>
+-#include <lualib.h>
+-#include <lauxlib.h>
+-#endif
+-#endif
+-#endif
+-#endif
++#include <@LUA_IMPL@/lua.h>
++#include <@LUA_IMPL@/lualib.h>
++#include <@LUA_IMPL@/lauxlib.h>
+ 
+ SC_EXTERN_C_END;
+ 
diff --git a/sci-libs/libsc/libsc-2.0.ebuild b/sci-libs/libsc/libsc-2.0.ebuild
index 229d1ccd05fc..8c40ce589305 100644
--- a/sci-libs/libsc/libsc-2.0.ebuild
+++ b/sci-libs/libsc/libsc-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
@@ -26,7 +26,7 @@ IUSE="debug examples mpi openmp romio static-libs threads"
 REQUIRED_USE="romio? ( mpi )"
 
 RDEPEND="
-	dev-lang/lua:*
+	dev-lang/lua:0=
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
diff --git a/sci-libs/libsc/libsc-2.2-r100.ebuild b/sci-libs/libsc/libsc-2.2-r100.ebuild
new file mode 100644
index 000000000000..0f53a1eb30b7
--- /dev/null
+++ b/sci-libs/libsc/libsc-2.2-r100.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+inherit autotools lua-single toolchain-funcs eutils
+
+DESCRIPTION="Support for parallel scientific applications"
+HOMEPAGE="http://www.p4est.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="debug examples mpi openmp romio static-libs threads"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	romio? ( mpi )"
+
+RDEPEND="${LUA_DEPS}
+	sys-apps/util-linux
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi[romio?] )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2-autoconf_lua_version.patch
+)
+
+DOCS=( AUTHORS NEWS README )
+
+AUTOTOOLS_AUTORECONF=true
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
+		tc-has-openmp || \
+			die "Please select an openmp capable compiler like gcc[openmp]"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die
+
+	# Inject a version number into the build system
+	echo "${PV}" > ${S}/.tarball-version || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable mpi)
+		$(use_enable openmp openmp)
+		$(use_enable romio mpiio)
+		$(use_enable static-libs static)
+		$(use_enable threads pthread)
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+	)
+	econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto examples
+		dodoc -r example/*
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		# Remove compiled example binaries in case of -examples:
+		rm -r "${ED}"/usr/bin || die "rm failed"
+	fi
+
+	# Remove ac files, bug #619806
+	rm -r "${ED}"/usr/share/aclocal || die "rm failed"
+
+	# Fix wrong installation paths:
+	dodir /usr/share/libsc
+	mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed"
+	rmdir "${ED}"/etc/ || die "rmdir failed"
+	mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed"
+	rmdir "${ED}"/usr/share/ini || die "rmdir failed"
+}
diff --git a/sci-libs/libsc/libsc-2.2.ebuild b/sci-libs/libsc/libsc-2.2.ebuild
index 832e275e91d8..9d7d12e95188 100644
--- a/sci-libs/libsc/libsc-2.2.ebuild
+++ b/sci-libs/libsc/libsc-2.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
@@ -26,7 +26,7 @@ IUSE="debug examples mpi openmp romio static-libs threads"
 REQUIRED_USE="romio? ( mpi )"
 
 RDEPEND="
-	dev-lang/lua:*
+	dev-lang/lua:0=
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild
index 229d1ccd05fc..4c588fc838b4 100644
--- a/sci-libs/libsc/libsc-9999.ebuild
+++ b/sci-libs/libsc/libsc-9999.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools toolchain-funcs eutils
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools lua-single toolchain-funcs eutils
 
 DESCRIPTION="Support for parallel scientific applications"
 HOMEPAGE="http://www.p4est.org/"
@@ -23,10 +25,10 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="debug examples mpi openmp romio static-libs threads"
 
-REQUIRED_USE="romio? ( mpi )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	romio? ( mpi )"
 
-RDEPEND="
-	dev-lang/lua:*
+RDEPEND="${LUA_DEPS}
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
@@ -36,6 +38,10 @@ DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999_20201220-autoconf_lua_version.patch
+)
+
 DOCS=( AUTHORS NEWS README )
 
 AUTOTOOLS_AUTORECONF=true
@@ -50,8 +56,10 @@ pkg_pretend() {
 src_prepare() {
 	default
 
+	sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die
+
 	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version
+	echo "${PV}" > ${S}/.tarball-version || die
 	eautoreconf
 }
 
@@ -66,7 +74,7 @@ src_configure() {
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 	)
-	econf "${myeconfargs[@]}"
+	econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index d976d385fc96..7e04318ab07f 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -3,6 +3,7 @@ DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a
 DIST p4est-2.0.tar.gz 1296762 BLAKE2B 1d755ec72905da069b9c91182a437c59107189402eb26444cf7fc1755b81bdbfad9aa25802720df401e8d434e5ac67e68b1d7dd5bf312f881017925498ad7514 SHA512 05f8a95ad431bd36fd3e48ca9360de0f90d1af7dfc77601cd46766898a9bc82b9157e22bdb6135e7003f59c7ecc4cd9ad34b89de25ba3c6f11a86d46cac8592c
 DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
 EBUILD p4est-2.0.ebuild 2853 BLAKE2B a1ecf45f94636c199d0976af9af9f2dc79fea444bb4148cbddf1d06b51561417c02f444e6f5be131059c542e430fcc6002f296da206e6c8f7c4b37143f4263f7 SHA512 10d56e55b8625b5132b4f99e2e78fbdb3234df094f458ae384f629bcb2fd73d4077a20f834fca5359f967324dd894afbe4634f975dbe13ae732c0e2e1f095549
+EBUILD p4est-2.2-r100.ebuild 2928 BLAKE2B f895c1e2642760a1faa207519453f84e0ee763673162ccef3da9fb83542de68b66f74faff67e76be559a845b988f805d47225e7adf02946507630cca6761f86b SHA512 d9e7026c87372449a4b5499021eeb340a1a7d3f45b4b29f799f749d25ac753b52fbd94e89463a0a06995827a28c3e4d72763451ba8f9136edc0c0bb87cc9aae2
 EBUILD p4est-2.2.ebuild 2853 BLAKE2B a1bf41e6371e1445bd53292b9b804cfdee21241508959c95eeecbc0c002b8f3122e54499fde49c0bfd089d478fc13f6d4f05ae2e0893032e22a6d3cea1b7f8a7 SHA512 7047a4f5cb50d17e0189366f9f25c67664ba5d043ca7626ab3b96617a73b375f442150a2acaef665b6070f5e4bd537178470e425979b8f12f5ae389b10464529
-EBUILD p4est-9999.ebuild 2853 BLAKE2B a1ecf45f94636c199d0976af9af9f2dc79fea444bb4148cbddf1d06b51561417c02f444e6f5be131059c542e430fcc6002f296da206e6c8f7c4b37143f4263f7 SHA512 10d56e55b8625b5132b4f99e2e78fbdb3234df094f458ae384f629bcb2fd73d4077a20f834fca5359f967324dd894afbe4634f975dbe13ae732c0e2e1f095549
+EBUILD p4est-9999.ebuild 2928 BLAKE2B 8b275b896e9ec3b2913660ea92cbf1573c5ede82ccd18bbc51b2d550f278566edaef69d07142531611ed527a0e0661fb03cc0ef919be33b5a2c683ccc520e796 SHA512 888bc5d6b2242207431072d4d4736f1676649e4140acc47b6511f430567a850103c7e482588eadc39b3d799dc7e06474169b6354761ff990182ce5ad9a283a10
 MISC metadata.xml 932 BLAKE2B 25927e97d0092f9fbab6dd7c35f0b2d6b568f1a9790fb1d31917a42946cea1305f9b31aa7cf5773a2b1588b94aab482de2ebfb9aa867af14b8bba2765be2faea SHA512 9c3b0cc4f9f95cf8f4c7d0e250fbc2934e80563ac98b131031d5ba66122a47b9435027f452aeee2df0e917098c7f626513001a30f57952bfaaece21fc9dcc1c1
diff --git a/sci-libs/p4est/p4est-2.2-r100.ebuild b/sci-libs/p4est/p4est-2.2-r100.ebuild
new file mode 100644
index 000000000000..cde320a2e5c6
--- /dev/null
+++ b/sci-libs/p4est/p4est-2.2-r100.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+# The build system currently fails with everything newer than 1.11.
+WANT_AUTOMAKE=1.11
+
+inherit autotools lua-single toolchain-funcs eutils
+
+DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
+HOMEPAGE="http://www.p4est.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="
+		https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# TODO petsc
+IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	romio? ( mpi )"
+
+RDEPEND="${LUA_DEPS}
+	~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=]
+	sys-apps/util-linux
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi[romio=] )"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/automake:1.11
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
+		tc-has-openmp || \
+			die "Please select an openmp capable compiler like gcc[openmp]"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Inject libsc to get  all parts of the build system...
+	if ! [[ ${PV} = *9999* ]]; then
+		rmdir "${S}/sc" || die "rmdir failed"
+		mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
+	fi
+
+	# Inject a version number into the build system
+	echo "${PV}" > ${S}/.tarball-version
+
+	AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
+	eautoreconf
+
+	sed -i \
+		"s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \
+		"${S}"/configure || die "sed failed"
+
+	sed -i \
+		"s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
+		"${S}"/configure || die "sed failed"
+}
+
+src_configure() {
+	# avoid underlinkage
+	LDFLAGS="${LDFLAGS} -lsc"
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable mpi)
+		$(use_enable openmp)
+		$(use_enable romio mpiio)
+		$(use_enable static-libs static)
+		$(use_enable threads pthread)
+		$(use_enable vtk-binary)
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--with-sc="${EPREFIX}/usr"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r doc/*
+
+	if use examples
+	then
+		docinto examples
+		dodoc -r example/*
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		# Remove compiled example binaries in case of -examples:
+		rm -r "${ED}"/usr/bin || die "rm failed"
+	fi
+
+	# Fix wrong installation paths:
+	dodir /usr/share/p4est
+	mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
+	mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
+	rmdir "${ED}"/etc/ || die "rmdir failed"
+}
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index 7f8e399758eb..cf8dea879cea 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
 
 # The build system currently fails with everything newer than 1.11.
 WANT_AUTOMAKE=1.11
 
-inherit autotools toolchain-funcs eutils
+inherit autotools lua-single toolchain-funcs eutils
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
 HOMEPAGE="http://www.p4est.org/"
@@ -29,11 +31,11 @@ SLOT="0"
 
 # TODO petsc
 IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
-REQUIRED_USE="romio? ( mpi )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	romio? ( mpi )"
 
-RDEPEND="
-	~sci-libs/libsc-${PV}[mpi=,openmp=,romio=,static-libs=,threads=]
-	dev-lang/lua:0=
+RDEPEND="${LUA_DEPS}
+	~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=]
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
diff --git a/sci-libs/pyshp/Manifest b/sci-libs/pyshp/Manifest
index d43279ad3c0a..955931a1d6d2 100644
--- a/sci-libs/pyshp/Manifest
+++ b/sci-libs/pyshp/Manifest
@@ -1,5 +1,3 @@
-DIST pyshp-2.1.0.tar.gz 215360 BLAKE2B 2b32a3db242b90f801abdbc31f3c930bc40c3ad0606433d90f62c6b9af3c0459e8c8467d60aec1075368779e5a4fffa9e3985e1875d82edf732faf982359c605 SHA512 ab0c7832f7e480ec3cdbf94ec29f84b590486625bde3d5cf465e5dc6ddca02998b99510b6c14d5ba005816c5b091044badc1e68988fd971f9e18266096ad86cb
 DIST pyshp-2.1.2.tar.gz 217857 BLAKE2B f4c50e16987b13b7968fe37e4e7f20329b6871c879b837113aac281527f6a00d5d13e10f93e8ecd5896cf089d801d76cec5d93645a6919fbc48d96d4318bb767 SHA512 54fadaa133d3fbf3b9a318be02dd21c2a35a3c58c15de8e6d0cffa6ca83eefe12603fe5930d3df63ad4c6a6d711336752f08923c6406168207ac291d05592582
-EBUILD pyshp-2.1.0.ebuild 549 BLAKE2B 34a54b03e748fae8daad52154dce55d32be41d1638242c183210007015945eba8acb5ba6a09c8d274334543e4ee8c939f669079555b748f7e8e8afff38612914 SHA512 7dfcab869adfc8aca9c706c2e63f9b80baa4f61efa59f0c10299644a7fccc9c867dee781e4c52914b8eeca6961ccf6b85793fd2ca1210e369689a477086041c0
 EBUILD pyshp-2.1.2.ebuild 548 BLAKE2B f836c8ba68e1c17217f44c7face5ae19c67856331f9474625fa8eb3ff53850bf2ddc43366fc10cade66de5e2ab76eb991ad932c3915c7e6fc0b3544cf42c23a9 SHA512 9301271eb958e47f5fb9fcab1a08ec3e6dd8f53f3b54945c94283a8ead783811f387d2d020d742d9b5b4ea966fd633803b4822770ed1a54c97afe96218d7c0d7
 MISC metadata.xml 327 BLAKE2B 48f3a2409f354b39c05d8111f78f1bce40425f79db30c83d345f81a081d2098bdf42dfc49e47854ec788cf75841cb9427a5c2eb9b71dd139f3fbe398e1380346 SHA512 3b9fdbf92fc5ad41b8afe4b315bad42806062c974b37496875fcc861af525905cc8d4b81e0a4d20d3e9333ea38c57c7aae6764c64537ef9e27386a53168299b4
diff --git a/sci-libs/pyshp/pyshp-2.1.0.ebuild b/sci-libs/pyshp/pyshp-2.1.0.ebuild
deleted file mode 100644
index 5499cd13c879..000000000000
--- a/sci-libs/pyshp/pyshp-2.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Pure Python read/write support for ESRI Shapefile format"
-HOMEPAGE="https://pypi.org/project/pyshp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" shapefile.py || die
-}
diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest
index d3808fa0537e..e0b35e33b55a 100644
--- a/sci-libs/trilinos/Manifest
+++ b/sci-libs/trilinos/Manifest
@@ -1,10 +1,6 @@
-DIST trilinos-12.14.1-patches-r0.tar.xz 6448 BLAKE2B f852a4612c400ddfb6dcecb476e0b9b2cd0f38ac9cd74fd09fc1f99ccb2588a4703f8c8514689c81d23aa218aff3cdcbe9b5205becea8936723d6e339705d54d SHA512 206bd08f0a5b7f7107e60c9e9c1a15fa7e74916bacb5399cccdd936b426768834ff24424ea77e8d1706afa98d88bb5a098b3b0203039024a3b5f5388c4a9735b
-DIST trilinos-12.14.1.tar.gz 129036436 BLAKE2B e7401df2ff8408a7af4a8e90d93b1929df65228c4f5cf3c754d20ebdfa8f3835800f540e87c1198e0baf2fefe0920618ae497f59373720754ab0c9dc1da93136 SHA512 dfff0e0582cb5ad12614dd53e9635572c8d1ee86d96f432f5a6e046af63edb13f6bfa3037204ab89fbb0d27e9be9bd9661d47efb41ab2a6e421bca5eba6b6a87
-DIST trilinos-12.18.1-patches-r0.tar.xz 6236 BLAKE2B fdcdedde68ef855aa98671223ad2c42467284ad7ca364e2b5ca715094a6efacc463f2d1812ee63ac980ca87dbe16bb2ac04835f52efa1df34651a608cb5407e9 SHA512 e6db2be4642b8f9797b0be6dd05641ae469dd5117b1b04da54ed955bd56473d6aaa69d59dfd7869db1e7059d2d9b2cb2d9269dd5ef863663eabb90c5c256b987
-DIST trilinos-12.18.1.tar.gz 152007573 BLAKE2B 5dc2ee432d777712fb4ca1dc2d7ad68015f523fdbcbd4f55388a89d31c0946a1c5031b3e8f906952cf6b2f4f16928e6da5f17b1f6ee0f0e5669cfce5c8a09367 SHA512 e2a57df57e8e98ed97bbde9c1e768738f0eaccc32466aff6daa308573a860b3debee89bd570c113ca0f6a6458ff562aa6596ddf657236c368b7b2e26a4b4466b
 DIST trilinos-13.0.0-patches-r0.tar.xz 7672 BLAKE2B 6412f1226549086ef2fca3c4d8bba3c5541489879f4fa37c3598a7271128e3232fa1cc56a51d44fb88d679458a79a082c3984085ddbe4bc0884b0cb45ba683c0 SHA512 91372fe0f47a1f5d4dbc1856e2cfb9d4f1eb8cc0de941013a7a6e791730c9e10decdcd4ca39b36bae836ac66040bee70af187b4a056d46b0da0fe72e8c5943fc
 DIST trilinos-13.0.0.tar.gz 157960946 BLAKE2B 6336d71f469dd4561786092b175ec3396d6b7956aeec6ab8d9d6e87a1b1158a0840661a87514888fc16ea36c44d628dadb865a3244785c2c5d4b24213aca2096 SHA512 74b1e852971c8f040e8640688c879659bf6b03eed0bc6f76f31d768e7c4eb50b23fb8bfb9997d7f630001d80150161aac80fbd3237f52071657908320c1d723d
-EBUILD trilinos-12.14.1.ebuild 6148 BLAKE2B d8ef14be03e34742e59292426af03336fb3997f3e50b02e0d6a9d6114a5d67c7d3530e93f44e645e247f395343b1a3045383714f8408a41a0434cf125f6006c5 SHA512 b96f197cfd8435366940237eba40dd8cd48e950e6c814ebcb18b6c04125f374d4475cecaea3c25a2ec60b3685e3db2d52ac025a9f6031111c67039cfa00be2d8
-EBUILD trilinos-12.18.1.ebuild 6445 BLAKE2B 0e8efec55654b6f10ef389df708c6f3ce1f9d80be8f8d5a45a442520a656d59859a1ce7f796650445deaa8b16e5077ff4f2333401eb0a336ef3e5f50779036ad SHA512 639cf20e9bd4353c63a3c61e831ee6a24471c61cfccc4a9821f759b2fd652a63a9de7ac5c798aca5e65bbd856193659e105e1dc457f9f1ec0fa634e71935c515
+DIST trilinos-13.0.1.tar.gz 157950374 BLAKE2B 79f337b02a0fe9ddf7b55334e035946204b3bb469b92fff4063896a378c82d9c5f04c0bf0e9ddd21603ecf9d84a91860606482b545916f16029a11d2b6c64aa0 SHA512 22241a9ad8b6b6ab9117aba254f65195fc0c8e1b52eacb16e763c999086b6da6b0c180d8864fbe421704e0fe0c433d37512099755d54e60f13ed525dc6c0fd57
 EBUILD trilinos-13.0.0.ebuild 6530 BLAKE2B 655911a00a65ff877f2c3eae666ab44136db8b9651683120f0e8f85fbb883206c3ebce2f5464d9d140e9246102af741d2ed2ff688e0146055ac1c9aae15d47bb SHA512 ab20c26d14b3b03e4e5d66c4aa5f69913bafa34d933891269007613694fb2ec7c54bde1164e81daf9f8cad33bcd221532773e2b79cd693fa18d96e8bb0f1a2d0
+EBUILD trilinos-13.0.1.ebuild 6503 BLAKE2B 4610913cfba5220f83712b93a5dbc6e684bdd3da572171ee80bbf3375ff28466c7e1f57a68b9c1e0baf62a1375a12c2401f5700798be3a39820a113375cc7dd1 SHA512 28ec65d1bfe227f59585d5dc81aed40ed5a15236a40e38141bb658075dc28e6f6c76e1de9598cdfdc18fa9307c66dc05f41e994b02442d3348df4889835c0214
 MISC metadata.xml 2778 BLAKE2B 45cb2a647a1730c9b6b21271364b5f4acaf145f6ae33db356d0b9be7584705c29a645d3f96abfe0a9b87540ae55ab586ec202191776f4472b66291c274b9f24b SHA512 c58e98197353efe1c6fef038dd53d4a938e85aa66fc53f00cab0133d8ee89c629eead55c270c88583778b193f0a85b498c7235fc3f1e8f45a1abfff2d5f0cbec
diff --git a/sci-libs/trilinos/trilinos-12.14.1.ebuild b/sci-libs/trilinos/trilinos-12.14.1.ebuild
deleted file mode 100644
index affe878ba6ec..000000000000
--- a/sci-libs/trilinos/trilinos-12.14.1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake-utils toolchain-funcs multilib toolchain-funcs
-
-DESCRIPTION="Scientific library collection for large scale problems"
-HOMEPAGE="http://trilinos.sandia.gov/"
-MY_PV="${PV//\./-}"
-PATCHSET="r0"
-SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-
-IUSE="
-	adolc arprec boost clp cuda eigen glpk gtest hdf5 hwloc hypre
-	matio metis mkl mumps netcdf petsc qd scalapack scotch sparse
-	superlu taucs tbb test threads tvmet yaml zlib X
-"
-
-# TODO: fix export cmake function for tests
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/binutils-libs
-	virtual/blas
-	virtual/lapack
-	virtual/mpi
-	adolc? ( sci-libs/adolc )
-	arprec? ( sci-libs/arprec )
-	boost? ( dev-libs/boost )
-	clp? ( sci-libs/coinor-clp )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
-	eigen? ( dev-cpp/eigen:3 )
-	glpk? ( sci-mathematics/glpk )
-	gtest? ( dev-cpp/gtest )
-	hdf5? ( sci-libs/hdf5[mpi] )
-	hypre? ( sci-libs/hypre )
-	hwloc? ( sys-apps/hwloc )
-	matio? ( sci-libs/matio )
-	mkl? ( sci-libs/mkl )
-	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
-	mumps? ( sci-libs/mumps )
-	netcdf? ( sci-libs/netcdf )
-	petsc? ( sci-mathematics/petsc )
-	qd? ( sci-libs/qd )
-	scalapack? ( sci-libs/scalapack )
-	scotch? ( sci-libs/scotch )
-	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
-	superlu? ( sci-libs/superlu )
-	taucs? ( sci-libs/taucs )
-	tbb? ( dev-cpp/tbb )
-	tvmet? ( dev-libs/tvmet )
-	yaml? ( dev-cpp/yaml-cpp )
-	zlib? ( sys-libs/zlib )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
-
-PATCHES=(
-	"${WORKDIR}"/patches
-)
-
-trilinos_conf() {
-	local dirs libs d
-	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
-	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
-		libs="${libs};${d:2}"
-	done
-	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
-	dirs=""
-	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
-		-DCMAKE_SKIP_INSTALL_RPATH=ON
-		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
-		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
-		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
-		-DTrilinos_ENABLE_ALL_PACKAGES=ON
-		-DTrilinos_ENABLE_PyTrilinos=OFF
-		-DTrilinos_ENABLE_SEACASChaco=OFF
-		-DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
-		-DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)"
-		-DTrilinos_ENABLE_TESTS="$(usex test)"
-		-DZoltan2_ENABLE_Experimental=ON
-		-DTPL_ENABLE_BinUtils=ON
-		-DTPL_ENABLE_BLAS=ON
-		-DTPL_ENABLE_LAPACK=ON
-		-DTPL_ENABLE_MPI=ON
-		-DTPL_ENABLE_ADOLC="$(usex adolc)"
-		-DTPL_ENABLE_AMD="$(usex sparse)"
-		-DTPL_ENABLE_ARPREC="$(usex arprec)"
-		-DTPL_ENABLE_BLACS="$(usex scalapack)"
-		-DTPL_ENABLE_BoostLib="$(usex boost)"
-		-DTPL_ENABLE_Boost="$(usex boost)"
-		-DTPL_ENABLE_Clp="$(usex clp)"
-		-DTPL_ENABLE_CSparse="$(usex sparse)"
-		-DTPL_ENABLE_CUDA="$(usex cuda)"
-		-DTPL_ENABLE_CUSPARSE="$(usex cuda)"
-		-DTPL_ENABLE_Eigen="$(usex eigen)"
-		-DTPL_ENABLE_GLPK="$(usex glpk)"
-		-DTPL_ENABLE_gtest="$(usex gtest)"
-		-DTPL_ENABLE_HDF5="$(usex hdf5)"
-		-DTPL_ENABLE_HWLOC="$(usex hwloc)"
-		-DTPL_ENABLE_HYPRE="$(usex hypre)"
-		-DTPL_ENABLE_Matio="$(usex matio)"
-		-DTPL_ENABLE_METIS="$(usex metis)"
-		-DTPL_ENABLE_MKL="$(usex mkl)"
-		-DTPL_ENABLE_MUMPS="$(usex mumps)"
-		-DTPL_ENABLE_Netcdf="$(usex netcdf)"
-		-DTPL_ENABLE_PARDISO_MKL="$(usex mkl)"
-		-DTPL_ENABLE_PETSC="$(usex petsc)"
-		-DTPL_ENABLE_Pthread="$(usex threads)"
-		-DTPL_ENABLE_QD="$(usex qd)"
-		-DTPL_ENABLE_SCALAPACK="$(usex scalapack)"
-		-DTPL_ENABLE_Scotch="$(usex scotch)"
-		-DTPL_ENABLE_SuperLU="$(usex superlu)"
-		-DTPL_ENABLE_TAUCS="$(usex taucs)"
-		-DTPL_ENABLE_TBB="$(usex tbb)"
-		-DTPL_ENABLE_Thrust="$(usex cuda)"
-		-DTPL_ENABLE_TVMET="$(usex tvmet)"
-		-DTPL_ENABLE_UMFPACK="$(usex sparse)"
-		-DTPL_ENABLE_X11="$(usex X)"
-		-DTPL_ENABLE_yaml-cpp="$(usex yaml)"
-		-DTPL_ENABLE_Zlib="$(usex zlib)"
-		-DML_ENABLE_SuperLU:BOOL=OFF
-	)
-
-	use eigen && \
-		mycmakeargs+=(
-		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
-	)
-	use hypre && \
-		mycmakeargs+=(
-		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
-	)
-	use scotch && \
-		mycmakeargs+=(
-		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
-	)
-
-	# cxsparse is a rewrite of csparse + extras
-	use sparse && \
-		mycmakeargs+=(
-		-DCSparse_LIBRARY_NAMES="cxsparse"
-	)
-
-	# mandatory blas and lapack
-	trilinos_conf blas BLAS
-	trilinos_conf lapack LAPACK
-	use superlu && trilinos_conf superlu SuperLU
-	use metis && trilinos_conf metis METIS
-
-	# blacs library is included in scalapack these days
-	if use scalapack; then
-		trilinos_conf scalapack SCALAPACK
-		mycmakeargs+=(
-			-DBLACS_LIBRARY_NAMES="scalapack"
-			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
-		)
-	fi
-
-	#
-	# Make sure we use the compiler wrappers in order to build trilinos.
-	#
-	export CC=mpicc CXX=mpicxx && tc-export CC CXX
-
-	#
-	# cmake-utils eclass patches the base directory CMakeLists.txt
-	# which does not work for complex Trilinos CMake modules
-	#
-	CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Clean up the mess:
-	mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
-	if [ -f "${ED}"/lib/exodus.py ]; then
-		mv "${ED}"/lib/exodus.py "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
-	fi
-
-	#
-	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
-	# has a chance to pick up the libraries...
-	#
-	cat >> "${T}"/99trilinos <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
-	PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin"
-	EOF
-	doenvd "${T}"/99trilinos
-}
diff --git a/sci-libs/trilinos/trilinos-12.18.1.ebuild b/sci-libs/trilinos/trilinos-13.0.1.ebuild
similarity index 97%
rename from sci-libs/trilinos/trilinos-12.18.1.ebuild
rename to sci-libs/trilinos/trilinos-13.0.1.ebuild
index d526edf1054c..c7868ab5db28 100644
--- a/sci-libs/trilinos/trilinos-12.18.1.ebuild
+++ b/sci-libs/trilinos/trilinos-13.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://trilinos.sandia.gov/"
 MY_PV="${PV//\./-}"
 PATCHSET="r0"
 SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz"
+	https://dev.gentoo.org/~tamiko/distfiles/${PN}-13.0.0-patches-${PATCHSET}.tar.xz"
 
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
@@ -101,7 +101,6 @@ src_configure() {
 		-DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
 		-DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)"
 		-DTrilinos_ENABLE_TESTS="$(usex test)"
-		-DZoltan2_ENABLE_Experimental=ON
 		-DTPL_ENABLE_BinUtils=ON
 		-DTPL_ENABLE_BLAS=ON
 		-DTPL_ENABLE_LAPACK=ON
@@ -205,6 +204,9 @@ src_install() {
 		mv "${ED}"/usr/lib/pkgconfig "${ED}/usr/$(get_libdir)"
 	fi
 
+	mv "${ED}"/include/* "${ED}"/usr/include || die "mv failed"
+	rmdir "${ED}"/include
+
 	#
 	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
 	# has a chance to pick up the libraries...
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
index a9716f49ad3c..c5a0c7cbc06c 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1,3 +1,3 @@
-DIST volk-2.3.0.tar.gz 344763 BLAKE2B 0f0e0cb7e6cd28086802c1618685ec30dedf5cdf67bef7ed09f3a7482f84d6e7972f4b22c096676bdef34c66c60d936ca8ab300cd4da07f6714cface1c2846ed SHA512 9e3b405b7be46b4f5ff61a4d42fa9013fc55169bc18c9cf9253e446fe23fd12dc0356adb9aa176e33dfa4cc478e4b9226bee906a2d89ef83bac3b28f52816382
-EBUILD volk-2.3.0-r2.ebuild 985 BLAKE2B a330acb57bd0b0f5bda21a0542cce07f085f81138e04efa3fec7402650dd4d3c6610c28b2d3ba613f411a7735e27e21af80bc5ad6cb3aca9ce8937ec5e3ac03d SHA512 3f9aef0f1993d56a89182cc9b048023376765be01d8e63b54373f448ee6473d9ed9ae91c2a9efc5a8e7537fbcbd66bc6c1980f2259b1b60de17e59da0474b01c
+DIST volk-2.4.1.tar.xz 315072 BLAKE2B 1ce1d220f9e1e9251332fb6caf7d72eaf3db85009a49434edbf6490b02ab016c4b1eb8677f0e5f446f5783615f2256710621b1806684dffeb1ff441756e4a635 SHA512 7c16a5d750cdea2927c3b08dcad29e19f10932a3b7b35cb25ecc66554d7e441c95906a4746fcf62f895709aee1191f1bb91189c3509b444b6b4ba37a306f9909
+EBUILD volk-2.4.1.ebuild 1015 BLAKE2B 10b82c48ac5ba097e13dc035da145d377a8d6d139697c3f50333c4d9752a9640ecacfc068805f51a25ba8753bef301e259e31dc31b580f8ce455fb9831201d47 SHA512 86d04659f916ac06c64fb2b593bf532269ce4dc4b7403357c4d0e78c1c5b9398195486e9bbdff23c3f40896dab513fd9b10b78215805b549a6128d4147142548
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/sci-libs/volk/volk-2.3.0-r2.ebuild b/sci-libs/volk/volk-2.4.1.ebuild
similarity index 88%
rename from sci-libs/volk/volk-2.3.0-r2.ebuild
rename to sci-libs/volk/volk-2.4.1.ebuild
index c9841926b90f..2450491ce80e 100644
--- a/sci-libs/volk/volk-2.3.0-r2.ebuild
+++ b/sci-libs/volk/volk-2.4.1.ebuild
@@ -11,10 +11,10 @@ inherit cmake python-single-r1
 
 DESCRIPTION="vector optimized library of kernels"
 HOMEPAGE="http://libvolk.org"
-SRC_URI="https://github.com/gnuradio/volk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz -> ${P}.tar.xz"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="orc test"
 
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 0be529a1cff8..e782c287f22e 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index ceab02a8ac73..880ce72acb81 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -5,6 +5,8 @@ AUX flint-2.6.0-multilib-strict.patch 622 BLAKE2B d383ce45fb82fabd62530cc15a8bda
 AUX flintxx-include.patch 507 BLAKE2B 250e54de1ab5b70cffdac7348b78db543cbdb366efa419dea62ffed2b0b5f95b787019e96fb95b9253b5289d58a2322b41f660f1719516e410e4245b09accb7b SHA512 144dc23d8706e22c6ac5d50bc2ce6c9e2eb8016155bec48a809bceec435d07781105c073b669302132963f063ab1c311e7381f78cc29a0141ca78eceb25aa0dc
 DIST flint-2.5.2.tar.gz 2212242 BLAKE2B 36b9b1f2acb1d79534d85884d755fddba3b8b40efbe92aeeecd7d1526cd21f0849054c30d23c565c6a13c609992cf22f56f5b640da15e1c7e6ba6840fc710d47 SHA512 cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2
 DIST flint-2.6.3.tar.gz 4526340 BLAKE2B d663b44166cd857f83c2752eb4d4f6dc45eb8de535089e5dbe9939ac1464f1d69f66b62184644fff1ecd1d171f389d5ab874873def670c702733a0eba17bfd13 SHA512 8e71570364c789b1d4eaaa5f5adf10212cab47bf1a9f45c333211035ed021a86bb7b1de1feec51e83b2e113e8168853e370f127d2d2b1e941a12aec71fe8ae9e
+DIST flint-2.7.0.tar.gz 4943210 BLAKE2B a23b79195c71ef4691a450a82daded3de56eb51df1b3c850e13200527fff08da668281f350d7278ff52187eba8b7d9b27f4e69fafcaf771d8a01d72c6925b062 SHA512 6eac3d6fc306cacf482379074cba0d109aae4fbe8f907c17bcfe0afc2e8603c0fbe80e88a1ac374d9fa6d87aa59eb2b973f225a69da6dcc647255f060ad8711f
 EBUILD flint-2.5.2-r1.ebuild 1714 BLAKE2B e1e6770c375f95ac1bb5d4284ffc205ba4a95d9933799718862ab31a12c87c3da9ed0c46509b808856a3663eef1d4bbd0c7334d9b1f76a192d66e196a2eb1683 SHA512 4ee441362d871807a93a9e9ab8d5a4d261f1c87ae0802525a780855ceb93666f3ca721a0fcbfc7d341522a0c8d81e3b28765ba6a1246a3535881e35e20ec24dd
 EBUILD flint-2.6.3.ebuild 1155 BLAKE2B 5297af3acffb38e372b910766b6c4bd18c03779f2a36c4fd26ea6585a26a7c0201386e550b5ebc69dbb97a1e705470fa6ddaecd435e49fe85d2c527413af6b98 SHA512 1294c25101affbeb28c4a42110516e0f376344153c2b67b87300ea73f5aeaca12ee137051dce0983c2dc47d198dbc8a359a70fae46befb209a7b7aca20deff1b
+EBUILD flint-2.7.0.ebuild 1190 BLAKE2B 58b110471c0df4a259995a710b692ff4552e55e0e6e0b12e23421557a6773443115388b17a90bc5ba86e42f5007edf22797e582d5fb9ee0570537b92c77639bf SHA512 140c49b72df14f36c01f6e6c51f2fc370b33ca65c4716932022996afdec4a0ed10edee67b1fddd8a51f8a0ba5986ad7f94fa02e704cedbc3864281f01280bb64
 MISC metadata.xml 481 BLAKE2B f0d2cbeda37050bec654c0cba3c45b7340f37b29aa570c744d0a882f662481e7d8d777f48b0530fa23090807d9ad0a913733f4d55a3661f82322cfe544b90508 SHA512 63b38afaf08270df42d3a26cca9f5f491562dd89d8e9c43def3849a624d6694343147e47a602d75e44a656a8db1f7cb06885534fe39917cb46f2f895efc8ff16
diff --git a/sci-mathematics/flint/flint-2.7.0.ebuild b/sci-mathematics/flint/flint-2.7.0.ebuild
new file mode 100644
index 000000000000..d61fd70522a9
--- /dev/null
+++ b/sci-mathematics/flint/flint-2.7.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake python-any-r1
+
+DESCRIPTION="Fast Library for Number Theory"
+HOMEPAGE="http://www.flintlib.org/"
+SRC_URI="http://www.flintlib.org/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+
+# Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
+SLOT="0/15"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="doc ntl test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? (
+	dev-python/sphinx
+	app-text/texlive-core
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	)
+	${PYTHON_DEPS}"
+DEPEND="dev-libs/gmp:=
+	dev-libs/mpfr:=
+	ntl? ( dev-libs/ntl:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.6.0-multilib-strict.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_NTL="$(usex ntl)"
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_DOCS="$(usex doc)"
+	)
+
+	cmake_src_configure
+
+	if use doc ; then
+		HTML_DOCS="${BUILD_DIR}/html/*"
+		DOCS=(
+			"${S}"/README
+			"${S}"/AUTHORS
+			"${S}"/NEWS
+			"${BUILD_DIR}"/latex/Flint.pdf
+		)
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_build html
+		cmake_build pdf
+	fi
+}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 70f1025221ad..b485c43d3fae 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index ffa7f28e1647..a54b4c1c7a82 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -10,7 +10,7 @@ AUX gnuplot-5.4.0-pkg-config.patch 1162 BLAKE2B e72dd15ab84baba71328b38402b78671
 DIST gnuplot-5.2.8.tar.gz 5340677 BLAKE2B 169f5bef44a64b3b7a5be40e28ea22ef24ebc7526fe13ab09e16495453c3922712603d63a03c3b4332368d2ae8cbe4ef57ec53e18bbb4ad2cde13e4cc534245a SHA512 513dff15236dcb58c3c5471cdaa0713242787dbf30ef860c3f69152cb87c6392e4973caff5eb178707bbb84c78548e806b2920864a37686bce49425fbfdc4e8c
 DIST gnuplot-5.4.0.tar.gz 5622595 BLAKE2B e42011fa49ba0440436a406737f03ad55359b337dce359c62c1b4f536f70ca07126cf04e3e0eef6e4b22340dfb0318f6890d7814ad55b38d60ee24a4bc570ca1 SHA512 abbb69ded9eed3a1e53caeeb7d75ee4e3532b1254640a3f38f00260e261e75f87744e3df4210b0db7c8c2acee9b25147524d5377b3f4305e2449b2e99ca58d66
 DIST gnuplot-5.4.1.tar.gz 5608076 BLAKE2B 7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d SHA512 2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121
-EBUILD gnuplot-5.2.8-r1.ebuild 5963 BLAKE2B f2a75ab3088375bb296df3dd5a25f7d63b5ebcd0674ff96778abc14f8ebdc927157e9b06e82519e658b4120662b0b36155e7fbaf1a6f97de7bf094cf888b1ff5 SHA512 bb707a1f70697584da5f13c7f6b2dae44aa7bc836c45cbd5792e8d7c5909db4015ce634470321090d4ffd6479e870799eb63d97349019d140ab86d76ab423fa3
+EBUILD gnuplot-5.2.8-r1.ebuild 5960 BLAKE2B 5202a31d54588c4971fcbefe1af5b2f5df1716779a01d9e14d40ce516ac9dfb0b3c4c3341a0fd0bff71b18cc4d9ee7faa27a4350e3ed3e0209f89c2321b1fa8e SHA512 55941dd9711b9dc6012091949d1aa1ffd310bcead08140dc4027c46e73d186975cd6f2983378bc646b59bffb17a92a2cfab9e5b5be59c52cc05a46a37078386c
 EBUILD gnuplot-5.2.8.ebuild 5846 BLAKE2B bf448f20b5754401d3cb095783bd66332585addbbd916d4b0672f0c6f8b8a5cbfdfffdcf4516463770d5ba29b7b11ad075c0d6aba046bdf8922fb2273d92b995 SHA512 6a79d97ec2b480f0da057259382466f43752693b43a314ddebdf1e0a0f511bf0ed75cc48773df2665129b9d660a84c3f3b3dd2b657d4eeac1cd0a45388fa2d71
 EBUILD gnuplot-5.4.0-r100.ebuild 5251 BLAKE2B 855f0b8c3c9d650d7b36f063e19958306695266cfa6fc5a1ea625df6794f66db42a889492234beaa953b1fd94da5616d80e91e0ec32c5edfb428b9fe97d563f7 SHA512 f64417a4934c0f14197c81340d54d3e91f79f4412829791db73fbc568ba13967e0032f1493276c13ef9d88bc224c57144f611c53ad8c1c0fe8855d4fe08c150c
 EBUILD gnuplot-5.4.0-r2.ebuild 5120 BLAKE2B 449a0b41a70da220ac7027aa149c58d19ec2273d693f5aaa6ccf8612940fa42a046c978d8dbb8d4efdfe4e2c062d1fb97fd0a4558fd88620228d2dbefce2b2a2 SHA512 b0468c83ff54e8d06803001e154718375458129196378ada36d6a5d0f7f50536f40261d8bde3fcfb4fb0a7238f7d454cc84ba61353f7361490967ff8b004567a
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild
index fe62012b7f6d..3626a3bcebd4 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.8-r1.ebuild
@@ -17,7 +17,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot"
diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest
index d03b6838fd0e..c68e25fcdb54 100644
--- a/sci-visualization/pythonprop/Manifest
+++ b/sci-visualization/pythonprop/Manifest
@@ -1,5 +1,3 @@
-DIST pythonprop-0.29.tar.gz 586118 BLAKE2B ac018f147206b59fbd2295e6e72d6e1a801d6456d8a9784bdb2511b0d9dcecfa455363826680051c90e0fcc83fdc95a16c91df120efb2e70456958276967dec7 SHA512 2fbbffedc9e010fdebeed7a84d23c599a2532ae0b67e6a2ba2da6bea0dc0496cb1f71ac54650285ed35196f33e689fc3d967e3bd7c4fb16832fc484a6b777fcb
 DIST pythonprop-0.30.tar.gz 1141872 BLAKE2B 0703358221825bbeffb47cd5ff97a8de4c22ed9922347b96e359c7fbeffd6bae681a81d4938c03f4199ce583821d6e1006ce2e12aa718f50b5de69f2c0476a38 SHA512 421cade49a241d0dd38afa92e2c1874e2e6a0837ac7aeb9f4a294a2cec23e80e446e88a4de202de445cde73b9d816f4d6e487536be8c02017f1754c116fba310
-EBUILD pythonprop-0.29.ebuild 1215 BLAKE2B 12d040287abe3d190bcffa886a51306fa0bbe1edd6c7c655e48f078d4fb904808e96a7827b7e2e3ea7ff3c6256f522981b12efb88e19389544676f382b89688a SHA512 f14a3917581e04e8748584b1e0229fab65ea4365c2bd11bef6582a5a1e01279521ae55005dcca2a27df2f3f1677959680fd9ca5de0a006dd2b07be18758834f5
-EBUILD pythonprop-0.30.ebuild 1210 BLAKE2B 8dd884be316ee49fd94a1e8f0583e00ff6d08414ad20b7cee3375a01db7fb80bd2837b62b78a163f28036284581c768866984edf80cb974940f9242b27eedfb1 SHA512 e738b924a6340031f6c5f1ef70372028aa8552e0c01fc5042ad0c5d180cc8cab5d2c8b32b34f468790d343f800c51447bd663dc7239fdfadef73c5d00d8cf1bd
+EBUILD pythonprop-0.30.ebuild 1209 BLAKE2B b6fdddb914661a982413460384323787d154522752d8d203f40738b5d65ac5f49d869ddcdd35f4793659b2636773ff60fe3d24b2431f070cf330086f1ca1d885 SHA512 8e756faf34bf12082a645ca36ed64b241e39aace8454cbf375455554414821ce993528f6bf6bf3022be2b9493cc4307755346a2f9fb9ff53c0aff7ee65dabdb6
 MISC metadata.xml 459 BLAKE2B dbf50a4c24f4a4dc0b27d087e0f0942ef7826ed8fcb858fd9744371f906bc5e1ff727a37db157705f5ebf630e744ce21bf9fc578e59eaaa6170215066b85a681 SHA512 23f2836015bd753b0a4957be9efa3347d2f5c6b79ec041465120aa9e8e6565397ba343ea8a393273eaab3c146b8555914b4a1e8bba2a0c4596bc49833388e8f1
diff --git a/sci-visualization/pythonprop/pythonprop-0.29.ebuild b/sci-visualization/pythonprop/pythonprop-0.29.ebuild
deleted file mode 100644
index 1888fc5fc46d..000000000000
--- a/sci-visualization/pythonprop/pythonprop-0.29.ebuild
+++ /dev/null
@@ -1,51 +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 autotools python-single-r1
-
-DESCRIPTION="Scripts to prepare and plot VOACAP propagation predictions"
-HOMEPAGE="https://www.qsl.net/h/hz1jw/pythonprop"
-SRC_URI="https://github.com/jawatson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-		sci-libs/cartopy[${PYTHON_MULTI_USEDEP}]
-		dev-python/scipy[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-python/cairocffi
-	sci-electronics/voacapl
-"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	app-text/rarian
-"
-
-src_prepare() {
-	eapply_user
-
-	# drop building *.pdf files
-	sed -i -e "s#docs/user/help##g" Makefile.am || die
-	# do not call update_destop_database here
-	sed -ie "s/UPDATE_DESKTOP = /UPDATE_DESKTOP = # /g" data/Makefile.am || die
-	# fix Desktop Entry
-	sed -ie "s/HamRadio/HamRadio;/g" data/voacapgui.desktop.in || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	python_optimize
-}
diff --git a/sci-visualization/pythonprop/pythonprop-0.30.ebuild b/sci-visualization/pythonprop/pythonprop-0.30.ebuild
index 38ac7c2ed83e..35305b711e3d 100644
--- a/sci-visualization/pythonprop/pythonprop-0.30.ebuild
+++ b/sci-visualization/pythonprop/pythonprop-0.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit autotools python-single-r1
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index ea29cb62be0f..0b0492cf9447 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 09a216ffb58c..9d2ed479ab43 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -7,5 +7,5 @@ DIST ack-v3.4.0.tar.gz 251106 BLAKE2B 192d1e851ef5bd3547e21fe49cf276180eb278af78
 EBUILD ack-3.0.0.ebuild 810 BLAKE2B 2617de5e26ff8f9ecf601ee5a4f5c2104ec9acfc2e42fcc1fe56742dbe64c729bfbd58f780374bdd1bc6563bac29e05284e99e73ec5f5310cef0fa10cef239b6 SHA512 574ee3043cc235a1914d2002ac9a3184890f2ae6f23037823a699bca22b04b44d15c2617d4bd910e4e00123106d2c5a47d36e8289d75b1583e758f4b6cefd51e
 EBUILD ack-3.2.0.ebuild 812 BLAKE2B 916da318cdcc7aeb9b98f65f156365f103e59248c1087615c293da0a73d4fc1ad3f535e2f6f5a422406a26a522cebcb12f97d9e05c3d80aecf64e2e445020898 SHA512 b4272f60a2ffd169b490b07f2ac28db6c069ed5543451202d1b49b34f2deea2dc05098a0a304bc4a8b5cfde86419f2ab486a8a9b5dd88951d8994d2c4946a2eb
 EBUILD ack-3.3.1.ebuild 812 BLAKE2B aef52558bf7791b754afdfdce9fb497c26b44a3aeebe8a1b2bc587bcbce6d5477340194c33d551f7aedb4b2f5fe9fd71fce8aa6e382fffa686dffc0ea2a7fc87 SHA512 93c5e79e1800400bd40405993f5a8e05e43a446c308b26f3e6c9f670df36c354e2cf6f0396b5ad9fe636a1f6031d8a5e4a655b8b32e2e5abc1af4158983972f2
-EBUILD ack-3.4.0.ebuild 830 BLAKE2B 94b37db82ec9fa94a449de96b221ad55568593ca1bada350f6ee68e8a951112cc1cda561833853023f245e9be5ce31440f72b974a70543e9bcf20c9f43bc9191 SHA512 69dbb82b289c3e3a40633f8def16f7c49075b4a8df896a865858ff32c60f846deb9fea9c003ae6f4d6f068abfa8d77ed72827a6f5c87fa65864d1029acb8f92f
+EBUILD ack-3.4.0.ebuild 828 BLAKE2B 50b9213ec87c984ac9d78ecb5283ff29878e20c72c733f40d1d9b38c0acd5b1213c23175ca6ac679657b0e4dd67296c301bafd3aa57c9f665d949b42bb7d4588 SHA512 cbcc0291eddd9f6abcaae5e9183c5d8b5e7b44cbe2c1f949e9a66761867f4f23810fdda3ad9c0fdc061c769ac3ca66e84b03f018ed2efb6471ab117d9d3a8133
 MISC metadata.xml 1749 BLAKE2B c8803cd3161065885162a0a3c21a426e36914ff7796b3f99eb57f1e1db40be7cb789df331dde048e112f6ab691a30607100a521091ece034d2edabffc22751ee SHA512 91bee1d028fac56e397138f7db10742721a509c3ba1f7de21aebe5d9c334b2bc56736cbedf47df90f3dec5bc6193feacccceb45ad247e54fefdae5a06df65dac
diff --git a/sys-apps/ack/ack-3.4.0.ebuild b/sys-apps/ack/ack-3.4.0.ebuild
index ee0ad246b94f..90f7405ca35e 100644
--- a/sys-apps/ack/ack-3.4.0.ebuild
+++ b/sys-apps/ack/ack-3.4.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://beyondgrep.com"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 218c51efa593..8d2f3caad667 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -2,7 +2,7 @@ AUX attr-2.4.48-perl-5.26.patch 785 BLAKE2B 307e652d83c5d623415ae389f01df918c552
 AUX attr-2.4.48-switch-back-to-syscall.patch 3889 BLAKE2B bc308b40781abd79e8a45bcd7509bbc7924d44e0109b521f52d07d705bdfed9f80badeb8ba2aae44fd5350c36f54ebb31ec7273abc5f388ca91cd60dcf148c2b SHA512 e0e8c6bb89a42e91ff0daf3bb2aa7e75bb26ebd6f59d549cc037db8d156e03cef195fa7ac813f8cd22325583cf9e81d6782ec06a8f5e5f8b4eeadc104a6c5492
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
 DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
-EBUILD attr-2.4.48-r3.ebuild 2359 BLAKE2B 51ade9db9989ec3613f7d2fdb36b140584550e5aa1ee56fbc0874e2444eb56ae642bc938a27cef5e094c07e111bfcb0b1512314afcde58d809681ad310f1d163 SHA512 35a0f35163df7b904fa32d1dc553b0f447d06e3f2bea8eaad71c9f716c9838603c0d26e06b7f25955584716743991bb7e209005426f5d56e9c79e272440026ca
 EBUILD attr-2.4.48-r4.ebuild 2352 BLAKE2B 7d90d8442281a18b198ef654a115accc7228c66386dc4b453dfffc1bf8b80b7d3978ab83b8f520be7935f114fdc5f9391124b6628b3dcc15ad6ea67bb65a761b SHA512 16be12e9f26b6140f66e4b67533945e17171495951e17c0384250e32a13159e8572f80d505b0d6b76bfcaf47297420044e815414d2862284f0bda5f669bfadaa
-EBUILD attr-9999.ebuild 2444 BLAKE2B e14a033fc704cbfe4c1695d7246f7d1250b6232172fc2dd79e533891508e435a4d6f7382832ec654889b06b71d6f0448d320d7f7fea4b2793d5a32fbfa6c5c23 SHA512 3777897c5e5889ee81efcfa8af4814b6856211155d073938c88905776280dea5115837ef621f97c4c885e6f0a318ef723d66674696fcd3e9c983cd6c79f4dbc0
+EBUILD attr-2.4.48-r5.ebuild 2584 BLAKE2B 44947dccaf200cedddc154153a957793b6de341b00ac395aba99b5c047f116eaa8f049ed2185d054261bb917d992ffa8c0bf79a53d6549ed2e26be0e3e0dc17b SHA512 7a9dfb9696cc8c7a452b21462be7f1c319042ea78aaad6cdf31cae1f48b229f7c390fcae4dc2ed20b24f9724e50f298ce4c706a238538976871a43e688c046e7
+EBUILD attr-9999.ebuild 2476 BLAKE2B e5531eae4407b8ea7aa21a00a8eac0c63fb2f2f3745030b8acc20780c896660c67e470ff562940f55f6074b641b812be9aa455c0c6e6a7b4353fb82bc3ff044d SHA512 9fadedfc67e6f03d1ebcbb0b8bbf64a47cfcea0f8a1d4e7c3e42c1ad4de2bccf2309775eff8d473892867339da0afea98d88d009a31ece6ce809c8b3a29a82de
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.4.48-r3.ebuild b/sys-apps/attr/attr-2.4.48-r5.ebuild
similarity index 70%
rename from sys-apps/attr/attr-2.4.48-r3.ebuild
rename to sys-apps/attr/attr-2.4.48-r5.ebuild
index baa2831efd2a..2de4d8189160 100644
--- a/sys-apps/attr/attr-2.4.48-r3.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r5.ebuild
@@ -1,44 +1,55 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
 
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
+
+	inherit autotools git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+fi
+
 DESCRIPTION="Extended attributes tools"
 HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+
 IUSE="debug nls static-libs"
 
-DEPEND="nls? ( sys-devel/gettext )"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-perl-5.26.patch"
+		"${FILESDIR}/${P}-switch-back-to-syscall.patch"
+	)
 
-PATCHES=(
-	"${FILESDIR}/${P}-perl-5.26.patch"
-	"${FILESDIR}/${P}-switch-back-to-syscall.patch"
-)
+	default
 
-pkg_setup() {
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles || die
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize #580792
+	fi
+}
+
+src_configure() {
 	# Remove -flto* from flags as this breaks binaries (bug #644048)
 	filter-flags -flto*
 	append-ldflags "-Wl,--no-gc-sections" #700116
-}
-
-src_prepare() {
-	default
-	elibtoolize #580792
+	tc-ld-disable-gold #644048
+	append-lfs-flags #760857
+	multilib-minimal_src_configure
 }
 
 multilib_src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	tc-ld-disable-gold #644048
-
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
 		--enable-shared
@@ -51,10 +62,10 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D%/}" install
+	emake DESTDIR="${D}" install
 
 	# Sanity check until we track down why this is happening. #644048
-	local lib="${ED%/}/usr/$(get_libdir)/libattr.so.1"
+	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
 	if [[ -e ${lib} ]] ; then
 		local versions=$($(tc-getREADELF) -V "${lib}")
 		local symbols=$($(tc-getREADELF) -sW "${lib}")
@@ -85,7 +96,7 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	if ! use static-libs; then
-		find "${ED%/}" -name '*.la' -delete || die
+		find "${ED}" -name '*.la' -delete || die
 	fi
 
 	einstalldocs
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index 7a00a2b560ee..ba5fdd791fcf 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -23,11 +23,6 @@ IUSE="debug nls static-libs"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 
-pkg_setup() {
-	# Remove -flto* from flags as this breaks binaries (bug #644048)
-	filter-flags -flto*
-}
-
 src_prepare() {
 	default
 
@@ -40,13 +35,16 @@ src_prepare() {
 	fi
 }
 
-multilib_src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
+src_configure() {
+	# Remove -flto* from flags as this breaks binaries (bug #644048)
+	filter-flags -flto*
+	append-ldflags "-Wl,--no-gc-sections" #700116
 	tc-ld-disable-gold #644048
+	append-lfs-flags #760857
+	multilib-minimal_src_configure
+}
 
+multilib_src_configure() {
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
 		--enable-shared
diff --git a/sys-apps/baselayout-java/Manifest b/sys-apps/baselayout-java/Manifest
index 10d415742618..f1beb40ef52e 100644
--- a/sys-apps/baselayout-java/Manifest
+++ b/sys-apps/baselayout-java/Manifest
@@ -1,3 +1,3 @@
 DIST baselayout-java-0.1.0.tar.gz 72571 BLAKE2B 3a41752b1bdc3980fe8690e499738e19ba9c390164fba04d16eba8f85a73557c7f9c15e311fcd738c250ed1226cc143bc933eef14edad0546b27eb5b41cf3bd3 SHA512 6f5b6ff1ed07406711e15a768f5abdf9f7edef1b31e094760f265863aa8991bf60ff71c8b10003265d8ec1aa7c94a611bede96980d25c819908b705b4d2d1062
-EBUILD baselayout-java-0.1.0-r1.ebuild 1322 BLAKE2B b2b2d606a6e4b6c13734e8d5cc2beda1728f279e2bd00c3699dfddc69687219a0eff64797a14bfc8b9a42c5e2d4efe842e472f9bc9000946367b3f4b08343655 SHA512 13c99034e38a2a2aeee921f2810d01154b8637d85346931a00e3f9894f3c4e52eb0e60284fcfc8249e7cc97ce7074f4e30b8aee4732fed2db2b47787c97b3221
+EBUILD baselayout-java-0.1.0-r1.ebuild 1399 BLAKE2B 8bc14f9e8ad297310e63d250ccd0aac45fab087982ebde056fae9a642d7390ce11552b1bb58eaca3a409cccb9868c0e755f6df0c2c3b73b00f0dddab3c7050ca SHA512 49608bdaa36f8d34b725805c4e39f97c21f4170c6bc8571bccd1ad7ec05bbe4618d9b77fec96020cd1f8855ddcfe2ad8648d409988b6a12d9c15d9ab75d578ea
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
index 23ba5272869d..803fe0c5eac9 100644
--- a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
+++ b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
@@ -28,7 +28,7 @@ src_install() {
 	exeinto /etc/ca-certificates/update.d
 	newexe - java-cacerts <<-_EOF_
 		#!/bin/sh
-		exec trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth "${EROOT}"/etc/ssl/certs/java/cacerts
+		exec trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth "${EPREFIX}/etc/ssl/certs/java/cacerts"
 	_EOF_
 }
 
@@ -44,6 +44,6 @@ pkg_postinst() {
 	# so jdk ebuilds can create symlink to in into security directory
 	if [[ ! -f "${EROOT}"/etc/ssl/certs/java/cacerts ]]; then
 		einfo "Generating java cacerts file from system ca-certificates"
-		"${EROOT}"/etc/ca-certificates/update.d/java-cacerts || die
+		trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth "${EROOT}/etc/ssl/certs/java/cacerts" || die
 	fi
 }
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
index 570a7229fbc1..068dcc9cd555 100644
--- a/sys-apps/fd/Manifest
+++ b/sys-apps/fd/Manifest
@@ -1,53 +1,82 @@
 DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
+DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST anyhow-1.0.31.crate 28514 BLAKE2B 1177bbac61e96eb007a7a9a79499a7dab08a5c828987221df32c137b69bed53473b37f01debf49a7da0883407c6da40192fbc800c9b7983128738b2889d327a4 SHA512 e60394f48b74f8db4e61b9bfdb146b8e7a8b014c0a729ccb9e657d648a9310e642c77f6e5e5d4c8a6ed40a65c65bda79e45cda9a3efd04a901376e3912aebb8a
+DIST anyhow-1.0.35.crate 28928 BLAKE2B 74fec657b5c21455298198bd9feddbc5086c433f2c43de45950e33341ca9527f88f4ccb94eef248437e455394d54ec0dc13af33843deb799a0215abd1b1a874f SHA512 e93baa31f9eb04dcefc9e17fe030778337796490cec3467799f98dbfda77f55522457adde388c08b8893303e8a34292b863793f37956c4adfb7a88ba10fbd154
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
 DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
+DIST bstr-0.2.14.crate 345490 BLAKE2B 96095cf4d70d88cd5cb4a61bd0e72a673933c7d1d95b713bd44375e739037ae12451602fa539ebf98e73d39a6786728ad145e882117b98108d945ba96b810e83 SHA512 de62c0f31ad672f90a8038fa163c7cdaf474b35ec24592aee5549af7c76d43e6ed00f8d7237e15ab27576c27a7232033a217955de6a0a3b40c83661b3a7e1e8a
 DIST cc-1.0.53.crate 51740 BLAKE2B 04d9d6d7e5999c9463dd86eaed965ec728c285ea0e642a02383b45ea820bcbb37c91116646b0fa2636e7176030bcff29612a72482df8c7a02a7262a805791e55 SHA512 8c7224b21a36d46afcdb7b2475686edb2d31b784e95e792f81acd5d5840b0065ca8869ca1c8c5a70cfb3e31dbe5c006360b054c1f11a92f0e1937e4e6d335229
+DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
 DIST ctrlc-3.1.4.crate 12702 BLAKE2B 96437ca96cc75eac980623a7ae15e9ecd224f7d6373744f39b16ff0fdac708bc2761829c1d8de2bc4c66a0f6e7fcf7791831044447e9d0ac6521e4da4d566d98 SHA512 1a5101d11b57c4000edfe3cec6367d59c4a59d4db3b0c39fb50a86f175dc89bee3494950c301317e6137250499cc39aa9b30bf94042caf08cc185152743a5b2f
+DIST ctrlc-3.1.7.crate 12854 BLAKE2B 7934273fc3763b6a6b763590f2f26f2479e9dd459e42222879cc40d9ccc109d78b02e69fec88d11781528897f5c7034b16bfd1eafaba13363981e46fb6fac703 SHA512 fe8aeb4168a7870f8ebcc212d9fa221740385d1f8498557e282b7dc0569b3e6cc03de0d124281809021ec8b9ebac9ec22b5418ca02ca8cf9810fd2d029e6ce6b
 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
 DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
+DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
 DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
+DIST dirs-sys-next-0.1.1.crate 10490 BLAKE2B a691f9603b649f648d410c7588a84c69adaff41179aa8eac899ed47082f171d765876864f08e3d0dbf3fa3798c1342b30e3bdf530ef06ed017c235a63b15d5a9 SHA512 e89af71b6bb4e23efb8ff189b42615672c2aa305fb8798393de2f9151c78cbfd5f3e45b066f5de64dfad69a84b15e72a1cdb4377f31ee9288018143017ed5730
 DIST fd-8.1.1.tar.gz 75702 BLAKE2B 9bf5a18edd54cdf797c6279d2ed3181f0b7ac6ca3a54843bd7e8f3f070e9aecdd0d7b51922a420e330fecc5f6427b16be09302504ea26fbfb3beefe0f3a2a3c2 SHA512 71c078deacd498ebd9e52e32c4208c35383035ec7b87513b4127319c0294b598ce8fd9ad1acb7d665f6b64024b69f6f9fe3ace93da9f1504b7d5875018204352
+DIST fd-8.2.1.tar.gz 83391 BLAKE2B a2dc300c0f65aba04eeb422aa46c93136f305b73ca70b1e0b9429e507652a203855070115f3d0c3bd8bcd4015a470439197749ec2020edf518a55d024dfdea71 SHA512 5e921cb3556899e086f0fbaae21842b532c486c75e91cbb8351e25f640467217ac89e8cfba044e855e2425222bfdbd01befa4f35251c8705b30b3503adf3a7bf
 DIST fd-find-8.1.1.crate 75449 BLAKE2B 7f94b2c74fcf1b919c31cfde182b29f7409af1c107a5ca603d1d933568a65606db6c18128a6785ebf626a9aa9e26e2eb885f65b40c214f7074ee52864730a37c SHA512 fd9e887940e662337b6b1ff949ed60619e8996b52ff481dcde820d680a3eb9ba6676b710a8b2be7fde6a769089efbf49d857d06d64263965f58592524fff68d5
 DIST filetime-0.2.10.crate 13880 BLAKE2B bc2289129c0d79f37b2589ee31f7bd9719c1aa97854c0c06f321a394202bb96e86b9ec8f8727735e4925e214e6c7f75d87578ab44530a123807b5b7eae7b1097 SHA512 45d1b6fd6017bd1a479a4e343b8651c8d426616cb68914c728456fae2a27bb1a45fafcafeb9a12c89c4eed835327e461bf92b80eed0f3a4e84b196b584b8698e
+DIST filetime-0.2.13.crate 14348 BLAKE2B cdb21f88ba00293c93f4831ec81b1c5468d6ca88fc58d3c3daa106c5476089df630ce6082280a77bf6da881dd95f3000f4abeb2469d8aad4d0efb6c3bdd80a2b SHA512 ba7d31b0946bc30782feee124dd904b4c3ba75d1bd81131e3bef06faeb019b51e7cc436a4fe86f3dc9615900fa27bce3f4965f13472ead173564054db8f6f786
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fs_extra-1.1.0.crate 29292 BLAKE2B ea1b787484218733a2c107ff059f3e89357afc51c510da0f5f30e4c9289c722a7c810a0a08138673aa454445dfcb08caa986ac64165ac27476d9b709d819308f SHA512 c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a
+DIST fs_extra-1.2.0.crate 29918 BLAKE2B 92e5de4cdaa16ed8c2737e988f8f2419e394f56e30ec43d9a29dbadc13ccbbdff7cf2b30788d37f160123df83fa998b966fc9b5f793b6e15f84af4dda7ec4cd1 SHA512 66670d624394874d7f786f8d362438c53f5b18008909ab8e7a74e82518dbc189e37588836f05f19dcd4718f4c1a5296fdf274380d574b1f475e28891ecdd6c91
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
 DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
+DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
 DIST hermit-abi-0.1.13.crate 9230 BLAKE2B 9591171d6f303a4a462d23edc2f8d493bdc23b6c2da4b464444718bfc89078e5a627e1543b7ab5be9d4e05f16c3508e55642360bb8d2cbd5edc2ce39b28d022e SHA512 ac424683ee3cfff9c63c735ac91008df722a2709d12744f009466574098433677266799e8ca817d3d3cad8f10f3c02e8081c67ff479701eabdc4543c0a79bd25
+DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
 DIST humantime-2.0.0.crate 17374 BLAKE2B 35f36b30d8fe3cb26f666dd57e31ab93924cf9d1c40d6c83cbf800f141c951634fcd641634a8f552baabf858303570bf8d1207e5455d5129f433d0c95b138c35 SHA512 5686246351af000cc38d10f65bd6cf3fe446dbedd75867f9bfc7a68c4b8183ccfc9e0cf14b7fa149d912acbfd9ff917d8ed5be3b5eab7832d23bf573a8e024e2
+DIST humantime-2.0.1.crate 17381 BLAKE2B 254f2bc0ea87123b49c22e95ff2218abb5f611918ae5419b960b472ce3402c5baf9d66c3a586b0ad9b10639473a0dcb660b8a8d79f86e5d6bd48768cc6aeb0f8 SHA512 c3cb464801fcbeea7c04e148cda2467386b7f008642d2641bdffab85784c16aa2708e847740772674d62b746c66d404e3b8307ebaa9c2df836fb58b3b0278e62
 DIST ignore-0.4.15.crate 52328 BLAKE2B 12567e87ae3c5cbf6daae21b4b1a7df7270f95734a8e2d21d7eb038e7a195b8fdb78da646c00fb232f2357ed1eccdd10c747d8985e0edfa6ae847be361203977 SHA512 f12b152a841d29a812af12d668648a142b79b4cdb01eb8c59ef9574c7c7bbcd7321b3e049bb3931866c3b26c196dfd3a48f7e5df63fa5923cb13a2daf0033f46
+DIST ignore-0.4.17.crate 53056 BLAKE2B 734e74210f13e5ad08864cc8b143fb780383cd36048e78da04a0475eaa760867dd4a385b37fdfaff0c5aca946d4aab19c4901df0833271a3ba05887ea5dec9c5 SHA512 52380126bb46478875093eb39972949625e1d9ada6fac7148faeccc22807d8e2a1e41c34549e7d9f884fd3cd6dc3d42b47a88b5b6de1089d7e3ee8014b3aea35
 DIST jemalloc-sys-0.3.2.crate 1344660 BLAKE2B c530eed197673dd515b41d504127c6c7abf75bb2dd0063b0a693be9502e3b5ae9db6d97dbf7fdd4bbab626ba1f788bf6b8e6804a476e109f22737bd2a79dcdff SHA512 b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647
 DIST jemallocator-0.3.2.crate 16393 BLAKE2B 03c190b2f4c6cf01957a4e11d13a230dd55593e1845ae4179b60c62fa28eaed4dd27efb3113039ddab1e66a28c102d4d9c64169d0c10a1945bac162d2f613a79 SHA512 e3fd9d377d6465519e73a91d5639d47bfd6cdf5898d551c49e3efd3269d14a75bb9163980e13ff429e7dc637b8430cdfdb1f5d6ec52993fcf7b6247a69850ac6
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.70.crate 472909 BLAKE2B bbc4b3ec2ebad2bed2a164e407e344ee4a70a7d83a00b8501d82d70a03dd76a3af40b5a494676d203c37683d602437737c8fd1cf1e7f513bfe5db2820ff29b39 SHA512 a543b972e73d5bf142988464cd62f4402b782796074aabf4ec9396e341050d545b83212c7e4c62c224d5e06de4d794c67fea91b83d605626df115b30d8f326de
+DIST libc-0.2.80.crate 513503 BLAKE2B d4bb5f789efa230ec9a7a2071652fc1e344669e5dfe3a2015694a1e8442cd5adc142f1374841a4f01984f132f0ad5f027913b201cd624f97e93d2bba31ad96a0 SHA512 69b2f4c67d29bd4fc8f6d0388036ac3ea0de2ba7387f56f4e4bd035696ba313fdce10d18107ef83490f574d6fff796b305d5f2c2bb03a7cf33b9136386e65b8c
+DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST lscolors-0.7.0.crate 18036 BLAKE2B 6ed35013099c9adcbb6f1a471216138cf12592928a098ff2312dd227744e2208a001e812a77d63cb729cf2b66bcdb0188ab1ba51d78d7f80a88bfc8f1ae5623e SHA512 470bb3ec7d603959394e561a1f3f1d037479da48f966ff822bf8ae4f7e724be87523adc6b5225ee4521a7bffae15ef67f60d0c04488c12e30cbec45651198bd3
+DIST lscolors-0.7.1.crate 17986 BLAKE2B 927e3d9155591c5223fccf78f011dfce21f29c7f9322de0e3a97703eec2b27ff1eb93890b9ef62cb0916ceb06bb88660b34443ef815aef621801f7917ff46b31 SHA512 65c618c25624b360a98f98142e0867d524d19e7060887993f35899a26a812e360d8b8d627d36a72fa3c604a1cb5615d6a425850087183b694083b9649e120776
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
 DIST nix-0.17.0.crate 195654 BLAKE2B 6857f84b3deb5800fe3167efd226f042bbcbbc61a4153ce59f69fb544616842c3f6d4566444201c669c6235d1d7577302e5404399f4937f1c0bbbd17fd47ef71 SHA512 3f2bc4f0e9dcb9753535aec9d626ad8126f0a9ea18f73760ba72be0f35d82542c659b4c443783010de133a318f423a16f71cd1f1dd5b5a1f4f71ff7bda247b63
+DIST nix-0.18.0.crate 209962 BLAKE2B 3ff822e3d49a6c477d5da3702fc88bbe270202acb4f7c449a78969ada9b8fc8855a90ee194bd2943dd27c28286b88e1b22a6003e08260e19f7c8ed6036bc2891 SHA512 b86660bfa2533fdfb945a3ef840c692b5d96108e3e73b76d6489b65039cde87ae04935d2f10878cab1ea38f039083aebf4ec9b2bb6ba66ee204be700e3e96581
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
+DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
 DIST regex-1.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69
+DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
 DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
+DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
@@ -56,15 +85,20 @@ DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST users-0.10.0.crate 18531 BLAKE2B 18f1dba893d2d88b33785b997f6b2a3582fbd5c2c21f460fd7ab3c98572d524dc0e0fdc1ab3c5651d46f4219cdfaa4b60fafc045f01f6147d99dd3aad92c146e SHA512 21052adcd602ff6c30a4e9f4e14fdca896dce03969b1b03069f93f3e9d2b25c66b83ac2f40ed4e960dcfb5a0e67719ee45da475855f6e397f3618273ea52469b
+DIST users-0.11.0.crate 21980 BLAKE2B c106e9ed67b9ad766bb7318506261579768185aea3d956d9e8b2adb52349525fe69703ee3bb2e4fb02aa223bfa6fc92a14d8128412623f70654254f842d7322c SHA512 e28028f895780bd59a11069b81b87470a287a447e42566cfb8de0e2d4ba8c90a3ce92901e253dcd2628383c8ed06c10714bc0181a57bf257f7edb3510936e596
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
+DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD fd-8.1.1.ebuild 2246 BLAKE2B fadf076642510e21dcaecf7317ac472c3267d21d5e8de0a9ecf277d948a7890c7c513aaebe9c82f5fcc9300c4dbf053aef0c2001c9470e562a524ae043527735 SHA512 0ae0772576261c6fc9ba1359a19409fe3c996302f4aecb70a50ad43543eaa6b225ecafd6a64d1be02775e12dcad9720ee2ac240ed893496734378d76b55d543b
+EBUILD fd-8.2.1.ebuild 2170 BLAKE2B a5e3a93657481ab106ed5fdfa3ed0002a329a892afea84fd5cd8774a7554dab78f84a19e2f6e1763f5d20aa2c2c68976fb7f4d721eb05340d1555d7ad2edc0c5 SHA512 049e2d8fc535e7e3022fba7b270f15fcc0e28bde20da713fb1909ffac24b515c0572fa3075703f47fbd384a2494ebef4427c6f748b2106c85072ba1e45de0274
 MISC metadata.xml 574 BLAKE2B cd747fc4e172f68394809255369afc79c95ce0667115fdda99bb38635a267be76880a75d781d1988f1ec3a0ca4b139e74c9f97c7faf65ac240c40ee9f4f92e6f SHA512 4be62b10ffe12ecb6d4284ff29006f9d884590dac7f67658eb985906ac1bce609230f1385e388061111cfeae70de4df999d55e834b987b69f24bdb878548f758
diff --git a/sys-apps/fd/fd-8.2.1.ebuild b/sys-apps/fd/fd-8.2.1.ebuild
new file mode 100644
index 000000000000..4d2bf148c6e5
--- /dev/null
+++ b/sys-apps/fd/fd-8.2.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.15
+ansi_term-0.11.0
+ansi_term-0.12.1
+anyhow-1.0.35
+atty-0.2.14
+autocfg-1.0.1
+bitflags-1.2.1
+bstr-0.2.14
+cc-1.0.66
+cfg-if-0.1.10
+cfg-if-1.0.0
+clap-2.33.3
+crossbeam-utils-0.8.1
+ctrlc-3.1.7
+diff-0.1.12
+dirs-next-2.0.0
+dirs-sys-next-0.1.1
+filetime-0.2.13
+fnv-1.0.7
+fs_extra-1.2.0
+fuchsia-cprng-0.1.1
+getrandom-0.1.15
+globset-0.4.6
+hermit-abi-0.1.17
+humantime-2.0.1
+ignore-0.4.17
+jemalloc-sys-0.3.2
+jemallocator-0.3.2
+lazy_static-1.4.0
+libc-0.2.80
+log-0.4.11
+lscolors-0.7.1
+memchr-2.3.4
+nix-0.18.0
+num_cpus-1.13.0
+rand-0.4.6
+rand_core-0.3.1
+rand_core-0.4.2
+rdrand-0.4.0
+redox_syscall-0.1.57
+redox_users-0.3.5
+regex-1.4.2
+regex-syntax-0.6.21
+remove_dir_all-0.5.3
+same-file-1.0.6
+strsim-0.8.0
+tempdir-0.3.7
+term_size-0.3.2
+textwrap-0.11.0
+thread_local-1.0.1
+unicode-width-0.1.8
+users-0.11.0
+vec_map-0.8.2
+version_check-0.9.2
+walkdir-2.3.1
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="Alternative to find that provides sensible defaults for 80% of the use cases"
+HOMEPAGE="https://github.com/sharkdp/fd"
+SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 BSD-2 ISC MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="/usr/bin/fd"
+
+src_compile() {
+	export SHELL_COMPLETIONS_DIR="${T}/shell_completions"
+	# this enables to build with system jemallloc, but musl targets do not use it at all
+	use elibc_musl || export JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)/libjemalloc.so"
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install
+
+	newbashcomp "${T}"/shell_completions/fd.bash fd
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${T}"/shell_completions/fd.fish
+
+	# zsh completion is in contrib
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/_fd
+
+	dodoc README.md
+	doman doc/*.1
+}
diff --git a/sys-apps/hwdata-gentoo/Manifest b/sys-apps/hwdata-gentoo/Manifest
deleted file mode 100644
index f46a109f2fbf..000000000000
--- a/sys-apps/hwdata-gentoo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0.4-openchrome.patch 781 BLAKE2B 9df96192f6c6be5502d32d35acd1853e3de0c5660a0022c0ede0f14d6a7b0847a2ade3fa3501d6cc658a03312f764a07d4f56e06b70508020ca69c4dda1e924b SHA512 0fa8effbb7a9ee05780bab67583c9da7b11b38498eaf2b447b5be3190d1b9d924476e07b27bee51b2d6298579a8a07340fc90a2634a579f177f024be0029c9a6
-DIST hwdata-gentoo-0.4.tar.bz2 149060 BLAKE2B 77534979aa9605836ce52906413b994a71d96636a3a39c65456a4899d839cb2f91ad101bfba884869c43795268c7fb13c7fa8ffab6f097f40dfd071712c4582b SHA512 dd62c51986c83ff5a9338fa20d98827cd44d86e808c9a2a52ff327dcdd941d0faed0ea4f85058485e8fc2f78e0c2fa18d3030e27fded8ed1777832ee789c189a
-EBUILD hwdata-gentoo-0.4.ebuild 850 BLAKE2B fbcf1affdc8cc8f8787118d11d5e4dae4397e55eb7bcc44baf061e229f3e513225e297016d1d12ef26914edf46965e7fe0edc4e0dbf61b494cfeb215c4ff3e1a SHA512 1adcc802837db000aebd3fa76739c5af52f1b8ff9963e5701c1a027dc1b6e475f01bc6f8f884c420bd64da91ba7b23d73649f0f7d821fb46213986c255fc18b9
-MISC metadata.xml 350 BLAKE2B fe6da0d849542f983c39e638cb95d62cf314b6dfc300292c65a8a59f30889cd764d9334357957da0cce221ca96c6b4d6a03081cd35b4854b4f6e416daa8acc5c SHA512 95a2cd965ddda7fd303b202db7bfdd372f59cdb199cf370ff5938975f61165c306c08240ab186b73f66884c89521625a9f5c3220f0631aa6c678abc5559ae00d
diff --git a/sys-apps/hwdata-gentoo/files/0.4-openchrome.patch b/sys-apps/hwdata-gentoo/files/0.4-openchrome.patch
deleted file mode 100644
index 7b0c6e87c9d5..000000000000
--- a/sys-apps/hwdata-gentoo/files/0.4-openchrome.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/pcitable
-+++ b/pcitable
-@@ -3688,7 +3688,7 @@
- 0x1106	0x3336	"unknown"	"VIA Technologies, Inc.|K8M890CE Host Bridge"
- 0x1106	0x3337	"unknown"	"VIA Technologies Inc.|VT8237A PCI to ISA Bridge"
- 0x1106	0x3340	"unknown"	"VIA Technologies, Inc.|PT900 Host Bridge"
--0x1106	0x3344	"unknown"	"VIA Technologies, Inc.|UniChrome Pro IGP"
-+0x1106	0x3344	"Card:S3 UniChrome"	"VIA Technologies, Inc.|UniChrome Pro IGP"
- 0x1106	0x3349	"ahci"	"VIA Technologies Inc.|VT8251 AHCI/SATA 4-Port Controller"
- 0x1106	0x3351	"unknown"	"VIA Technologies, Inc.|VT3351 Host Bridge"
- 0x1106	0x3364	"unknown"	"VIA Technologies, Inc.|P4M900 Host Bridge"
---- a/Cards
-+++ b/Cards
-@@ -429,7 +429,7 @@
- DRIVER s3
- 
- NAME S3 UniChrome
--DRIVER via
-+DRIVER openchrome
- 
- NAME S3 ViRGE (generic)
- DRIVER s3virge
diff --git a/sys-apps/hwdata-gentoo/hwdata-gentoo-0.4.ebuild b/sys-apps/hwdata-gentoo/hwdata-gentoo-0.4.ebuild
deleted file mode 100644
index caf609cc8650..000000000000
--- a/sys-apps/hwdata-gentoo/hwdata-gentoo-0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Data for the hwsetup program"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://wolf31o2.org/sources/hwdata/${P}.tar.bz2"
-HOMEPAGE="http://wolf31o2.org"
-
-IUSE="opengl binary-drivers"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="!sys-apps/hwdata-redhat"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-openchrome.patch
-
-	if use x86 || use amd64
-	then
-		if use opengl && use binary-drivers
-		then
-			continue
-		else
-			sed -e 's/DRIVER fglrx/DRIVER radeon/' \
-				-e 's/DRIVER nvidia/DRIVER nv/' \
-				-i "${S}"/Cards || die
-		fi
-	fi
-}
-
-src_install() {
-	dodoc ChangeLog check-cards
-	insinto /usr/share/hwdata
-	doins Cards MonitorsDB pcitable blacklist
-}
diff --git a/sys-apps/hwdata-gentoo/metadata.xml b/sys-apps/hwdata-gentoo/metadata.xml
deleted file mode 100644
index fef1da99f566..000000000000
--- a/sys-apps/hwdata-gentoo/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>releng@gentoo.org</email>
-	<name>Gentoo Release Engineering</name>
-</maintainer>
-<use>
-	<flag name="binary-drivers">Adds support for ATI/NVIDIA binary
-		drivers</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
deleted file mode 100644
index d4d349afd750..000000000000
--- a/sys-apps/hwsetup/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX 1.2-3-fastprobe.patch 2643 BLAKE2B 45578f4e000b44b0655e2ca43de11e2f564fd15587a9473cfb5b370a0e2955829d460d62e65b671497853dc7aa0b68d893e484479cb811a0bd0e0cd78a7dce0d SHA512 4a9d4e35f071849e7285f7cf9459d454e4878d1940525444863ac2c6104d999c5efffb62e01e792649697eddfbe8f4755dfc90cf4a4185d6637c989bd566ba82
-AUX 1.2-7-dyn_blacklist.patch 1840 BLAKE2B 5457275cac7597c3c518e415d30eddd6bbfa0a22a02f9013d2b74e9458c00c3867f56a51fa6db17752cc8214e5d9d954cf1b28f6583954496c461e1f579ba6b1 SHA512 e98d95a54987f12e6bc5a6171803490f0f8f14c82587909bd02375ef05ec0270e14b3d9442250948328e7062dfcb79e42e61240ed5a209bedd37b1a1e552f2b9
-AUX 1.2-7-gentoo.patch 560 BLAKE2B fd025d5ea34118ba1be46c3038594e62b2178c1d96de61bdbd69c9a8899dc4e4f26f63b14eba743dc670c63c14617fb89fe6b0d32c93ac12da9d03ffc1c3c674 SHA512 4fac3e716ddd511b9f533567a09f763f25bde439b772cbf8be3fffd6ef83ee60dc82b2655e63283c302955d3b8ee5d8aa06d99610cfd27a17412938b7cab1e0f
-AUX 1.2-7-openchrome.patch 520 BLAKE2B ef6da2b6edfdb1c9abea047f08ecdeea259ea80bd68d35ab534b3b3ce665fd6f0d6b0362ed46caa1a0b9488480c5f2ec9c6771d46ab645f2edb03b87b7873eec SHA512 f8a301d7e2d6508e5a25ba0099a808b1494cd992f2f6066912504b077a26c3fe01772e689a25f80acce59c5eff8369e2e1e33c06a7ea935e9a50d79f6fbfa25d
-AUX 1.2-strip.patch 209 BLAKE2B 0ddb29fcc59a841fef9bd08eb996cb84047a282ca7107636e222021d2da355b532f839b03eac6ee8cc3fdbcebdce30056eac049166f113e510197b9e92428c0d SHA512 93033d62d6328dab7bef0f42f6f41352c60081523d86388cd5823181483cf9245dd55c163d1e78ab51e20187cdca4017c815ae86f6de14394fb6cd2724dda98b
-DIST hwsetup_1.2-7.tar.gz 10706 BLAKE2B 2d0e005629f631aa3ef22f44122cf934d23929c89ee4ca7240dcdd9c2898e622a78e494a057b9eed96045e8b1a7b54252f402311360e84d57007876cd9a5f630 SHA512 ef252c748ecf1fc17d107fa413a76df5d9daab84b10eb1ca2c5c320207e0be522c4ae6204c1c85c613403e40312c9c876bcab04eeaa1a2e1724b7bb1c6d41a1e
-EBUILD hwsetup-1.2-r3.ebuild 1728 BLAKE2B 1bfee065d8b6ae15f3580760ba6e64c2015490e6064107e45e95b95ccd29f3cf535e3d05a3054667bb0d0d4bdd5b41dc30710fcff679155b7e1f48c6fe99a49b SHA512 ef67068f9189ae8bd925177d0f9a29555eeec274eef3ed4b3be092a05ba014fe6da32c16055763207d42533a6d917648190056b58cd2d6f15d242a695ac6f691
-MISC metadata.xml 256 BLAKE2B d02b5b33f7375594b6e77357966b74fd698579fcefce673bde9b7082e2a56a47b1b8824d5aa423ad7271113efc568997c476bc0106d147dbc1a198b201def869 SHA512 b301300f23bb631f440eef04dce17f16cfee618775d38013cfded6b0e8b806d772749578a39c43143104a1716d2cc6eefb3af7f6865d85da5b2cb6f1e78c7c68
diff --git a/sys-apps/hwsetup/files/1.2-3-fastprobe.patch b/sys-apps/hwsetup/files/1.2-3-fastprobe.patch
deleted file mode 100644
index 600b8c4002d6..000000000000
--- a/sys-apps/hwsetup/files/1.2-3-fastprobe.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/hwsetup.c
-+++ b/hwsetup.c
-@@ -140,14 +140,15 @@
- 
- int syntax(char *option)
- {
-- printf(VERSION);
-+ puts(VERSION);
-  if(option) fprintf(stderr,"hwsetup: Unknown option '%s'\n\n",option);
-- printf("Usage: hwsetup\n"
--         "               -v       be verbose\n"
--         "               -p       print rotating prompt\n"
--         "               -a       ignore audio devices\n"
--         "               -s       ignore scsi controllers\n"
--         "               -n       probe only, don't configure anything.\n");
-+ puts("Usage: hwsetup\n"
-+         "\t\t-v\tbe verbose\n"
-+         "\t\t-p\tprint rotating prompt\n"
-+         "\t\t-a\tignore audio devices\n"
-+         "\t\t-s\tignore scsi controllers\n"
-+         "\t\t-n\tprobe only, don't configure anything.\n"
-+		 "\t\t-f\trun a fast probe.");
-  return option?1:0;
- }
- 
-@@ -425,7 +426,7 @@
- {
-  signal(SIGALRM,SIG_IGN);
-  fprintf(stderr,"\nWARNING: Autodetection seems to hang,\n"
--                "please check your computers BIOS settings.\n");
-+                "please check your computer's BIOS settings.\n");
-  fflush(stderr);
-  if(wpid) { kill(wpid,SIGTERM); usleep(2500000); kill(wpid,SIGKILL); wpid=0; }
-  exit(1); /* exit program */
-@@ -591,12 +592,13 @@
-  return 0;
- }
- 
--int hw_setup(enum deviceClass dc, int verbose, int probeonly, int skip)
-+int hw_setup(enum deviceClass dc, int verbose, int probeonly, int skip, int fastprobe)
- {
-  int i,mouse=0,cdrom=0,modem=0,scanner=0;
-+ int probeopt=fastprobe?PROBE_SAFE:PROBE_ALL;
-  struct device **currentDevs, *d, *serialmouse=NULL, *usbmouse=NULL;
-  if(verbose&VERBOSE_PROMPT) wpid=startwheel();
-- currentDevs=probeDevices(dc,BUS_UNSPEC,PROBE_ALL);
-+ currentDevs=probeDevices(dc,BUS_UNSPEC,probeopt);
-  if(verbose&VERBOSE_PROMPT&&wpid>0) { kill(wpid,SIGTERM); wpid=0; usleep(160000); write(2,"\033[0m Done.\n",11); }
-  if(currentDevs==NULL) return -1;
-  check_proc_modules(); /* Get currently loaded module list */
-@@ -650,7 +652,7 @@
- 
- int main(int argc, char **argv)
- {
-- int i, verbose=0, probeonly=0, skip=0;
-+ int i, verbose=0, probeonly=0, skip=0, fast=0;
-  enum deviceClass dc=CLASS_UNSPEC;
-  for(i=1;i<argc;i++)
-   {
-@@ -659,6 +661,7 @@
-    else if(!strcasecmp(argv[i],"-a")) skip|=SKIP_AUDIO;
-    else if(!strcasecmp(argv[i],"-s")) skip|=SKIP_SCSI;
-    else if(!strcasecmp(argv[i],"-n")) probeonly=1;
-+   else if(!strcasecmp(argv[i],"-f")) fast=1;
-    else return syntax(argv[i]);
-   }
-  /* Allow SIGTERM, SIGINT: rmmod depends on this. */
-@@ -667,5 +670,5 @@
- #ifdef BLACKLIST
-  gen_blacklist();
- #endif
-- return hw_setup(dc,verbose,probeonly,skip);
-+ return hw_setup(dc,verbose,probeonly,skip,fast);
- }
diff --git a/sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch b/sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch
deleted file mode 100644
index efbe0f6abfed..000000000000
--- a/sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/hwsetup.c
-+++ b/hwsetup.c
-@@ -51,13 +51,40 @@
- /* Do not, under any circumstances, load these modules automatically, */
- /* even if in pcitable. (libkudzu may ignore this, and the KNOPPIX    */
- /* autoconfig scripts may probe them, too)  */
--char *blacklist[] =
-+char *blacklist[200][200] =
- { "apm","agpgart","yenta_socket","i82092","i82365","tcic",
-   "pcmcia_core","ds","ohci1394","hisax", "hisax_fcpcipnp",
-   "hisax_isac","hisax_st5481",
-   /* Winmodems, unusable, can block sound slot */
-   "snd-atiixp-modem", "snd-intel8x0m","snd-via82xx-modem"
- };
-+
-+int blacklistsize = 13;
-+void gen_blacklist(){
-+	int n = 13;
-+	int size = 0;
-+	char *comment;
-+	char module[1024];
-+	FILE *stream;
-+
-+	if((stream = fopen ("/usr/share/hwdata/blacklist", "r")) != (FILE *)0) {
-+		while((fgets(module, 1023, stream)) != (char *)0 ) {
-+
-+			comment = strchr(module, '#');
-+			if (comment != 0) *comment = '\0';
-+			comment = strchr(module, '\n');
-+			if (comment != 0) *comment = '\0';
-+			size = strlen(module);
-+			if (size < 2) continue;
-+			strcat (module , " \0");
-+			strcpy(blacklist[n] , module);
-+			n++;
-+			if ( n == 200 ) break;
-+			//printf(module);
-+		}
-+		blacklistsize = n;
-+	}
-+}
- #endif
- 
- /* If a conflicting module in a row is already loaded, the new module will not be probed anymore */
-@@ -547,7 +574,7 @@
-  char *cc;
-  if((m==NULL)||(!strcmp("unknown",m))||(!strcmp("ignore",m))|| check_loaded(m)) return 0;
- #ifdef BLACKLIST
-- for(i=0;i<(sizeof(blacklist)/sizeof(char*));i++)
-+ for(i=0;i<blacklistsize;i++)
-   {
-    if(!modcmp(blacklist[i],m))
-     {
-@@ -781,5 +808,8 @@
-  /* Allow SIGTERM, SIGINT: rmmod depends on this. */
-  signal(SIGTERM,SIG_DFL); signal(SIGINT,SIG_DFL);
-  signal(SIGALRM,alarm_handler); alarm(MAX_TIME);
-+#ifdef BLACKLIST
-+ gen_blacklist();
-+#endif
-  return hw_setup(dc,verbose,probeonly,skip);
- }
diff --git a/sys-apps/hwsetup/files/1.2-7-gentoo.patch b/sys-apps/hwsetup/files/1.2-7-gentoo.patch
deleted file mode 100644
index e4fc590393fd..000000000000
--- a/sys-apps/hwsetup/files/1.2-7-gentoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/hwsetup.c
-+++ b/hwsetup.c
-@@ -388,7 +388,7 @@
-          sprintf(fullpath,"%.90s%.32s",xpath,server[i]);
-          if(!exists(fullpath)) continue;
-          strncpy(xi.xserver,server[i],sizeof(xi.xserver));
--	}
-+        }
-       }
-     }
-    if((xpos=strstr(d->driver,xorg))!=NULL) /* Check for Xorg */
-@@ -653,7 +653,7 @@
- int writeconfig(char *name,struct device *d,int verbose)
- {
-  FILE *f,*k;
-- const char *kconfig="/etc/sysconfig/knoppix";
-+ const char *kconfig="/etc/sysconfig/gentoo";
-  char *desc;
-  unlink(name);
-  if((f=fopen(name,"w"))==NULL)
diff --git a/sys-apps/hwsetup/files/1.2-7-openchrome.patch b/sys-apps/hwsetup/files/1.2-7-openchrome.patch
deleted file mode 100644
index fb80f9dfcb1a..000000000000
--- a/sys-apps/hwsetup/files/1.2-7-openchrome.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/hwsetup.c
-+++ b/hwsetup.c
-@@ -456,7 +456,7 @@
-      else if(strcasestr(xi.xdesc,"Newport")) strcpy(xi.xmodule,"newport");
-      else if(strcasestr(xi.xdesc,"Siliconmotion")||strcasestr(xi.xdesc,"Silicon Motion")) strcpy(xi.xmodule,"siliconmotion");
-      else if(strcasestr(xi.xdesc,"Chips")) strcpy(xi.xmodule,"chips");
--     else if(strcasestr(xi.xdesc,"VIA ")) strcpy(xi.xmodule,"via");
-+     else if(strcasestr(xi.xdesc,"VIA ")) strcpy(xi.xmodule,"openchrome");
-     }
-    else strcpy(xi.xmodule,xvesa4);
-   }
diff --git a/sys-apps/hwsetup/files/1.2-strip.patch b/sys-apps/hwsetup/files/1.2-strip.patch
deleted file mode 100644
index 17de636a5dc7..000000000000
--- a/sys-apps/hwsetup/files/1.2-strip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- # define BLACKLIST to avoid loading potentially dangerous modules
- CFLAGS=-DBLACKLIST -Wall -fPIC
- OPT=-O2
--LDFLAGS=-s
-+#LDFLAGS=-s
- LIBS=-lkudzu -lpci
- CC=gcc
- 
diff --git a/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild b/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild
deleted file mode 100644
index c535829a9ffa..000000000000
--- a/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV=${PV}-7
-DESCRIPTION="Hardware setup program from Knoppix - used only on LiveCD"
-HOMEPAGE="http://www.knopper.net/"
-SRC_URI="http://debian-knoppix.alioth.debian.org/sources/${PN}_${MY_PV}.tar.gz"
-#http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 -mips ppc ppc64 sparc x86"
-IUSE="zlib"
-
-COMMON_DEPEND="
-	sys-apps/pciutils[zlib?]
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	sys-libs/libkudzu
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	sys-apps/hwdata-gentoo
-"
-
-pkg_setup() {
-	ewarn "This package is designed for use on the LiveCD only and will do "
-	ewarn "unspeakably horrible and unexpected things on a normal system."
-	ewarn "YOU HAVE BEEN WARNED!!!"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${MY_PV}-dyn_blacklist.patch \
-		"${FILESDIR}"/${PV}-3-fastprobe.patch \
-		"${FILESDIR}"/${MY_PV}-gentoo.patch \
-		"${FILESDIR}"/${PV}-strip.patch \
-		"${FILESDIR}"/${MY_PV}-openchrome.patch
-}
-
-src_configure() {
-	if use zlib ; then
-		sed -i \
-			-e '/^LIBS=/s,-lpci,-lz -lpci,g' \
-			Makefile
-	fi
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man
-	dosbin ${PN}
-	keepdir /etc/sysconfig
-}
-
-pkg_postinst() {
-	ewarn "This package is intended for use on the Gentoo release media.  If"
-	ewarn "you are not building a CD, remove this package.  It will not work"
-	ewarn "properly on a running system, as Gentoo does not use any of the"
-	ewarn "Knoppix-style detection except for CD builds."
-}
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index b37823cfdea1..880807067794 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,5 +1,5 @@
 DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
 DIST i2c-tools-4.2.tar.xz 87600 BLAKE2B 89f84ad07f4c042f67c308d48a402aa9ed46352062ddad3456d048730019e099e6eef626d487d802e07b100ae2c836e9aa6b2345950ff8744cbc0fe1a22616fb SHA512 5e230be4983c5c9c5718491d3ce9ee2e6205edea75c4097735eb32a25e522e37a074ef4cb61d2492707efebf0cb1b75ff65f1b2ae8c0bc1684a169526809a096
 EBUILD i2c-tools-4.1-r1.ebuild 1954 BLAKE2B 6dd8ba51d6948c9736c2ddd3e13efc7ef39a9d914a17d5ee7fc325639f6d734e95b4d6e12ed58f54b06cc3e140875b2de55756c77d228ca73c158661b2ac2850 SHA512 5d852e226406e78bb57ce21544b02dfc987cc64abea22cc22eb6f7558db2a79e6ee0134800082ddd549e30ae604d7c12892d9352655c3ba04100c71229248536
-EBUILD i2c-tools-4.2.ebuild 1716 BLAKE2B e143bf1c18b154b26d01601a3719881a2981fd8d8995c12dcec84b34936c2a4e639ede30ab27a3b34eeb4400b0a98cfb3433660c763213778ffbe50e2531c7ef SHA512 e9fc0d7af98f25c0494dee12a8cb20fc461478243cd20b6edc9a4b279b6d7f2fce1af3519c548e6349ab03823d326c920f558f5fdda9f3132b861e3d9559ece8
+EBUILD i2c-tools-4.2.ebuild 1720 BLAKE2B c47bfde08ea75f21db45bfbaf2d9183f655477e4ac50b06877c269677195e621eb2a0dae2235c27a7243873e7b6704a82da581ba938b315e9955d2af4fd7aa8b SHA512 5826397f6520c7db124b4e88cc053ed50f0024f70cbac4d17557884811a32cd13b289a4a6892c19ba12209cba2a3f15e54812b255d7db7dd6989679ce475e47c
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild b/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
index f55d8d32a059..9ff18f3fae14 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 184489dd9daa..455dbea78574 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -4,7 +4,7 @@ DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13
 DIST kbd-2.3.0.tar.xz 1099660 BLAKE2B 20044b942cc2568acc9c4616bc38cc0bacb6773ba397327e9e23c87f0473cfdb1a165b9905039fc60b69001d99f799c48491ca098b64961cf5821f7d4b954df7 SHA512 6d7ba496a963c29abf1f514831c47e6bc73797b04021115879cbdb203c879c5abfae9f8fcaeec52d8891cad848240d39f5293452d26c7f0a84fb58499ad6e927
 DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb
 EBUILD kbd-2.2.0-r2.ebuild 1597 BLAKE2B e56136d4d7a0bbae100e8886731a09c30b908b7d075dcb8c935726cc8a6795ee91a45d994d42457ee5435eb6f143639c678e8458e1f2dcf48b81a9092bdc1a02 SHA512 0060f49d5a29b83264f4a975774cd28dec0b4b1869400d7e2a05de23912e81e53b2aa68353c47a951d6efa83e36c19669ef4e6ca965ce866d5855d0f20968679
-EBUILD kbd-2.3.0-r1.ebuild 1922 BLAKE2B 38bcdddab72b5783e128c56636c482a601582fbb5898e7908b3752c56f29aa4aebed8233a7854f5f8c3bb028c47365e7f801d83c0dc1b56f013ae7cf19f2f14f SHA512 fa572d7cbd83873e600b7c9632bb15d4601efd9380c35b976ddade9df9da765baa5b5fe4422cbc1ad2999570c928e085444114c2faedf0b0e72ba95b3abaa61a
+EBUILD kbd-2.3.0-r1.ebuild 1921 BLAKE2B eaa0c00b63efdf5fa79182133cdec5206db73f671c1ba464bd4c66ecc4cfeb11ffa78fb426a6670043f1e5f62b8a9ce30c6d890309e8500c10dcfed37089e150 SHA512 c9fc2fee6979a8b35f73e11c1c360650e4bdadcb16640e6e22a435f80491e2fbc7d944f71a85faee12b1890d9a02f47b64b293f63e3b98f950f4f123ad7bfe7f
 EBUILD kbd-2.4.0.ebuild 1873 BLAKE2B 6c2dda365762f698add9ae8874be26679ab399f5373543c29710be91410138b8d7840b50d306e60dd4f76bc4ec4dab0c3022441633f0956b640cc340b225af6d SHA512 2c1614e0ad67eaeadbb7f0a46f45643f3946de100078d62f27d4aae8e5032bb4db99c14a0f013deaeae8e338894d02c269f14859b4f0a944afb799587471f56c
 EBUILD kbd-9999.ebuild 1873 BLAKE2B 6c2dda365762f698add9ae8874be26679ab399f5373543c29710be91410138b8d7840b50d306e60dd4f76bc4ec4dab0c3022441633f0956b640cc340b225af6d SHA512 2c1614e0ad67eaeadbb7f0a46f45643f3946de100078d62f27d4aae8e5032bb4db99c14a0f013deaeae8e338894d02c269f14859b4f0a944afb799587471f56c
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/kbd-2.3.0-r1.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild
index 3cb9fb4edd0d..6672ae4a9452 100644
--- a/sys-apps/kbd/kbd-2.3.0-r1.ebuild
+++ b/sys-apps/kbd/kbd-2.3.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	if [[ $(ver_cut 3) -lt 90 ]] ; then
 		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${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"
 	else
 		inherit autotools
 		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 0e7a1f477811..6ac47d16f860 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -9,6 +9,8 @@ AUX kexec.conf 340 BLAKE2B a65aa0f402c712c10f6095b37b620dacfe883ad621f5403d8190f
 AUX kexec.conf-2.0.4 1013 BLAKE2B 7594bf8c150d1165f30449526b658c78feab82526e649aa8cce35b6a47b2abd5a208b7ae4376f0330ea2194ae63f786bf0c30682f734f1b604be131e6e63570e SHA512 96db2834454aa4d038061e9b1f918932da3d3054021487425d0f70c6ad32096b9433ae2f3921e83196b23af901c32e591df3d6a84a6d14e064608d8ad895a599
 AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629048f8cc2866baa11ee7311424f998360f02dc2c1210be32222283c2bd2f93e1bf4bf65ec903203 SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3
 DIST kexec-tools-2.0.20.tar.xz 297476 BLAKE2B 7e29e7f7d85296dd3e614c45f14c27eca74ce4426d5de2d20387d89f2f63afed318d6157cc4001849a04bb83505bbae87c43d34683ebaf9a70f5f29e3979ade3 SHA512 3112b6202c1030705c53e3f65a2b58aec14d65333a35aad681d48b9f2bd1c51a2e05c985a1e5e867ab02f8a9c97708483d9d225619db7c6993676f1a242e2d99
+DIST kexec-tools-2.0.21.tar.xz 303300 BLAKE2B d5b7bddeafdcbfd2b07dab6e4f167fcb61ccf2ec487f1835ac552a4596d22a94a7297d0eb769913f84eddc564ba4d9ae0c9d4c76994d0e3670fe168f377ebc77 SHA512 f487d2e243c2c4f29fbc9da7d06806f65210f717904655fc84d8d162b9c4614c3dd62e1bb47104a79f0dc2af04e462baf764fb309b5d7e6d287264cb48fd2a3e
 EBUILD kexec-tools-2.0.20-r3.ebuild 3381 BLAKE2B 67e203cd4ea7fea5a7c100a5acf8dfa7376f96e98fadd48a3e0a2de430e6ae4092cf29a48b6d56b0a2bac7bb437d402fc8f2b370b9141dbd3eb5d6eac7d03673 SHA512 621707548ff183ed90b5d47531528954894bcde436e1f3beeb93a70e58a5018d3f9d0353d4654b9e57be9ef6cb4ab6f2168511a46106dcc86b9c24b6981b77ba
+EBUILD kexec-tools-2.0.21.ebuild 3265 BLAKE2B 1f5c5356f79113a1956d1b57dcb570f4bd0327ab03aef0917e06cac9cd6e7c1ae02ca530dd9e95b1f8e8f1b9277dd5c96397efb8881cffedf2a8096107e6ccb0 SHA512 163fd666f3f892d80c12bb809f5ef8a5494ba6a3f13bb5e1679b89795d943c19735c631bddc0f3ab51abf417413c20d24af47143941bd35fec747dc1d500d246
 EBUILD kexec-tools-9999.ebuild 3265 BLAKE2B 1f5c5356f79113a1956d1b57dcb570f4bd0327ab03aef0917e06cac9cd6e7c1ae02ca530dd9e95b1f8e8f1b9277dd5c96397efb8881cffedf2a8096107e6ccb0 SHA512 163fd666f3f892d80c12bb809f5ef8a5494ba6a3f13bb5e1679b89795d943c19735c631bddc0f3ab51abf417413c20d24af47143941bd35fec747dc1d500d246
 MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
new file mode 100644
index 000000000000..86b8d9fc9789
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.21.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool linux-info systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+	"${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+	export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+	default
+
+	# Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely.
+	sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
+
+	if [[ "${PV}" == 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with booke)
+		$(use_with lzma)
+		$(use_with xen)
+		$(use_with zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Respect CFLAGS for purgatory.
+	# purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
+	# -mfunction-return=thunk and -mindirect-branch=thunk conflict with
+	# -mcmodel=large which is added by build system.
+	# Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline.
+	local flag flags=()
+	for flag in ${CFLAGS}; do
+		[[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline"
+		[[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline"
+		flags+=("${flag}")
+	done
+	local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
+
+	default
+}
+
+src_install() {
+	default
+
+	dodoc "${FILESDIR}"/README.Gentoo
+
+	newinitd "${FILESDIR}"/kexec-r2.init kexec
+	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+	insinto /etc
+	doins "${FILESDIR}"/kexec.conf
+
+	insinto /etc/kernel/postinst.d
+	doins "${FILESDIR}"/90_kexec
+
+	systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "For systemd support the new config file is"
+		elog "   /etc/kexec.conf"
+		elog "Please adopt it to your needs as there is no autoconfig anymore"
+	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	local has_rootpart_set=no
+	if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
+		if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then
+			has_rootpart_set=yes
+		fi
+	fi
+
+	if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no"  ]]; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "This was probably caused by a previous version of ${PN}."
+		ewarn "Please reboot system once *without* kexec to avoid boot problems"
+		ewarn "in case running system and initramfs do not agree on detected"
+		ewarn "root device name!"
+	fi
+}
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 9a25eac64d29..d2b930ce3070 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -3,6 +3,6 @@ AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2
 DIST logwatch-7.5.3.tar.gz 495110 BLAKE2B b28d7381d259a132de7d9fd347ac4bafb44440b187aa811f3d3f65d7b1ccbb00c6b5bb660229cd8155fa5d7bc9668e7b4dd1ebe7bbb909b48367c6a6dd6793e5 SHA512 ad404f031fe016599a8f8d8c0820b23db61a9ad102815d3713e5d13e9a810c819ca7ad9cea50891852982e073ef033dbe7595fde8846971336148e32cbbe29ca
 DIST logwatch-7.5.4.tar.gz 481766 BLAKE2B d86ae3afc33a100fc353948be3591cd13566568d47cad02fa5f390882a223ca9d4d78692214f2f0898fa8bf8687314f60ad9ce02f0987bb86dd7136150a1d2b9 SHA512 6e6a5e8b7ae977244ea97895e06cccde320fce3dfbd2b1c58c945fc8872325a9676c8afe122b1f7230cb6617b64813caf90ef37fc472a1b200eb0b24ea72fa9b
 EBUILD logwatch-7.5.3.ebuild 2430 BLAKE2B 2c9d264ee0bb0f2f85a7a2f6d7856c25d4dbe714f38215ddc0608c1bc7596eeb0c5ea55405d002d0913d128faa0788cdb752e4cdc19d87e01a4b792bb73cd98e SHA512 e4bda7b798c5f26c9dc46d9c5211aca91e90046776a8d6b9af9d0d886e388476cf5259c446d70949a34d442a71c59e4c55232ac16116be8c69eb7a8af8f39532
-EBUILD logwatch-7.5.4.ebuild 2438 BLAKE2B 257d42e1e27297affbf91e91375ed1c3c759dee0159a63f8bea3b3d0448d27b8bc0c852434f4278df89636c5fcfd40c8eb8184d099491c5dace1f1b49bfaf326 SHA512 acfcdb3949bbcb72caab77a5843d2e46635bbfb1f88d262325488317e216c7b6c4fb07ecc48ea98b9cb14a97ffbe9745385ebaf8b66e9801dfdc6bfa6fcc5258
+EBUILD logwatch-7.5.4.ebuild 2437 BLAKE2B e54b6756f6d1532c2f9b4614e3fc082495be41c68a0aa541737c7007d4aafd01d726727de23ffb250f4456af2a4549924b48d24119d3b780534561a9cd28d059 SHA512 125b91f0b9e3578851d6bf7fba581246f1e2942142a55e5771d1aad054986edee18c1388785422c8e950d100988cdeb9729e6cb498503620ad0f274d6f63c24d
 EBUILD logwatch-9999.ebuild 2438 BLAKE2B 257d42e1e27297affbf91e91375ed1c3c759dee0159a63f8bea3b3d0448d27b8bc0c852434f4278df89636c5fcfd40c8eb8184d099491c5dace1f1b49bfaf326 SHA512 acfcdb3949bbcb72caab77a5843d2e46635bbfb1f88d262325488317e216c7b6c4fb07ecc48ea98b9cb14a97ffbe9745385ebaf8b66e9801dfdc6bfa6fcc5258
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/logwatch-7.5.4.ebuild b/sys-apps/logwatch/logwatch-7.5.4.ebuild
index 247b3915d881..09b79251a9d1 100644
--- a/sys-apps/logwatch/logwatch-7.5.4.ebuild
+++ b/sys-apps/logwatch/logwatch-7.5.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Analyzes and Reports on system logs"
diff --git a/sys-apps/lsd/Manifest b/sys-apps/lsd/Manifest
index 1c7461ba5598..fb952fd8de3a 100644
--- a/sys-apps/lsd/Manifest
+++ b/sys-apps/lsd/Manifest
@@ -1,91 +1,71 @@
-DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
-DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
+DIST aho-corasick-0.7.13.crate 111381 BLAKE2B 08efdd762a12cbafabfb6c1c6f8b87465b337ea006d48e612c5275f796e4d62aa0a595bcda783f7a58b1e2655b9b35333033806215518f097b6671888d152e0f SHA512 9bd3c12559d6bdb1ce798a62c59a202771b48125afb6e1b5be76cad13d750d9bedd7acd77d69557e34a698b17ed7da6832a7813d48ee2627f4a2abd5e04263e6
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST assert_cmd-0.11.1.crate 20524 BLAKE2B 1b9443fbe9bd677f03e4711091390697f5f7db575d02738a7911bcd80d9872922f7ab2c605507f49547b69fb34d150a6043e47aa44027e476e08b1c06cecb8b9 SHA512 146d3088d90bd22aff24ee37598298d45fb6775aa4f7eaf95d4bdb9c2e5cb5c5da31039ffe2a3833866c191de0ffd60ca9ba94757096bc1c24d17fd72f962c55
+DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
+DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST assert_cmd-1.0.1.crate 24575 BLAKE2B e204b79da44a27b9c70be8dbf53356714ac994b4e5daced1b4f570c9e6c4a422572e825a54387df25292bd27e9ae11fa57d803bcfe4643382a2f739859dd42fd SHA512 969e1f6ba28edc0d4d25a10390f8e94578562602d303e9a9e402f29655cb9d67edc1040b283e1bc9fb4a88a5817814d88e85b77944204288aabcfb6da69bbdbf
-DIST assert_fs-0.11.3.crate 17719 BLAKE2B fc0f58e1b9fa7e7d4e94df33c46a3a940b8a3b2f14ad70fabf5fcc5642eb0ec0970bfb33b28af41d4de1b2be03f54da9cd7701d1d649e51e5b03042453001415 SHA512 257b03670853d6dc01f01bdf73d356b52b05514b62e199b3021d60f1e4d7f477e1d3ac855714f832566273088679f19227994caed0fb1be0b406844a7e92bd28
 DIST assert_fs-1.0.0.crate 17729 BLAKE2B 5b1b49c86fed4c3939b8bb387350aca6ddbcd2092d57adc2dfa9009046769dc87efc1aa87c9543953fe4af883d3040c4a60134b31b4bacba4372f2fa62150abe SHA512 46fade410848be416e6713a1457291492a58b590149775b479f3921b4408784bb845e04b372b24d1d99baa81c899ddf3c90413bcf6a699acd514b4dbd9d57535
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
-DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-0.1.4.crate 10937 BLAKE2B 272fc9d216749941cb73d37d5233d1df4bde5abcf9a6e75ed928ee6493e9011922a06551dac1f6b1d0c34dce587c6ce1442ea62e88457c0cecf985e7a3d5e47e SHA512 811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce
-DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
-DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
-DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
-DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
+DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
+DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
-DIST chrono-0.4.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9
+DIST chrono-0.4.15.crate 150581 BLAKE2B 89f1fb1840e7d25e226f4ca1100d85a8d02e0e386a5820bc68c8b5fca8eb94eafa01d90ad895a8b3e2c237f79593056f48a4a0954b6bee1a6eebb5d6f53e7cde SHA512 64ec4c7fad26ce7dd107e3e1b176507cd8f4b10c3ff47940c45ccec0b882858dc35d5cebed36b64e2bd1b611ad8b48dfaa7cfe4a7b687887b4f0a8be1de24dbc
 DIST chrono-0.4.6.crate 133108 BLAKE2B ac9573577f4ea6516007df2f9948f9df4e8170e53119ba7cf1e55592bc594bd1cbf05759ce2baf9b6397b68a72aa9e0518ab0b7a9c63bd043ee4a7a8b81e36b4 SHA512 c869cab6da906d50531476c892510042eeccb3daf790ef13b3014121c805b3f8e23c7a6ffccb3bb11d15a1615e997df4180e41f0140a2c327cc816b94f28976d
-DIST chrono-0.4.9.crate 133671 BLAKE2B b11f0b9d5ea182974ad1a8f176d0fd100479bdcc0e99b32da055393c0ce617a2d006545b0acb145a9cbf838d06bebe9650ab21c50246caeac9cf93fdcdcc0cd8 SHA512 d68fdcc255a2b967ea3e18d30dba7bba76929fcfa216c2081426b4fd3846bed660bcec8f92eeccb3de88f6e08aae9ade1c5e5d14f36d0853fe9a4499bcd5a57f
 DIST chrono-humanize-0.0.11.crate 11546 BLAKE2B dc0627852f00daa020f529fc37d5caeefe4c4847c1864c51fa2538769c9c8cea2c45176910f594f7e208c8bca8d1479ceac27c41fe393a02187572d508836bb6 SHA512 47ca23567abf41975007025bdbb2b30ae9a59d8381069408716ff9d2c60f77bcd8c9aadd5cb672902d73cb85b3123b7818c20c8823a27f3a99cecd50cae47cd3
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
-DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
-DIST crossbeam-channel-0.3.9.crate 86771 BLAKE2B d0898ecfa5aaccd03ed714b657aee7a3279f4242516c2943073e75d23f23437f34bf63b465bdfef6567030c998e7b3c6bd4f5fe2e0ee4b50a03d8a15396a2090 SHA512 4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919
-DIST crossbeam-channel-0.4.2.crate 87419 BLAKE2B 721013134069abc8f01ae5e98e1e6f10981d4892881339d3bf87f1bcb58b362348dad92e702a6b2367075dd41d860d62cca0ac8b3691954c454ca70bb5158000 SHA512 19b0ed2b5ed0fb1fe7c809e08483152fc36cf46f465c8571ca0fb9ebb1cb4b2b8f5860a303c932f336f434dafa9776ce6026ea2e64457147fb540766dc6da2ce
-DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
+DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
+DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
-DIST escargot-0.4.0.crate 17410 BLAKE2B bfed9c7ac31903c23342d6e7d438ba509f7e4dddf2f4dbb7b6110b0af0e4d83eb49d989ee8dead0758f22aa4de7eb4d7ce4401308c8ccd73db0fcb28482ecf43 SHA512 0b1b62b2a34c8d180f9312b3fb8fd788390af2231e0cd28acbea8ef6847e9c654361cc3c244aa70a4ab98b726f74ea1e7a45312a4b6b225cf767aaf451475df3
-DIST float-cmp-0.4.0.crate 8774 BLAKE2B d8c4854b7147e938565d68e8f4890f0a0c25a886e78a2f61dc7fff595488e3a2655b2f942586546466a10087a0bc415b18acd41dd828c26427adb655c1fbedb8 SHA512 62aa5623affe11bc65f3153f8d0b923cce82ad6ce38dafb25ed30fd9d2d239fcd09baa10f0f4f9a58ea1a84b12688ce43e48c7e57c9751e940d32e9719c54a63
-DIST float-cmp-0.6.0.crate 9498 BLAKE2B 6b97561d238db033718674e9651871196c28b6a888576f14fdba1b8aefb68ce2e835355e67a58de881d06f1eaa85d204a2f9342edf45ee75cf286ca8ba4813fe SHA512 5c0adc79a64e3597ac905e9afed2394c2b811968a197f197d30a7ca0f135539bbce1c13cf9d110bc6a2616e45a6ef941d9e776033c5c2eb678d6a4c9caf7a6b1
-DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST dtoa-0.4.6.crate 15979 BLAKE2B 7ad070d30f933f169ab442069dd078022bfdb2d6227380e88e286cbba8b908378fd8dadc9f6a86fef985380d925f12ec81f90daf9d1a7accbc03c01d0046258a SHA512 f9ea608b069469736533a60b3f4091712992ebdc99c08af06adce4aea4a9aa9fcb477c3ab169d1c61afddb1f434096cd2f795fe2489f5f0535cc0400b9896b45
+DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST getrandom-0.1.12.crate 23809 BLAKE2B 9669147c455bd03bd15f304eb7019b218cbc482af850ac3cb4378327de5afabd50826a686d51b00437d740ac4e3a0bfc761c54ed295806ac8b77ae6848742346 SHA512 0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518
-DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST globset-0.4.4.crate 22369 BLAKE2B 7265cf19e3f7a8e710be40760098242fe156ddfa974a59aa29018c2c317876049dec21e70f8b416ea9a0d16c33754118c7f070dd0e50de70cf8cc10e484a6030 SHA512 b9da7f4d67d4269b0b3564d65904c9cca0db7df6d33255f6022eee614f0ad03f3dc6f9e52e52fca7461308d9f01dac1f3588baf87aef735c266561b1119f9985
 DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
-DIST globwalk-0.5.0.crate 9378 BLAKE2B 6a722371787719a39d68d28ee00b0cd751751b31cc4f5ed9831dddab34be29628f113b721056787510102e12082407321b2994230fb605782f0f9a873dcf0609 SHA512 48f787ebdab67154e4a08fbce5da2d26b4c3cb89a2c70ec6306c0cd4d2c53154991ae5b78cd01d1f9cfaf4ac5de0db85bef049ddf4d8f23442465dc09f5b99bc
 DIST globwalk-0.7.3.crate 12714 BLAKE2B ec9d0036c2556010111edd645494be456664e4f578eda4e4ee20a94e42e017ed16cbbb8db4c80449bdcc5a79d00ea361a2aa59d030de13e409431312f536ce57 SHA512 99b3844e8a79364e27e98e93e1a868eb7842a7ad1ba58e67be52c794c0ba999714b4cc1227a03499ebf0b09fdec1ab65e1b22806cb412c4d1abe3da6fb77b97a
-DIST hermit-abi-0.1.10.crate 9127 BLAKE2B 59582bd4f7ec1dc38b3df7df0ce77c6161a24666df6d913037f310bb159928b715d338e6938af677b0520c7185f839e04472915e18dc9eefc1775bd293c6ea6b SHA512 daae9d78f2657b4d7754b1f95144be8c23c4b607058e53fd2f5d81d5fb13ba7c55dfd9839765ea90141277e0844120110708ec4913d224dd29de957009d65194
-DIST ignore-0.4.10.crate 49022 BLAKE2B 4e1fef531f800bf95bf1a601cb8f64d93ed46623217392368cd1f59fe6e353dae8e8e6d2a017c5b3bc89acf2a964eb682d30803f2d4ac3744935c4567d2675d1 SHA512 ef4b3f58bbdc3b5317a14244494ba9cad8e3d062f0c8e137dd2d33572dc8a06b20f59860aabafccb729dc682134aa4e2bdaea8c07b351aa73a8ebb00e361ceeb
-DIST ignore-0.4.14.crate 51922 BLAKE2B d93eeaf945fa5165461979e2f54969b9e2ccf2f4986bbe465fba8a1f0f750ce66e82c1cc48d526e2115c8ed302daf37aa368503bd56d627ebdc9609a3136576d SHA512 eea97e9a80c9ae67b2f8e970e6d4362e8b2ed2067b6c94f8de51f851133db5e782fa0cedca835d342bc66af4ede3716a4ad97c9e0129bd5b78f8f6aacbfe23c6
-DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST hermit-abi-0.1.16.crate 9889 BLAKE2B 1d1681d484019adb9c27336ef87fe9680c18a57de71ca9bb3022878411ce8f933bcb0f5d03f190425039a53a427ecbe75f8eea654661340ebbc165fbb61322b8 SHA512 b9aa336e195fdbb3c1a1fc7167f3efd284c2c3ab0613ec47f07b5cf5865b56cac3aa0da4936f6a336f036993344126b3d872875c362c516e0ca538d8e36195f9
+DIST human-sort-0.2.2.crate 3024 BLAKE2B 0e112295ee73e6450bbf6431ff6841c9584de5daefeac077eec9eced452de61bebb8d3c3e13edd48b9e1002c421a8903da57a6a23a4c42576f2abaa7c6f02560 SHA512 062259992075a1be4c923379489410d856485682950cc31a05ad6ab6d04129f7e52dab016047c4de30c18f2ccc5c094c4469d9a920da0f450de3865a713bc987
+DIST ignore-0.4.16.crate 52343 BLAKE2B fa232eec0a35a2b144225ac804f2d8d198a95ab58d63d9a80378fcd9e9dc99b7aa800d8855da59d51a6004be496bb51a3eb9d318bcfc6c38b257c1de68a86abd SHA512 23d0205d25dee02067a6af9ccaab9abcf1eb812e309d029697f0b0a3fd6062e33d8fb1dcae8c78494867e82132ee6797bd4af716d7c1523afc29feebed6d6698
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.55.crate 400416 BLAKE2B 157b4f9d221f562e37ccfdd662a6777c8c6c45d1d2c9f9ff0f9d4d1bdf1aa66dac9f61a220e5be65fd7bc01273335eed86291e158f64da26bd7b398af26663e2 SHA512 649155c45a098dc043a42a0df19a7a43100f104bda1ce1a3bad9e5070b5a9c3a73f67197e286fb508c9257315b2e1d2a6eb4cba35f909ef0a2b1f61e1a29b196
-DIST libc-0.2.65.crate 439610 BLAKE2B a6390172ac5a76bb13860ffe0793a40fd6a74c7947c164ab1a033401473caaf77cc85bd578a37411d5f40bdeb13358a4810ac358a76799b24f7b797b2bde9915 SHA512 a5df4f7efae9dfdedeb140e3fec545135c7533f665f4eec61f071d01f40a2079e104c6a837c2b385aac4b306e4ddde34aa857fabb4a7ea7d7780159bc0b83c40
-DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
-DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST libc-0.2.77.crate 507233 BLAKE2B f02ee13e41dfa6317a6cf7f0724f891cc9f98a68cd25e865e744ebbe49d93c86f16c2fd71ef4410ff28e0b386c5b4dff605c1236db83bdb91292ae48d0900782 SHA512 1e6dbd6f646a50fffd294ea56146c42dec6c4e027f2cd886ce2bbab9a5a2d036e4787f95201c448bef9ceddd52d863153c849343791d92900bf1378fbacee0f7
+DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
+DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST lscolors-0.5.0.crate 15937 BLAKE2B 27c9d42fbdfa32ce9f01fc627c2a758544dccd72f2b63f232b4984287f61f5f4dc8788a30ad60ae92ddc374b7b993b577bbc0d11a03c61756af81cc672300fc0 SHA512 97d881cf248dee1a744e6016941abb80579518ede0883e419b6c452215ddc0b2a6336c6c6c254e4f463cfa7f3a648ea56fef1df0ff044daba98c2d03e1731013
-DIST lscolors-0.6.0.crate 17577 BLAKE2B 163fbb3b212af633d73a3ff73808ef13cb687e66afff5d3a15cef992ce6c4af8960baf826abfd098ce1a2d4fdb90178b780dd81404859be2ce748027f6a5448a SHA512 245e5d9fca5355d7135d089f9b1f66e4863b38829f52625366c6bf6eb7f1837d7b57ca30967843e2a6219b602618bd2048ab2a31912110083d177b7939f39e81
-DIST lscolors-0.7.0.crate 18036 BLAKE2B 6ed35013099c9adcbb6f1a471216138cf12592928a098ff2312dd227744e2208a001e812a77d63cb729cf2b66bcdb0188ab1ba51d78d7f80a88bfc8f1ae5623e SHA512 470bb3ec7d603959394e561a1f3f1d037479da48f966ff822bf8ae4f7e724be87523adc6b5225ee4521a7bffae15ef67f60d0c04488c12e30cbec45651198bd3
+DIST lscolors-0.7.1.crate 17986 BLAKE2B 927e3d9155591c5223fccf78f011dfce21f29c7f9322de0e3a97703eec2b27ff1eb93890b9ef62cb0916ceb06bb88660b34443ef815aef621801f7917ff46b31 SHA512 65c618c25624b360a98f98142e0867d524d19e7060887993f35899a26a812e360d8b8d627d36a72fa3c604a1cb5615d6a425850087183b694083b9649e120776
 DIST lsd-0.16.0.crate 39872 BLAKE2B cdf78606856d689e22edad5cf1f4f555edff2030e1b10ff0e706f7dbbe98c5836ef4a8ad6d061fd3c968f8499815b79c97595d0fff43d513e8fec40a4f3a632b SHA512 cd761e039f810c6fcb925228bdbc284ea0a3a9b16a11038de3086bf89ad1f99b442e33a0020612079bc40e7adb1a3ae056565f4022e2714bc9cc47767e7fc03e
 DIST lsd-0.16.0.tar.gz 43284 BLAKE2B fb8813f33fa487afea428a3dd3a01fe6c9e56616a8c69e7a97430e41deb4a0ed0cd5b4c6ee79ba02d145267d2fd2ee2167365b81fdcf868bec2cdce0a98a1535 SHA512 562c070d3e716af26ff3a54632cd176a1b95471fbb7e947f8175f89df483ff5b337d1a0d7578fa6ee41f77fa7ed1a618d37e91ebf1b8428e6a857918b415aa39
-DIST lsd-0.17.0.crate 51531 BLAKE2B 2d9df1b84e80d450ad58df646eb350ce1a1fd3b9f1a34efd365fe9dd9c7261b1a2f63dd044af843521f67146c5ac5a6c45c6a7d4d430fe3ca0964454b57fd37d SHA512 24e86f8f6db7558a00186d2da00efd3d1a5158e3d728cf91f2dc9ced609c2a170149996b0df787e24478ff5ff38d09b13b8a269180d16cbd074fb3aaac5e9b7b
-DIST lsd-0.17.0.tar.gz 51034 BLAKE2B ce0d0f41b805bec6d12b88d7cf70ffe956e4d920f9a9b26c795f4dadf879fb427abeac8e1badaff84357ac55e6926514d5aacda03b0f158fb58255cde96c5856 SHA512 a0d94af2e1186cb8794b1d6fd309b46df83fe67f008c548371f7c712bf9638f64d1e5bef1f23ae929d59cba2a0ed6961da74f6415973bb95673f37d5d75d1f95
-DIST lsd-0.18.0.tar.gz 51553 BLAKE2B c6b9fce395f838e1fc888ad145bdd8389be034c2e48ae9026931be7c74d740e2a5c52e2b5146e3e05c36ca8b74d1263c43877928d690f72e71fb4d7f6d050ffd SHA512 11692c000c14fc220b22b4a40ff65f59c527283b8aef541836a5e115062292d5bf9a96488af92726ca1757c3877d10d82145a3ae1d6656560b8e4217b37b62d6
-DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
-DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST lsd-0.19.0.tar.gz 69118 BLAKE2B 32f5fe37e2fd4d5b714101ba19b6f36d9b0d0d71e88e1d8e715e32c2c804735366d8ab517e5abf5193e478096c6dc2724be2a6bd68b75c2603f0954926ac315f SHA512 f9a1202f49b0e02746ba4034b199142a4b5224ba6cee8690a6fb01c18c046a26c531d0b4480838a28b3ca8de7ae522451bdc5ece43f902605a61f18571fb07fd
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
-DIST normalize-line-endings-0.2.2.crate 5299 BLAKE2B 3d0cfdcf94f7beaa24bfe5b332f952b96bd915ecb4943b912cdcd20e02b4ee6274c7c3fa9bb39743a0a09990901cb8406b2a6a583ad62ab61800f33df48ad32e SHA512 d1581fce8b99e2dc6ac187255722e8aa07c6d03daab536b41d483fb961afdcf043c8fd92843ae3a0835c36c39e403b6bf263d5fb6bc0342d88c4be0e9a4fc1c5
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3
-DIST num-integer-0.1.41.crate 19399 BLAKE2B 44b96c8f1295f0d3021303d7e3b49474b86fa7287a1f284867e18883617d642fbbb8725ddae0fd68b1ec70276977b87f4d040bc457e037562f4de374d042f178 SHA512 f979ace06e3c109e9b5217a85341117ad12bb6e8da1b7ad799d91a967e3da1eb785fb114294f049ed8a2022cd5269c1ff771bc319af3da0899df97a1e412297f
-DIST num-integer-0.1.42.crate 19463 BLAKE2B 91ea6900dba5a38bc7ac4de0db8706f5335baab636937e9efdb1b82ff0e8ece4451503de3ac9e473a4dd7c70d599066f14840789fa88aeedafa585f0f98ed61a SHA512 8c7e0529888e18b872a634e8983034b0357143aa72914b45c02ee87447204296970e9b1ed078d9436ecc779f25360b1a1cfaae5a9bf7c8ffc68793d7c25593b2
-DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
+DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
+DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
 DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
-DIST num-traits-0.2.8.crate 39965 BLAKE2B 58b2c432e8523efd95724e01ed80d61b2c4a798fc451e1c7257a392f78617d0ecbab9b1c1d799dde8593cc69f1dbf30d2e966330766992ebd43d8626926f12ee SHA512 a3019e45744245837b2f146ab4213746c93a1ad701958dd418272af89451b843f9b643eac673c1397f6079da7709c7e9ff46e0e829a4cf6092772c9d77bbc534
-DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
-DIST predicates-1.0.1.crate 24714 BLAKE2B 678e393fd1f6d8a4d7a6d0e0473f8f7ff6f0da3b612bd4f661fe3ba3b070409837fd3b19dc294e68af3b643eb04f9cf9020d76b4aff8360b0a1c4b4d8bc614ae SHA512 871465df78f22decadba2d797239c465cfc37033084197dc5f2bb047d5e7bada047300f331902b4e2c79036ad512544789932506b1031fe471b9d5ab918c2391
-DIST predicates-1.0.4.crate 26239 BLAKE2B 12ca05a2d98f9a4b6ad5442cdd8c5f5bd90a691d5f9c61389d710a7dcc88998b251252b9dcee4f4d8f742e1e4c00b25ceda57e39fc23b431fa7f04b2d7e64bfb SHA512 20f2ae6853e665b262651d4a2bf1fb70f4ee8e536f4fef2de79225fae44a4f32b4680f06f06523675e5af23e301ff58b0cde3e61c0e58c27e412d2eeec96fc35
+DIST ppv-lite86-0.2.9.crate 20933 BLAKE2B 493fb977d0db8eb4699893ed1d05758ee7cf1b5610b767a2ec352f3f430edf3d1a3bacefae554fb16eb2786fe4fb9b574c7b9961458a938da9a79b9084f062a8 SHA512 d9fe88a221733197b43db2a2a608dd2acdd9aa37129af07ad2405d66171b6f9f4c1a61530013c7f9ad69194a2e52e7480ba80c696e97cf2adaea7677052cb010
+DIST predicates-1.0.5.crate 26097 BLAKE2B 4adc79981c706796bef11e75e4a87cdfc5ff7f5066869f8d26f5ba0f3699c292edd6e5dd1be8854ff9e8b2604bf24904f1242056719e1d863951ca6f5ad042ae SHA512 696890cb9ed83b6ebd1b46e42bde95b148fe067174b0057e4ae83d9b3a4d2043dcedf0cc58b78e88b36a460402cd6359580356018986b4a136cba9e1afde55b6
 DIST predicates-core-1.0.0.crate 8066 BLAKE2B 71e70aec3adfae302287a1cd3d7d19eff8a697659d61ced33b89caa8a2a3359ab7251db012d973dd574abecec82acc010c5169d0670096af06e325761363c34d SHA512 024f997976ae618e3b82d59613f8b6c41b3c0b3b595b6cf38d10d2d27a11388e9511ca38c06d46b52a12fc19d3cec36a69ca14e1e21f316a719539e41c86d6f4
 DIST predicates-tree-1.0.0.crate 6251 BLAKE2B 00da28f7de9a7abb386c6a4425d8a2285d1ef22032476b0ac1bab4b8d34d2af69948f80d8f0498e2356caea3fe92ce352b58539413a8f0f052e9dbc26c96cc12 SHA512 29e1818b7cbcb7195dedc78e6a1436e8e8c88b61d43469952c4bba5bef7dbfd5b7f0dfbd9fd31f71e71cefe7c7b8c44ef361bff1a86f40c945caf48cbd87cf05
-DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
-DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
+DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
-DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
-DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
@@ -99,62 +79,59 @@ DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b01
 DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.43.crate 15212 BLAKE2B cd2e3bbd3cad2568bb61d71931f84b9c09ce694500508ef1fd78c841424bcc40515645062c3fa47cf0d6d99082cff3800a789c0bd0acab87ef5bfebe4e9f25e6 SHA512 c506b1b9067d1c40419a3b4bbd5b2b9bf2e92fba775d51f46bc80d322412a9a8d6d2f4e384071f27ba0e8e58e8ddc2ba4a0ee99567ba2e82e63472924fa46354
-DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
-DIST regex-1.3.6.crate 235465 BLAKE2B 18c6fa529f82fc9ea874605bdfb8d0306a22c88bd74a2473f3cf71b8df46b63133a0a9d3f7401b53a85ceecb6f3eda1d5d37ce5982d7d8e8b6cfa1c6206cfc5a SHA512 05dbc0f355bd1f3ee659a8ff888b37242f780500b76d153a100c21c12278db2429ccdd47f8dc182c708dd70d47fcfd5acd6eefb397c03e08cbdff701f6346628
-DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
-DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
+DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
+DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
+DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
-DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
-DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
-DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST rust-argon2-0.8.2.crate 28291 BLAKE2B 65b9727c348e1593bea85bdcd65b21ff0e667d87d1ff88692165d49948fb7b9294a4a4a20dbb824a68a2cdd59ce1c1483d6dfdc31d8f7800c7e34cae78297a0b SHA512 9ea8088ee1caba0cac453cc54f7e7327471282d0a8a65944b1c911f809bdeaad7e9379a399d215533e3c05538c9b5b7fe1f9845b01c580d76ada61ac8a24327b
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST serde-1.0.101.crate 73115 BLAKE2B 6b80a6e7f8965c412c6f5db62cf3782329818c59c43c9947ad9a33be56b334feb0fc0afae4722f368d708236e2763ee2b1e71b323b3e961880f99f2e178a82a6 SHA512 3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678
-DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd70733669627628cbdc921dbecc384d1a328fc8a37a8f5b96a84498d5fb4514374760ccccfcee1f3e809d35da5677cf4932 SHA512 08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417
-DIST serde_json-1.0.41.crate 69870 BLAKE2B 328935ee765889b82cd88ac7eab921e279ea8ad41445a8344b194605e1571b30b6204add7dc4de1f87994d8162428eaf4d825e9744c9971349e8fee19507265f SHA512 63ac513a4813a65962d8f63476ce8e63ce71d1e6643da7443d774078e4a743835276c50c04ce535b2e43251383c537365581838a0bd5d4893a644e396eeec55b
+DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b
+DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d
+DIST serde_yaml-0.8.13.crate 37683 BLAKE2B a6739f29e638fa77516ae106314a332a6cc86022db4a029eb7615e5deca712b67669330f02ba0d04cc53b9e3f661a5e970f7ebe723be18cd44c309218123a74a SHA512 12621a641ccc68f90a962e9a6d84ab922d9b30e58be88c26e8fa0cf921981f573bb929113108cfd08f47988902997d4b685db2cd361cbf83119612e95ff6e686
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-1.0.5.crate 190286 BLAKE2B 7d5c813bb4cebbc104978181532a050b0a7f79963a539d69a253ebdb15a83c275a5d5b04dfbb66a426afec2c90a450ed7be595619a2b5a31b0725d904f5adb92 SHA512 4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc
+DIST syn-1.0.48.crate 225747 BLAKE2B f7bfc4c38dec562a6dc7ecb7120c6df5e25ddc8591762bf5018ee0efa506613c9462a79e0e9cbd952cf5fa083abc164608d594bf2a47d226de4b4bdf02da050c SHA512 16b022a418eb9a7e5d651197561c329f749050a1710ff03b1af9a5f580543d00a1724826e0ced044d6ee4ad55dc615fff5a71ad72755e1685c429dc5853d93b3
 DIST tempfile-3.0.8.crate 24549 BLAKE2B 839b7637add53e91b232246739b21a60c28bd54704b65da889bc92733fd117d9aa46289c44d94974c9c24d7d532c97a4ad7c64617e1df8bec21671ecd16419e4 SHA512 88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
 DIST term_grid-0.1.7.crate 7353 BLAKE2B eb4d11b84995d8ca831c32c3b0c781244d7d97367aa6b877f1aaa21e6b10edad5a4597ab06d5c1b6a9cc00fbecd62fa3f28b9970119dec98c0eb5d0c74948b5f SHA512 12196d1f2579b6d593a7cdd34d74635b93fad710bcd682dd438143a9e814759346dc263dc8a65628b7ed8fc1dbcaa60fd9cec543d0cdae000cc5dc6fbb199bca
 DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
-DIST terminal_size-0.1.12.crate 8111 BLAKE2B a5b43c7fe8a3e13e49d7c9e787fc712f51313ea09648e474ac6eee4c0eceda346f5bd85ad69bac1eda67d6713d6d34230398a7b6b008cc3b58ee6d4d6b096bcd SHA512 6f0060529cda5a891a861566d22b0c3a17a702fccd8191387ec7e463bcd05cc88a80d889eb146ef704b6bc50c7b136d340b44897a300d6ef6269dd4b83837b5d
+DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
+DIST terminal_size-0.1.13.crate 8094 BLAKE2B b46de1f0dfdd6f4dd44c21a5cd7936cd9fef67d96be44775c29f3850e39b94f200c719bd0c0c31727725f1741ee9640a83c1f3083a45ed665db7f03e50793826 SHA512 75efac1092c6919efc7d427e3cf7d4c36a4d12b3d5c38ee35f94ddf2fb0efcc16fb92e608382905475d5de3078e9c64a29ec77816572797fdfb53a6708eaf266
 DIST terminal_size-0.1.8.crate 7289 BLAKE2B 17a620858a1a3f32f105fa61cd3f57166e1fae57c422a1ed9b59ff61d3c8f7916c1f7e3d7e3728b8f3cad481b1529d8bddd5ea98ca425e37c14cb469dec08858 SHA512 2392e2d3c34e6dc83c43e804ceb9990af82066879a2d74b21e4ab88bf9a8698f34c8734f3e8e3febdda44c0633819809259fb34bd48d138d22ad6c4b448f396c
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST time-0.1.40.crate 29518 BLAKE2B 9102a29eeeda597100e8e9f1e6a021df99678383d02264c8b94b07f5bef73aac5f0cc77345aa5d7d5db3f33d67581b4970e5a80597773afc726bcf73d1415b5b SHA512 a14753e598ae9def3f479741968bfba028e55debdfb1243cd1becfbf468d2c5fd8457aca720197e16a6a2c63e58e07c51cab5712327ad8ae37605a2825a29bc9
-DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
+DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
-DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
-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 users-0.10.0.crate 18531 BLAKE2B 18f1dba893d2d88b33785b997f6b2a3582fbd5c2c21f460fd7ab3c98572d524dc0e0fdc1ab3c5651d46f4219cdfaa4b60fafc045f01f6147d99dd3aad92c146e SHA512 21052adcd602ff6c30a4e9f4e14fdca896dce03969b1b03069f93f3e9d2b25c66b83ac2f40ed4e960dcfb5a0e67719ee45da475855f6e397f3618273ea52469b
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
+DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST users-0.11.0.crate 21980 BLAKE2B c106e9ed67b9ad766bb7318506261579768185aea3d956d9e8b2adb52349525fe69703ee3bb2e4fb02aa223bfa6fc92a14d8128412623f70654254f842d7322c SHA512 e28028f895780bd59a11069b81b87470a287a447e42566cfb8de0e2d4ba8c90a3ce92901e253dcd2628383c8ed06c10714bc0181a57bf257f7edb3510936e596
 DIST users-0.9.1.crate 20456 BLAKE2B 49a2dd188f8d944d361a4e58f3f437718af7510c2b684e22209058e97dfd9d5ecec2c901cbe2cef36ab74d11091b1280de8b94135da523f57b02372ed5571fe0 SHA512 e372f8402d241e924c77a13621053836a1a36a6a6b9b66d5e187a582be0a85638270ea140c048e07f6739ed228711095fc98705303c499f2b542fd548df0819a
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
-DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
+DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
-DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
-DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
+DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wild-2.0.1.crate 6946 BLAKE2B 00aef7e2de0ed4c055cfdfcd3b1bd03ff53fac394ab76ab9173ed1e13992673252a35ec03a36ff0ce115d1f17e54a9af829301bb9df24ea2cc7cbd084861ee01 SHA512 001f83176ab74b1ebff70fa63bcb93d66aee8eb7519d917af3ba894a208b2346da38ff278b26b11affde90755530ea707918c9476e3b0c72951d23bcb1677ec9
-DIST wild-2.0.2.crate 7714 BLAKE2B c55c016fd6e784492d419c11f43eeff1ca7ea6e5598770188a56db1fbd6c8732769041abc36f76ad720dd9a3780806bec943e74333b4f8f36dd9b9f6a3d94a9b SHA512 31f9169b77127c1fb20dcb29cd6b0eeeaa5654086d65db2eae5ffe744e3ffec8de98927caea21f699ec79a1f040d6891070ef7f2e99aba5fee79c13e77ca9f80
+DIST wild-2.0.4.crate 7068 BLAKE2B 4f2846b44c5cb34de67688afb74af36b5f435e314b4a5312fe33eaa8378a218354bde2355f6ef53ef1444abcfeaafc150f76f155aa97850d09fff469e3bd1fc5 SHA512 a0c7d27891064d7455c3abf8aaecbd744e7fdd3b4e11bd8e7becb8917585410828fe45f2077e90d81608d230d8a31eaaf2ac818d4ad3225e1f9d3ffd27495453
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
-DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
-DIST winapi-util-0.1.4.crate 10089 BLAKE2B 5dfae5588233a6fa10ec000b3c5de17679e7636bcfb70cbbc1b2b1340543334125b413d53583459823be253a32b90279eba5a3a8debb404390d0328ed6377352 SHA512 2a90921a30ca021b6178b175b780e4803f40ac87f35bcb63bb09fbc9c79f8f991dd94fa3a0fa525c2e38354d9f6dee780a6cc5ea0a24bff49356d052f6bb8231
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST xdg-2.1.0.crate 12444 BLAKE2B 616b52f46f3904f3da7584fba331b730a3fbc78e2b41ff188a2dd15ed421ee5f7595487d4c4aa6ec557907ee09f3f77880882673857c2c1a83892afb142c23c3 SHA512 5896540327691f7609cc8cb4055561e791ab627e7327e5c49c9ccb14713d35ce8f43e17bd333cdfb4991884501d6b0bd480e41e9a3dde97499644240675ed52e
+DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
 EBUILD lsd-0.16.0.ebuild 1392 BLAKE2B c1b8865714c255758cce5d34664ba768436fc50e4eb86eb9b5d6cd1794f6e7f0f902be5f586f44e3546765261345b0725340351403351a50284b841d917930a4 SHA512 d5e9098898f97cc1e6e5e2c796c90c66f6965967164871aabf876277f95b8214fcc552dad926ae8d4b27c91bdfc3a2a582055d185bb83fdcdec1e3bb0f7384c7
-EBUILD lsd-0.17.0.ebuild 1857 BLAKE2B c415fa53124cc9d4dd4ad0039d3a718c2680931a32a9d7e745e64e323eb1798757d7ade1f66ce375e079872a169a9758c8e2f5b7e4fbf2591a325622da1f560f SHA512 fab21806fd10c59a3b0595cee128bf5a60fa12961b16521fbb1989a76ebbb85b005d4a272059a35575fd307b47206a55310b30fd373533f355a0b426a585544a
-EBUILD lsd-0.18.0.ebuild 1784 BLAKE2B 7b3cd14cf137846da769b54a65982458a7fda02ca7e6951e32e756718162a8898b6b47b524a6e44e7e4ea5476035e167a37e1e7263bc4d5423744034a08af6c6 SHA512 d00c84c6a08d88dce2064140f374c0293e531ca5fbc37c0f0be36ef5b60884b0321d6eff3a6c985ff6acf62931f7e5903a26087b313e41341c9d960b318f7a4e
+EBUILD lsd-0.19.0.ebuild 2064 BLAKE2B 18d8629dce22033901a6baf22c888d06fd7f5c5b24eb7b5738fa212cabbdeffcf8854311062c37e99c7643047d24c6dba700c6b80be0ecd919a4c7916f83022b SHA512 8596e21e238b81c3fe14955dec85e528358580610313816ee8d872d45573dad6ebceacc0ccf3d0f023dd9788a6b43ac3b17696adb2819f6ba4d5c885aa49ef96
 MISC metadata.xml 759 BLAKE2B 46f9729d738136d537cfed0a59cb6be6821b5b59bd4381171fce99943119cc477c54b03f303be47451ba9f8929fe94bb62c32881eb730ec11e306517afca505a SHA512 98a410b73a6a4f51f3e949a6e78087052580ce53e4720528aa9e97d3ddb052b6d6e1055cd2609f07d7a605c499e620843842461d514ddc84644f6cac007be599
diff --git a/sys-apps/lsd/lsd-0.17.0.ebuild b/sys-apps/lsd/lsd-0.17.0.ebuild
deleted file mode 100644
index 2932b2d6452f..000000000000
--- a/sys-apps/lsd/lsd-0.17.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.6
-ansi_term-0.11.0
-ansi_term-0.12.1
-assert_cmd-0.11.1
-assert_fs-0.11.3
-atty-0.2.13
-autocfg-0.1.7
-bitflags-1.2.1
-bstr-0.2.8
-c2-chacha-0.2.3
-cfg-if-0.1.10
-chrono-0.4.9
-chrono-humanize-0.0.11
-clap-2.33.0
-crossbeam-channel-0.3.9
-crossbeam-utils-0.6.6
-difference-2.0.0
-escargot-0.4.0
-float-cmp-0.4.0
-fnv-1.0.6
-getrandom-0.1.12
-glob-0.3.0
-globset-0.4.4
-globwalk-0.5.0
-ignore-0.4.10
-itoa-0.4.4
-kernel32-sys-0.2.2
-lazy_static-1.4.0
-libc-0.2.65
-log-0.4.8
-lscolors-0.6.0
-lsd-0.17.0
-memchr-2.2.1
-normalize-line-endings-0.2.2
-num-integer-0.1.41
-num-traits-0.2.8
-ppv-lite86-0.2.6
-predicates-1.0.1
-predicates-core-1.0.0
-predicates-tree-1.0.0
-proc-macro2-1.0.6
-quote-1.0.2
-rand-0.7.2
-rand_chacha-0.2.1
-rand_core-0.5.1
-rand_hc-0.2.0
-redox_syscall-0.1.56
-regex-1.3.1
-regex-syntax-0.6.12
-remove_dir_all-0.5.2
-ryu-1.0.2
-same-file-1.0.5
-serde-1.0.101
-serde_derive-1.0.101
-serde_json-1.0.41
-strsim-0.8.0
-syn-1.0.5
-tempfile-3.1.0
-term_grid-0.1.7
-term_size-0.3.1
-terminal_size-0.1.8
-textwrap-0.11.0
-thread_local-0.3.6
-time-0.1.42
-treeline-0.1.0
-unicode-width-0.1.6
-unicode-xid-0.2.0
-users-0.9.1
-vec_map-0.8.1
-version_check-0.9.1
-walkdir-2.2.9
-wasi-0.7.0
-wild-2.0.2
-winapi-0.2.8
-winapi-0.3.8
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A modern ls with a lot of pretty colors and awesome icons"
-HOMEPAGE="https://github.com/Peltoche/lsd"
-SRC_URI="https://github.com/Peltoche/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND=""
-
-QA_FLAGS_IGNORED="/usr/bin/lsd"
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-}
diff --git a/sys-apps/lsd/lsd-0.18.0.ebuild b/sys-apps/lsd/lsd-0.19.0.ebuild
similarity index 58%
rename from sys-apps/lsd/lsd-0.18.0.ebuild
rename to sys-apps/lsd/lsd-0.19.0.ebuild
index 52c34a79c861..1c4de710edcf 100644
--- a/sys-apps/lsd/lsd-0.18.0.ebuild
+++ b/sys-apps/lsd/lsd-0.19.0.ebuild
@@ -4,77 +4,94 @@
 EAPI=7
 
 CRATES="
-aho-corasick-0.7.10
+aho-corasick-0.7.13
 ansi_term-0.11.0
 ansi_term-0.12.1
+arrayref-0.3.6
+arrayvec-0.5.1
 assert_cmd-1.0.1
 assert_fs-1.0.0
 atty-0.2.14
-autocfg-1.0.0
+autocfg-1.0.1
+base64-0.12.3
 bitflags-1.2.1
-bstr-0.2.12
+blake2b_simd-0.5.10
+bstr-0.2.13
 cfg-if-0.1.10
-chrono-0.4.11
+chrono-0.4.15
 chrono-humanize-0.0.11
-clap-2.33.0
-crossbeam-channel-0.4.2
+clap-2.33.3
+constant_time_eq-0.1.5
 crossbeam-utils-0.7.2
 difference-2.0.0
+dirs-3.0.1
+dirs-sys-0.3.5
 doc-comment-0.3.3
-float-cmp-0.6.0
-fnv-1.0.6
-getrandom-0.1.14
+dtoa-0.4.6
+float-cmp-0.8.0
+fnv-1.0.7
+getrandom-0.1.15
 glob-0.3.0
 globset-0.4.5
 globwalk-0.7.3
-hermit-abi-0.1.10
-ignore-0.4.14
-kernel32-sys-0.2.2
+hermit-abi-0.1.16
+human-sort-0.2.2
+ignore-0.4.16
 lazy_static-1.4.0
-libc-0.2.68
-log-0.4.8
-lscolors-0.7.0
-maybe-uninit-2.0.0
+libc-0.2.77
+linked-hash-map-0.5.3
+log-0.4.11
+lscolors-0.7.1
 memchr-2.3.3
 normalize-line-endings-0.3.0
-num-integer-0.1.42
-num-traits-0.2.11
-ppv-lite86-0.2.6
-predicates-1.0.4
+num-integer-0.1.43
+num-traits-0.2.12
+ppv-lite86-0.2.9
+predicates-1.0.5
 predicates-core-1.0.0
 predicates-tree-1.0.0
+proc-macro2-1.0.24
+quote-1.0.7
 rand-0.7.3
 rand_chacha-0.2.2
 rand_core-0.5.1
 rand_hc-0.2.0
-redox_syscall-0.1.56
-regex-1.3.6
-regex-syntax-0.6.17
-remove_dir_all-0.5.2
+redox_syscall-0.1.57
+redox_users-0.3.5
+regex-1.3.9
+regex-syntax-0.6.18
+remove_dir_all-0.5.3
+rust-argon2-0.8.2
 same-file-1.0.6
+serde-1.0.117
+serde_derive-1.0.117
+serde_yaml-0.8.13
 strsim-0.8.0
+syn-1.0.48
 tempfile-3.1.0
 term_grid-0.1.7
-term_size-0.3.1
-terminal_size-0.1.12
+term_size-0.3.2
+terminal_size-0.1.13
 textwrap-0.11.0
 thread_local-1.0.1
-time-0.1.42
+time-0.1.44
 treeline-0.1.0
-unicode-width-0.1.7
-users-0.10.0
-vec_map-0.8.1
-version_check-0.9.1
+unicode-width-0.1.8
+unicode-xid-0.2.1
+users-0.11.0
+vec_map-0.8.2
+version_check-0.9.2
 wait-timeout-0.2.0
 walkdir-2.3.1
+wasi-0.10.0+wasi-snapshot-preview1
 wasi-0.9.0+wasi-snapshot-preview1
-wild-2.0.2
-winapi-0.2.8
-winapi-0.3.8
-winapi-build-0.1.1
+wild-2.0.4
+winapi-0.3.9
 winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.4
+winapi-util-0.1.5
 winapi-x86_64-pc-windows-gnu-0.4.0
+xdg-2.1.0
+yaml-rust-0.4.4
 "
 
 inherit cargo
diff --git a/sys-apps/lsvpd/Manifest b/sys-apps/lsvpd/Manifest
index 765695320bf0..462f78039216 100644
--- a/sys-apps/lsvpd/Manifest
+++ b/sys-apps/lsvpd/Manifest
@@ -1,5 +1,5 @@
 DIST lsvpd-1.7.10.tar.gz 89862 BLAKE2B a2fa6f85822313b5cf17ec9207ddd533ffb1cb4a3ee2e32416d6b646930f8499c3d8994ab6cd21b1d4d01be1c32f13e2bd1206cc073bbcbaf8cb9722993a1510 SHA512 0ee9b8329e9ea7eac6b502051a5ecc5af28642aa3f14af9cecd0217ea6637a548eaeab2e5631534041dfd849701e0905a0618b1ab62162b9af493ab0f8ad7ff4
 DIST lsvpd-1.7.11.tar.gz 90366 BLAKE2B 2dfbbc92921106247580395ac663731bc4486d9380b052cfaa0867939a22b4c10d130adcb01260316e5c0fa5a093eb8c95c0d0b04a5ea17792e5891cb302a554 SHA512 68efdbee6bbfb4fd6673bc83d340aea6a121d48d1e75dcc4f9322521d8a3aa7b04fbe1acbb7e7343c5a7e2dd33f21ecf2e54a32ff5f6f2b9e1e5d6c34b8b25b5
 EBUILD lsvpd-1.7.10.ebuild 574 BLAKE2B 20b45740c87d91ba4393af9841b77bb41d624a416ca82cb04315f8319f5788535d76c189e340bd167988d4038922944d11d2438502a6859c7f2c90390149875b SHA512 2575ab1d7c815bf1a2fe10334cca7bf52c454021fe30f96dd064372bbc1c79e7efdfdb9646e7636462c441c11978892a67e832a4bc6ba38e96636ebaca133912
-EBUILD lsvpd-1.7.11.ebuild 575 BLAKE2B c5f93a9b8e866ab6c07ab716f37aaa571c27a5bf9606c198fdf8107ea8bcc9936e3d0748f116d8bd1b8da32ba4c26093efa159681aa0aae0bfee0785e2ca9309 SHA512 8ca6d60982f851c230f9a95b4f6caff791af16f6bc9e9bf7f9eed5062bd14cf1462705f55abfdefefd9930b1436befd7489839dbd3b63cfeac01d383d5b27b7a
+EBUILD lsvpd-1.7.11.ebuild 574 BLAKE2B 20b45740c87d91ba4393af9841b77bb41d624a416ca82cb04315f8319f5788535d76c189e340bd167988d4038922944d11d2438502a6859c7f2c90390149875b SHA512 2575ab1d7c815bf1a2fe10334cca7bf52c454021fe30f96dd064372bbc1c79e7efdfdb9646e7636462c441c11978892a67e832a4bc6ba38e96636ebaca133912
 MISC metadata.xml 988 BLAKE2B 1029729819fe1c2f8b197e27a127de88fb0a72cd6671a27cb08effdb81108b2be892860bc97012f6cb903d509ca3eb9fe4bf0f59c0642f93b19e0f453e7f276f SHA512 f20dfdcc425ead51943d39d8a5dec0f38baa023cd204a446e63f0f50588d51519a83af3fb6004ede20aa0d0d63ef5d9523d491759fc849951fbceaf96bef254b
diff --git a/sys-apps/lsvpd/lsvpd-1.7.11.ebuild b/sys-apps/lsvpd/lsvpd-1.7.11.ebuild
index 8dfb6ff3bd44..ee450bf1b3be 100644
--- a/sys-apps/lsvpd/lsvpd-1.7.11.ebuild
+++ b/sys-apps/lsvpd/lsvpd-1.7.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~ppc64"
+KEYWORDS="ppc64"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 5a20caaa097c..0ec47895dfd1 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,7 +1,4 @@
-AUX moreutils-0.63-respect-env.patch 657 BLAKE2B 2f33bb68f3d23f0fa45849fd5d5fb63f8cdbb27b3c28eb92e132d632aa0b9487ecf85c9b9cdfa2bcebc009be4a5ce5da2407742b02f52352dd00a88f84ba1eff SHA512 e9cffcba65d224daa5bba7f15d9e8b39cd18ac2f0e25b91aae6e49017b8c6edb4eff1458c68832e207ec5ed4bca193df3f01ddf4851639509c70cdc967befa8a
 AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee92def3df7cc5bb74b476ae8172924421676bec09f6c74a59d7b07b82382e57b502088d75e5c365a5747ee7d38e8ba3c227 SHA512 db1ff22fb8a6284bea95488b71c456353379d4f9b4142f62ad7371e2546ff82fae6e7e2fb4be2e5b018d475ef5d19c677059cdb171d882e9c7a3641ed0ce4647
 DIST moreutils-0.64.tar.gz 92741 BLAKE2B 3e014a18a3b7615bcd83fd9b0a1e3010a059aae154395c2c1158f57634fe83c27503dc3aff1e116743cf80fc73ee2063ea60b03d4bece4119b962669095c71dc SHA512 94f131b9b02a8c1139dfe34abacab022687f51413c529288f57fa876676c028e200324ed855b910a7dbfb4290eb8b38b3dc182eda49988f521a550162b0a0eec
-DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b
-EBUILD moreutils-0.63.ebuild 1506 BLAKE2B 279f0854c3238f533262718720f4e7cdccd69ea46b95095e81787f982418910384de1c202cf6be8404ef657eb1eba6fa60ca8df535a6c594f93c0ccb75b57394 SHA512 fce87829894fb3c5f55e82563568a280c010237e8fb011f1528e5e7660dbd421b2eced669a6ac9458e1eb62fd0041bb488d88f7a0bcbe8a563f688451749bd8a
 EBUILD moreutils-0.64.ebuild 1692 BLAKE2B 83d6a26ec6dd356f2a2a1613ded2c63847077b2c88e4153e725451cb25ec7f79c184736141c667112b8f46da2608535692882dff16cb269776be894131f4f0e5 SHA512 51bf783fac4952b980d89d73b239a6f098b6bc85cb8a1f97ff871e827370069d29ca42bd2ef5ba3db8ea22b257f581da0a9ab592aeb4f4d7e6e49bc860be2c7b
 MISC metadata.xml 313 BLAKE2B d0cd446eb7516dec44ac4eb8a73d268652317a7dd1b3531f9e69341ae5a768a2dbc554fb577d499d139a684d190c400c08b5a14023c1a0db03cc599321c651e5 SHA512 07345c6cea216cf9e7043eab1a33cdc9bd9bf52adb5a4019afa401faddfbf0129f2297d01e2a9595cf9963e55ba53c4496b7ab79a9c33be85fac18ca60220a3f
diff --git a/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch b/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch
deleted file mode 100644
index 45f85b1988e5..000000000000
--- a/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/is_utf8/Makefile b/is_utf8/Makefile
-index 4ebf8be..f0a111e 100644
---- a/is_utf8/Makefile
-+++ b/is_utf8/Makefile
-@@ -37,14 +37,14 @@ LINKERNAME = lib$(NAME).so
- SONAME = $(LINKERNAME).$(VERSION)
- REALNAME = $(SONAME).$(MINOR).$(RELEASE)
- 
--CC = gcc
--CFLAGS = -O3 -Wextra -Wall -ansi -Wstrict-prototypes
-+CC ?= gcc
-+CFLAGS ?= -O3 -Wextra -Wall -ansi -Wstrict-prototypes
- 
- $(NAME): $(OBJ)
--	$(CC) $(CFLAGS) -o $(NAME) $(OBJ)
-+	$(CC) $(CFLAGS) -o $(NAME) $(OBJ) $(LDFLAGS)
- 
- IS_UTF8_LIB:
--	$(CC) --shared -fPIC $(CFLAGS) $(LIB_SRC) -o $(LINKERNAME)
-+	$(CC) --shared -fPIC $(CFLAGS) $(LDFLAGS) $(LIB_SRC) -o $(LINKERNAME)
- 
- all:
- 		@make $(NAME)
diff --git a/sys-apps/moreutils/moreutils-0.63.ebuild b/sys-apps/moreutils/moreutils-0.63.ebuild
deleted file mode 100644
index 616df9ea930b..000000000000
--- a/sys-apps/moreutils/moreutils-0.63.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="a collection of tools that nobody thought to write when Unix was young"
-HOMEPAGE="https://joeyh.name/code/moreutils/"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ppc ~ppc64 x86 ~x86-linux"
-IUSE="+doc +perl"
-
-RDEPEND="
-	perl? (
-		dev-lang/perl
-		dev-perl/IPC-Run
-		dev-perl/Time-Duration
-		dev-perl/TimeDate
-	)"
-DEPEND="
-	app-admin/eselect
-	doc? (
-		dev-lang/perl
-		>=app-text/docbook2X-0.8.8-r2
-		app-text/docbook-xml-dtd:4.4
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.63-respect-env.patch
-)
-
-src_prepare() {
-	# don't build manpages
-	if ! use doc ; then
-		sed -i -e '/^all:/s/$(MANS)//' -e '/man1/d' Makefile || die
-	fi
-
-	# don't install perl scripts
-	if ! use perl ; then
-		sed -i -e '/PERLSCRIPTS/d' Makefile || die
-	fi
-
-	default
-}
-
-src_compile() {
-	tc-export CC
-	emake CFLAGS="${CFLAGS}" DOCBOOKXSL=/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
-
-	# sys-process is more advanced than parallel from moreutils, rename it
-	if use doc; then
-		mv "${ED}"/usr/share/man/man1/{,${PN}_}parallel.1 || die
-	fi
-	mv "${ED}"/usr/bin/{,${PN}_}parallel || die
-}
-
-pkg_postinst() {
-	# try to make sure $EDITOR is valid for vipe (bug #604630)
-	eselect editor update
-}
diff --git a/sys-apps/mouseemu/Manifest b/sys-apps/mouseemu/Manifest
index a180b8b50c52..a3c2915ac3a4 100644
--- a/sys-apps/mouseemu/Manifest
+++ b/sys-apps/mouseemu/Manifest
@@ -2,8 +2,6 @@ AUX mouseemu-0.12-fix.diff 1715 BLAKE2B 304d966a994d535b71b119ba4c0e01149e34c46b
 AUX mouseemu-0.13-fix.patch 707 BLAKE2B 6c0eaf3573d856899a43cd435d2c8f59434ab927f2e0c297d6db1da2bf16134344b59ffa2d9c0a61e245f02827a43a159346fef5f2a597e6de8706c2f41af830 SHA512 dfcd90a8e300d98e85ccb16455989a2a8e31f9b782887834e5ab3491391f0a681571f438e808860e095639e95fef4fbfc7f8d1c0edccd4b7b5d9bc915facfc87
 AUX mouseemu-0.15-build.patch 191 BLAKE2B 419963f29c2513906d0ef5f766fe2142e875684055a03726a9e4cb49f3ef39404e92cd7bcb8dd022fd355e22c8da09da1f081ddfab3effbe9beaa83d138c0acf SHA512 e0c55d7b77b18bfadd0b060d9fb6dd534e0fdf3cbcf5768262d8bdb8c26c0beb976c2c000bdf6cb9b26781dfb0e3dd5bb99cd005e34e49cfb0147ab4b19800e9
 AUX mouseemu-0.15-openrc.patch 228 BLAKE2B a05e7fdfb812f800b1c372fbf1d2f27d6eae5f476ae4fe39baee92208220d85e383c407e65f7d4d62aaa2385db2c5b5e9f49523844a6bfe9d15e00fef05ffadf SHA512 e26a9749c777852eb1a0feb5c15f6ed64635f40264e6065b4e9a7fb450db53357132e08b522724ae63735720d24fe92431f9a31d9b5ae2023783fc45f882269a
-DIST mouseemu-0.12.tar.gz 12019 BLAKE2B b4442cbfaf5c950a1ce690d7faabd1f92b7a2ab08fe5ddc86194c70039d92b5bbc54c33ee5d0a9896235c47fc12c52be1583740488637dc55cce078230c7df80 SHA512 192cb502d93ff6347082769444205597ef18f62b901033a9987f70c80b0f59fa0de2d79dc73ae2b04a90321842035549ff0d9c2f45284a2dc8324a944e85f514
 DIST mouseemu-0.15.tar.gz 13958 BLAKE2B 2e27a901309897a208875ab737843ffbe2f733a21daa9bcf0a6c45aea0403898edc4f1aaef7c3fc0243627e09101ec73672b937b4f5fdf3ff25a0b4c6520e30e SHA512 7a6cbb0526a9ca51632d589bf873adb182c02f4a666cf9e94cedba9499d6c6cc1ad2ac7e5a482d22949e64ad69f04f444cb0fa78ea728c5653989d150f62918b
-EBUILD mouseemu-0.12.ebuild 900 BLAKE2B 71fe1e4e195d0070b724bd6bd5f0f64ff927b05a2a36006a280735cda8d21097730e26e08394a457032a1d60917b0d4134d71955b8090e4a896c1be3aa736357 SHA512 bb56047eb2d14bbcccf4f2c269cb2d3897647a020458c67c295ae6031772b13df30e5f94f94dba84fcb0f5a8d825513ad068175ec871ab5557c1794671f4b5df
 EBUILD mouseemu-0.15.ebuild 985 BLAKE2B 9e47f537c0d12a8b28d5a8b7b112597fd778f632d4adbdcd5bcff437d0f52bed1d0757d1c6a3bb216aa63d3c5b205916cc233b6e0934cdabe61826f0713a9f52 SHA512 b2b1e40fda25c1d85d2f771da7de49ee0b759ab790e17875aabbf13d32b45e853600505f71baa5727b2fb97c0dd9ae1a876b3bcac503f5a38466013d1aa2fdb9
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-apps/mouseemu/mouseemu-0.12.ebuild b/sys-apps/mouseemu/mouseemu-0.12.ebuild
deleted file mode 100644
index f7dae0998f94..000000000000
--- a/sys-apps/mouseemu/mouseemu-0.12.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Emulates scrollwheel, right- & left-click for one-button mice/touchpads"
-HOMEPAGE="http://geekounet.org/powerbook/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}"/${P}-fix.diff )
-
-src_install() {
-	dosbin mouseemu
-	einstalldocs
-
-	newinitd mouseemu.init.gentoo mouseemu
-	insinto /etc
-	doins mouseemu.conf
-}
-
-pkg_postinst() {
-	einfo "For mouseemu to work you need uinput support in your kernel:"
-	einfo "        CONFIG_INPUT_UINPUT=y"
-	einfo "(Device Drivers->Input device support->Misc->User level driver support)"
-	einfo "Don't forget to add mouseemu to your default runlevel:"
-	einfo "        rc-update add mouseemu default"
-	einfo "Configuration is in /etc/mouseemu.conf."
-}
diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index 09394ee0be86..2a305aa52eb9 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -1,10 +1,8 @@
 AUX flags.patch 1057 BLAKE2B 4b601dff49cfe1d82cc32b2fbb0c32922e9f049e010d1403b8986ed5d6e2d8d7c6550c1f08d184327518b71b461aa181b1b4230704dfaa993828c7a2be5d8ce5 SHA512 fd17023c238598472d8e590f2bdff75019c1c6cf76215fa54a15de7089e4f0c89259bdc99fa34147d3dbe2e1572989b6d0814ff99a859635975f627575bc1075
 AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06
 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459
-DIST opal-utils-6.5.2.tar.gz 2082426 BLAKE2B 20256f13f95da73bcccae670627c9786229e756183fad33ff45ecf2d91f1039c73a0f881b3ac794abad35d51b7bef0b780bd0f8260818c84a262ce7bb0c45b2e SHA512 765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091
 DIST opal-utils-6.6.2.tar.gz 2121790 BLAKE2B 3f1ec80baa112ba0d01fcb9a64b45592da03addd067484ef237204fd712359c04796353f47a32ac943e0e135a580c3c5ad7a5843ee4d5259cde3cbaf1bbefcc4 SHA512 a864e4120ffac4065b89d5da7c959ac20643be42e83f4186a778355f3ea0b36cbd1e02c91b1460b6fa6550fceec9034cce096b89f840b4051d65c7f0ab70dc27
 DIST opal-utils-6.7.tar.gz 5320182 BLAKE2B e2fa86a7d5d96afda8f8266875687fb3c2e61ca2932ea5585921b2e5cffe30cb3554d85d078448cda032cbc0438d188ea40b5aad6e7f4c923e77fa4e42e6f364 SHA512 1626d64554c608cd823dc27b58f35206cf6d011afde124746e06fd5f1e8c714c199d9f2b60417415daf01cfbc46208d08d49eef29538a515b539a551b8c5e5c3
-EBUILD opal-utils-6.5.2.ebuild 2445 BLAKE2B 20e09470fc0dc469ccfb06b3b620141279cdfc61876978b5ddf0b5ea2c0204392dc814ca2bc23be6e90f8439ff456b488f551cdc13349806a85804c70dc44fad SHA512 4c143e7311020e7c908b393665c283e36e4cb6c5d06bd082fb95209a7e5385ab3bdec1d21ff2a2d6b52965e83e294574208bbc46508713c5bce518deeac598cf
 EBUILD opal-utils-6.6.2.ebuild 2815 BLAKE2B 1d8e59b670f9ccc280ac0b0364fe3a9dea1ef1b965d4f7e8560578042f4bb9c0bdb32cb0b88d79df670d57e96ecfe874e68d65114d9dd77da5ef6e6d608f2791 SHA512 f296e23759af240529158ae714604499945d42303ebd1b674b890d19cc137fdbbafbabcb16dc519f537f99399bba629c151ccc34ae33c144479da4183c61489e
-EBUILD opal-utils-6.7.ebuild 2476 BLAKE2B 31186be829b62c2f49520382e8fc4a4093185ee1e558ef139aa8df987b4149ac03c33e27cb1f9f93a153fc1c0507e03d2383548a04b463bbddadf5d8cb4b16c1 SHA512 d977bda473e459f38f81d5f5049c7c2d432a04c5a4be1509cfff41c15800f14b7e86486471ae33a5bc6cad4a4fd8df6d9ca78020b5db12b5148d59709cdd53c7
+EBUILD opal-utils-6.7.ebuild 2475 BLAKE2B f66986e47b09c99ea39692693924c9ba68d5a2c5bdb10df9d4161893674487fbcb5f6cef75a07c29339d9bc319c15a8f097d5383dce970a6a24bb28c987fd2fe SHA512 64aba18d510666ad96f265414647bce74a1063fa29d2319b215acc44d913e16df69cec1a0d70f8f3be84428e84a328b64e64babab0b31313079b49ed427e8bb7
 MISC metadata.xml 1099 BLAKE2B 8715aef2781f806a58a094125d7c3ca6189a27a4d4c52ff6286905975a6b688921e09519f9968bb243c216611bab2da6507775c86e5e7293b9412d46ee7713da SHA512 d159348f48be29e96a84845474b1c6286ca29df1d62bec79a1a3385e89be0ac0b84a3465c41e769e447ac5598a189564f5e3e638668ea8c876b6899a1cb33666
diff --git a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
deleted file mode 100644
index 805fc46be850..000000000000
--- a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit linux-info python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="OPAL firmware utilities"
-HOMEPAGE="https://github.com/open-power/skiboot"
-SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="ppc64"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="doc? (
-	$(python_gen_any_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-	')
-)"
-
-CONFIG_CHECK="~MTD_POWERNV_FLASH ~OPAL_PRD ~PPC_DT_CPU_FTRS ~SCOM_DEBUGFS"
-ERROR_MTD_POWERND_FLASH="CONFIG_MTD_POWERND_FLASH is required to use pflash and opal-gard"
-ERROR_OPAL_PRD="CONFIG_OPAL_PRD is required to run opal-prd daemon"
-ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
-
-S="${WORKDIR}/skiboot-${PV}"
-
-PATCHES=( "${FILESDIR}/flags.patch" )
-
-python_check_deps() {
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	tc-export CC LD
-	export OPAL_PRD_VERSION="${PV}"
-	export GARD_VERSION="${PV}"
-	export PFLASH_VERSION="${PV}"
-	export XSCOM_VERSION="${PV}"
-}
-
-src_compile() {
-	emake V=1 -C external/opal-prd
-	emake V=1 -C external/gard
-	emake V=1 -C external/pflash
-	emake V=1 -C external/xscom-utils
-
-	use doc && emake V=1 -C doc html
-}
-
-src_install() {
-	emake -C external/opal-prd DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	emake -C external/gard DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	emake -C external/pflash DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	emake -C external/xscom-utils DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-
-	newinitd "${FILESDIR}"/opal-prd.initd opal-prd
-	newconfd "${FILESDIR}"/opal-prd.confd opal-prd
-
-	systemd_dounit external/opal-prd/opal-prd.service
-
-	if use doc; then
-		rm -r doc/_build/html/_sources || die
-		local HTML_DOCS=( doc/_build/html/. )
-	fi
-	einstalldocs
-}
-
-pkg_postinst() {
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		echo
-		ewarn "With systemd opal-prd.service will fail to start"
-		ewarn "with 'mmap failed: Operation not permitted' error"
-		ewarn "if /dev filesystem is mounted with 'noexec' option"
-		ewarn "see https://github.com/open-power/skiboot/issues/258"
-		echo
-	fi
-}
diff --git a/sys-apps/opal-utils/opal-utils-6.7.ebuild b/sys-apps/opal-utils/opal-utils-6.7.ebuild
index 52c2ae8fcedf..45a1a17db0b0 100644
--- a/sys-apps/opal-utils/opal-utils-6.7.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0 GPL-2+"
 SLOT="0"
-KEYWORDS="~ppc64"
+KEYWORDS="ppc64"
 IUSE="doc"
 
 DEPEND=""
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2d67d412e968..4a47bc2edc9d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -16,6 +16,6 @@ EBUILD portage-3.0.11-r2.ebuild 8785 BLAKE2B 735df2fdb2481176693a377fe9aeda86e31
 EBUILD portage-3.0.12.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d
 EBUILD portage-3.0.4-r1.ebuild 8527 BLAKE2B 631108e364ee22d284e334c5c641f4e807375ac75804a7c3099837d94a74f4c41cbbaf6ca365624516f858ee68c07b8551a3c1c9f1950f6352d0186db4bd28c6 SHA512 8ff2a857a31c283408b9d8a6f5d1a984c6299ccd1b7f8eaaff2e3b5f3b1dcc62f32bee8dbc1496a4a75e836f4772f91a295a23facb005d035c337032ed63d6a1
 EBUILD portage-3.0.8.ebuild 8379 BLAKE2B d2c21e67e7e182c79c0435033dcafdef239a28d4108a953a74839bd6cd8fc83076bdd324f35cc2d64028c13f6a9b4bbb6a725b3f797be035e1a0710f07a9e980 SHA512 b000f7461b73ea27b71e228df180f7cca078890d93a89f8c835986e49eba31d9faa1b6ade34db6aa9e35a4fb9cfed05eb104611e9952dbbd6f99cff41f75b850
-EBUILD portage-3.0.9.ebuild 8378 BLAKE2B 6d286cf9502773ffe070393836d1bb524e1e7ab5ae23106f1bebd4b1e407ff674387681bc9134e03439f8ef0b6d95fe5fff4855d4df07227eb60e19d522eba62 SHA512 0274d6dabbc5d1cc25bee61483a53d6e5088a432984a8961f3631f010aada1e55082d766f180eeb5acf251c3d5f834957e24120c62bd19e2ceee328ab40818f2
+EBUILD portage-3.0.9.ebuild 8377 BLAKE2B 8c9826354e9e3ca8633f20a14ce5e861b1d2b117b0c2dd33bc097692c4193065404aaa6745029c6cd07692d2d6c0ac34415c3e4048b655dbe2240374c25a1f00 SHA512 b22a6a04a419b935fd02f34140918f93dc9c28a4d8cdc59e97d1c5e696ff877901c6054cf859b2a203a9ecb6d632230cd6583d970f4cdcb97e0e2e732c61ddaf
 EBUILD portage-9999.ebuild 7417 BLAKE2B 088bcba17cd3d8451e04fa5a2a5e71ea237cd976b9cabbe157822e14b58bf283e628227c1807d5eed2f88699476f312745540bbb5c15ab25089844d4436f9e71 SHA512 bb43ac625afdd22f52cf5d4c45be1512ee56d14cb4ded2cc0c0680d22869836290a09ac09e88967d3e54b6ffd21e0dd429c8cc7f64431617f11e6645d396a020
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-3.0.9.ebuild b/sys-apps/portage/portage-3.0.9.ebuild
index 7625b8e90651..57013e8f88d2 100644
--- a/sys-apps/portage/portage-3.0.9.ebuild
+++ b/sys-apps/portage/portage-3.0.9.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-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"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/servicelog/Manifest b/sys-apps/servicelog/Manifest
index 3c87845ebfd0..361f59ae110d 100644
--- a/sys-apps/servicelog/Manifest
+++ b/sys-apps/servicelog/Manifest
@@ -1,5 +1,3 @@
-DIST servicelog-1.1.14.tar.gz 361289 BLAKE2B 297c03c7d97295567c988eb2080554dfabb3becc159be4cf21a4c431698baa9e50f2af063b274341ec9b9cfd2664defa0aadb7169a518a4cb62b059c0f051cdd SHA512 d7b5e4089f258d69a7a07a46e43f1083fad701a917c150af8b68542db26348c0160dbca6c0d94aa68eb7a4b77139a763780c1af8422b785009567489a5e587cb
 DIST servicelog-1.1.15.tar.gz 29097 BLAKE2B a2ae131305ce466999536fca6734c006eafe70d8be16c5a8465f6ceb7ffb53cd06d82fe7229275f4e71ffddf7a572a214591aed59a6345f81c3f65dbe205cd1e SHA512 5d5142aeb947133fb8ae77d5021790ab530d4614a8becf018342e1feeded2f64302343189d4bd4d684b096888aad6f45e08861404bcc5437abeac078fbbb7ac6
-EBUILD servicelog-1.1.14.ebuild 432 BLAKE2B df52a6e6512b6b9e8f117e101a16b8073ff7fc05fc89c5ead73e819e518fba638a84dac8f67207995a12c76c400485b9c5ab1f2466686541b62b2558e86d4075 SHA512 420aabd7282cef8b0e91b567e16b8c8a8c817dee196c131d7eb9b31a6740afd30fdc41bc8f7b14c6e9ad9d1c221d3cfebadbc52fc392a1767de9fe473f3d2d54
 EBUILD servicelog-1.1.15.ebuild 520 BLAKE2B b94d9773d4dd5ae6a998b973e75411287fc2591a03178571375324b962b398ceab6c635773b8ab2a261306050f5f89796991af47cf35bd9de304c8e0f805e86f SHA512 4686394f0074f960c1e4d8d3ac0ca56e4c92ab7bf22ee748fdfaeb2695ff2d3bc2be315a41edcc52e25477beee8b99f8e0b8f4fb689038d59cb4bd0ca779c9e0
 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710
diff --git a/sys-apps/servicelog/servicelog-1.1.14.ebuild b/sys-apps/servicelog/servicelog-1.1.14.ebuild
deleted file mode 100644
index 943f3ee6ec8e..000000000000
--- a/sys-apps/servicelog/servicelog-1.1.14.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
-
-DESCRIPTION="Provides utilities for logging service-related events"
-SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
-HOMEPAGE="http://linux-diag.sourceforge.net/servicelog/"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="ppc ppc64"
-
-DEPEND="
-	sys-libs/libservicelog
-"
-RDEPEND="
-	${DEPEND}
-	virtual/logger
-"
-DOCS="ChangeLog"
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 207694681f41..6fdf2e7dd0e1 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 580b932fd6d3..82daa9ea9e38 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -5,7 +5,7 @@ DIST keystone.conf.sample-18.0.0 107458 BLAKE2B c1d826acdd671638fc4542864811bda8
 DIST keystone.conf.sample-2020.1.9999 105293 BLAKE2B f0e685f99ca3b6cdfb9ccd0b41709bd6c51cb4aa79d20fa12773f96cd6ecad730691cf7fb2384b0ab44787d6e2825c5f147310ca19d82a2adb6cd2ab623b52f2 SHA512 fc7e7272b1a0f8703fe8ec8f93208573b84a2121b55de919beb05c7bb7dd3542c71983dfdc73b7cb618eb68167e6c6a51aa8384839ae3503c677e17ff030f383
 DIST keystone.conf.sample-2020.2.9999 105293 BLAKE2B f0e685f99ca3b6cdfb9ccd0b41709bd6c51cb4aa79d20fa12773f96cd6ecad730691cf7fb2384b0ab44787d6e2825c5f147310ca19d82a2adb6cd2ab623b52f2 SHA512 fc7e7272b1a0f8703fe8ec8f93208573b84a2121b55de919beb05c7bb7dd3542c71983dfdc73b7cb618eb68167e6c6a51aa8384839ae3503c677e17ff030f383
 EBUILD keystone-17.0.0.ebuild 5508 BLAKE2B 8779e0f11ccdd028b6db17d837e7b6c5663cf018737c728ea6e0396234a06676446c3087d28c004ea5a25c5af1c157f903d7d3b65ffca0b05596a94014245876 SHA512 e70b26e703b47948099f156ad6031b29d2df99a3e17057897a8530002fff9a314c94e20702881f3b98961bd233f47a2de8f8f0ea0fe30b25c281d01e25ed96c0
-EBUILD keystone-18.0.0.ebuild 5517 BLAKE2B 55b1c4231cc1e012cb76ba4cd8bd6e198fd5261881cfc45ac8350bd39bca758d5db52d5aa83adb1a5774ecbcf072d27d18682622542f69c1f66e4c0743a35486 SHA512 c8461b7b509acc14a534b752cfedb656220f0e4690cdaf6d01791d3c94a5bbda0ad0758fad678013a371940c0ef146cb4ff54fd139f9ca64fa361430274c59b2
+EBUILD keystone-18.0.0.ebuild 5515 BLAKE2B acb04c4c53147a0f0d52720ec829ab2f08ae978d99b99faa150c162c1b9d64c962c171d420c6baa72c7415baf4b9e726e4f404c4a1330d2b364354a0f96b120b SHA512 32ba5d6dc50fd4b706e852f43ac6856f3280d2c03222b4b79fe056fc05be570e28393b131233e1a2251b73f731579d6c91a1f05090187af75e93966a629027eb
 EBUILD keystone-2020.1.9999.ebuild 5510 BLAKE2B e122338074aa33c3ec97d483df5d3c75bb72575cdb59543f33b090bf29b9e1dfefe24a1a2296b5b6455423234f49f4dc04f18e5fcb07310ab8a2ffdb2bb61abb SHA512 a9328e60a80c112041ee2798b7f2106f1c937003886d9d73326cfad19f4fca9b6cd834415ec7a42f156ef10f835a420c6488c8c6d67b5ef923eb6c7517063e9c
 EBUILD keystone-2020.2.9999.ebuild 5517 BLAKE2B 55b1c4231cc1e012cb76ba4cd8bd6e198fd5261881cfc45ac8350bd39bca758d5db52d5aa83adb1a5774ecbcf072d27d18682622542f69c1f66e4c0743a35486 SHA512 c8461b7b509acc14a534b752cfedb656220f0e4690cdaf6d01791d3c94a5bbda0ad0758fad678013a371940c0ef146cb4ff54fd139f9ca64fa361430274c59b2
 MISC metadata.xml 654 BLAKE2B f4ab0710d9df108ad25c402094d8586777b892ac135a5cb690f54a1656d77bb8fac1283f687b65a86bc3eff1ef77e11b3e5899f36f135f4b0d88f445135e21dd SHA512 01f0b211a0560c451cafb7653790b8f84930c542713637ba6305a536d65103bb54e80d66dfd12daecfbb189b33825393ea13b4cc19d9733a09478920165e3f6e
diff --git a/sys-auth/keystone/keystone-18.0.0.ebuild b/sys-auth/keystone/keystone-18.0.0.ebuild
index 875d600dda54..d09a91b28159 100644
--- a/sys-auth/keystone/keystone-18.0.0.ebuild
+++ b/sys-auth/keystone/keystone-18.0.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/victoria/keystone.conf.sample -> keystone.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-auth/pam-pgsql/Manifest b/sys-auth/pam-pgsql/Manifest
index 9724d0b44f36..27584cfaea9d 100644
--- a/sys-auth/pam-pgsql/Manifest
+++ b/sys-auth/pam-pgsql/Manifest
@@ -1,3 +1,3 @@
 DIST pam-pgsql-0.7.3.2.tar.gz 712533 BLAKE2B 6841505963310f5192aff3dce4d7d0ed8dce18bac629bd9338390794bdb6a0a2dd96b96a55660b5fcb6a34ebeeb8ef4024ce1203321508e027284fc8e94df3c5 SHA512 d5766e56a13b0b4762fba10d624d12f130f2675f1f1772eaaf275b599f44adcf98287c2636462ba3faf46af139eb1bd157918c0c783040796562f37dec17a6d9
-EBUILD pam-pgsql-0.7.3.2.ebuild 1216 BLAKE2B c995d29299e8d00e100a9357c5864c726e85ee7b9fc3b7a328a9eddba4aad7ff57f414616cd13d318158175fea33b6ae4db3b04f3f727cbe9b4eb2c7f033de1b SHA512 bcf5c2080147d0956d9b64fbb195fd69d239bad79dd179627b5d52c6fbaab8874c5fc0e9f6d3deb8ee25887c4267574a9e9a0b2eef9f3c079646239867c53ba6
+EBUILD pam-pgsql-0.7.3.2.ebuild 1174 BLAKE2B 0f35f65f70a7d22d04733f762ce9108fbea253cd1325ef31ffe1720f2c23acb159fda7e2c54d65f18820c769afbb6f01fef325bd08394d41c2d086ab6789d076 SHA512 2608b01a8412bb83d0fa91c7d9747a26970d2e7462db12aaf33efe671ef91689d65a2aa7a148b720e32be8f71c930c757d053e4540b881e03aaf642efa625007
 MISC metadata.xml 246 BLAKE2B 850b5402f188737f73aa16633a584d3f88d79e37a372857a3ecd6b7afb081a1b6d11a4c8edc74163410833a45d49a45fdeb6a3662e964d04670d13ba5cd0fbbf SHA512 1ef684533eaaf13fb66f13b4e9f340b4d2984d50b82b021c91a08c14cb1542d09701fa3bfd07a81a32f6b6a5c347e025feb102d0a7092f3727ad72c2f75c245d
diff --git a/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
index cf69a6bf4c9d..56bbf56885ef 100644
--- a/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
+++ b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.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"
+EAPI=7
 
-inherit eutils pam
+inherit pam
 
 DESCRIPTION="pam module to authenticate users via PostgreSQL"
 HOMEPAGE="https://sourceforge.net/projects/pam-pgsql/"
@@ -17,18 +17,17 @@ fi
 RDEPEND="sys-libs/pam
 	>=dev-db/postgresql-8.0:=
 	>=dev-libs/libgcrypt-1.2.0:0="
+
 DEPEND="${RDEPEND}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 src_configure() {
 	econf \
 		--sysconfdir=/etc/security \
-		--libdir=/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF}
+		--libdir=/$(get_libdir)
 }
 
 src_compile() {
@@ -37,7 +36,8 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" pammoddir="$(getpam_mod_dir)" install
-	find "${ED}" -name '*.la' -delete
+
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/sys-auth/pam_ldap/Manifest b/sys-auth/pam_ldap/Manifest
index 270be8fbaad0..063d5f032b3c 100644
--- a/sys-auth/pam_ldap/Manifest
+++ b/sys-auth/pam_ldap/Manifest
@@ -1,3 +1,3 @@
 DIST pam_ldap-186.tar.gz 163437 BLAKE2B 4e917985b78349283c891daca94935792f2316afc08cd694edb7256c89a7ed612a62ba4b53111fc2022f6e11f754103bf58ac0a53a4298b011a5379625c51cdc SHA512 aaa6fbc48150db53bf92dcf600bcb8f0526baa2e6124f46468f59958c8a91495eb003d16a45b659c8cbb2d3481c4732a0d1f5945a2c98c09549ef8a51ed18a3d
-EBUILD pam_ldap-186-r1.ebuild 1107 BLAKE2B 7b061ebe4818c13cbbdcd9c5ff459b0a422bb46e6150c9b85b0103cb72c95ee63c3337c4e5b0d2423f35026958c9df5b4a6e08b454f397c2fcdf69c7f2acfd3c SHA512 687f94e43ccab6c0daf45b09b139d98840044a36fc3809511a6a6b80c1066db795c27e0f6e7011ef04d2ed0c583e33eafcb188adb187316b8b8f87dc0bc7851e
+EBUILD pam_ldap-186-r1.ebuild 1078 BLAKE2B 79106aa5614b939c8e3d629ad39c94cbf3f7809f5ac7a7118e6c42efb1e5e19cd17fbb2011e0dc701ce64e5dcf0abfb564d298c637e79ab0108ff2379218e5aa SHA512 4df60d7c47aea1a7a0f3f74073f9bdf30093260c77d135a3c1d6c63632de2e08e4358472c85771f56a7ab0a0efb3177b3537326cf355309b9a5f2571461bbe48
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild b/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
index 0cd43d581f46..8c7afee1f10d 100644
--- a/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
+++ b/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib-minimal pam
+EAPI=7
+
+inherit multilib-minimal pam
 
 DESCRIPTION="PAM LDAP Module"
 HOMEPAGE="http://www.padl.com/OSS/pam_ldap.html"
@@ -13,10 +14,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ssl sasl"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-	sys-libs/pam[${MULTILIB_USEDEP}]
+DEPEND="sys-libs/pam[${MULTILIB_USEDEP}]
 	>=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}]
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[${MULTILIB_USEDEP}] )"
+
 RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 19a2b52fa79b..b3a39fd3e08f 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index d52acfa40956..a019dd705e35 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -11,6 +11,7 @@ DIST storcli-7.1017.zip 36266095 BLAKE2B e1bb4c6bbd19712530fc8d3d7917bf943221f12
 DIST storcli-7.1211.zip 36988201 BLAKE2B 487dda0c78af60d96dc6eb8bc0c7074dd99719acc4faf10027430ea80a5d1cb76e6bdc9eaf0931967c5cdf10d80ee824f45118144bfc032a4ddce52d678df354 SHA512 f28ae41adf2286153ecd57f7d022940069356c9636e45aaae4ae45215487bbb8e3dea51fa4aa00b9e9340069036c1be21b186ce177e0fd0a6a0bb786cb58181f
 DIST storcli-7.1316.zip 37136466 BLAKE2B 7bca2e1b330f40e66945567ac8fad04d448993ff7ab4a4d846a0b6142fbe3988ab00775aa3897e3268e30b34cb7659e96f75d2383d3e85e4bec433edde5ba17e SHA512 049b34d44bb1140ad804f6bb6d8fb133ac9bbc4aface721051e713c7a1056acb0f894f4f4793ef9e02e48958a745d12bc5389e7e763716c780fb1c2c387e34d6
 DIST storcli-7.1410.zip 34424559 BLAKE2B cb0b613d0ccbf6ac36d1aace9174286ffe89d0602c7bca3b2712abcdba1b82cc2498de686e815e01fa125920c94d780e2f7fa4ab2ff570dc42818f4c4f491da4 SHA512 4887d434757f15e931c3c3c57b2316fc0cf0a5284c6009601b58c9585b73f9b9c9a0318dd3c4472cd3578aa5ec12b641a371db1d726a637741f6f0b34dd1f3e7
+DIST storcli-7.1508.zip 35678755 BLAKE2B 9fb8da35be491afaea3a288b5c4c1ed0806fa9d6831e9a6dbf14d4c00469b1ce6e9d8fe9a98ce64505580420b5c145f002338d3029794af4c54779d9f324ec56 SHA512 43565cc695e9e7a7725474ab8091ea00de8fde7fabffe708c45e4c0e8713b1fcb1a5a25963bba44974b7787bebc06a59f3b8180416fefb0a54b4fd403c6152be
 EBUILD storcli-1.19.04.ebuild 2061 BLAKE2B 4325ee37d40cec579ec666a21729c157992db6e71dd52ef0686dd555be2d3fe3b6aad15785427b65dbb0b677a1ce80079a0d08e2fb871d10d230a1bc5d867149 SHA512 f267f5faa8e9d3951b3e166915c9cb090702ae0bf751d923e8206ce73628bf82777965e156e40bb864434b1855af3488bcd5c1ac7748537fff567a2f5964a083
 EBUILD storcli-1.20.15.ebuild 2074 BLAKE2B 8b6fd28e3be1b8895c393ce38d844d85a9d80bca8d8c58be6c7e5f4a8c3560bc219b5e3a3d891cea6a2d274762319fd18c44e3200aa1238abb6a4cd5d2a3c5df SHA512 07da506f5535aa55195dbc8ca04564e7e88073cc61a2ec94f513ce877b156618c8092290793558495ff339273dc8d1b9f02ed07cb35138ff4fdc2301ee021564
 EBUILD storcli-1.21.06.ebuild 2667 BLAKE2B 71249f138b350ca36f6fec6e64672ce923b80e982baac3666e844bd98fcd7ea18c3527b14299f05a9b8c720b3ea39cd25abb4c3bd1d3394bec4ce281203d9c23 SHA512 657a80558476e4134fc2821c5aa9f8de0b3dc6ff3ee38a9385be538f310006d725b52683fd56ead278eb92c57413d3a3096fb09792af93854248cc9aab69c598
@@ -21,5 +22,6 @@ EBUILD storcli-7.0709-r1.ebuild 2345 BLAKE2B 3a03247560eceebed6c1413850607eb7c2b
 EBUILD storcli-7.1017.ebuild 1806 BLAKE2B 31822ab31c50bbb0cf00bc126479888a1fd199a9304ab891f4c0dda0867c9f1e4aca7c62b484842e3bd84dee8ed57f7a1ef270b987fcc0156dc168d1ae033819 SHA512 abde801f76ff804ea33d14ab25b051743a9fe8d366b8663ad919e828fa4b10f6fd68c1b9e3b934b9c4447533657a689d5f324a09b9bae5424245fee5ec988b74
 EBUILD storcli-7.1211.ebuild 1822 BLAKE2B eeedf7c5527b0e14c6eb0ae2c619e9d1d941f42a18fafaa37d293a788a43c59f7967a67e2158498439a89ae7d6420ca8f673254d2e6f6a8efaa7811a32bb91b3 SHA512 f5b8660ae5f859ec7ae5e9ae3fb3b142e004be55c0c1a1c357ea70204f77b9cb0248c635305e5c49361a0de8b3f92fc44dab198c03483b107679ecf311abcccb
 EBUILD storcli-7.1316.ebuild 1822 BLAKE2B 3939bd238e40a3e41503efd7e5c8c87057b5b65511b985eff5530ffa661a445cb0818f870d5d64f18fd2b2f21dcf47365d225495146d4276b257f67a8cd05ac6 SHA512 b3661ca4af4e6308d1f87c0e8dff2b3b46b40df31f6fa7201fc80a3a4727fcdf39d7a7fb475674c41e3fd4d1a8ed5a2061a5328fe1ebd754141b7a079b6e7d10
-EBUILD storcli-7.1410.ebuild 1702 BLAKE2B 4d51a6d3db4a53bd6b7d896ba2976b13342289fa6c8c44e297e730672a845cef8fa998452fe81ef7c069b9e206b277ab184d5ca284af68fa608da07e5348d3e5 SHA512 f01cfdde3b43c42b5c90d9dd0feecfa48aa339e47c2186df23a30a9d674354d27cdc9372e0cc0b69f4df9de92a17b3994a35e84a5e26e3bb23626962fa6dd09c
+EBUILD storcli-7.1410.ebuild 1701 BLAKE2B 706ca8f5b08be1d5bbd552daa202ab419fe844b50d48336762c9131a69a6f4310a822d94d8a6ecebca8532f5f4dd19f3b89cf753687e268da437d5597741a999 SHA512 95501c39002179a6c2f81073c073dc28bb5fc9cad98580bb7cae9bcde286fa7e20644e1fc2df07f50ddcd9b52e8e12cf71ae0d555053f3e74f632111a6e62fee
+EBUILD storcli-7.1508.ebuild 1687 BLAKE2B ee640a302e94533891ba235f9d75f6e78750db54ed80c08a9bfd0765ebe7d330f57a725b484788fc63be9a1959dc8b59550540e40637ee41b942babe6c079b7d SHA512 3e9ac6899cb5bb254a03237bf8932dba6b6cd191299fab1eb2bbefda9c4c37dfb9cf1e363cf8db37371f6c8b3262b38071efd4aaf454e4dbe4d4591d39110271
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/storcli/storcli-7.1410.ebuild b/sys-block/storcli/storcli-7.1410.ebuild
index cd0ac4c6ba7d..fdae103d9b5d 100644
--- a/sys-block/storcli/storcli-7.1410.ebuild
+++ b/sys-block/storcli/storcli-7.1410.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://docs.broadcom.com/docs-and-downloads/docs-and-downloads/raid-co
 
 LICENSE="Avago LSI BSD"
 SLOT="0/7.14"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-block/storcli/storcli-7.1508.ebuild b/sys-block/storcli/storcli-7.1508.ebuild
new file mode 100644
index 000000000000..ae266864ee4f
--- /dev/null
+++ b/sys-block/storcli/storcli-7.1508.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pax-utils toolchain-funcs
+
+# Upstream is still using strange version numbers
+MY_PV="007.1508.0000.0000"
+
+DESCRIPTION="MegaRAID StorCLI (successor of the MegaCLI)"
+HOMEPAGE="https://www.broadcom.com/support/download-search?dk=storcli"
+SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${MY_PV}_Unified_StorCLI-PUL.zip -> ${P}.zip"
+
+LICENSE="Avago LSI BSD"
+SLOT="0/7.15"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+MY_STORCLI_BASEDIR="/opt/lsi/storcli"
+
+QA_PRESTRIPPED="${MY_STORCLI_BASEDIR:1}/storcli
+	${MY_STORCLI_BASEDIR:1}/storcli32"
+QA_PREBUILT=${QA_PRESTRIPPED}
+
+src_unpack() {
+	mkdir srcfiles || die
+	pushd srcfiles &>/dev/null || die
+	default
+	mv Unified_storcli_all_os/Ubuntu/storcli_*.deb "${WORKDIR}" || die "Failed to move storcli_*.deb"
+	popd &>/dev/null || die
+
+	rm -rf srcfiles || die
+
+	# Unpack Ubuntu package which will be our $S content
+	unpack "${WORKDIR}"/storcli_*.deb
+	rm -f storcli_*.deb || die "Failed to cleanup storcli_*.deb package"
+	unpack "${WORKDIR}"/data.tar.xz
+
+	mkdir "${S}" || die "Failed to create '${S}'"
+}
+
+src_prepare() {
+	default
+
+	# Create clean $S
+	mv "${WORKDIR}"/opt/Mega*/storcli/* "${S}" || die "Failed to move storcli_.deb content to '${S}'"
+	rm -rf "${WORKDIR}"/{opt,control.tar.gz,data.tar.gz,debian-binary} || die "Failed to cleanup no longer needed files"
+}
+
+src_install() {
+	exeinto "${MY_STORCLI_BASEDIR}"
+	newexe storcli64 storcli
+
+	dosym "${MY_STORCLI_BASEDIR}"/storcli /usr/sbin/storcli
+
+	pax-mark m "${D}${MY_STORCLI_BASEDIR}"/storcli
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index c5adde9945f3..99aafa2d3c23 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/bootcreator/Manifest b/sys-boot/bootcreator/Manifest
index 189af84f1ae0..13d42380450e 100644
--- a/sys-boot/bootcreator/Manifest
+++ b/sys-boot/bootcreator/Manifest
@@ -1,4 +1,3 @@
 DIST bootcreator-src.tar.gz 18881 BLAKE2B 5f6375b16d7d676c50d0b61aed5706dbe972bb2eff98e3870df58fc03cf00050788ab1f2da12bb37a839c525bdfa926fcccea5638532454704c3c961a4600a59 SHA512 53a17cc6b6ec9eea06b4162f32068d5f6c86ff066cc152e30c346010b197a88f3266315295c90b7123a68e81fb4ee95e4b0b341ef666df2eaa230ac762892d0e
-EBUILD bootcreator-1.1.ebuild 554 BLAKE2B 863062ea74938eba408441e31d2f7c3f295d2e2cebeb65b3afa4bee187c95788d3eac435df0924b887ede000298c84e0bd82de98dcc391c110e6990d92364c50 SHA512 2617918ed187743964a0214a8286ebafb8f9a33f981e0613be67bd1a81f7abb81ebd430cc0e9311047d7d918a62e283372c546082dab35ad4ec3be9eb9fa62a5
 EBUILD bootcreator-1.2.ebuild 554 BLAKE2B 863062ea74938eba408441e31d2f7c3f295d2e2cebeb65b3afa4bee187c95788d3eac435df0924b887ede000298c84e0bd82de98dcc391c110e6990d92364c50 SHA512 2617918ed187743964a0214a8286ebafb8f9a33f981e0613be67bd1a81f7abb81ebd430cc0e9311047d7d918a62e283372c546082dab35ad4ec3be9eb9fa62a5
 MISC metadata.xml 263 BLAKE2B e66994388bfb417186bf7a8f1d7e8b12c243f9fb8b2a5d911129327b569829be2cf0896c099c3ae4b283f10636dbf03e109b7d7037f4373b98827d27a4dce8f7 SHA512 f72954ee8887da0e1b3e59effb6eb40294102e91b1060c2d736fa47a3a12513d959b44e77fc62f881408e38d30a47f1c5b1c4a0d9c3646b5fb75118e5295ea5d
diff --git a/sys-boot/bootcreator/bootcreator-1.1.ebuild b/sys-boot/bootcreator/bootcreator-1.1.ebuild
deleted file mode 100644
index 5f9a3fcc145e..000000000000
--- a/sys-boot/bootcreator/bootcreator-1.1.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
-
-DESCRIPTION="Simple generator for Forth based BootMenu scripts for Pegasos machines"
-HOMEPAGE="http://tbs-software.com/morgoth/projects.html"
-SRC_URI="http://tbs-software.com/morgoth/files/bootcreator-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	dosbin src/bootcreator
-	dodoc doc/README
-
-	insinto /etc
-	newins examples/example.bc bootmenu.example
-}
diff --git a/sys-boot/palo/Manifest b/sys-boot/palo/Manifest
index 7b0a07c8d7d7..d5cf884e011e 100644
--- a/sys-boot/palo/Manifest
+++ b/sys-boot/palo/Manifest
@@ -3,10 +3,8 @@ AUX palo-2.00-toolchain.patch 532 BLAKE2B ef8df5bd7874ac88aa27b2864ee0baeb57e470
 AUX palo-2.12-gcc10.patch 403 BLAKE2B f1201ecf345ed5751200d2cf52778fe1bc6c7d7bec995b97dc8dee65b4ea00a547b788390ead7dccee8c3fbd172ba578b33fd3fd223c8dc389b0b5bd0ef517d9 SHA512 2df2080b4ca9514a036cbf1c5fb85f42fe5cd34efe4c0b8b9217c58a1e94bf276b9994d32e0527c499ecf87e2ef279cc97c3a9ef813fb51d1649752a48792b87
 AUX palo.conf 260 BLAKE2B 1e81466dcecedc4ca1894863491f4c91e88becc9a5c5815e69028eeadc98ca61e99951fb754a8261a6cdb763aaa22201ae77f65fd4de07bbbd3f3c801322e277 SHA512 4147e480362161cd61ad9af8fb7048b87f9126c213661ab26f77ba98fe7f1acd03791b154667137e4a265e3c31e54e703d32daa86ff0805f47bc7c1b8b03cfe6
 DIST palo-2.12.tar.gz 124911 BLAKE2B 79fa572e118e77114dcb3b888abc65163bd56cb44cf69cd25bcaa33a7c6151b8254bf00c459ad17ca1d948f9b440378133f048e2add123a757908c108b802703 SHA512 6ea20490b84bf18a1d1e8037de453f5f480cba8403b267d4d63fceceffb39e18545c6d20c8dd7b07044ff5567eedd2c58b2a626971b53d1d35c5b3a4e8fefbf0
-DIST palo-2.13.tar.gz 125108 BLAKE2B 9c73e66be7950ae6e7fd0a5dcb9cf460dfcb469580a25c121eb7ffc41aaf4a0b67d7f77ddf7a12479718c6ffc64a3a9327ab8c92cc73e79cffad07d61c6fd120 SHA512 6ecde0720fcf672cd7baf71bb04e16f2a1412d958ec35c4e2c9a7a3b372dab1a12ce6e47198ac8500aca750cbbb7190c3476ea626007c3418eb6c23f06011d37
 DIST palo-2.14.tar.gz 125207 BLAKE2B fcbc7e59552d83828c07acb055429c1155b738dd12e22c9fc81759b9f84382e3ea793e957421d420c93fa5818d5ad8f12b5317cfe6d5d45d95fc15b272c6fe8c SHA512 9d22ea2826a69a9bb661a4c17aaa78d648f0684b96c2dc0f164d2086f48fc85207e40c69227dd76d153dd171574dd62f6e5e90dd415209de372b4d7d8ab40f57
 EBUILD palo-2.12-r1.ebuild 897 BLAKE2B 9fa46a0b23e97fc8963a26b1120583be20f6445a808dbb276098b2fe2b2b09c762aa14c6a8ac78a41519e5a5b1aaf285ece53e9d1ccdf25b445db337474c133f SHA512 3a61404d790e67c85f4ca795c341eb773484ae215619b5c0dac150df06154be36d43a5a463eb5e0bb393ad29b6a75de8417054d5ce8c81acc22aa36e0176efe5
-EBUILD palo-2.13.ebuild 860 BLAKE2B 7a17faa365a38220b990929b64fd9a98cd4cb2d36f04cf5b0020d01592c91a59035d1524fdb8a28f75b2fee14365071eae05606b3fc04f222869c08f17bc0ef7 SHA512 c874798a19104e75d58118f80c3829382dd5e7e7dbe88ad030d6507f29b168575b93856345393ad266cc86df099776ad6fc3505433073f7a56a5484f7bbc7fe1
 EBUILD palo-2.14.ebuild 860 BLAKE2B 7a17faa365a38220b990929b64fd9a98cd4cb2d36f04cf5b0020d01592c91a59035d1524fdb8a28f75b2fee14365071eae05606b3fc04f222869c08f17bc0ef7 SHA512 c874798a19104e75d58118f80c3829382dd5e7e7dbe88ad030d6507f29b168575b93856345393ad266cc86df099776ad6fc3505433073f7a56a5484f7bbc7fe1
 EBUILD palo-9999.ebuild 843 BLAKE2B c200c0441938166e99c13b05e4efe73ada669c12804c171ce587024417cd9fa3eb614ed4d0cb3f78ed5a8c198e6760aa0b5a6b4fa03a4dc223113fbc6a1cdde6 SHA512 b9612a37d4b3477c5792265a73f1108fee4a691200adc6b7fd8d70f9c017e919a87972d23c37fe555d47561d0acfe371bb298d9d255684b7bbe011e32277d57c
 MISC metadata.xml 255 BLAKE2B 1fa496c80211e9d85183a6265abd22165c24a3e98bd943810b2b0fd3ac0f116508125d9771acc8fb00fbf9e5fe430ce53719992bc04f48e6418287d29ad66b45 SHA512 2cf3b51893dc7516f5c278cde4060895ec11266964e76c5e0ee41a963f7fd97de80920513d8fd5eee59023de26dc9ce17cfb37ff3d364632a413e2478fda8664
diff --git a/sys-boot/palo/palo-2.13.ebuild b/sys-boot/palo/palo-2.13.ebuild
deleted file mode 100644
index 17741656154b..000000000000
--- a/sys-boot/palo/palo-2.13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="PALO : PArisc Linux Loader"
-HOMEPAGE="http://parisc-linux.org/ https://parisc.wiki.kernel.org/"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~hppa"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.00-toolchain.patch
-)
-
-src_compile() {
-	local target
-	for target in '-C palo' '-C ipl' 'iplboot'; do
-		emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) ${target}
-	done
-}
-
-src_install() {
-	into /
-	dosbin palo/palo
-
-	insinto /usr/share/palo
-	doins iplboot
-
-	insinto /etc
-	doins "${FILESDIR}"/palo.conf
-
-	insinto /etc/kernel/postinst.d
-	insopts -m 0744
-	doins "${FILESDIR}"/99palo
-
-	doman palo.8
-
-	dodoc TODO debian/changelog README.html
-}
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 32159b630ae0..6e222f77efd0 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -3,10 +3,8 @@ AUX raspberrypi-firmware-0_p20130711-config.txt 1706 BLAKE2B a7086f2f91a3eb26887
 AUX raspberrypi-firmware-0_p20130711-envd 53 BLAKE2B 52aa8814f82f9c8a5e2f4c3b2be80e6e62b2e969d03a96f3162a998a9aa4621ab79df48d573389d92cc963979c8dd7c0e012cd8d996e5e23252eb66f869f0e74 SHA512 032aa497cbde187ed8cfa5ba5adaf96b28f9dd2babb882d934d9009771ca50e9d8c6a8d5535551a8e8cf8e1932865dd0e4806ba56c9694952cbb3d93f9081ca7
 AUX raspberrypi-firmware-1.20201022-cmdline.txt 108 BLAKE2B b7830fdaf1ffb64cb07a27db79dcb30a73194d7c1cf9b0f05529303f1fe2aea5ee26c71d563e029760a06d78f77d0213a6cda0819c08f7014782997f159f716e SHA512 6dbf694f4df9d5d5dfdd62a33be90aa95d655b113760cbbee9575a59e6250b831e73530cb392e8e89056806f298283626c50665b9d4573663e6686bbcc577d6b
 AUX raspberrypi-firmware-1.20201022-config.txt 1784 BLAKE2B 7f37f02c486e6db2767b108e5926dc056f558ef32ae8ac3debea2fe7a210b159a2e4721846be8719520667c9bb86dc5d15c7c815f90dfe2686748f4d474fac61 SHA512 0909fae9bf731417f732486f7823f92a142824f5cab490b1736a16e7f569c9ecd805828c533c238dd3c5d75efcd2679e0d3697d988388000e1475a966fa66f12
-DIST raspberrypi-firmware-1.20190925.tar.gz 185571086 BLAKE2B c3a9b2760fa853fbd1dd09bc4048c9e78594f88da5af608c3a761554d4046a4c869db8981c64140a24e82e0a61b8dc776bb8d895df60c6424e44780f78b18cb0 SHA512 4b7b29cc6c2a33d7a37987c492034d9afbb2220364c50cf265e0adf8e5f393c2275dcffaa77c89b3f43b2e98d199741b67590cb60ff8beae8ef677852f63b4a0
 DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8
 DIST raspberrypi-firmware-1.20201201.tar.gz 189332299 BLAKE2B b3ec91f07b4713d26c29be5412d018a220129eef7ddf7c5c09d85e645c2c5754a95f13be7e690ab40648a982e3974cc760aa5b33c76612da836227d38c4ee3a5 SHA512 a7f4591552718956bd7f2d0d377234277e2e6f18cc9714ea30fe13f26d5ae1164b982f39dcf72ae4a18663369ef06d0187d8182713763262371c13107aac4c65
-EBUILD raspberrypi-firmware-1.20190925.ebuild 1911 BLAKE2B 126451fbb0daa5f9d07381fb0e6259cfed1235c2b59773a44c03cbb84eb480a1092138b0e64b2e1e495d9b9ae43fd876ab2a0ef507f976dd36a8847276c28db6 SHA512 3e52692de708837448b18aef8a9df97b065bab94539c43f0c58fc786b8e4aede84a168d402d4dbd118661f433361a817b39cbbfe219caef3966a3d6fbb37e3b4
 EBUILD raspberrypi-firmware-1.20201022.ebuild 1890 BLAKE2B 9753b9646bbc6fde102e179c085a640d655a9c1032fb92a5637fe54327e89d8f898071038c99cf7f013926f06f73795b2b5cab652838665b4a1c368459121cb3 SHA512 2bb448d45c08f68d284eb54ad2bf15e6f5b77dda2b75dbe45ae1a75476177f723336774fbe6e0956419b2822661a33db80692dcd8656b2efbb3c64e535065043
 EBUILD raspberrypi-firmware-1.20201201.ebuild 1891 BLAKE2B b4da4a56d2a17da1c9fcc4303cf15e5bf39afe0f1b770816c46abb770afd2030a30b080f994223c0e6663eb2b46a19e20cfa2fa84d2efe97408f6db4d5099760 SHA512 a780cd790e8eae658989968fd868e69983e933862253147f32eb9510d81715b3f26850ee88c46311edf1b4d619fae87afb974944b0461a9840c8066333cfb00a
 EBUILD raspberrypi-firmware-9999.ebuild 1892 BLAKE2B 7d3b73f730a94a75f61652eb350c12c7d3cd328cd26b03bf3cf4300df1c4fe9bd7c7d8fed90523645d6d692665a0b35d4db9ea50fa423d50c38115ed76bb7401 SHA512 7f88844eba41233565f6ac795dd2f9f390c94b7e153bb2893e4bc24eaeb28c7984523b44212f1c349a93b21aa51c984b21f102425eb9fff757f11e5753ca950a
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190925.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190925.ebuild
deleted file mode 100644
index 3b499cf2ad55..000000000000
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190925.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot readme.gentoo-r1
-
-DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-
-# Temporary safety measure to prevent ending up with a pair of
-# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware
-# none of which installed device tree files.
-# Remove when the mentioned version and all older ones are deleted.
-RDEPEND="!<=sys-kernel/raspberrypi-image-4.19.57_p20190709"
-
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
-	EGIT_CLONE_TYPE="shallow"
-else
-	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~arm ~arm64"
-	S="${WORKDIR}/firmware-${PV}"
-fi
-
-RESTRICT="binchecks strip"
-
-pkg_preinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		local msg=""
-		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
-			msg+="/boot/cmdline.txt "
-		fi
-		if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
-			msg+="/boot/config.txt "
-		fi
-		if [ -n "${msg}" ] ; then
-			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove(backup) your copies durning install"
-			msg="${msg} and merge settings afterwards."
-			msg="${msg} Further updates will be CONFIG_PROTECTed."
-			die "${msg}"
-		fi
-	fi
-}
-
-src_install() {
-	insinto /boot
-	cd boot || die
-	doins bootcode.bin fixup*.dat start*elf
-	newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt
-	newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt
-	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index b99608e0cf4b..a0cc972260a3 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,9 +1,6 @@
 AUX silo-1.4.14_p20120819-gnu90-inline.patch 544 BLAKE2B 6336a6713a706b8181cbb5d60f542f47fa4009347546bdb812369fb3fb054818e6230af239244ee9628a315df5c1bbdf0085be92448c9f2fca3f1ec7323f51dd SHA512 a3ac9e1226de694063bce8edcd0160ab7340a2821ec243ea45a79885da81eaf3a8af2bbe19350edaa45654a2d13ef070682ea7eca80e12f982e8a05ef49abcd7
 DIST silo-1.4.14_p20170829.tar.gz 183612 BLAKE2B 88fb4b0ce4e9b8fa9518bcb6226f4fe9ec7011bf3f73d9f0f1562ff837217ca8d54ee783eed0b50096b009fc56527be8e4211623f5b0e4ef5372c38c0fe304f1 SHA512 bda31084ba2ee5b01d331fd390cbccf039dc812debe25f3af97dd5d2855668cbe7e160dee4ca45c16af1fa4aa86224daf3b474fd49b22a8b7f453584a12f3c2b
 DIST silo-1.4.14_p20200602.tar.gz 183668 BLAKE2B e229cdb9fbc5f0111aa49919f4b3b91c0770492fa06f91bda15c65af160b728b9409365c3ff0a93091b1e3011c60d0b0bec1101ffabaddbaef7e1083158830b1 SHA512 7a70fe25c1bb3ce655e4fbb85b00fe0d29fe0a6f98b80c1b8267b72bc9324ac0749cd050921163cc286e094f7d9bc81315d63ff02d2442b5c30ce350a537fcc1
-DIST silo_1.4.14+git20120819-1.diff.gz 10711 BLAKE2B c44a0204e3aece4eec8355f88b3a195c1ba7019c0aa648cc4e28ff6cb85fc6d96634bd282e5aaea9123dbc5835820acf2fc15054c91842d6b1040fc13cb0033b SHA512 60719b672a0f1dd2a005e763efd232bbf7aeb00198e0b46827208b78f1b32acc3a730d43944382dec4b95fddfbb373b1eb69dc911ad28ec9d1d1e6c45d84db20
-DIST silo_1.4.14+git20120819.orig.tar.gz 755510 BLAKE2B f1185086671c12c901704c2aa1f582a4e983d2d4a2d5ec18194aebcd43a7bdf9e7ad329efebaf4911d40f8a417ff8c8566b61be4eac5fea13235ac44d0edf852 SHA512 2d1dd8f805fb0a272877b5e8e19e5a645aa9fe02cf2b5ef43b5d2894c0c6a5a82483a0e41556af50f01dc795dc5e43350ae92139485c19d64cda75c2aca01a38
-EBUILD silo-1.4.14_p20120819-r1.ebuild 1706 BLAKE2B 6c4886239f6f55a88640e166b7eb84a3da383795c42e19bd70ec0bfef687b6624c2fb71ea11603d964f86b5dd97e2cb4b9d09b79df650f9552ecec8ddcd3b80d SHA512 88d310f1178eb846f99edebae4b3fddbe3aa2f8a0a0f9fdca568cd9342fe74e0613b8c73d5d751a23faef5c9914695d6d245e0938561de25f9d1fde217804134
 EBUILD silo-1.4.14_p20170829.ebuild 1750 BLAKE2B 64ec3de22ace15d3b5db8a188b5832143d99e620c71e9c166ed97db4b16d1f428a5f04b276a405d71109d9e8cfa4317a5aff072616a53f32267694ca91664075 SHA512 7e96c39c3d3297a4030493558a2993993b5df90a0184059b1f11a774e46595395dc28898b5fbe2ebadd1d2b0fda1a3177d5cfa61e7d53e6ff9b76324edc3a11e
 EBUILD silo-1.4.14_p20200602.ebuild 1638 BLAKE2B ed8464fa7529647f88dd3badc9ff38ed5a6333516e7611e685b1aacd5543a83426ab1d3b8f1ce48419d00c7275a816fa7f3ac8f9bd865b80fe6eaa9b94bf3d4f SHA512 379936279d64d850d23fadae1986b22499581172bcfcb39515357f8997f8b891ed0008034c54cd20556ee7840fe4e8878411f589402e128b7ff07e3e019131bb
 MISC metadata.xml 338 BLAKE2B 67b4c6cb9a586c688c374a0e3e4019ce5714cd67f303ce719a8aad5ec274ab91ce93040d6b81fe46fba0beaf0e535cc6d283c1c9e3957de4d0e80e09de8a4756 SHA512 67785ade40e4a1266b6597c9404ce6e7c6fb749b89988223ebf94aab3870e23f9c93da65ec69550e49451e7f2bf271d4e0a6a64add3520accbdfeab094f5f25d
diff --git a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
deleted file mode 100644
index 946707a29471..000000000000
--- a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mount-boot flag-o-matic toolchain-funcs eutils
-
-DEB_PL="1"
-MY_PV="${PV##*_p}"
-MY_GIT="git${MY_PV%%_*}"
-MY_PV="${PV%%_*}"
-MY_P="${PN}_${MY_PV}+${MY_GIT}"
-
-DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
-SRC_URI="mirror://debian/pool/main/s/${PN}/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/s/${PN}/${MY_P}-${DEB_PL}.diff.gz"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* sparc"
-IUSE=""
-
-DEPEND="sys-fs/e2fsprogs
-	sys-apps/sparc-utils"
-RDEPEND=""
-
-ABI_ALLOW="sparc32"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gnu90-inline.patch
-)
-
-src_prepare() {
-	default
-
-	#Set the correct version
-	sed -i -e "s/1.4.14/1.4.14_git20120819_p1/g" Rules.make || die
-
-	# Fix build failure
-	# -fno-PIC is needed to shrink silo size back to manageable on
-	# profiles where gcc has -fPIC default (via --enable-default-pie).
-	sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE -mcpu=v9 -fno-PIC/g" Rules.make || die
-}
-
-src_compile() {
-	filter-flags "-fstack-protector"
-
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-
-	dodoc first-isofs/README.SILO_ISOFS docs/README*
-
-	# Fix maketilo manpage
-	rm "${D}"/usr/share/man/man1/maketilo.1
-	dosym tilo.1 /usr/share/man/man1/maketilo.1
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-	ewarn "NOTE: If this is an upgrade to an existing SILO install,"
-	ewarn "      you will need to re-run silo as the /boot/second.b"
-	ewarn "      file has changed, else the system will fail to load"
-	ewarn "      SILO at the next boot."
-	ewarn
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 6fa478a6f165..5bc55c723796 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index da3cffb6ede1..709a39407d29 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -10,7 +10,7 @@ DIST cinder.conf.sample-2020.1.9999 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a
 DIST cinder.conf.sample-2020.2.9999 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
 EBUILD cinder-16.2.0.ebuild 7626 BLAKE2B 2d2eacf1a1ea90dc0a8f93caca9bc0ed9876862d85b55e9845be979e87c773bdae48c464741d7220f87be0ec9bea9eb69e9af56c2fb5e1d39910abcdd63471e5 SHA512 11019a13e8f7811228e95d3dffba35cce531de79b4abf42701f72e1d217fb5fa2314033d4d39da1b931a1e66eca06d87c1ba652f34d44fadcccba4407cca9aed
 EBUILD cinder-16.2.1.ebuild 7628 BLAKE2B 89c1b14ec775f5635cb0a39ed2fe3b37678c2ae57dc968908b62b94296fb022b876c311eeb43898f8b0d96b1cde152799e7606237e8fa123ab8088e67b9247ad SHA512 62b9ea484e242f6a1bfbbc6ccaeba4a1c063300cc868f191c6980f4a8196409831df4acf82a5f89f8bb7dbed5da61381f2c019a225cfa7bf175c13d745305016
-EBUILD cinder-17.0.1.ebuild 6818 BLAKE2B 9ffb3360cbe44be93d6a498149f1846211ecfd0491cbbec89362663e6f69f9a7a68c979f750f9c6ed8ffd5106d2d282c23bdcba5885a88f155214e8703d34436 SHA512 309047d98b6c4a072a0d4b9cc779c66cc0077bec999292d6cd11f57b4d3666d4eb0b35629286e66cfb5ea720c805b23826058f9870b7289a187e91252ae4fae2
+EBUILD cinder-17.0.1.ebuild 6816 BLAKE2B 20bbc45b13c84fd757fcb9a81250f1433d4de7bae16ae2125aafd5a29b4dd476cc0fd0dbdea29d30a8e5cc046972c6e7319f89aba12e8b9fbb0be1d3c0121e6c SHA512 5be7b0f976de53d4830e0056f810ec96e35a4d2cde853514552e0dd87dfe6e4ce9e5b281de4aea36672f5c045b5ab679c557999de59644a15b363b5d0c60947e
 EBUILD cinder-2020.1.9999.ebuild 7628 BLAKE2B 89c1b14ec775f5635cb0a39ed2fe3b37678c2ae57dc968908b62b94296fb022b876c311eeb43898f8b0d96b1cde152799e7606237e8fa123ab8088e67b9247ad SHA512 62b9ea484e242f6a1bfbbc6ccaeba4a1c063300cc868f191c6980f4a8196409831df4acf82a5f89f8bb7dbed5da61381f2c019a225cfa7bf175c13d745305016
 EBUILD cinder-2020.2.9999.ebuild 6818 BLAKE2B 9ffb3360cbe44be93d6a498149f1846211ecfd0491cbbec89362663e6f69f9a7a68c979f750f9c6ed8ffd5106d2d282c23bdcba5885a88f155214e8703d34436 SHA512 309047d98b6c4a072a0d4b9cc779c66cc0077bec999292d6cd11f57b4d3666d4eb0b35629286e66cfb5ea720c805b23826058f9870b7289a187e91252ae4fae2
 MISC metadata.xml 1102 BLAKE2B 9ae7e7c1dc78a29aaa42da894b86bb674c080636008e95ec57f7eb0a483006f1128d5aa42fe6a673611732063f8e5bfbee0e4596af4196f23065f362d92a6860 SHA512 ee165a4bbe18345bd11de0590ec389c7ad1055a052470666939f77b4c5dce220e1400effd1b89a44ca515dcebd15c392b4bc4aa8d76ce23116ae8b5525197b42
diff --git a/sys-cluster/cinder/cinder-17.0.1.ebuild b/sys-cluster/cinder/cinder-17.0.1.ebuild
index db06b542b144..1926f3de0bf2 100644
--- a/sys-cluster/cinder/cinder-17.0.1.ebuild
+++ b/sys-cluster/cinder/cinder-17.0.1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/victoria/cinder.conf.sample -> cinder.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index aa1737c7b58e..7bd84537994b 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -6,7 +6,7 @@ DIST heat.conf.sample-2020.2.9999 77233 BLAKE2B 4c15a617a667aa72af08038d90a3935e
 DIST openstack-heat-14.1.0.tar.gz 2356647 BLAKE2B 0b4d009fcb631929bdc1e9a429e3370a546fb1763ab66439cd3791b1437417ef18da46f4bae8397bc5a661e09acbceb09d2f32dc06a190852f67989b900035ac SHA512 b74795ae10d29348b47c91d8de2166999ab51caef42521d9347565414ba1f2bbd2870c54af9d3877fe11e1388c900e64ed780a0e22a1270adea6cb1cc4971e0b
 DIST openstack-heat-15.0.0.tar.gz 2391827 BLAKE2B 50e7881a4114ba2ed6ba9067a7879382b5b3d61e2db8f113190a6194f8d34d1b06734a1e3b532805cfad23999ed233ea9c8fc369e1b269828653f346e28ddff7 SHA512 dd17f5cabadd90ab88adea3782a29802b0b4467c46c40dbd41ce68c08e2425b2eec362833b79cb739e16e6d5b137256cc4955afd5bd143e3a2e613d3b428dd5d
 EBUILD heat-14.1.0.ebuild 6521 BLAKE2B 58aa8bd7863071a746921494cbfe0dbed0255afdaeca04200c5da8eec8a72d6dfb60f8eea935ef6e022fb150fd8da0768568a07f920ca3da4c6fa787ea0d6a6f SHA512 db194c1dd764de4a215c22f12a301015613d4755a83c20e0eabe66c1cc98cd797725174600c6423a570a07a3c2309e514d491a0cb2af4cac678078a4e328c705
-EBUILD heat-15.0.0.ebuild 6491 BLAKE2B b58bd60b1f8a6cf62bcc8f4998544cc31f70516fb5af083ea03802fd5e60effde2e34bfcfec0e0c9ab78f0dac720b7fa30043526f6cef62ba05ff36aec74e4b2 SHA512 c96c014876a9e1207e33ad16da62644b57dab2f6f3bf7294dc9dff1ff22a5e7782f896a5b323fa687b2fbf067811949e151f38b2d9524427f452344d8fb74374
+EBUILD heat-15.0.0.ebuild 6489 BLAKE2B f6ae384652600ba2b328576daba5ba2a48fbf1a5075374bfafe952a361efb40e04ca8503edfc539d001e64fbb3fa5dd0e7d2276e400cf948df28bec1122f609d SHA512 f3aca652572c21d782b27e8125e5b3663546d63eb42dbe4dcfd9d7c2829e708166567456b743ea660ecdabcf07037f7c9318d705f333947f8ef1665c3188ce93
 EBUILD heat-2020.1.9999.ebuild 6523 BLAKE2B cdacdee6b9255868054e2b95007798bf57705ccfdf3a26469e1bcc2e453e3eee9cbb14e4fc9d7bb3cb8c1094bd9a05687e70c34e34451884e566f4b49914f78e SHA512 dda25b9d90be92beb6cba6ce1519f1426cd9dc89f5487c0b4dbb836b4546c982f7529e6efc76d3a63950fe70e89b42fa079b476fdffa30967d5aa750bc8bf6ce
 EBUILD heat-2020.2.9999.ebuild 6491 BLAKE2B b58bd60b1f8a6cf62bcc8f4998544cc31f70516fb5af083ea03802fd5e60effde2e34bfcfec0e0c9ab78f0dac720b7fa30043526f6cef62ba05ff36aec74e4b2 SHA512 c96c014876a9e1207e33ad16da62644b57dab2f6f3bf7294dc9dff1ff22a5e7782f896a5b323fa687b2fbf067811949e151f38b2d9524427f452344d8fb74374
 MISC metadata.xml 631 BLAKE2B 566d35b5533177a6d8b0ef428c9bd1a320aace6b43e186139c4b53cde224c1bf488340be8b6bcac14bf6c7a51212952dc13940d34edc38e24d7d2fbea5ce0c68 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429
diff --git a/sys-cluster/heat/heat-15.0.0.ebuild b/sys-cluster/heat/heat-15.0.0.ebuild
index caa96cc9763a..ff801b85ed1d 100644
--- a/sys-cluster/heat/heat-15.0.0.ebuild
+++ b/sys-cluster/heat/heat-15.0.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.victoria -> heat.conf.sample-${PV}
 		https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S="${WORKDIR}/openstack-${P}"
 fi
 
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index c2878033daf7..d9a5d6a0ac04 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,18 +1,22 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.17.13.tar.gz 31841139 BLAKE2B b068ed913fe9a36aaf51b2e2ff05841374b9b1ad25392c0b894bb25b2895228201e9c85eee84a6d61901855be336ad07a1108fbeb43a619f779667191737eddb SHA512 eaebc7d649a2a53f2a7bae8fe70ccd469f8f983a2d14148f86e86a05d66a40ce8b71d4422e653966daf4c86ccd353693cc0e9bfe3a44b5259239d047a20ddb7a
 DIST kubernetes-1.17.14.tar.gz 31844013 BLAKE2B 725081706a7647127018d34d55d1eae1ac750d1378a7b8762aff39a638f88931e2f37d8609329b32bce360bb52e654f230f1c121d122fd90ab94de6b8a035f0f SHA512 6d5a22c47bd89a5622e38746a6e9c6d3146f065d7f1e63c161f6fc667e1c7d973a4ce0a77a63b53ed46708f490477c182119a0809d08b8ee3041f232a60ad19e
 DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d694d55130fa6fd0a13f2e6ec653971670a8b1af04dc5972738e504cce664619b1aad67d0bcae217884fb352c364a6804 SHA512 967caccf8758bcdf4549ec83b795ec580e072d8108b2c8ef10f1d05696dedbfd5d472e27590bb952639f198003b44dc83da5435853337938035488959360e3d3
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
+DIST kubernetes-1.18.14.tar.gz 32666861 BLAKE2B 6a005804280d72de84d1bab68a51e72c41de0b3a50a1c40befab1290e9fcfecba133fa441f50bf250f458ca4ad44f4fab495da4782626efff70dcfe0f3029d49 SHA512 e19b834db4920db6b466662a8c001ecaad7a7bee6c4faef871bbc3f528e10b0b4c9fc6f3ac065953ce625db0ede98d76536cf3158b4fb241725115febb141946
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.19.6.tar.gz 33470206 BLAKE2B ea7614da380ce7c834884d96b37753802eb4919b4fb274dabf0d38f0438039c90ab1fccc86e0d8f665c15ae61f1d3f6ce4d400782ed580033cfd58390cd50617 SHA512 d7c6db2fa399b04a3acae792546fa0384e6b3a3e5eaa2c1ba6c49d656da0197f5be3d009756313436816f3839825c66ce23a06a1ec35c37f1c3fcfba79f9ac32
 DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
-EBUILD kube-apiserver-1.17.13.ebuild 975 BLAKE2B 741780310211ee7b3c7e6a9bdb4774f6d09eb139b0cac659a6e51fd2ba733886fe18a7f028a6c123bb3b609e3cf8a3cfcb80e39af0099444d9190227e10fbfbe SHA512 6a3b3d15dc76cbdd66053eb69b5dd4f888897272b3e9d6d7fd3cc8014c8320b3b2406a0e0c0165e9fef13b0b7050c220c73446fa641a49692fb83f71e41527dc
-EBUILD kube-apiserver-1.17.14.ebuild 976 BLAKE2B 62c56381e05666cc1d0362403bab27a38f27dce58cdfd84cff171d1b46795e827fdf670247887501779f56b066228526911a7235e1d3971d0a152de6b73baf7f SHA512 8013f2ecc8296ce0580fafeace5a690a1f318296ce772ded602b145c9e84937f25521b34fcafe51c0dea3e86410230370e655872857e96bf23aaf77d50dfb43e
+DIST kubernetes-1.20.1.tar.gz 34424663 BLAKE2B 156482f88f051eeea0c428c357a79d876ff0ce5f8ed6eb1ffa72be83bff45b72970280fa1bc7629804c178b9fa45ad84a9961a4f0e7eca1b58351fc7d7f4cfc0 SHA512 40598999cc5c96c54591338eb985bc056892ef2f98cfb521ff26937fa29f63a20e97f52a8454433ff98614d579509b7a5e927edcd96f4725505a334a999c0326
+EBUILD kube-apiserver-1.17.14.ebuild 975 BLAKE2B 741780310211ee7b3c7e6a9bdb4774f6d09eb139b0cac659a6e51fd2ba733886fe18a7f028a6c123bb3b609e3cf8a3cfcb80e39af0099444d9190227e10fbfbe SHA512 6a3b3d15dc76cbdd66053eb69b5dd4f888897272b3e9d6d7fd3cc8014c8320b3b2406a0e0c0165e9fef13b0b7050c220c73446fa641a49692fb83f71e41527dc
 EBUILD kube-apiserver-1.18.10.ebuild 1004 BLAKE2B 37352f285c75f1fd14d2acdd847caad33e422d47dcd768dd1e1bc2adf968eda55bb0e7fb90c1f0055909a6a3d6e3e714d08ab8bbaa5bd1c32a6dcb84ff6d8bf7 SHA512 194dbdb7bde76fcd1f3d623dfe92790968da796e8272dfa6920cd965daaad6cf4a92661fec81e2fe3fb009a0d9b49dd732db83132cc474d212e8b9963d2d5f8d
-EBUILD kube-apiserver-1.18.12.ebuild 1005 BLAKE2B a5012338e60aa1ddebb47360b366bfb3b0dc0ab303bad91b7595287ff883058628ec96c4936e0084c314542b917ae8f6e1c29c9f7eb926555c59f097681ff295 SHA512 48aebd74d74e744e9f579e923459369a36774f80a17e81876664c0aae38d26b1d017f8656c968d4ca922c5bb2f66d5656a44a4d6b059cdcebb353202c1cca103
+EBUILD kube-apiserver-1.18.12.ebuild 1004 BLAKE2B 37352f285c75f1fd14d2acdd847caad33e422d47dcd768dd1e1bc2adf968eda55bb0e7fb90c1f0055909a6a3d6e3e714d08ab8bbaa5bd1c32a6dcb84ff6d8bf7 SHA512 194dbdb7bde76fcd1f3d623dfe92790968da796e8272dfa6920cd965daaad6cf4a92661fec81e2fe3fb009a0d9b49dd732db83132cc474d212e8b9963d2d5f8d
+EBUILD kube-apiserver-1.18.14.ebuild 1005 BLAKE2B a5012338e60aa1ddebb47360b366bfb3b0dc0ab303bad91b7595287ff883058628ec96c4936e0084c314542b917ae8f6e1c29c9f7eb926555c59f097681ff295 SHA512 48aebd74d74e744e9f579e923459369a36774f80a17e81876664c0aae38d26b1d017f8656c968d4ca922c5bb2f66d5656a44a4d6b059cdcebb353202c1cca103
 EBUILD kube-apiserver-1.19.3.ebuild 1011 BLAKE2B e379517c1e19e309e5151e8919d04dcee5573c36da9cc6794c3b523da3b65e929a68dc10c86e22330e94f710005b07936fb252df8f2f7f730910705e92a56129 SHA512 c0bff494da8b557f348ca19d92d748a9490e03b7eef4cf80239a2ac01478cd3fbe3b8c477034e95d9b8405936daefe47cf47371378188a3a989368e3dade5b6d
-EBUILD kube-apiserver-1.19.4.ebuild 1012 BLAKE2B 6ddd81924033f371422aa120319efb48ec5ac3a61599ec4d691eb26e51f2eb1b5d27c4c2a6717d36bdec6c21b57ddcfa9456d4e322942d20945143afb7a6b839 SHA512 2b4121c6e2c6ef381dd9fbe23c3b52043620d737539088e3917e3529784823e228cdd569493c3e38a7a4fad0a49b4b12581cf637d66840fd6f7df5efab72036c
+EBUILD kube-apiserver-1.19.4.ebuild 1011 BLAKE2B e379517c1e19e309e5151e8919d04dcee5573c36da9cc6794c3b523da3b65e929a68dc10c86e22330e94f710005b07936fb252df8f2f7f730910705e92a56129 SHA512 c0bff494da8b557f348ca19d92d748a9490e03b7eef4cf80239a2ac01478cd3fbe3b8c477034e95d9b8405936daefe47cf47371378188a3a989368e3dade5b6d
+EBUILD kube-apiserver-1.19.6.ebuild 1012 BLAKE2B 6ddd81924033f371422aa120319efb48ec5ac3a61599ec4d691eb26e51f2eb1b5d27c4c2a6717d36bdec6c21b57ddcfa9456d4e322942d20945143afb7a6b839 SHA512 2b4121c6e2c6ef381dd9fbe23c3b52043620d737539088e3917e3529784823e228cdd569493c3e38a7a4fad0a49b4b12581cf637d66840fd6f7df5efab72036c
 EBUILD kube-apiserver-1.20.0.ebuild 1012 BLAKE2B 6ddd81924033f371422aa120319efb48ec5ac3a61599ec4d691eb26e51f2eb1b5d27c4c2a6717d36bdec6c21b57ddcfa9456d4e322942d20945143afb7a6b839 SHA512 2b4121c6e2c6ef381dd9fbe23c3b52043620d737539088e3917e3529784823e228cdd569493c3e38a7a4fad0a49b4b12581cf637d66840fd6f7df5efab72036c
+EBUILD kube-apiserver-1.20.1.ebuild 1012 BLAKE2B 6ddd81924033f371422aa120319efb48ec5ac3a61599ec4d691eb26e51f2eb1b5d27c4c2a6717d36bdec6c21b57ddcfa9456d4e322942d20945143afb7a6b839 SHA512 2b4121c6e2c6ef381dd9fbe23c3b52043620d737539088e3917e3529784823e228cdd569493c3e38a7a4fad0a49b4b12581cf637d66840fd6f7df5efab72036c
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.17.14.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.17.14.ebuild
index ec67c2c362ce..ea9dfae0d2bf 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.17.14.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.17.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-apiserver
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.18.12.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.18.12.ebuild
index e2230b0a755b..dadfa3ce121d 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.18.12.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.18.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.17.13.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.18.14.ebuild
similarity index 89%
rename from sys-cluster/kube-apiserver/kube-apiserver-1.17.13.ebuild
rename to sys-cluster/kube-apiserver/kube-apiserver-1.18.14.ebuild
index ea9dfae0d2bf..e2230b0a755b 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.17.13.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.18.14.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit go-module
+inherit bash-completion-r1 go-module systemd
 
 DESCRIPTION="Kubernetes API server"
 HOMEPAGE="https://kubernetes.io"
@@ -10,10 +10,11 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="hardened"
 
-COMMON_DEPEND="acct-group/kube-apiserver
+COMMON_DEPEND="
+	acct-group/kube-apiserver
 	acct-user/kube-apiserver"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.19.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.19.4.ebuild
index 0c60e4a0143a..c7e9121eb778 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.19.4.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.19.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.19.6.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.19.6.ebuild
new file mode 100644
index 000000000000..0c60e4a0143a
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.19.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.20.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.20.1.ebuild
new file mode 100644
index 000000000000..0c60e4a0143a
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.20.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 8d42bc6a3cc3..7937261e7623 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,18 +1,22 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.17.13.tar.gz 31841139 BLAKE2B b068ed913fe9a36aaf51b2e2ff05841374b9b1ad25392c0b894bb25b2895228201e9c85eee84a6d61901855be336ad07a1108fbeb43a619f779667191737eddb SHA512 eaebc7d649a2a53f2a7bae8fe70ccd469f8f983a2d14148f86e86a05d66a40ce8b71d4422e653966daf4c86ccd353693cc0e9bfe3a44b5259239d047a20ddb7a
 DIST kubernetes-1.17.14.tar.gz 31844013 BLAKE2B 725081706a7647127018d34d55d1eae1ac750d1378a7b8762aff39a638f88931e2f37d8609329b32bce360bb52e654f230f1c121d122fd90ab94de6b8a035f0f SHA512 6d5a22c47bd89a5622e38746a6e9c6d3146f065d7f1e63c161f6fc667e1c7d973a4ce0a77a63b53ed46708f490477c182119a0809d08b8ee3041f232a60ad19e
 DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d694d55130fa6fd0a13f2e6ec653971670a8b1af04dc5972738e504cce664619b1aad67d0bcae217884fb352c364a6804 SHA512 967caccf8758bcdf4549ec83b795ec580e072d8108b2c8ef10f1d05696dedbfd5d472e27590bb952639f198003b44dc83da5435853337938035488959360e3d3
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
+DIST kubernetes-1.18.14.tar.gz 32666861 BLAKE2B 6a005804280d72de84d1bab68a51e72c41de0b3a50a1c40befab1290e9fcfecba133fa441f50bf250f458ca4ad44f4fab495da4782626efff70dcfe0f3029d49 SHA512 e19b834db4920db6b466662a8c001ecaad7a7bee6c4faef871bbc3f528e10b0b4c9fc6f3ac065953ce625db0ede98d76536cf3158b4fb241725115febb141946
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.19.6.tar.gz 33470206 BLAKE2B ea7614da380ce7c834884d96b37753802eb4919b4fb274dabf0d38f0438039c90ab1fccc86e0d8f665c15ae61f1d3f6ce4d400782ed580033cfd58390cd50617 SHA512 d7c6db2fa399b04a3acae792546fa0384e6b3a3e5eaa2c1ba6c49d656da0197f5be3d009756313436816f3839825c66ce23a06a1ec35c37f1c3fcfba79f9ac32
 DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
-EBUILD kube-controller-manager-1.17.13.ebuild 995 BLAKE2B 415d764fd1b869881b77028994696658f3df64861e30afe2f428886355f839f8ad9e6935f7097578942d81e77510c567116eba6eac69fa338c568bbec90ca7b4 SHA512 6b217ae240ab158951ab2b57a81c7d76175a4ab24c886a57f8cce35852123d34b8c4321fc6ca35c3a97f25631089e873d328c7f78b032ad27489ee9ece87f0e9
-EBUILD kube-controller-manager-1.17.14.ebuild 996 BLAKE2B 929048396d2bd64334c24c4370e2a27ac6c736d00076094bbf8768062c3fb6abd2dd1ed157f636343845c76afff78850104c6dfb115e966eedc2300a7b64b1d2 SHA512 64d7b841153d8dd15a077cce8d3287f4e9e717879c94b739565a4e06eff4b974edc0017e5610a0a0597f859493d12ddfd3d4ef3e0003202e318cc7cdb0064b3b
+DIST kubernetes-1.20.1.tar.gz 34424663 BLAKE2B 156482f88f051eeea0c428c357a79d876ff0ce5f8ed6eb1ffa72be83bff45b72970280fa1bc7629804c178b9fa45ad84a9961a4f0e7eca1b58351fc7d7f4cfc0 SHA512 40598999cc5c96c54591338eb985bc056892ef2f98cfb521ff26937fa29f63a20e97f52a8454433ff98614d579509b7a5e927edcd96f4725505a334a999c0326
+EBUILD kube-controller-manager-1.17.14.ebuild 995 BLAKE2B 415d764fd1b869881b77028994696658f3df64861e30afe2f428886355f839f8ad9e6935f7097578942d81e77510c567116eba6eac69fa338c568bbec90ca7b4 SHA512 6b217ae240ab158951ab2b57a81c7d76175a4ab24c886a57f8cce35852123d34b8c4321fc6ca35c3a97f25631089e873d328c7f78b032ad27489ee9ece87f0e9
 EBUILD kube-controller-manager-1.18.10.ebuild 995 BLAKE2B 0e02e87535309211f9b0616b55d68b4f39b961de404c2241c5f98c7ac33c11a7688c02a291cb1fbd6a47476b448c7d8937a69b1d4ceae1669ffd11ecac6f84e7 SHA512 5f7c3ad0e5f76d130752015beca896d42a249981a19fc96f30fd79a3ea721aa17b6d6a070797f695e32c63ff3e2a913bc55cbbd9816768153dc434cb5837c649
-EBUILD kube-controller-manager-1.18.12.ebuild 996 BLAKE2B 1b71359d516c24758c4c22ef0724aad19fd7cffabc0a1e22eba9809e635099d1934336309ba7330801eacdb2ec17136e080ac3de2868d56670d15216d3781042 SHA512 dc4c0d820fcdc1602952e42f4868f9e7a2a7f10a3b49633b11807e4a6bd22be44e19f4306aaf88b1a3b1f0442173fde980c0c7534c078e535f1251aa66548d00
+EBUILD kube-controller-manager-1.18.12.ebuild 995 BLAKE2B 0e02e87535309211f9b0616b55d68b4f39b961de404c2241c5f98c7ac33c11a7688c02a291cb1fbd6a47476b448c7d8937a69b1d4ceae1669ffd11ecac6f84e7 SHA512 5f7c3ad0e5f76d130752015beca896d42a249981a19fc96f30fd79a3ea721aa17b6d6a070797f695e32c63ff3e2a913bc55cbbd9816768153dc434cb5837c649
+EBUILD kube-controller-manager-1.18.14.ebuild 996 BLAKE2B 1b71359d516c24758c4c22ef0724aad19fd7cffabc0a1e22eba9809e635099d1934336309ba7330801eacdb2ec17136e080ac3de2868d56670d15216d3781042 SHA512 dc4c0d820fcdc1602952e42f4868f9e7a2a7f10a3b49633b11807e4a6bd22be44e19f4306aaf88b1a3b1f0442173fde980c0c7534c078e535f1251aa66548d00
 EBUILD kube-controller-manager-1.19.3.ebuild 1013 BLAKE2B ece69494aaf4069df77f5b59f69194bc9026ff0ff9c99c26d01871c79d79cdb9690b6ef0e23548aa9d949fc2a3d498d90ae3343d718d75f8c5fc064f15fc82f4 SHA512 b4cd7597206d1a0689ae8fc8592ecf2b438e386d8a65057b60aafc8fb2614d1ce0a16ef92d3e807c4dc93177786f93f9a10f00d0dfe091abd3a6c01ec34c5142
-EBUILD kube-controller-manager-1.19.4.ebuild 1014 BLAKE2B 17fcd0560a912cb174f5efe605c2400f13644a1229cc2d2009c8f01e73cf1f8c277e9111f07f020ef6fdd65667fdff1cf89578fb76849f01c06000449a2def66 SHA512 557136c63f805b8ffa64d3a6c63411594d77c1d98587cb0ac42a9ecc00eb9c6b91330866da16b82bafe8e97eec6a1b3d899b790bf98f112a566eda9bae0b53c9
+EBUILD kube-controller-manager-1.19.4.ebuild 1013 BLAKE2B ece69494aaf4069df77f5b59f69194bc9026ff0ff9c99c26d01871c79d79cdb9690b6ef0e23548aa9d949fc2a3d498d90ae3343d718d75f8c5fc064f15fc82f4 SHA512 b4cd7597206d1a0689ae8fc8592ecf2b438e386d8a65057b60aafc8fb2614d1ce0a16ef92d3e807c4dc93177786f93f9a10f00d0dfe091abd3a6c01ec34c5142
+EBUILD kube-controller-manager-1.19.6.ebuild 1014 BLAKE2B 17fcd0560a912cb174f5efe605c2400f13644a1229cc2d2009c8f01e73cf1f8c277e9111f07f020ef6fdd65667fdff1cf89578fb76849f01c06000449a2def66 SHA512 557136c63f805b8ffa64d3a6c63411594d77c1d98587cb0ac42a9ecc00eb9c6b91330866da16b82bafe8e97eec6a1b3d899b790bf98f112a566eda9bae0b53c9
 EBUILD kube-controller-manager-1.20.0.ebuild 1014 BLAKE2B 17fcd0560a912cb174f5efe605c2400f13644a1229cc2d2009c8f01e73cf1f8c277e9111f07f020ef6fdd65667fdff1cf89578fb76849f01c06000449a2def66 SHA512 557136c63f805b8ffa64d3a6c63411594d77c1d98587cb0ac42a9ecc00eb9c6b91330866da16b82bafe8e97eec6a1b3d899b790bf98f112a566eda9bae0b53c9
+EBUILD kube-controller-manager-1.20.1.ebuild 1014 BLAKE2B 17fcd0560a912cb174f5efe605c2400f13644a1229cc2d2009c8f01e73cf1f8c277e9111f07f020ef6fdd65667fdff1cf89578fb76849f01c06000449a2def66 SHA512 557136c63f805b8ffa64d3a6c63411594d77c1d98587cb0ac42a9ecc00eb9c6b91330866da16b82bafe8e97eec6a1b3d899b790bf98f112a566eda9bae0b53c9
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.17.14.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.17.14.ebuild
index 23ada18df068..c96771b74a1f 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.17.14.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.17.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.12.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.12.ebuild
index 25099739497e..a8f8cabb4852 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.12.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.17.13.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.14.ebuild
similarity index 93%
rename from sys-cluster/kube-controller-manager/kube-controller-manager-1.17.13.ebuild
rename to sys-cluster/kube-controller-manager/kube-controller-manager-1.18.14.ebuild
index c96771b74a1f..25099739497e 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.17.13.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.18.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
@@ -25,7 +25,7 @@ S="${WORKDIR}/kubernetes-${PV}"
 
 src_compile() {
 	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
-		emake -j1 GOFLAGS=-v GOLDFLAGS="" WHAT=cmd/${PN}
+		emake -j1 GOFLAGS="" GOLDFLAGS="" WHAT=cmd/${PN}
 }
 
 src_install() {
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.4.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.4.ebuild
index 7ebd21720e51..1ebd04eb6335 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.4.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-controller-manager
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.6.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.6.ebuild
new file mode 100644
index 000000000000..7ebd21720e51
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.19.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.1.ebuild
new file mode 100644
index 000000000000..7ebd21720e51
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.20.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 26da6f6a5d04..e9edf114266d 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,18 +1,22 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.17.13.tar.gz 31841139 BLAKE2B b068ed913fe9a36aaf51b2e2ff05841374b9b1ad25392c0b894bb25b2895228201e9c85eee84a6d61901855be336ad07a1108fbeb43a619f779667191737eddb SHA512 eaebc7d649a2a53f2a7bae8fe70ccd469f8f983a2d14148f86e86a05d66a40ce8b71d4422e653966daf4c86ccd353693cc0e9bfe3a44b5259239d047a20ddb7a
 DIST kubernetes-1.17.14.tar.gz 31844013 BLAKE2B 725081706a7647127018d34d55d1eae1ac750d1378a7b8762aff39a638f88931e2f37d8609329b32bce360bb52e654f230f1c121d122fd90ab94de6b8a035f0f SHA512 6d5a22c47bd89a5622e38746a6e9c6d3146f065d7f1e63c161f6fc667e1c7d973a4ce0a77a63b53ed46708f490477c182119a0809d08b8ee3041f232a60ad19e
 DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d694d55130fa6fd0a13f2e6ec653971670a8b1af04dc5972738e504cce664619b1aad67d0bcae217884fb352c364a6804 SHA512 967caccf8758bcdf4549ec83b795ec580e072d8108b2c8ef10f1d05696dedbfd5d472e27590bb952639f198003b44dc83da5435853337938035488959360e3d3
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
+DIST kubernetes-1.18.14.tar.gz 32666861 BLAKE2B 6a005804280d72de84d1bab68a51e72c41de0b3a50a1c40befab1290e9fcfecba133fa441f50bf250f458ca4ad44f4fab495da4782626efff70dcfe0f3029d49 SHA512 e19b834db4920db6b466662a8c001ecaad7a7bee6c4faef871bbc3f528e10b0b4c9fc6f3ac065953ce625db0ede98d76536cf3158b4fb241725115febb141946
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.19.6.tar.gz 33470206 BLAKE2B ea7614da380ce7c834884d96b37753802eb4919b4fb274dabf0d38f0438039c90ab1fccc86e0d8f665c15ae61f1d3f6ce4d400782ed580033cfd58390cd50617 SHA512 d7c6db2fa399b04a3acae792546fa0384e6b3a3e5eaa2c1ba6c49d656da0197f5be3d009756313436816f3839825c66ce23a06a1ec35c37f1c3fcfba79f9ac32
 DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
-EBUILD kube-proxy-1.17.13.ebuild 921 BLAKE2B 91cf30d2997a292d3483cf56eb3582c36f40f8d06dffdc323ffce92301eb4f3cadb19a306473b68e17a31c2de67d38144480d965a8c71413edf786f4259282cf SHA512 d65fe717deb2769c1a3554cf4643e35b6b9998efd67ef279597285471bdc1cabde94e9914f9b097754dab38541ad1fe1d65a269b7ca8668819af333f94db00b3
-EBUILD kube-proxy-1.17.14.ebuild 922 BLAKE2B bfd93c76c8f0ea61fb3cef2a0de77617df9993d8a5c0eca7121d771763dadc8bca702822c73362031609b9c15e05cacbac7a25d86f2df043d45242f1ff4a2d94 SHA512 57eb38bf2e407b32c61e1389e8b278c3d49602ca5480380d9cc7d86ce4beb781b5a7c64980b4c2cce6eb6d604ed220930eeb33fdd0189299688a04ff95f423c8
+DIST kubernetes-1.20.1.tar.gz 34424663 BLAKE2B 156482f88f051eeea0c428c357a79d876ff0ce5f8ed6eb1ffa72be83bff45b72970280fa1bc7629804c178b9fa45ad84a9961a4f0e7eca1b58351fc7d7f4cfc0 SHA512 40598999cc5c96c54591338eb985bc056892ef2f98cfb521ff26937fa29f63a20e97f52a8454433ff98614d579509b7a5e927edcd96f4725505a334a999c0326
+EBUILD kube-proxy-1.17.14.ebuild 921 BLAKE2B 91cf30d2997a292d3483cf56eb3582c36f40f8d06dffdc323ffce92301eb4f3cadb19a306473b68e17a31c2de67d38144480d965a8c71413edf786f4259282cf SHA512 d65fe717deb2769c1a3554cf4643e35b6b9998efd67ef279597285471bdc1cabde94e9914f9b097754dab38541ad1fe1d65a269b7ca8668819af333f94db00b3
 EBUILD kube-proxy-1.18.10.ebuild 921 BLAKE2B 91cf30d2997a292d3483cf56eb3582c36f40f8d06dffdc323ffce92301eb4f3cadb19a306473b68e17a31c2de67d38144480d965a8c71413edf786f4259282cf SHA512 d65fe717deb2769c1a3554cf4643e35b6b9998efd67ef279597285471bdc1cabde94e9914f9b097754dab38541ad1fe1d65a269b7ca8668819af333f94db00b3
-EBUILD kube-proxy-1.18.12.ebuild 922 BLAKE2B bfd93c76c8f0ea61fb3cef2a0de77617df9993d8a5c0eca7121d771763dadc8bca702822c73362031609b9c15e05cacbac7a25d86f2df043d45242f1ff4a2d94 SHA512 57eb38bf2e407b32c61e1389e8b278c3d49602ca5480380d9cc7d86ce4beb781b5a7c64980b4c2cce6eb6d604ed220930eeb33fdd0189299688a04ff95f423c8
+EBUILD kube-proxy-1.18.12.ebuild 921 BLAKE2B 91cf30d2997a292d3483cf56eb3582c36f40f8d06dffdc323ffce92301eb4f3cadb19a306473b68e17a31c2de67d38144480d965a8c71413edf786f4259282cf SHA512 d65fe717deb2769c1a3554cf4643e35b6b9998efd67ef279597285471bdc1cabde94e9914f9b097754dab38541ad1fe1d65a269b7ca8668819af333f94db00b3
+EBUILD kube-proxy-1.18.14.ebuild 922 BLAKE2B bfd93c76c8f0ea61fb3cef2a0de77617df9993d8a5c0eca7121d771763dadc8bca702822c73362031609b9c15e05cacbac7a25d86f2df043d45242f1ff4a2d94 SHA512 57eb38bf2e407b32c61e1389e8b278c3d49602ca5480380d9cc7d86ce4beb781b5a7c64980b4c2cce6eb6d604ed220930eeb33fdd0189299688a04ff95f423c8
 EBUILD kube-proxy-1.19.3.ebuild 928 BLAKE2B 34644b672e168243d5589eca39c2bad64d5b5fdd41d022cad64a9d9792a14856e5ed55f7868739af44ee039d8184c2a57e0c076adf59498be9d961f312a3cb17 SHA512 0372233c7948b6206d4aada693a4093fc439dd7390de682b6a363fcf8a3e5915213065b30773cdbaa2e2557e3c19db721df1ce4239cf01ae88366fba525bfc68
-EBUILD kube-proxy-1.19.4.ebuild 929 BLAKE2B f4edf4ee4dcd41abcfaaed2373837b952323b7fa6f42322ef792e287c68986c54b9d9a36fda99a21913c6b59dcc44e835793bc48abd06e3cd83676e8df132965 SHA512 f942cccd8c6bc7094bc54fbd258868a74c9d4f5ffc73d55acb8d1bd4548033aba0a457b4a0e03ce4a81ce2f240fcafe6a5d580f9db8cd323357c5aa13380611c
+EBUILD kube-proxy-1.19.4.ebuild 928 BLAKE2B 34644b672e168243d5589eca39c2bad64d5b5fdd41d022cad64a9d9792a14856e5ed55f7868739af44ee039d8184c2a57e0c076adf59498be9d961f312a3cb17 SHA512 0372233c7948b6206d4aada693a4093fc439dd7390de682b6a363fcf8a3e5915213065b30773cdbaa2e2557e3c19db721df1ce4239cf01ae88366fba525bfc68
+EBUILD kube-proxy-1.19.6.ebuild 929 BLAKE2B f4edf4ee4dcd41abcfaaed2373837b952323b7fa6f42322ef792e287c68986c54b9d9a36fda99a21913c6b59dcc44e835793bc48abd06e3cd83676e8df132965 SHA512 f942cccd8c6bc7094bc54fbd258868a74c9d4f5ffc73d55acb8d1bd4548033aba0a457b4a0e03ce4a81ce2f240fcafe6a5d580f9db8cd323357c5aa13380611c
 EBUILD kube-proxy-1.20.0.ebuild 929 BLAKE2B f4edf4ee4dcd41abcfaaed2373837b952323b7fa6f42322ef792e287c68986c54b9d9a36fda99a21913c6b59dcc44e835793bc48abd06e3cd83676e8df132965 SHA512 f942cccd8c6bc7094bc54fbd258868a74c9d4f5ffc73d55acb8d1bd4548033aba0a457b4a0e03ce4a81ce2f240fcafe6a5d580f9db8cd323357c5aa13380611c
-MISC metadata.xml 362 BLAKE2B 7f3bc6132d658d3af0f5ed69dc10e06a6aa93bcbf229a1f089ea6ff9d72fa4c489c2374e2932898d75d5eef61e6ccf1875ccb8c783c34864fd976ae845f10f28 SHA512 51b04b1a97ab16a620347142992b59fdeaacbec1940e69a7a98df386f978024fb27b92dd0ae7557ed1c31c36bc34ff7d2c86c935ce0e01dfbb1bd8d7080d807c
+EBUILD kube-proxy-1.20.1.ebuild 929 BLAKE2B f4edf4ee4dcd41abcfaaed2373837b952323b7fa6f42322ef792e287c68986c54b9d9a36fda99a21913c6b59dcc44e835793bc48abd06e3cd83676e8df132965 SHA512 f942cccd8c6bc7094bc54fbd258868a74c9d4f5ffc73d55acb8d1bd4548033aba0a457b4a0e03ce4a81ce2f240fcafe6a5d580f9db8cd323357c5aa13380611c
+MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.17.14.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.17.14.ebuild
index 7054c6b9a9b7..5ef88fafdada 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.17.14.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.17.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.18.12.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.18.12.ebuild
index 7054c6b9a9b7..5ef88fafdada 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.18.12.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.18.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.17.13.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.18.14.ebuild
similarity index 98%
rename from sys-cluster/kube-proxy/kube-proxy-1.17.13.ebuild
rename to sys-cluster/kube-proxy/kube-proxy-1.18.14.ebuild
index 5ef88fafdada..7054c6b9a9b7 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.17.13.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.18.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.19.4.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.19.4.ebuild
index 2bf8b1a469e1..ddc12b2f8a73 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.19.4.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.19.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="net-firewall/conntrack-tools
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.19.6.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.19.6.ebuild
new file mode 100644
index 000000000000..2bf8b1a469e1
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.19.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.20.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.20.1.ebuild
new file mode 100644
index 000000000000..2bf8b1a469e1
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.20.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/metadata.xml b/sys-cluster/kube-proxy/metadata.xml
index d19e726572c4..601df5439e13 100644
--- a/sys-cluster/kube-proxy/metadata.xml
+++ b/sys-cluster/kube-proxy/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
 	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
diff --git a/sys-cluster/kube-router/Manifest b/sys-cluster/kube-router/Manifest
index 489e932eab75..ad4e2f0622f1 100644
--- a/sys-cluster/kube-router/Manifest
+++ b/sys-cluster/kube-router/Manifest
@@ -4,7 +4,9 @@ AUX kube-router.logrotated 85 BLAKE2B 41c40f60ee686f7387e01c85345e6d8d3c562df236
 DIST kube-router-0.4.0.tar.gz 8403982 BLAKE2B e5e9e92064f00d696ca1cde310813541910d3e37b9c31336b1f2729e63a963fb454a2a9d07b2394134b9ea96e64d6caa26b6230bfd214883f5951bcfdd30c674 SHA512 00617e434b770c1b5eeb3f2c85ae9b6f49157224a5df223f5d1ec514ba087164bb03f0e28a38c75d3149c0c028ed54ceccf898a77c474bbf64921f45db7c3e3c
 DIST kube-router-1.0.1.tar.gz 8413249 BLAKE2B dd158fda5a25925d1f630764f7ad77a821c145def887093692333fcdb4e9a3d9736fe3243f7834abf60d71835fe37a81e4d0a9f20cb45e05d9bb817a50d81196 SHA512 a84176785367fb87562a9a410d87376d938fb32c8aec0cd71259ca3af2204b76ba083201b5f2ad38b395a83a321f0feec4b304a4f3add595b5eadf0837a6918b
 DIST kube-router-1.1.0.tar.gz 8095149 BLAKE2B 9487d329ef1dc09b0e0d58233a4440da53a239f78dfd4d1f4676c23c347f550431c2a898656e0670afc002bd5435ae172662408fa3526335af95303a1ac9d6d9 SHA512 14ff214257fb0dd1a2e98c5d2a5abb65d2b104402d8403066225274f85dfa861fef6c2b389c2c008a07b42367bb5be52785e375c13e2feffd915863f1da5c86a
+DIST kube-router-1.1.1.tar.gz 8155406 BLAKE2B c036f94eb8e938d37fcc62c58d64c718493d730e0b3fec9ecc2287a772f9890cf63b9728c3c8b0eae00098173e237b91a3dc8801029ed026800b5df3076e7d5a SHA512 172921e999cd9634663ec522623259ad9b64ce18506b8358d90547714f64a5c0b73598f8da402e1f4ecdabb3f4d5602e784f27a55747a7d4d2c47c42f51abfef
 EBUILD kube-router-0.4.0.ebuild 5257 BLAKE2B ddde07a17a1683a0c4adb1fa99e78ac15850a762c1eaeed2e4cac1957fd7225a5c402795d817cc8e9700d3aa170ae004d5d16e9664304a74931c123e9a5436f8 SHA512 00aeb5a34a105d0e5ce74ec835ae2e8df56ec7f9994577d7bebe6a4c1e254977e96029573a0b6c29fcbff3ea2a9f1f7eff14f0d3171604bd6d910c06c0fbedcf
 EBUILD kube-router-1.0.1.ebuild 6423 BLAKE2B 6fe7a2501be0970e96f99a390bd26af361c244a7b2b8fe3b3daef3a2b75a8657256276551a6e1d849b65ce36c43476c7f22e474d2c64aa844c43458f615202df SHA512 ad87bf32a8475821ce9af56313c7882c854b417dcc1f073efe8675952a384b6683c377735912815930c5d0f5cf45191edfad6ab88bad23bd37c9b31abbde6fd7
 EBUILD kube-router-1.1.0.ebuild 929 BLAKE2B e1fab52aacd33a3ccde6c5bf4e50e4406fc802fd19552b15b9e2b64b6784e08194c199645c996f8252854d4709223f3142a6acf5b49fc103927d03519e18f577 SHA512 2eea212b3161751b510fb0aab072a1946fb55ef468a4e3e6fd2204ff92b7df578e2c5d5b83b5ec8decf3e140b60924ed6617a430ae01e412ad1352e4db9701db
+EBUILD kube-router-1.1.1.ebuild 929 BLAKE2B e1fab52aacd33a3ccde6c5bf4e50e4406fc802fd19552b15b9e2b64b6784e08194c199645c996f8252854d4709223f3142a6acf5b49fc103927d03519e18f577 SHA512 2eea212b3161751b510fb0aab072a1946fb55ef468a4e3e6fd2204ff92b7df578e2c5d5b83b5ec8decf3e140b60924ed6617a430ae01e412ad1352e4db9701db
 MISC metadata.xml 848 BLAKE2B 3ba78ece1af8cf69ab50f10afdd24ff8765b1bace2ba02ec094dde976d216d7cb1afc9a2d69d6b674aa03bd842bfa453f0583380119bf8595fbc524fc9fd0e51 SHA512 5746d825adf43cbf15d4d9886194c1ab351497a0dc8110d9e19c879c306ac1e808c1986346de5f842b8b3910febebbe7b81f6c909f3ccd7067507b83396b166e
diff --git a/sys-cluster/kube-router/kube-router-1.1.1.ebuild b/sys-cluster/kube-router/kube-router-1.1.1.ebuild
new file mode 100644
index 000000000000..001c06d8fbc8
--- /dev/null
+++ b/sys-cluster/kube-router/kube-router-1.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="A turnkey solution for Kubernetes networking"
+HOMEPAGE="https://kube-router.io"
+SRC_URI="https://github.com/cloudnativelabs/kube-router/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	net-firewall/iptables[conntrack]
+	net-firewall/ipset
+	sys-cluster/ipvsadm
+"
+
+src_compile() {
+	emake BUILD_IN_DOCKER=false GIT_COMMIT=v${PV} kube-router
+}
+
+src_test() {
+	go test -mod=vendor -v -timeout=30s ./cmd/kube-router ./pkg/... || 
+		die "tests failed"
+}
+
+src_install() {
+	dobin "${PN}"
+	einstalldocs
+	newinitd "${FILESDIR}"/kube-router.initd kube-router
+	newconfd "${FILESDIR}"/kube-router.confd kube-router
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/kube-router.logrotated kube-router
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 3b8bc1670d24..44743c9cadb5 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,18 +1,22 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.17.13.tar.gz 31841139 BLAKE2B b068ed913fe9a36aaf51b2e2ff05841374b9b1ad25392c0b894bb25b2895228201e9c85eee84a6d61901855be336ad07a1108fbeb43a619f779667191737eddb SHA512 eaebc7d649a2a53f2a7bae8fe70ccd469f8f983a2d14148f86e86a05d66a40ce8b71d4422e653966daf4c86ccd353693cc0e9bfe3a44b5259239d047a20ddb7a
 DIST kubernetes-1.17.14.tar.gz 31844013 BLAKE2B 725081706a7647127018d34d55d1eae1ac750d1378a7b8762aff39a638f88931e2f37d8609329b32bce360bb52e654f230f1c121d122fd90ab94de6b8a035f0f SHA512 6d5a22c47bd89a5622e38746a6e9c6d3146f065d7f1e63c161f6fc667e1c7d973a4ce0a77a63b53ed46708f490477c182119a0809d08b8ee3041f232a60ad19e
 DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d694d55130fa6fd0a13f2e6ec653971670a8b1af04dc5972738e504cce664619b1aad67d0bcae217884fb352c364a6804 SHA512 967caccf8758bcdf4549ec83b795ec580e072d8108b2c8ef10f1d05696dedbfd5d472e27590bb952639f198003b44dc83da5435853337938035488959360e3d3
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
+DIST kubernetes-1.18.14.tar.gz 32666861 BLAKE2B 6a005804280d72de84d1bab68a51e72c41de0b3a50a1c40befab1290e9fcfecba133fa441f50bf250f458ca4ad44f4fab495da4782626efff70dcfe0f3029d49 SHA512 e19b834db4920db6b466662a8c001ecaad7a7bee6c4faef871bbc3f528e10b0b4c9fc6f3ac065953ce625db0ede98d76536cf3158b4fb241725115febb141946
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.19.6.tar.gz 33470206 BLAKE2B ea7614da380ce7c834884d96b37753802eb4919b4fb274dabf0d38f0438039c90ab1fccc86e0d8f665c15ae61f1d3f6ce4d400782ed580033cfd58390cd50617 SHA512 d7c6db2fa399b04a3acae792546fa0384e6b3a3e5eaa2c1ba6c49d656da0197f5be3d009756313436816f3839825c66ce23a06a1ec35c37f1c3fcfba79f9ac32
 DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
-EBUILD kube-scheduler-1.17.13.ebuild 980 BLAKE2B 59b13870a0cf9667315f9ada89c2f84b20a387894ba66dc4db6b40fc4f68c30f4cd66bd2c160447666d64bd0cbbf4f354793c56a495bf07ca6a64d59dfdbfaa8 SHA512 c8ac15ebc5ce5526b0b42684141ea1493e8dbec1a7412402fe6b0cf451964d1b01e0a4ca044dfff0cf6df209d0a2a7e2895256352d5b9281449ac79fb45ea05b
-EBUILD kube-scheduler-1.17.14.ebuild 981 BLAKE2B 138abec122588f0e3c2a08ac415fa0bb49939ce6c6dd3e7dc687376602996a7b75b2c610c521ec973489967fa1682a05ab78690008ed78fb88daf2234e1acd5f SHA512 2ba85727af5bbcbc9787ccab32e258018b905448dfdabc2217bebf852afc92d44ced6694bc6019120346fbd16f51eb440f50a5b7509651887d3df320d58a4bae
+DIST kubernetes-1.20.1.tar.gz 34424663 BLAKE2B 156482f88f051eeea0c428c357a79d876ff0ce5f8ed6eb1ffa72be83bff45b72970280fa1bc7629804c178b9fa45ad84a9961a4f0e7eca1b58351fc7d7f4cfc0 SHA512 40598999cc5c96c54591338eb985bc056892ef2f98cfb521ff26937fa29f63a20e97f52a8454433ff98614d579509b7a5e927edcd96f4725505a334a999c0326
+EBUILD kube-scheduler-1.17.14.ebuild 980 BLAKE2B 59b13870a0cf9667315f9ada89c2f84b20a387894ba66dc4db6b40fc4f68c30f4cd66bd2c160447666d64bd0cbbf4f354793c56a495bf07ca6a64d59dfdbfaa8 SHA512 c8ac15ebc5ce5526b0b42684141ea1493e8dbec1a7412402fe6b0cf451964d1b01e0a4ca044dfff0cf6df209d0a2a7e2895256352d5b9281449ac79fb45ea05b
 EBUILD kube-scheduler-1.18.10.ebuild 979 BLAKE2B 3452a23ce4c0260f19ab673fa725d0dab18c06fcf194ad2703bc9d11fda99334d55c6eef701f92a82f049b8ad91d0d6ee2318df5b4c6e0cb4f50ebb82c4fa20d SHA512 f0256abcbb27d4eb0b5b1e7cf6b1b1ec37545bf6182a1a371a195317b729ca4e0d394d9bb89c1d6dd1cb770dc1fab5c66d3ccb422054d542904e8260944ade41
-EBUILD kube-scheduler-1.18.12.ebuild 980 BLAKE2B 7748469a14dbeff7596492398847575c7911d03b50666122ff85cfc8979582027996627cf8ef0e880e9a3e5a543eeea8b84209e80df97c256e5bf11e7b49cfa0 SHA512 f7183cd1322bdb4dcfc181202a67fdad3b2d5b1af3c0a92cc4c6eacfa7cdcc79de361832e1de8b7f1725461885469b67023d59e6198416b4321cda7fe8a614e7
+EBUILD kube-scheduler-1.18.12.ebuild 979 BLAKE2B 3452a23ce4c0260f19ab673fa725d0dab18c06fcf194ad2703bc9d11fda99334d55c6eef701f92a82f049b8ad91d0d6ee2318df5b4c6e0cb4f50ebb82c4fa20d SHA512 f0256abcbb27d4eb0b5b1e7cf6b1b1ec37545bf6182a1a371a195317b729ca4e0d394d9bb89c1d6dd1cb770dc1fab5c66d3ccb422054d542904e8260944ade41
+EBUILD kube-scheduler-1.18.14.ebuild 980 BLAKE2B 7748469a14dbeff7596492398847575c7911d03b50666122ff85cfc8979582027996627cf8ef0e880e9a3e5a543eeea8b84209e80df97c256e5bf11e7b49cfa0 SHA512 f7183cd1322bdb4dcfc181202a67fdad3b2d5b1af3c0a92cc4c6eacfa7cdcc79de361832e1de8b7f1725461885469b67023d59e6198416b4321cda7fe8a614e7
 EBUILD kube-scheduler-1.19.3.ebuild 986 BLAKE2B dfd44bf7514501fb504941a0d39760affed4d7a40b1de38569ede78e5882976ba99cebaf5470ad5286026373cc89e33cd13f48a4aeafedca34ec157e02ab70d8 SHA512 7ec037243377d2caf291d3c48ab3c4b7804a8c414d0527e13a0b9a4750a7ef2abee5eb580ce307937516878b79fc6795e5407c36188fc94c8eff9f98aac90ded
-EBUILD kube-scheduler-1.19.4.ebuild 987 BLAKE2B 9923a4552e935463e26b4cbb0fe06ba3b0bdd697ffee66eb99d54dde50bc2a380aa00c9f9064151de23ce455638c1912e5093266e7fcf586cb77699afac753ff SHA512 a668af044df3e8dcc4633806d620ec0c743d75f0dde819d6320497de56e9ea7359f6c5c79637c83d8df2156df949772dbd4e73315ed8fde6f4a2adf9b3360725
+EBUILD kube-scheduler-1.19.4.ebuild 986 BLAKE2B dfd44bf7514501fb504941a0d39760affed4d7a40b1de38569ede78e5882976ba99cebaf5470ad5286026373cc89e33cd13f48a4aeafedca34ec157e02ab70d8 SHA512 7ec037243377d2caf291d3c48ab3c4b7804a8c414d0527e13a0b9a4750a7ef2abee5eb580ce307937516878b79fc6795e5407c36188fc94c8eff9f98aac90ded
+EBUILD kube-scheduler-1.19.6.ebuild 987 BLAKE2B 9923a4552e935463e26b4cbb0fe06ba3b0bdd697ffee66eb99d54dde50bc2a380aa00c9f9064151de23ce455638c1912e5093266e7fcf586cb77699afac753ff SHA512 a668af044df3e8dcc4633806d620ec0c743d75f0dde819d6320497de56e9ea7359f6c5c79637c83d8df2156df949772dbd4e73315ed8fde6f4a2adf9b3360725
 EBUILD kube-scheduler-1.20.0.ebuild 987 BLAKE2B 9923a4552e935463e26b4cbb0fe06ba3b0bdd697ffee66eb99d54dde50bc2a380aa00c9f9064151de23ce455638c1912e5093266e7fcf586cb77699afac753ff SHA512 a668af044df3e8dcc4633806d620ec0c743d75f0dde819d6320497de56e9ea7359f6c5c79637c83d8df2156df949772dbd4e73315ed8fde6f4a2adf9b3360725
+EBUILD kube-scheduler-1.20.1.ebuild 987 BLAKE2B 9923a4552e935463e26b4cbb0fe06ba3b0bdd697ffee66eb99d54dde50bc2a380aa00c9f9064151de23ce455638c1912e5093266e7fcf586cb77699afac753ff SHA512 a668af044df3e8dcc4633806d620ec0c743d75f0dde819d6320497de56e9ea7359f6c5c79637c83d8df2156df949772dbd4e73315ed8fde6f4a2adf9b3360725
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.17.14.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.17.14.ebuild
index 778135c2020b..51dfcc877824 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.17.14.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.17.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.18.12.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.18.12.ebuild
index 519380fd3d81..050239c08999 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.18.12.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.18.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.17.13.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.18.14.ebuild
similarity index 95%
rename from sys-cluster/kube-scheduler/kube-scheduler-1.17.13.ebuild
rename to sys-cluster/kube-scheduler/kube-scheduler-1.18.14.ebuild
index 51dfcc877824..519380fd3d81 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.17.13.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.18.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
@@ -18,7 +18,7 @@ COMMON_DEPEND="acct-group/kube-scheduler
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!sys-cluster/kubernetes"
-	BDEPEND="=dev-lang/go-1.14*"
+BDEPEND="=dev-lang/go-1.14*"
 
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.19.4.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.19.4.ebuild
index 177edc1feff5..e25a81f904ce 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.19.4.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.19.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 COMMON_DEPEND="acct-group/kube-scheduler
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.19.6.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.19.6.ebuild
new file mode 100644
index 000000000000..177edc1feff5
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.19.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.20.1.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.20.1.ebuild
new file mode 100644
index 000000000000..177edc1feff5
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.20.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 749e8f023ab6..192dd844f940 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,15 +1,19 @@
-DIST kubernetes-1.17.13.tar.gz 31841139 BLAKE2B b068ed913fe9a36aaf51b2e2ff05841374b9b1ad25392c0b894bb25b2895228201e9c85eee84a6d61901855be336ad07a1108fbeb43a619f779667191737eddb SHA512 eaebc7d649a2a53f2a7bae8fe70ccd469f8f983a2d14148f86e86a05d66a40ce8b71d4422e653966daf4c86ccd353693cc0e9bfe3a44b5259239d047a20ddb7a
 DIST kubernetes-1.17.14.tar.gz 31844013 BLAKE2B 725081706a7647127018d34d55d1eae1ac750d1378a7b8762aff39a638f88931e2f37d8609329b32bce360bb52e654f230f1c121d122fd90ab94de6b8a035f0f SHA512 6d5a22c47bd89a5622e38746a6e9c6d3146f065d7f1e63c161f6fc667e1c7d973a4ce0a77a63b53ed46708f490477c182119a0809d08b8ee3041f232a60ad19e
 DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d694d55130fa6fd0a13f2e6ec653971670a8b1af04dc5972738e504cce664619b1aad67d0bcae217884fb352c364a6804 SHA512 967caccf8758bcdf4549ec83b795ec580e072d8108b2c8ef10f1d05696dedbfd5d472e27590bb952639f198003b44dc83da5435853337938035488959360e3d3
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
+DIST kubernetes-1.18.14.tar.gz 32666861 BLAKE2B 6a005804280d72de84d1bab68a51e72c41de0b3a50a1c40befab1290e9fcfecba133fa441f50bf250f458ca4ad44f4fab495da4782626efff70dcfe0f3029d49 SHA512 e19b834db4920db6b466662a8c001ecaad7a7bee6c4faef871bbc3f528e10b0b4c9fc6f3ac065953ce625db0ede98d76536cf3158b4fb241725115febb141946
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.19.6.tar.gz 33470206 BLAKE2B ea7614da380ce7c834884d96b37753802eb4919b4fb274dabf0d38f0438039c90ab1fccc86e0d8f665c15ae61f1d3f6ce4d400782ed580033cfd58390cd50617 SHA512 d7c6db2fa399b04a3acae792546fa0384e6b3a3e5eaa2c1ba6c49d656da0197f5be3d009756313436816f3839825c66ce23a06a1ec35c37f1c3fcfba79f9ac32
 DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
-EBUILD kubeadm-1.17.13.ebuild 901 BLAKE2B 7f118a9ac267777fc698ef039be02061aede156020072f011c8e78decdde80adfb36abe921255f57230121a2722b4cf02c35d268a4bef35982c8ff0fd5509035 SHA512 c6592ea1b41e9ee7ec7c475af14674d9b4559f5c2319638546de0b01aba89a10c9ed5bba5db697a08889c3b3d58720bae1a76ce225863218b24909f72e7d5df5
-EBUILD kubeadm-1.17.14.ebuild 902 BLAKE2B 255a094f68fe085bd9421d4f8cfd9572f9e8a609e687ed4806c0e07a42d103acd4e97986b67e2e7de94648233a205b85d9642a802e2863ec941ab6fdee632785 SHA512 1fba5a6a6bfa5513c53220d62f67adf6508b53c48e0d195ca363ccb9b7f56bc3290cd3a30fea925aab95da7410c6e33a8d525604918fc2416a97bf0a7564ff9b
+DIST kubernetes-1.20.1.tar.gz 34424663 BLAKE2B 156482f88f051eeea0c428c357a79d876ff0ce5f8ed6eb1ffa72be83bff45b72970280fa1bc7629804c178b9fa45ad84a9961a4f0e7eca1b58351fc7d7f4cfc0 SHA512 40598999cc5c96c54591338eb985bc056892ef2f98cfb521ff26937fa29f63a20e97f52a8454433ff98614d579509b7a5e927edcd96f4725505a334a999c0326
+EBUILD kubeadm-1.17.14.ebuild 901 BLAKE2B 7f118a9ac267777fc698ef039be02061aede156020072f011c8e78decdde80adfb36abe921255f57230121a2722b4cf02c35d268a4bef35982c8ff0fd5509035 SHA512 c6592ea1b41e9ee7ec7c475af14674d9b4559f5c2319638546de0b01aba89a10c9ed5bba5db697a08889c3b3d58720bae1a76ce225863218b24909f72e7d5df5
 EBUILD kubeadm-1.18.10.ebuild 901 BLAKE2B 7f118a9ac267777fc698ef039be02061aede156020072f011c8e78decdde80adfb36abe921255f57230121a2722b4cf02c35d268a4bef35982c8ff0fd5509035 SHA512 c6592ea1b41e9ee7ec7c475af14674d9b4559f5c2319638546de0b01aba89a10c9ed5bba5db697a08889c3b3d58720bae1a76ce225863218b24909f72e7d5df5
-EBUILD kubeadm-1.18.12.ebuild 902 BLAKE2B 255a094f68fe085bd9421d4f8cfd9572f9e8a609e687ed4806c0e07a42d103acd4e97986b67e2e7de94648233a205b85d9642a802e2863ec941ab6fdee632785 SHA512 1fba5a6a6bfa5513c53220d62f67adf6508b53c48e0d195ca363ccb9b7f56bc3290cd3a30fea925aab95da7410c6e33a8d525604918fc2416a97bf0a7564ff9b
+EBUILD kubeadm-1.18.12.ebuild 901 BLAKE2B 7f118a9ac267777fc698ef039be02061aede156020072f011c8e78decdde80adfb36abe921255f57230121a2722b4cf02c35d268a4bef35982c8ff0fd5509035 SHA512 c6592ea1b41e9ee7ec7c475af14674d9b4559f5c2319638546de0b01aba89a10c9ed5bba5db697a08889c3b3d58720bae1a76ce225863218b24909f72e7d5df5
+EBUILD kubeadm-1.18.14.ebuild 902 BLAKE2B 255a094f68fe085bd9421d4f8cfd9572f9e8a609e687ed4806c0e07a42d103acd4e97986b67e2e7de94648233a205b85d9642a802e2863ec941ab6fdee632785 SHA512 1fba5a6a6bfa5513c53220d62f67adf6508b53c48e0d195ca363ccb9b7f56bc3290cd3a30fea925aab95da7410c6e33a8d525604918fc2416a97bf0a7564ff9b
 EBUILD kubeadm-1.19.3.ebuild 906 BLAKE2B 5efec4d82bb7d0197af8b423a5a503c2c00ebfd21aa1790aa4eef89968832811278b836ba256910df9b14010c64cbb367e2331dbfe74891045e872d40e6bfe14 SHA512 d7caf5711538385a89329ec6118ccacc05452549e06bf1fd54cae4e90e7508c5e7e0207cfc65e5d0e9a7a88964b122ba1649b1850a94c62ce914c7967e63535f
-EBUILD kubeadm-1.19.4.ebuild 907 BLAKE2B 997a6d7c90c6e24a34e2a38624e96788ff455222459016954ed3335cbeff01d34e2173b99ca85455e3229dad52af52afa1341d5b2ed6e299cd626ac5816346f7 SHA512 aef36b64c58fd050cda91a5c3534fb9827e830f5aa3e17ff0d66e4c1903e8e4147f851ac75e61644d58f728dc45973982d542f3d5ce9ba41a10fb76b50598b00
+EBUILD kubeadm-1.19.4.ebuild 906 BLAKE2B 5efec4d82bb7d0197af8b423a5a503c2c00ebfd21aa1790aa4eef89968832811278b836ba256910df9b14010c64cbb367e2331dbfe74891045e872d40e6bfe14 SHA512 d7caf5711538385a89329ec6118ccacc05452549e06bf1fd54cae4e90e7508c5e7e0207cfc65e5d0e9a7a88964b122ba1649b1850a94c62ce914c7967e63535f
+EBUILD kubeadm-1.19.6.ebuild 907 BLAKE2B 997a6d7c90c6e24a34e2a38624e96788ff455222459016954ed3335cbeff01d34e2173b99ca85455e3229dad52af52afa1341d5b2ed6e299cd626ac5816346f7 SHA512 aef36b64c58fd050cda91a5c3534fb9827e830f5aa3e17ff0d66e4c1903e8e4147f851ac75e61644d58f728dc45973982d542f3d5ce9ba41a10fb76b50598b00
 EBUILD kubeadm-1.20.0.ebuild 907 BLAKE2B 997a6d7c90c6e24a34e2a38624e96788ff455222459016954ed3335cbeff01d34e2173b99ca85455e3229dad52af52afa1341d5b2ed6e299cd626ac5816346f7 SHA512 aef36b64c58fd050cda91a5c3534fb9827e830f5aa3e17ff0d66e4c1903e8e4147f851ac75e61644d58f728dc45973982d542f3d5ce9ba41a10fb76b50598b00
+EBUILD kubeadm-1.20.1.ebuild 907 BLAKE2B 997a6d7c90c6e24a34e2a38624e96788ff455222459016954ed3335cbeff01d34e2173b99ca85455e3229dad52af52afa1341d5b2ed6e299cd626ac5816346f7 SHA512 aef36b64c58fd050cda91a5c3534fb9827e830f5aa3e17ff0d66e4c1903e8e4147f851ac75e61644d58f728dc45973982d542f3d5ce9ba41a10fb76b50598b00
 MISC metadata.xml 917 BLAKE2B ece7788c2a425d9663a25793715a9a2b1227c76f4ca0606340adf98bf524325524cbfde458125fc20cdfe4278950f4109d6a8a4d31c066f7884c33d856b5cd31 SHA512 587a9b0e0de0e18ccd2b8de9929f588c270172e795cede9093fa2380aa422f67e6e35ea0f534d8507ec278448bb1a7a2832bff561a92f8663e15824130be450a
diff --git a/sys-cluster/kubeadm/kubeadm-1.17.14.ebuild b/sys-cluster/kubeadm/kubeadm-1.17.14.ebuild
index 9ab85c491025..e301e2a424d4 100644
--- a/sys-cluster/kubeadm/kubeadm-1.17.14.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.17.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubeadm/kubeadm-1.18.12.ebuild b/sys-cluster/kubeadm/kubeadm-1.18.12.ebuild
index 9ab85c491025..e301e2a424d4 100644
--- a/sys-cluster/kubeadm/kubeadm-1.18.12.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.18.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubeadm/kubeadm-1.17.13.ebuild b/sys-cluster/kubeadm/kubeadm-1.18.14.ebuild
similarity index 98%
rename from sys-cluster/kubeadm/kubeadm-1.17.13.ebuild
rename to sys-cluster/kubeadm/kubeadm-1.18.14.ebuild
index e301e2a424d4..9ab85c491025 100644
--- a/sys-cluster/kubeadm/kubeadm-1.17.13.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.18.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubeadm/kubeadm-1.19.4.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.4.ebuild
index 192287ce82c9..2d33afced967 100644
--- a/sys-cluster/kubeadm/kubeadm-1.19.4.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.19.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubeadm/kubeadm-1.19.6.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.6.ebuild
new file mode 100644
index 000000000000..192287ce82c9
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.19.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.20.1.ebuild b/sys-cluster/kubeadm/kubeadm-1.20.1.ebuild
new file mode 100644
index 000000000000..192287ce82c9
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.20.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 0ff930d8646b..ae146e38b7c3 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,15 +1,19 @@
-DIST kubernetes-1.17.13.tar.gz 31841139 BLAKE2B b068ed913fe9a36aaf51b2e2ff05841374b9b1ad25392c0b894bb25b2895228201e9c85eee84a6d61901855be336ad07a1108fbeb43a619f779667191737eddb SHA512 eaebc7d649a2a53f2a7bae8fe70ccd469f8f983a2d14148f86e86a05d66a40ce8b71d4422e653966daf4c86ccd353693cc0e9bfe3a44b5259239d047a20ddb7a
 DIST kubernetes-1.17.14.tar.gz 31844013 BLAKE2B 725081706a7647127018d34d55d1eae1ac750d1378a7b8762aff39a638f88931e2f37d8609329b32bce360bb52e654f230f1c121d122fd90ab94de6b8a035f0f SHA512 6d5a22c47bd89a5622e38746a6e9c6d3146f065d7f1e63c161f6fc667e1c7d973a4ce0a77a63b53ed46708f490477c182119a0809d08b8ee3041f232a60ad19e
 DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d694d55130fa6fd0a13f2e6ec653971670a8b1af04dc5972738e504cce664619b1aad67d0bcae217884fb352c364a6804 SHA512 967caccf8758bcdf4549ec83b795ec580e072d8108b2c8ef10f1d05696dedbfd5d472e27590bb952639f198003b44dc83da5435853337938035488959360e3d3
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
+DIST kubernetes-1.18.14.tar.gz 32666861 BLAKE2B 6a005804280d72de84d1bab68a51e72c41de0b3a50a1c40befab1290e9fcfecba133fa441f50bf250f458ca4ad44f4fab495da4782626efff70dcfe0f3029d49 SHA512 e19b834db4920db6b466662a8c001ecaad7a7bee6c4faef871bbc3f528e10b0b4c9fc6f3ac065953ce625db0ede98d76536cf3158b4fb241725115febb141946
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.19.6.tar.gz 33470206 BLAKE2B ea7614da380ce7c834884d96b37753802eb4919b4fb274dabf0d38f0438039c90ab1fccc86e0d8f665c15ae61f1d3f6ce4d400782ed580033cfd58390cd50617 SHA512 d7c6db2fa399b04a3acae792546fa0384e6b3a3e5eaa2c1ba6c49d656da0197f5be3d009756313436816f3839825c66ce23a06a1ec35c37f1c3fcfba79f9ac32
 DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
-EBUILD kubectl-1.17.13.ebuild 900 BLAKE2B a2316313974f7d973a3b95348227f2a7a7080d87d327cf1fa0869cd42e8c3cba4c15db9e3d08a563b5f2b7a60268f0366c8594eaeb4cd4a1210510b85819feec SHA512 0bfff79b25a87fe70a95b3a63213323d48bdfd525b27089d8f7f7eb5a37eca9897f9912b454a5581364cf5f24e9a7c636bddbfd9c992c2453954a33b490e624c
-EBUILD kubectl-1.17.14.ebuild 901 BLAKE2B 0e16ff8b1cc0c3ec52e1ba469e25fa268b2fd8a2d1d3beb4236be91acdaf4f601bed9a08acb6d802cf6ceaa295ea9ff8592668868962155a8f621b9612475989 SHA512 6219eabfd961215925d0ce1817c9f6e1a3491a2471279005d8b1547451816456995635d046771e32c9b9dcd01575b1f2bdc43f03256e9be0f982e7f6b2096cd4
+DIST kubernetes-1.20.1.tar.gz 34424663 BLAKE2B 156482f88f051eeea0c428c357a79d876ff0ce5f8ed6eb1ffa72be83bff45b72970280fa1bc7629804c178b9fa45ad84a9961a4f0e7eca1b58351fc7d7f4cfc0 SHA512 40598999cc5c96c54591338eb985bc056892ef2f98cfb521ff26937fa29f63a20e97f52a8454433ff98614d579509b7a5e927edcd96f4725505a334a999c0326
+EBUILD kubectl-1.17.14.ebuild 900 BLAKE2B a2316313974f7d973a3b95348227f2a7a7080d87d327cf1fa0869cd42e8c3cba4c15db9e3d08a563b5f2b7a60268f0366c8594eaeb4cd4a1210510b85819feec SHA512 0bfff79b25a87fe70a95b3a63213323d48bdfd525b27089d8f7f7eb5a37eca9897f9912b454a5581364cf5f24e9a7c636bddbfd9c992c2453954a33b490e624c
 EBUILD kubectl-1.18.10.ebuild 900 BLAKE2B a2316313974f7d973a3b95348227f2a7a7080d87d327cf1fa0869cd42e8c3cba4c15db9e3d08a563b5f2b7a60268f0366c8594eaeb4cd4a1210510b85819feec SHA512 0bfff79b25a87fe70a95b3a63213323d48bdfd525b27089d8f7f7eb5a37eca9897f9912b454a5581364cf5f24e9a7c636bddbfd9c992c2453954a33b490e624c
-EBUILD kubectl-1.18.12.ebuild 901 BLAKE2B 0e16ff8b1cc0c3ec52e1ba469e25fa268b2fd8a2d1d3beb4236be91acdaf4f601bed9a08acb6d802cf6ceaa295ea9ff8592668868962155a8f621b9612475989 SHA512 6219eabfd961215925d0ce1817c9f6e1a3491a2471279005d8b1547451816456995635d046771e32c9b9dcd01575b1f2bdc43f03256e9be0f982e7f6b2096cd4
+EBUILD kubectl-1.18.12.ebuild 900 BLAKE2B a2316313974f7d973a3b95348227f2a7a7080d87d327cf1fa0869cd42e8c3cba4c15db9e3d08a563b5f2b7a60268f0366c8594eaeb4cd4a1210510b85819feec SHA512 0bfff79b25a87fe70a95b3a63213323d48bdfd525b27089d8f7f7eb5a37eca9897f9912b454a5581364cf5f24e9a7c636bddbfd9c992c2453954a33b490e624c
+EBUILD kubectl-1.18.14.ebuild 901 BLAKE2B 0e16ff8b1cc0c3ec52e1ba469e25fa268b2fd8a2d1d3beb4236be91acdaf4f601bed9a08acb6d802cf6ceaa295ea9ff8592668868962155a8f621b9612475989 SHA512 6219eabfd961215925d0ce1817c9f6e1a3491a2471279005d8b1547451816456995635d046771e32c9b9dcd01575b1f2bdc43f03256e9be0f982e7f6b2096cd4
 EBUILD kubectl-1.19.3.ebuild 901 BLAKE2B 928a7f93d2de11e0f5671a40819a54d0ba59284e7036fc166d9af399495bc897fa9508e9b69f2d00e36c467135fc2fd61b642fe0a88a9aa21afc3ec4fc07c0f8 SHA512 0becacf2403f7b2baa65a4f482d7caf36414ebe328e57e2f88987d706698810aa69375e90e743d655e56fc4278016564b2578d2812b3d72785c8a80b4920f999
-EBUILD kubectl-1.19.4.ebuild 902 BLAKE2B e1c50f7f5774556d754f5014f80a4fdbd8064a05e19283108b55957896cfaf034669e82a068484ed57c349200ce3a2e4eae02a34400b8f885a86d2f7f982c76b SHA512 6677668326cd8fa238fb339c78474902d50d8acb16dc46e0fe1b562c1b762d981ab15ab806487b5eb5f85d47c8724248ebcb2b0ce706af12e8134db18b1c76b7
+EBUILD kubectl-1.19.4.ebuild 901 BLAKE2B 928a7f93d2de11e0f5671a40819a54d0ba59284e7036fc166d9af399495bc897fa9508e9b69f2d00e36c467135fc2fd61b642fe0a88a9aa21afc3ec4fc07c0f8 SHA512 0becacf2403f7b2baa65a4f482d7caf36414ebe328e57e2f88987d706698810aa69375e90e743d655e56fc4278016564b2578d2812b3d72785c8a80b4920f999
+EBUILD kubectl-1.19.6.ebuild 902 BLAKE2B e1c50f7f5774556d754f5014f80a4fdbd8064a05e19283108b55957896cfaf034669e82a068484ed57c349200ce3a2e4eae02a34400b8f885a86d2f7f982c76b SHA512 6677668326cd8fa238fb339c78474902d50d8acb16dc46e0fe1b562c1b762d981ab15ab806487b5eb5f85d47c8724248ebcb2b0ce706af12e8134db18b1c76b7
 EBUILD kubectl-1.20.0.ebuild 902 BLAKE2B e1c50f7f5774556d754f5014f80a4fdbd8064a05e19283108b55957896cfaf034669e82a068484ed57c349200ce3a2e4eae02a34400b8f885a86d2f7f982c76b SHA512 6677668326cd8fa238fb339c78474902d50d8acb16dc46e0fe1b562c1b762d981ab15ab806487b5eb5f85d47c8724248ebcb2b0ce706af12e8134db18b1c76b7
+EBUILD kubectl-1.20.1.ebuild 902 BLAKE2B e1c50f7f5774556d754f5014f80a4fdbd8064a05e19283108b55957896cfaf034669e82a068484ed57c349200ce3a2e4eae02a34400b8f885a86d2f7f982c76b SHA512 6677668326cd8fa238fb339c78474902d50d8acb16dc46e0fe1b562c1b762d981ab15ab806487b5eb5f85d47c8724248ebcb2b0ce706af12e8134db18b1c76b7
 MISC metadata.xml 334 BLAKE2B e4daad1c0150025addcba294ef07c06e004c6d713e0d03a72b70a51bc44d6a4b0a86c9cd543af113c312f693d79c2985b679d6774a54370e9af9b0430de63f22 SHA512 f894ee487b6aff7d302bef231d72faba7ae9c0aa673974b306a4b74fe3b90dbc62c49b6bd829cc1b439a6d820ffe94db3a15ea2209250fc3b13c8b06297af27c
diff --git a/sys-cluster/kubectl/kubectl-1.17.14.ebuild b/sys-cluster/kubectl/kubectl-1.17.14.ebuild
index 6cd5067f5396..9640e72af8ee 100644
--- a/sys-cluster/kubectl/kubectl-1.17.14.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.17.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/kubectl-1.18.12.ebuild b/sys-cluster/kubectl/kubectl-1.18.12.ebuild
index 6cd5067f5396..9640e72af8ee 100644
--- a/sys-cluster/kubectl/kubectl-1.18.12.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.18.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/kubectl-1.17.13.ebuild b/sys-cluster/kubectl/kubectl-1.18.14.ebuild
similarity index 98%
rename from sys-cluster/kubectl/kubectl-1.17.13.ebuild
rename to sys-cluster/kubectl/kubectl-1.18.14.ebuild
index 9640e72af8ee..6cd5067f5396 100644
--- a/sys-cluster/kubectl/kubectl-1.17.13.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.18.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/kubectl-1.19.4.ebuild b/sys-cluster/kubectl/kubectl-1.19.4.ebuild
index 716d7d53396c..1f18731b5eb7 100644
--- a/sys-cluster/kubectl/kubectl-1.19.4.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.19.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 DEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubectl/kubectl-1.19.6.ebuild b/sys-cluster/kubectl/kubectl-1.19.6.ebuild
new file mode 100644
index 000000000000..716d7d53396c
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.19.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.20.1.ebuild b/sys-cluster/kubectl/kubectl-1.20.1.ebuild
new file mode 100644
index 000000000000..716d7d53396c
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.20.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index eb70c62af6cf..834edc95f643 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,18 +3,22 @@ AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbc
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
-DIST kubernetes-1.17.13.tar.gz 31841139 BLAKE2B b068ed913fe9a36aaf51b2e2ff05841374b9b1ad25392c0b894bb25b2895228201e9c85eee84a6d61901855be336ad07a1108fbeb43a619f779667191737eddb SHA512 eaebc7d649a2a53f2a7bae8fe70ccd469f8f983a2d14148f86e86a05d66a40ce8b71d4422e653966daf4c86ccd353693cc0e9bfe3a44b5259239d047a20ddb7a
 DIST kubernetes-1.17.14.tar.gz 31844013 BLAKE2B 725081706a7647127018d34d55d1eae1ac750d1378a7b8762aff39a638f88931e2f37d8609329b32bce360bb52e654f230f1c121d122fd90ab94de6b8a035f0f SHA512 6d5a22c47bd89a5622e38746a6e9c6d3146f065d7f1e63c161f6fc667e1c7d973a4ce0a77a63b53ed46708f490477c182119a0809d08b8ee3041f232a60ad19e
 DIST kubernetes-1.18.10.tar.gz 32640930 BLAKE2B f07b5cb047bb023f1b46414edf360b4d694d55130fa6fd0a13f2e6ec653971670a8b1af04dc5972738e504cce664619b1aad67d0bcae217884fb352c364a6804 SHA512 967caccf8758bcdf4549ec83b795ec580e072d8108b2c8ef10f1d05696dedbfd5d472e27590bb952639f198003b44dc83da5435853337938035488959360e3d3
 DIST kubernetes-1.18.12.tar.gz 32641752 BLAKE2B e1af0b8c83d0854cbe0c5f1751cb4433fae022f07785c116b27854db1858c30b0d0a46af97204d8df94d20000c860275e980e123ced53dad514f3441c3b2453c SHA512 20cfac78a484724c648d65e3904d588e9853e80eb291598d788d492293e7190ec6df737c90dc3e87268d5218523920f2958684f2684853c5433c080bc6c6523d
+DIST kubernetes-1.18.14.tar.gz 32666861 BLAKE2B 6a005804280d72de84d1bab68a51e72c41de0b3a50a1c40befab1290e9fcfecba133fa441f50bf250f458ca4ad44f4fab495da4782626efff70dcfe0f3029d49 SHA512 e19b834db4920db6b466662a8c001ecaad7a7bee6c4faef871bbc3f528e10b0b4c9fc6f3ac065953ce625db0ede98d76536cf3158b4fb241725115febb141946
 DIST kubernetes-1.19.3.tar.gz 33357048 BLAKE2B 9e023d8be35a4f65ec7412e3dd624f22ecaac478da9e2c4ef98f7369e686bc4b3ccc7f8ba2a1aa1f4fc4aabfaa6670678799fd3db6326fdd3d034b678e66ff0c SHA512 a394544e3baf797282291cae28b58e27e31fea3b3f66274a5ce9005519534860ae6f4b138ce51f4996e7da15930fadeb21d427d80e93433dc14e79cdcb250607
 DIST kubernetes-1.19.4.tar.gz 33362702 BLAKE2B a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a SHA512 b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da
+DIST kubernetes-1.19.6.tar.gz 33470206 BLAKE2B ea7614da380ce7c834884d96b37753802eb4919b4fb274dabf0d38f0438039c90ab1fccc86e0d8f665c15ae61f1d3f6ce4d400782ed580033cfd58390cd50617 SHA512 d7c6db2fa399b04a3acae792546fa0384e6b3a3e5eaa2c1ba6c49d656da0197f5be3d009756313436816f3839825c66ce23a06a1ec35c37f1c3fcfba79f9ac32
 DIST kubernetes-1.20.0.tar.gz 35797322 BLAKE2B 8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5 SHA512 d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b
-EBUILD kubelet-1.17.13.ebuild 996 BLAKE2B cc36c5052214105c94b7160960f86129d6d356b1111f539d007e117eba99f8f25be61f98b415a22a976c4409154d24b418a3f557bf1be0c9791d45bb34cad89d SHA512 88c906092887d7d7bf6a0697774e1cbc6ae4f9897b54410f08c015f9a04a8fe893b45001d860a5acbb4242574c282302ffd9e58fe0b99cb0782a100425646d7f
-EBUILD kubelet-1.17.14.ebuild 997 BLAKE2B 35252dbc83344caa86944c708e9f8f3a4fbbd5657bccee14b3a1782ea91f4ce89e614a80d1a6bcd3b044908eec6a7560e462c4be50a3b9134c45cfac2481bd9f SHA512 ccf2ae644acc00e64935a0bee9556629d07632de7e1ef91c499a122847a17d9aa3964dbe87622ad97d7fd77d4315401eec5b4449d2516493945aaff451a7636d
+DIST kubernetes-1.20.1.tar.gz 34424663 BLAKE2B 156482f88f051eeea0c428c357a79d876ff0ce5f8ed6eb1ffa72be83bff45b72970280fa1bc7629804c178b9fa45ad84a9961a4f0e7eca1b58351fc7d7f4cfc0 SHA512 40598999cc5c96c54591338eb985bc056892ef2f98cfb521ff26937fa29f63a20e97f52a8454433ff98614d579509b7a5e927edcd96f4725505a334a999c0326
+EBUILD kubelet-1.17.14.ebuild 996 BLAKE2B cc36c5052214105c94b7160960f86129d6d356b1111f539d007e117eba99f8f25be61f98b415a22a976c4409154d24b418a3f557bf1be0c9791d45bb34cad89d SHA512 88c906092887d7d7bf6a0697774e1cbc6ae4f9897b54410f08c015f9a04a8fe893b45001d860a5acbb4242574c282302ffd9e58fe0b99cb0782a100425646d7f
 EBUILD kubelet-1.18.10.ebuild 996 BLAKE2B cc36c5052214105c94b7160960f86129d6d356b1111f539d007e117eba99f8f25be61f98b415a22a976c4409154d24b418a3f557bf1be0c9791d45bb34cad89d SHA512 88c906092887d7d7bf6a0697774e1cbc6ae4f9897b54410f08c015f9a04a8fe893b45001d860a5acbb4242574c282302ffd9e58fe0b99cb0782a100425646d7f
-EBUILD kubelet-1.18.12.ebuild 997 BLAKE2B 35252dbc83344caa86944c708e9f8f3a4fbbd5657bccee14b3a1782ea91f4ce89e614a80d1a6bcd3b044908eec6a7560e462c4be50a3b9134c45cfac2481bd9f SHA512 ccf2ae644acc00e64935a0bee9556629d07632de7e1ef91c499a122847a17d9aa3964dbe87622ad97d7fd77d4315401eec5b4449d2516493945aaff451a7636d
+EBUILD kubelet-1.18.12.ebuild 996 BLAKE2B cc36c5052214105c94b7160960f86129d6d356b1111f539d007e117eba99f8f25be61f98b415a22a976c4409154d24b418a3f557bf1be0c9791d45bb34cad89d SHA512 88c906092887d7d7bf6a0697774e1cbc6ae4f9897b54410f08c015f9a04a8fe893b45001d860a5acbb4242574c282302ffd9e58fe0b99cb0782a100425646d7f
+EBUILD kubelet-1.18.14.ebuild 997 BLAKE2B 35252dbc83344caa86944c708e9f8f3a4fbbd5657bccee14b3a1782ea91f4ce89e614a80d1a6bcd3b044908eec6a7560e462c4be50a3b9134c45cfac2481bd9f SHA512 ccf2ae644acc00e64935a0bee9556629d07632de7e1ef91c499a122847a17d9aa3964dbe87622ad97d7fd77d4315401eec5b4449d2516493945aaff451a7636d
 EBUILD kubelet-1.19.3.ebuild 1003 BLAKE2B 8c7e0e91a3108a6fa20ffa4ca7ecc247cf19f3ca2fa22f4c69795abc4430c1068ec854bed768ccb8caede6427456d5f8b43ff1aa018a3f9a2875a62c32d5ced8 SHA512 55923ca8b0a637bf9e710be0f2f217ab17ab4aa37785c6da7c2d5d28b62dbfdf4f1df425f1b8770c2051335a57911b919188e8a587bc08a32058601e9fe456e9
-EBUILD kubelet-1.19.4.ebuild 1004 BLAKE2B 0ad9b099c3404ec897e5a98c2812a2cc722a7d4933f23cf4117f539e8b5844e8eab2895fb7b120e7194d33044212140620e66d9726090bf462d7a9519ccb5b0d SHA512 ca6e9ea5dd11bb5f48b6dd8e21e18cb451dffeb123be423aa20bdeb87c9050adf6487c9e87bb0603eb54cd5c1fbc40a42e61d24cc69d6de591e5327f88c45ac0
+EBUILD kubelet-1.19.4.ebuild 1003 BLAKE2B 8c7e0e91a3108a6fa20ffa4ca7ecc247cf19f3ca2fa22f4c69795abc4430c1068ec854bed768ccb8caede6427456d5f8b43ff1aa018a3f9a2875a62c32d5ced8 SHA512 55923ca8b0a637bf9e710be0f2f217ab17ab4aa37785c6da7c2d5d28b62dbfdf4f1df425f1b8770c2051335a57911b919188e8a587bc08a32058601e9fe456e9
+EBUILD kubelet-1.19.6.ebuild 1004 BLAKE2B 0ad9b099c3404ec897e5a98c2812a2cc722a7d4933f23cf4117f539e8b5844e8eab2895fb7b120e7194d33044212140620e66d9726090bf462d7a9519ccb5b0d SHA512 ca6e9ea5dd11bb5f48b6dd8e21e18cb451dffeb123be423aa20bdeb87c9050adf6487c9e87bb0603eb54cd5c1fbc40a42e61d24cc69d6de591e5327f88c45ac0
 EBUILD kubelet-1.20.0.ebuild 1004 BLAKE2B 0ad9b099c3404ec897e5a98c2812a2cc722a7d4933f23cf4117f539e8b5844e8eab2895fb7b120e7194d33044212140620e66d9726090bf462d7a9519ccb5b0d SHA512 ca6e9ea5dd11bb5f48b6dd8e21e18cb451dffeb123be423aa20bdeb87c9050adf6487c9e87bb0603eb54cd5c1fbc40a42e61d24cc69d6de591e5327f88c45ac0
+EBUILD kubelet-1.20.1.ebuild 1004 BLAKE2B 0ad9b099c3404ec897e5a98c2812a2cc722a7d4933f23cf4117f539e8b5844e8eab2895fb7b120e7194d33044212140620e66d9726090bf462d7a9519ccb5b0d SHA512 ca6e9ea5dd11bb5f48b6dd8e21e18cb451dffeb123be423aa20bdeb87c9050adf6487c9e87bb0603eb54cd5c1fbc40a42e61d24cc69d6de591e5327f88c45ac0
 MISC metadata.xml 334 BLAKE2B 5fb3ca0290f69bb3b68aa155afa7d239029ea77ad7c1d9c082df32e8e7fdd4188f8313a6799eb1f98a1d24c6d69b059c5c8cbe4dbeadf33c0892ac4482a41863 SHA512 1a049b08c9dd669d645179ca1afc93a8015fa5faddee858c497d45d7c9917a51261a33bd07545926d2698c200aada2e8ffd535466bed97e2dc07fa0b11bef9e1
diff --git a/sys-cluster/kubelet/kubelet-1.17.14.ebuild b/sys-cluster/kubelet/kubelet-1.17.14.ebuild
index 0b63052fc869..1476164f3233 100644
--- a/sys-cluster/kubelet/kubelet-1.17.14.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.17.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/kubelet-1.18.12.ebuild b/sys-cluster/kubelet/kubelet-1.18.12.ebuild
index 0b63052fc869..1476164f3233 100644
--- a/sys-cluster/kubelet/kubelet-1.18.12.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.18.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/kubelet-1.17.13.ebuild b/sys-cluster/kubelet/kubelet-1.18.14.ebuild
similarity index 98%
rename from sys-cluster/kubelet/kubelet-1.17.13.ebuild
rename to sys-cluster/kubelet/kubelet-1.18.14.ebuild
index 1476164f3233..0b63052fc869 100644
--- a/sys-cluster/kubelet/kubelet-1.17.13.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.18.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/kubelet-1.19.4.ebuild b/sys-cluster/kubelet/kubelet-1.19.4.ebuild
index 03f40ee62ef0..e2dd171a1bba 100644
--- a/sys-cluster/kubelet/kubelet-1.19.4.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.19.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kuber
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 RDEPEND="!sys-cluster/kubernetes"
diff --git a/sys-cluster/kubelet/kubelet-1.19.6.ebuild b/sys-cluster/kubelet/kubelet-1.19.6.ebuild
new file mode 100644
index 000000000000..03f40ee62ef0
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.19.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.20.1.ebuild b/sys-cluster/kubelet/kubelet-1.20.1.ebuild
new file mode 100644
index 000000000000..03f40ee62ef0
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.20.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.15"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index a63449fa10f7..37050b56cb22 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -17,7 +17,7 @@ DIST neutron-ml2-plugins-17.0.0.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422b
 DIST neutron-ml2-plugins-2020.1.9999.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 DIST neutron-ml2-plugins-2020.2.9999.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
 EBUILD neutron-16.2.0.ebuild 8434 BLAKE2B f44ea199a0dd10a05c3fed5b85c199df61ba2f7ea33dd2983d5d47522afb1f9fd06b7e7f11e12ce5dde7519a158c640ca12240b2eaa0704e1d79e554e00686a4 SHA512 040cbb03ffcd068f94f0e2beeb3eeff9153b4c01c06d67f7a93c5fc17f1283a5d15c83007efcdf4d1f8a58c59c7a53092d0f1797ce6ef64c4c64569f5dc51415
-EBUILD neutron-17.0.0.ebuild 8315 BLAKE2B f4f2ee602d5c871dde01f017b6b2b215ff62369a65d264412c6dff7fcea9ebf3791ab9502e63b284160145f629cef2a518f74e9771c18ad97b69a11dfbb43b9a SHA512 990e58211592aabe206ccebda35505cc85407cbbbd12f13bbb996f92a8aa35b28ca1084883825fdba0df821f8d92b87f7b0062f31c7f6515ef4776d8c4e92f4a
+EBUILD neutron-17.0.0.ebuild 8313 BLAKE2B f8a69f329757370c6a9e6bc25fcdafeb4988ac9fa90ef101e58d59ead17c54af0dcc8b782d44b6b5c11f3cde49223a8185b3bf82ac39cab42a37fb629c78e351 SHA512 0147ec97514e24ebce0afa2675019fecdcddf5fc7539de5c717332ff83193e018f4280b330880b661d5f4372f5ed5ef18e3b2e1e869d1f25edb15bb89903ac88
 EBUILD neutron-2020.1.9999.ebuild 8436 BLAKE2B 597fd963d5359060fb293eaebe0eb87b1549aabb5d33048c0d7590980ccf406793eaa541861e988424e93cd969a5d4b7d7210be1eab05765f78e8813c157d509 SHA512 34f3cd5c78d91d817e4c25a993cb56d70ab4005f15d9c7b4869e6aa1c349baa354d76eff6792ca3e5ebe2efd6f681e47b24e2e2130569648fe6501baa35b46f7
 EBUILD neutron-2020.2.9999.ebuild 8315 BLAKE2B f4f2ee602d5c871dde01f017b6b2b215ff62369a65d264412c6dff7fcea9ebf3791ab9502e63b284160145f629cef2a518f74e9771c18ad97b69a11dfbb43b9a SHA512 990e58211592aabe206ccebda35505cc85407cbbbd12f13bbb996f92a8aa35b28ca1084883825fdba0df821f8d92b87f7b0062f31c7f6515ef4776d8c4e92f4a
 MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/neutron-17.0.0.ebuild b/sys-cluster/neutron/neutron-17.0.0.ebuild
index 11c02b079653..08a0bdd70527 100644
--- a/sys-cluster/neutron/neutron-17.0.0.ebuild
+++ b/sys-cluster/neutron/neutron-17.0.0.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz -> neutron-configs-${PV}.tar.gz
 	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index 869e76a18ba5..3ec1c04b345a 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -4,5 +4,5 @@ AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a
 DIST sanlock-3.6.0.tar.gz 221666 BLAKE2B 7fe95bd6813c13b76993b343a5ad605c7ba642583987ffa5fef583f34c053ee62b0f9e5979f5b5cb9e4fcde53268ae3debc5ec36b04f6651cc4cb902dff52df9 SHA512 59eb2a6f12e95d54886fdf6d56fd9a6814dd20fe11f39664f2bb82a56326fee48c9465ae30e6d04f970c8f1b0d9c2e22b90d21ab1f657c6d6b61ff9f02332443
 DIST sanlock-3.8.2.tar.gz 266780 BLAKE2B 5248d08225bcc2a19594a3dcd3872c8c69ca8b217d31f6263f2717e4594180d4ba4685c9679ce2f31b6a2dcb4fe9f3e6a5dd5ac3ed073aea02599e7bbc04390c SHA512 2fa92e16eee4d2f3dac452400522f7e90b93b71349d322564d5957e2d87fb4bd69f0b5617b05f4b296c272d6da9a404fccadbbfff106354a0e302c436593eaac
 EBUILD sanlock-3.6.0.ebuild 2055 BLAKE2B ddf101be000bf9d0b081a50386bbd8947e025d8edb475457167cc460c4f3a44f9863d0a3db1720839d239da61b9b3925d8eb953a29029501281eb6e6873575c9 SHA512 1c651d40550f67858d4ff552f8cbeea125205396087cb2290e3b70d370a410fbdab29d7e2fc0da9d01593b59c29042080a463fff920601b37e5577a5cec125bb
-EBUILD sanlock-3.8.2.ebuild 2082 BLAKE2B 7e15478bca6b0b452ec2118d3d291e3379573eeb78f4d32a7a6d254b2eb7b081844c46e387a7c91e1a1e74167d52d51259a7097006f83bd272e36b6ede2bdfdf SHA512 490e4e92569b49d1b4db7bc1862094dc761965a93f1dd73cb84c3c7541dc1324890bc5c379ac8bc5c293e7921f5cf647c32b2b2e55767b4189519c10d1324925
+EBUILD sanlock-3.8.2.ebuild 2081 BLAKE2B f4605e9dc42b12f199f375cd9d4b935f68a0951bba8cbc6ff9770e8b96fa119d0cc17831c8ddf40b4cb7d4393312e4f49b69969ca816762af8bc26318fe68df5 SHA512 86ac3b384c283df2340ac5bdbe83755cdfb4ae877609c284fced517c756973269ac2cf1df5f296bbe1beab0bc5e8eac9f355b1b1b0c8266d980f6a970dba03cc
 MISC metadata.xml 368 BLAKE2B a15a411ea20eb7649f299e38704b394344194d7526f9bc92b27c0a26760d7dba05b1e5d483ff5f9ce73a6d1cd527a18ac905344a614c8dc31a0c1180b2be07e7 SHA512 2cc3ec3c99cfff2e0c576ab6c7b0a39460af875ba826ce0cf3c5a1a4f0f3def6170753c8d42af2fc7a139ad7f2135e309c3165bde83b4e7574292768c96e8086
diff --git a/sys-cluster/sanlock/sanlock-3.8.2.ebuild b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
index 8e147096a3aa..91dc06ac1d5b 100644
--- a/sys-cluster/sanlock/sanlock-3.8.2.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2+ GPL-2 GPL-2+"
 SLOT="0"
-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"
 IUSE="python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 2effd5ff3552..a139b5871449 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index eafcbdeaee6b..c172246df78c 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -1,5 +1,5 @@
 DIST binutils-apple-LP64-patches-1.tar.bz2 10235 BLAKE2B 3352170bcfe73c574217597233ca58c7d6ebeedf9dfe9da1399953dfe1a0c87fc26e9ba8864620ddd67c6f38e48aeb6950737637605f0b860eb4a0d246f3aff7 SHA512 5632d4033c39e47de3ec275d02100ed53408a63122fe722c26dda1b02275c397524b113e51e1334d3235fc7f0a3bb8e53d4ccc1c2e40f24c6129282846da22e1
-DIST binutils-apple-patches-11.3.tar.bz2 7871 BLAKE2B de4e909a084da79d139b7f07d98c55ebe8aac3fc5ba5accb365e0eb003b726a619369e7695f43faaeb6acabc1db5eba9195e8e22aeed0e864446ade48d13a826 SHA512 ae73528bd0fa47413caef0f65b0077011123ae2bcf366a09da8fcd5cb79ef76495f9c11560f039fc2f35405430d5ff0295913ba44dce1a8677bd347db179ecdf
+DIST binutils-apple-patches-11.3-r1.tar.bz2 9041 BLAKE2B c881117e19e119173dd8c126859f8ebab5ff4024697c9650b8ba145c021aa6e251086d3678d80fec2672e78637a5beca795b71ae871692e832ba4e69a7a8e04c SHA512 eda63cd89f67674556dc75de719cd318f534544db50165d4faac454f67c557c9944e7e024c4443e640f987ed8c8826ccd578427743a86d7220c2ba90ed2206d4
 DIST binutils-apple-patches-3.2-r0.tar.bz2 4137 BLAKE2B 9cd7afbba5337cb9c395556b2691e4acd73ee323d643da4335f6465ccc29b06f889d01fb42c7778576607bfdb859e2df38d3ebf82d4bf7f0971079da6985f237 SHA512 5381a93d61c39993cdb294ecb238016e26cdfe283fae553f75ddc6662812709301d5208c770ac0992d1dfab92e4802c660e6fb4336ad891335ab716d3b042805
 DIST binutils-apple-patches-3.2.6-r0.tar.bz2 3500 BLAKE2B f10dcf71400ea5d4bf7efb8ad906240765cfb56743274b3e1684eeb4273a35171aa4202d475920cff2c5c39e89f9bd1d7e5b0d38ba6c2b4705b0a592ba47e063 SHA512 4ccb8ebd49ac8eac4dbd0c1f24ee1836f216efd2e9e15b13072cbc76d8f83fbf4f1f6b3b60736bf5d5482af3e49ec1eaedfce8dd0ce1e949f915faf9c92ee0ea
 DIST binutils-apple-patches-4.3-r1.tar.bz2 37363 BLAKE2B a5ad04d4bf746a864f03a25d052197ed9a6ecada1f34460f4e38bea8cd87dfe2cb6c7f99f2096acac2231cd1e0c13c53757854b07f729a7a0c5a162a908fbe83 SHA512 f5d64ad182891c3af971e6aabd3c0c1b717b6a1cb471632339cba61b41a998d15880d18de09aafa1c3d059e528c888d6e8b914025c79bc21897d90a6d0e2ebf5
@@ -22,6 +22,7 @@ DIST cctools-877.8.tar.gz 1720708 BLAKE2B 97bce69d7c88a917ad1351635b4bd0ebd3273f
 DIST cctools-886.tar.gz 1731850 BLAKE2B c206ad8c94fa3d132726db8cbc60ed09b6f1f7aa8118a99b1e7ed350323c11b729d68c912ba7648cf900cc2a26cbff12a03072afe92efe09c8974be280448731 SHA512 49f14e165da3a9fcf16614a810b8a2a68907348bd27a60b268b330e416a0bc070fb6445e1e6b80d849026bd6ce7de4459623ab86168e2d63bb492d1ba6680c5b
 DIST cctools-895.tar.gz 1716126 BLAKE2B 9706a6b243518693888e5e21dfe8d83b217380b47db621a7f1b35105eb72fb8997353ff85133224b0856f6b6ec710f54a4fe79076d9e228f89c98b6f517de309 SHA512 4ef9db870385cc2c4263bcbe42ff0de80386771f5acbc7082a1818ecd6b8d7bb1bfa02a7fcfecd3e7281481aeaaac4c331359aca3564bfe7a4c7dea1e0d06126
 DIST cctools-949.0.1.tar.gz 1968671 BLAKE2B b38fbae5d2ec011a94c2e4ec299c1ecd173f2c2516664cf925b06aaa078e234b59068158ea29dfcbf763ca98c73bc1806a507fbbe49a8d4d0a2fd4e602f401ce SHA512 13c493a48852c980d2829d28616c18640ad5ebfe6acd55143c4c948665e0b65377a459560667074fdac5e69bb6360fea13d988303c49fd3dd4a58e9b5c54ebcb
+DIST darwin-xtools-8.2.1-r100.tar.gz 2934997 BLAKE2B d0324d47d3aa0afd0007fbbd16c74e046c643c645744cc7ef0535eeed275c2d61763a1c6708b3a0a796f0fc83e62b5e5fe907c62553b439bea750353cfac2f73 SHA512 7000bca61b1dc63d1d08a9bcf104dace4376c2656af0faddc28a7d6c3718dbe54713da96136091a2024a644eaf90758714d1e4eb3cfeec2df0e412d847f59c30
 DIST dyld-132.13.tar.gz 342690 BLAKE2B 011418ba5b91a28bb7c5f8188af2fac5478bad53581396b7c1c4623a854a8f0d5ecb92d023246157830ed2db83bbf28e23225a255188e2d07eeb6c933814bda6 SHA512 2c9d50fc32868b696d88730eb6ea6afa9bb9f56883cc2ea4f1d41f370f311b7487a29ce0eff6761e1eeb086a18e2513953989d8d5d3ef1043bb662e86baadd3f
 DIST dyld-195.6.tar.gz 412518 BLAKE2B f525aac0020baa69c5d7c42a7027b0d2fdef9fa3c2e5d3831101989eab20f2eb7932c99355ca34e6e0b988b9808013739d452592e0b8832e1306cc6027cc5d0f SHA512 58a9ea27efc02e66f9d99bfa250af1d90326385385431e5279386bbd9ab53366bf7e8236543296908b7214c33523c8f60098a6298a7393b3180e2a6bce18e7c5
 DIST dyld-353.2.1.tar.gz 510036 BLAKE2B 6f355bcb87d6136d3c29b2766146303ecf092fb407296a0a93412598276ea88c4f826da75d20cc5d3e2bfac750a62c413b117ee95dd710eac83b647786fb109b SHA512 a9488620499f682e245b55b7e0e4ec02fc0bcf03bd8a70d4a4ee0ba762067ade2f41c188990c101727476d41c19368b4cc89cccf2df40231da1c777742c7391f
@@ -45,7 +46,7 @@ DIST ld64-85.2.1.tar.gz 598524 BLAKE2B 92cb3c763cc067e2ee6c4fec910f078cc69daca2a
 DIST ld64-97.17.tar.gz 421947 BLAKE2B 56820ef28490f2e0181d6e36b87506c6f00ae5759afe304a063fb6bd1904ace566ef4aa69ff0d235d65968af547a1a5735cb23bcefa990f418740188d399b637 SHA512 841774a1a7c0e2f661ac7e66703f7578d8f11274897ffa15f8c49daf290a23465763f264a4dae99f15754891f44c425c0d327652112007b499bc8f755a7fc9d6
 DIST libunwind-30.tar.gz 82811 BLAKE2B 26993d6afa6930931c01b579326964a66832ed7a6ffa26eff10016c8d6d175d3b671753cf8700dcdbae7f0a9c01b16e9cbd3c9fe86697608f1f08a8eceb64782 SHA512 57106eafa1516791b4e0db2de6c6336bc0c1cbd8bf098a6d3a809fafa457802c95a7aeae9137f4ca5922a3018dfd8f597907ea4187b0afbbf267500eae00041f
 DIST libunwind-35.3.tar.gz 90002 BLAKE2B d63ab0ae6e66a6f35ec17de9713d3bf4853cd80af218e868762b20dd8a44d42cd9ff8fce1d8c46fca4759144726bbf248a02a5dede5a94a2b75d3b45ddb7d018 SHA512 b7d9a86ef24f1fe9ca14517471e03a910219a229af9f0d4cf94435115971360640451107ba20c93fb1aab788f8b6eb5ed580ee08fdaa990b9fa43e9ae360c6b4
-EBUILD binutils-apple-11.3.1.ebuild 11874 BLAKE2B b254cbffd41be7f0e4dbf7d534c20ee33011fd6f2685e57595777c1e3be833d25f03bcfd2a52c40354170c5ccaa28f46bc680e020e6dddf86f434482c353c821 SHA512 314b8f699f06f285285cc4fca53b5551af50f79eaae4337d23c7ab025aae201e103498d3c25c256e028ba6aa499e4212ff7d1b63ec5ee8077dd50fbfdcf0d1a1
+EBUILD binutils-apple-11.3.1-r1.ebuild 12072 BLAKE2B 503efec8e7918f50ef1dbdc12c8c6e0e9eea9e4742e936b64f53bd62a1c9b6c088fffcf9a2e8f5efc0c35a1038cde09682b490121cd07dc7a75fabae5e93d4f9 SHA512 18ddce3981b0b7bc7f9fd15fa402d5cec01f851003f892e6b57499654b5cb681c7d1362b49f76358fca1443cc9b9082f4ee491c814b70da019bae25667b9007b
 EBUILD binutils-apple-3.2.6.ebuild 6937 BLAKE2B 649bdbc5433d05db4fca58b4cb95538fae8654ac0c91c95915f172a92a4fa61724e57876b0a9ecfb09d1942060b0298da3af5577033bb8a860807d6a7fcdba08 SHA512 617d78b58688d9f4900d65bd49f90c21c64d62de48bcc42e63ed9a5f2468e29e5dba84e17799eb2fbffa064ce5b0087fbdf5669000b0dc6a2eb30388d585f123
 EBUILD binutils-apple-3.2.ebuild 5855 BLAKE2B e709686ef502a5d015b8559b2102e45daa586b66f9e6ef60026baca48baaef4d2dee0e3ed757146d9842676de074827fdfd23dced29e631d75e22e1ed6668103 SHA512 76fa7523601c37302012453208284ff0ce5f2efd6442a2df54c8b73e86d427ea8c1d6a8fb4045b0987cff1232b0b7f93f9319a68fb553e7fad04f6046b8b14c9
 EBUILD binutils-apple-4.3-r2.ebuild 10207 BLAKE2B 8d115224cf5fc41ba2d77fcd9effc8c86e28d18ffdd97defdf9d3739136682dfd02de84ce14e429f3ebe45ec614152ebb8a574ebab6ad6f14e23dba07e3742d3 SHA512 8aa25ac3326aa24bf501201fcd8c07c98d71c8d2bda8aeafacf854318b40b101b2acc112a4d81817269908294904b1ba466fd4eb48e162f65caa8f800be77a76
@@ -58,4 +59,5 @@ EBUILD binutils-apple-7.2-r1.ebuild 11943 BLAKE2B 675e352ea19134540d25f7d71c027b
 EBUILD binutils-apple-7.3.1.ebuild 13155 BLAKE2B c436339d7c06e06e0f4dbeddabc0eecb699588f18d877cc47f555b1f1ccc749c19836e508b45f024564d2e23b2a2ae694bda53d97d07f8bfffb0a03023bbafec SHA512 c111e2eee6cf3803ff3a10e3f83fcdfecb9207803c208100c0610c0a2200263e140c1f76db85e3947aad81aa9fd1a9ba9e4d7a5a616a1003c8057961f3ef90ac
 EBUILD binutils-apple-8.1.ebuild 10340 BLAKE2B 4410c9bb7642e2ccc84224724cbba2a942f32bbc9386043613c271c9e8f93c2b9177868f3b784b84f1393a23dba62ed23e5d404d8578cead0ab6ede5af75a094 SHA512 27014523cfce9f79cc151626e6954b54c9fa73806d67ebb98197157f3edea2ccc24b57c311f67c91360cf59082a69df9c37fd0340d3c0005b0fe04733a7ffcaa
 EBUILD binutils-apple-8.2.1-r1.ebuild 11367 BLAKE2B 572af74e5a95f6c120152fc7627ac1a2634a8537ed28400c827d683cbc7447bbdd83d873678ab2e459770a1c515d43c759b0471fb3ee531d5a5c203dcccbd774 SHA512 9a49baeda4f83da08eebcaa8497e1149b490b3bb7a49d32106a3f4ab1b770d7ed0e499c8ae670ebb83f671bc20d97a8e61e924a736e408e469a4146b58418e80
+EBUILD binutils-apple-8.2.1-r100.ebuild 2247 BLAKE2B 285964310e5f3d7c607ca4a0efc9caa5ee3189a3c604baee72876ec5764daa998033d0c48c37556709e1856505f408e8648286be824fb6596bf52925bd609837 SHA512 0a3d29dac913282632a798ccd0564334d791dba5e88a8981f3197914020589cc0d48371b520fee51a180cf01056ad38589df9ac9903832517bef09f1c3cc1c76
 MISC metadata.xml 684 BLAKE2B 5cd10b7a5817bb4fe8b94ffbfa422e43c0f50c2d7d6db881ab82b4741f24548560fb07c6f4b1bf8164ee80ec7052147f7f5158640e4c9fa94b950871148491f2 SHA512 e588cb802b2b22ee656b9dcf45d9d372a3b306fa3574a7d859e2df9032eeeab63219a9d9b69249a5a67733dff4c484da17621f00d2b0775935f2cfa5a6f91977
diff --git a/sys-devel/binutils-apple/binutils-apple-11.3.1.ebuild b/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild
similarity index 96%
rename from sys-devel/binutils-apple/binutils-apple-11.3.1.ebuild
rename to sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild
index 9263d8e00b0f..fa4886114d0b 100644
--- a/sys-devel/binutils-apple/binutils-apple-11.3.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-5.1-r2.tar.bz2
 	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.3-r2.tar.bz2
 	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-8.2-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-11.3.tar.bz2"
+	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-11.3-r1.tar.bz2"
 
 LICENSE="APSL-2"
 KEYWORDS="~x64-macos ~x86-macos"
@@ -79,6 +79,10 @@ src_prepare() {
 	mkdir -p include/mach-o || die
 	# never present because it's private
 	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
+	# TARGET_OS_BRIDGE is undefined in TargetConditionals.h of newer MacOSX.sdk.
+	# We don't target BridgeOS. Disable it to avoid errors when clang adds:
+	# -Werror,-Wundef-prefix=TARGET_OS_
+	sed -i -e 's/#if TARGET_OS_BRIDGE/#if 0/' include/mach-o/dyld_priv.h
 
 	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
 	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
@@ -94,9 +98,9 @@ src_prepare() {
 	epatch "${S}"/${PN}-5.1-extraneous-includes.patch
 	epatch "${S}"/${PN}-5.1-strnlen.patch
 	epatch "${S}"/${PN}-7.3-make-j.patch
-	epatch "${S}"/${PN}-11.3.1-no-developertools-dir.patch # 7.3 failed to apply. updated
-	epatch "${S}"/${PN}-11.3.1-llvm-prefix.patch # 8.2.1 failed to apply. updated
-	epatch "${S}"/${PN}-8.2.1-llvm-shim.patch
+	epatch "${S}"/${PN}-11.3.1-no-developertools-dir.patch
+	epatch "${S}"/${PN}-11.3.1-llvm-prefix.patch
+	epatch "${S}"/${PN}-11.3.1-llvm-shim.patch
 	epatch "${S}"/${PN}-11.3.1-nolto-fix.patch # bugfix
 	epatch "${S}"/${PN}-11.3.1-segaddrtable-fix.patch # bugfix
 	eprefixify libstuff/execute.c
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild
new file mode 100644
index 000000000000..09414c80bf15
--- /dev/null
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake  # keep dependencies down
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Darwin Xtools matching Xcode Tools ${PN}"
+HOMEPAGE="https://github.com/iains/darwin-xtools"
+SRC_URI="https://github.com/grobian/darwin-xtools/archive/gentoo-${PVR}.tar.gz -> darwin-xtools-${PVR}.tar.gz"
+
+LICENSE="APSL-2"
+SLOT="8"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+IUSE="tapi"
+
+DEPEND="sys-devel/binutils-config
+	app-arch/xar
+	tapi? ( sys-libs/tapi )"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/darwin-xtools-gentoo-${PVR}"
+
+src_configure() {
+	CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/xtools-${PV}
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/xtools-${PV}
+	if [[ ${CHOST} != ${CTARGET} ]] ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/xtools-${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/xtools-${PV}
+	fi
+
+	is-host-64bit() {
+		case ${CTARGET} in
+			x86_64-*|powerpc64*)   echo YES   ;;
+			*)                     echo NO    ;;
+		esac
+	}
+
+	local mycmakeargs=(
+		-DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}
+		-DPACKAGE_VERSION="Gentoo ${PN}-${PVR}"
+		-DCMAKE_INSTALL_PREFIX=${EPREFIX}${BINPATH%/*}  # cmake insists on /bin
+		-DCCTOOLS_LD_CLASSIC=NO  # fails to link, and is useless anyway
+		-DXTOOLS_LTO_SUPPORT=NO
+		-DXTOOLS_TAPI_SUPPORT=$(use tapi && echo ON || echo OFF)
+		-DXTOOLS_HOST_IS_64B=$(is-host-64bit)
+		-DXTOOLS_BUGURL="https://bugs.gentoo.org/"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# cmake insists on installing in /bin, so move bins to the place we
+	# want them
+	mv "${ED}${BINPATH%/*}/bin" "${ED}${BINPATH}" || die
+
+	keepdir "${LIBPATH}"
+
+	doman ld64/doc/man/man*/* cctools/man/*.[135]
+	dodir "${DATAPATH}"
+	mv "${ED}"/usr/share/man "${ED}/${DATAPATH}/" || die
+
+	cd "${S}"
+	insinto /etc/env.d/binutils
+	cat <<-EOF > env.d
+		TARGET="${CHOST}"
+		VER="xtools-${PV}"
+		FAKE_TARGETS="${CHOST}"
+	EOF
+	newins env.d ${CHOST}-xtools-${PV}
+}
+
+pkg_postinst() {
+	binutils-config ${CHOST}-xtools-${PV}
+}
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 7b20bf64e127..bc605c1b2ade 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -10,6 +10,6 @@ DIST bison-3.7.4.tar.xz 2617336 BLAKE2B e49a4a6fba1dc93314133541c24c6619b465a818
 EBUILD bison-3.1.ebuild 2482 BLAKE2B 2595a1242d213c2839fd7cf1d3a069b666d3915d1e86a4903ee35136be9018bc5d0a960c9e4c24927c9f0573d76802a764ab8da9157ab399dd000238d196760c SHA512 97f27e6390787b602ad7aad377e1d8313d58036e7b3f3acb141b009bd8327839e2cac72ae3231d8ffed5fbaeb66298c356834956c8ea5665d1b0e674751457db
 EBUILD bison-3.6.4.ebuild 2456 BLAKE2B 3d5bf57304e3cc58529ab940baa619b0300592dffcd9de892afb694a0efe1e023e10960998418c2bea6f06f8438eb6a59772da67f077040b4f13b61a64e55cc1 SHA512 4034360fdeb456588bc8e0c86709efb1cdd4e775c484fecb93c5d0f804229f108d0470fad4f3964ba18cfb6d4a268c775dc159548a30ebfe238ce846191d4b2d
 EBUILD bison-3.7.1-r1.ebuild 2564 BLAKE2B 39e2951e7b56da27efe14877358c2f290cca25c60a4beda65854edc4923b10ed8e51074dffa8578ae03ab6c673fd07d1345269e30b296cdc7fa4d3ab7a0a106c SHA512 b377a5c91dfc518f51778d9ff81b5410b7631cf7c3a24618ecb21e1b80084afbe2f8a128bfbae0c753f72ea1bc1f2640624755316737294158a445646151f09c
-EBUILD bison-3.7.3.ebuild 2464 BLAKE2B 85280ad28d338d5dbca25fd0b7a47c33c9cf20a15964d03351c38c2d2fb4b429334f5e44a4d35c04e8be3f71a5c3cfe024e92363f50ff42b1d4ecee891fed61f SHA512 e87895ecf45dc64ea08413cbe65333518e7092ce4538eb4610d3e72589bcb5fa0b4deab6a2730d0e90c8900ac6e822354a8d59fe8fcd93d07d4b2b98d8059d9b
+EBUILD bison-3.7.3.ebuild 2463 BLAKE2B f1b79a57e017e834b3ea0a19c1d61c237a223e543c74fc56d43a04b46f9aec56e7f37b6c13f9cd3db871daa12dc474ad597d238a81adc095bd37f9fed78b13d7 SHA512 733c04bcb3d01b99103b8cc07dec16a4fd93196587dfea3a6a7ec7d4e3c7ab39884b9e494f551d6fb25913757e9ab3cf541e73d81c6460d5a9df0706583315ac
 EBUILD bison-3.7.4.ebuild 2472 BLAKE2B eb303a11c93c006e1c90ba0b7f1fdf00f7ba5220d2b7ac64b49e1206cf43fd76f07dfd4a44f323e39a6eea666fa4e5ae858e9bee398e0b497d0cfe813adac68f SHA512 c4b89e95de226dfe0f74b366ce65ff27bd58a48b50e55c4fc1df776c5f4d6b7cd88b6ce1e182a70987b56be4041231ffd6fc517a4f363ab932163fa2344da282
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.7.3.ebuild b/sys-devel/bison/bison-3.7.3.ebuild
index 65c3feb74108..d41c7bbdc0a0 100644
--- a/sys-devel/bison/bison-3.7.3.ebuild
+++ b/sys-devel/bison/bison-3.7.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 8c838707d9de..f0881033e217 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-common-10.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
 EBUILD clang-common-11.0.0.ebuild 591 BLAKE2B 306d03beefbfc18bb39355d549d30b62b651efef5e462564822075d3407f5b5267cf3e1bb241bf97db24d6d3faffe73eac6609d994d196b85374f7a246957a5e SHA512 9ffc10f89e5240e2622ca46a682e5172884baaacc5e1ef6e7aedbe1b2e30376f6c5d238f2cb3d1d6dd69dadbc7f6caac61f14e2f52766feca1f15115c809c127
 EBUILD clang-common-11.0.1.9999.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
 EBUILD clang-common-11.0.1_rc1.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
+EBUILD clang-common-11.0.1_rc2.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
 EBUILD clang-common-12.0.0.9999.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
 EBUILD clang-common-9.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-11.0.1_rc2.ebuild b/sys-devel/clang-common/clang-common-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..c9abcb48cca8
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-11.0.1_rc2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+PDEPEND="sys-devel/clang:*"
+
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 9145951400c6..e7b84bcb4e56 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -2,6 +2,7 @@ EBUILD clang-runtime-10.0.1.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d
 EBUILD clang-runtime-11.0.0.ebuild 703 BLAKE2B 083804754e5d7c82f8a63095d81cd31349425b1a37da512e80c0e2b1e0e0e48955f75d49535c8d28d2c1c084aeecb692b214246a22c503f380aae782863286f6 SHA512 16afe60399c075bb6f64156246255db2f5914909ad51a9e82fe1ad4607034418f311fc635e5ae66dc750604a7139541553b0e0c1c6d3b533ddcb09aaf7f9eefa
 EBUILD clang-runtime-11.0.1.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-11.0.1_rc1.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
+EBUILD clang-runtime-11.0.1_rc2.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-12.0.0.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-9.0.1.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f
 MISC metadata.xml 578 BLAKE2B d58a4d1a7bf88a0d5640a02f3acb7e491f275b3bb66a8583aa057b8daae93bb1dbb80f6150bc326228c6ab8c8f8498b46bf72a3fb5e97d0eeea2fb39f87660e3 SHA512 822f56b33d991088ad5e51c3dd96e2e36f544b68c57e45ed8365835d1ef6d0eb797f9de1f8f33b59fbbaf085e245079ca767d5e8b773261cf9ad2c5629b7b16a
diff --git a/sys-devel/clang-runtime/clang-runtime-11.0.1_rc2.ebuild b/sys-devel/clang-runtime/clang-runtime-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..2713d1f397ff
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-11.0.1_rc2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+PROPERTIES="live"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}
+		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 7300df9599b5..720f80d4c72f 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -7,11 +7,13 @@ DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-10.0.1.ebuild 11828 BLAKE2B e6ee6571b0be8983ea5d23acb899e562758a1cc6f28acc1e82d0b4d8cf5854262fb5f059abf0154e523c075f49ef804255a1ae106982276a1276fd9106d39da3 SHA512 c076072d0c3a1dc91b50dc58af34a0d274217f2d3b138c5fcdeda5e0d669511c1cc5dc3ef2b2332e9bc5b6d8660520def5f03dfb8890c1d7a4701e2915b122ab
 EBUILD clang-11.0.0.ebuild 11582 BLAKE2B 90fae946ded4ba69c2ccd2b3f489255f16e3d1568d6e01f700c26ccf075db7bf313a2190f0495b82fd604f1c14331172f3e0ba517fbbc19cb0d7695f7d0c1353 SHA512 6d1de2f567c938bafecba2536eddd6629b388c3dd9f14130e13eaf8ce64550b9e3745bb35328ec481becc0ba67720a20ea4a6146a4971695b14b913d7d5d5236
 EBUILD clang-11.0.1.9999.ebuild 11563 BLAKE2B ff57ac954fed39956734c6eeb1dc7a1de82e377fa1366aafa214ae844eba0c31b59bf4c42c7f6dbf2f806e92fd48f79deccebc0ac7bf7f83d3bbf5167876aebf SHA512 ebdb0f1442204dcec5c359895ebc5db335f844cf7c801628f6024cbc253583973327648abcaa6717947642ad041d6359accd64ffa2acfa17a15ff6e8c972feff
 EBUILD clang-11.0.1_rc1.ebuild 11563 BLAKE2B ff57ac954fed39956734c6eeb1dc7a1de82e377fa1366aafa214ae844eba0c31b59bf4c42c7f6dbf2f806e92fd48f79deccebc0ac7bf7f83d3bbf5167876aebf SHA512 ebdb0f1442204dcec5c359895ebc5db335f844cf7c801628f6024cbc253583973327648abcaa6717947642ad041d6359accd64ffa2acfa17a15ff6e8c972feff
+EBUILD clang-11.0.1_rc2.ebuild 11563 BLAKE2B ff57ac954fed39956734c6eeb1dc7a1de82e377fa1366aafa214ae844eba0c31b59bf4c42c7f6dbf2f806e92fd48f79deccebc0ac7bf7f83d3bbf5167876aebf SHA512 ebdb0f1442204dcec5c359895ebc5db335f844cf7c801628f6024cbc253583973327648abcaa6717947642ad041d6359accd64ffa2acfa17a15ff6e8c972feff
 EBUILD clang-12.0.0.9999.ebuild 11498 BLAKE2B 4e715e105fe646e9c3af7708685ca1758702f1becb42436611b628dfeec7241a63c5e8feb407ce25f708c4ac58ecacd41a2677e05fb687e8d96a0869633319dd SHA512 adf5827949ccdc26cb159caa96dccd42b21100898a73cf98388cd4cb42d0dbe054b245c18957f4de36b0a6141a7bee7e1393fcc3d6c290f2a7c88285b6593bf8
 EBUILD clang-9.0.1.ebuild 9020 BLAKE2B 7c5f8d85d4c6c4d1541c14ff36f2b93ebd553b3ff11e1c9d90dc6eb406b9a7f4072ec08d508cad4efebdfc0d622750a0cba8b24a21b8a053ccabac99bfa750e5 SHA512 6eb0b5558982ad0c43b9478f4ca25c4aadc7a7ed0e4cabd0b918b75613e7d3fac88c0cd09d1616fa88618b7b5b5783b35d3a5b9b9a3b2f7366863aac738e2743
 MISC metadata.xml 1336 BLAKE2B aaddc1c1193323466a545df21dfa53b637c3edff4f61cd55037d8327273457cf8d35cad7b92a2eef31acfb055a3e1ed93cb53a913b01eddf43b7b3dc6de880c4 SHA512 0538198df449cdf4d0cd00cb50d7c6883b06524419a29c4376cdcaed440fb84cfbd4983a1a025ae9a6e2fc5d91a4870bfcde587c493d8b617baec2214705601c
diff --git a/sys-devel/clang/clang-11.0.1_rc2.ebuild b/sys-devel/clang/clang-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..4a3a05b4df86
--- /dev/null
+++ b/sys-devel/clang/clang-11.0.1_rc2.ebuild
@@ -0,0 +1,431 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org multilib-minimal pax-utils \
+	python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx default-lld
+	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}
+	test? ( sys-libs/compiler-rt )"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	doc? ( dev-python/sphinx )
+	xml? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!<sys-devel/llvm-4.0.0_rc:0
+	!sys-devel/clang:0"
+PDEPEND="
+	sys-devel/clang-common
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	default-lld? ( sys-devel/lld )"
+
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_MANPAGES=build
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+llvm.org_set_globals
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	mv ../clang-tools-extra tools/extra || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# headers for clang-tidy static library
+					clang-tidy-headers)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-wrapper
+			clang-refactor
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+
+			# extra tools
+			clang-apply-replacements
+			clang-change-namespace
+			clang-doc
+			clang-include-fixer
+			clang-move
+			clang-query
+			clang-reorder-fields
+			clang-tidy
+			clangd
+			find-all-symbols
+			modularize
+			pp-trace
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-clang-man
+				docs-clang-tools-man
+			)
+		fi
+
+		use doc && out+=(
+			docs-clang-html
+			docs-clang-tools-html
+		)
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			# normally copied from LLVM_INCLUDE_DOCS but the latter
+			# is lacking value in stand-alone builds
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-clang
+	multilib_is_native_abi &&
+		cmake_build check-clang-tools check-clangd
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
+	elog "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
+	elog "  dev-python/pyyaml"
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index eaac31c800e2..879828d8e9e4 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -13,6 +13,7 @@ AUX gcc-spec-env.patch 1544 BLAKE2B ebd019ff63f6a8526f741f1760925538f10b25c7d5fc
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
 DIST gcc-10.2.0-patches-2.tar.bz2 17701 BLAKE2B bed0cf2dcb6b2e35dbd86c43db617cfa0a0973b3d55bd6e12baf9e6495afd0fec855fefd223172c23f11449769996c18359abacfac36f62681310c861d5d2850 SHA512 6ebf5875ecc9f10dea67d4793fcc47178ddd6abe8959fc0390c6ff967fba7318013b4bf251abf451999b86697e97390c8698685b12086956c8e6bc2e97708bc9
 DIST gcc-10.2.0-patches-4.tar.bz2 23266 BLAKE2B 8173474d3dea27a440b36eb80c89aabb08c37528c3ec2382839c46fc36336aff7f9cdf3dfbc66947df9286b1cfe9f479d615f77d81ab24ff68a3edf5df5b2350 SHA512 17080f358a3f231837de35188ad1a6ae554a4ca6199efae6dacf9b17706937379559d6c8de330b4237480fea6f5cffffc1158c1d5ecc36ec3a7b410546a2684b
+DIST gcc-10.2.0-patches-5.tar.bz2 24415 BLAKE2B 08d1e2409a6013f8ba3c14b60a5db773b0ca18b2df71bb1c11aa3ae76bba69d88ca4e7a33d2a7a012bd36bff15c55d5ada9b53d3e36c210b9a5e7aba178327f8 SHA512 04292690aa221849c16432ee165a3aef8ad81dec0acc68a0499b3a4256eb8dacf6c1160ac91053c0b84f30a019bfeb121bb21b6ffed3dae15a5b8c24f1e870df
 DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
 DIST gcc-11.0.0-patches-5.tar.bz2 12815 BLAKE2B fb5d467422de29bee6cd4e1b822ecbe1cc1a0364288f6ff37b43ceb12cf96618dcc072ddc5b1311e205996cb1d528be28641870ce03a51fa1d65ccf0c8c4d075 SHA512 6ebc28998b02c2fdd6cbc8b70a9c67a9de08226880b11bd87f512e9b81a04d9d78597faab3814c27f7bd6bed51513119d580eb828b0d4891768819c028aa48db
 DIST gcc-6.5.0-patches-5.tar.bz2 13723 BLAKE2B db0170d6db74dcb6dc3ec937379c188814cfe88b5204aa0c1cc925083d8f178be4896e98ff44fe224060e4e1fea98ef3c90aa8339b2cf78d33cd2dc8b94e3bdc SHA512 d79cf975157c5285faa893da0259b0013df66b01ad597322f05ece0343dd7912d8d793663448c04f37be93092e2fde06f84374e142cb81b12ba5964b37b0de89
@@ -20,16 +21,19 @@ DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccd
 DIST gcc-7.5.0-patches-3.tar.bz2 11613 BLAKE2B 84d59103bffaec8fc57e69dbb17f53882935b20c23d54db5f805e8270fa16d8e572ee4a369ecc82d2279cf66a71d1eb2a7f0c9792d4495d2f68946d6b6403f15 SHA512 6e5bea150c56ce3d43c9b0878691ed54ecc5d2a12482e99261efa74af7f1d59ec94c2d0c363792d99e0d3a0abd739d5d06b861da4dea2c1676e5d498b5815d55
 DIST gcc-7.5.0.tar.xz 62783088 BLAKE2B 8a5efeef517a5da1634d063aaa83bf5e002f86acdf27419f1067f5c3d087333d9eea0c8db427b8bd895af646990bb00ee173069980ca49cec848434a4127256f SHA512 fe716cc19f2e3255d3a8b1b8290777bf769c6d98e6e0b07b81a3d6ad43f8af74cb170dfa18b1555dbfcd3f55ae582b91a286ccef496b9b65c1579902f96a1f60
 DIST gcc-8.4.0-patches-2.tar.bz2 16254 BLAKE2B 5ee50ee1a3f6cdb392b370a0f62af7e8fd2fb2cadc46d4faf37ddbae23812a0e9f2e35a4ed6a08c41ffe648c21e9982e965d3ab91f68ae941c6cad74098afa2f SHA512 26fd2ad9f29dfd1db671d4966c16165a6fb75bd74f440871fb41dcb9b6102f07347ae8df67baa9e4d52aec91d3d67803a952b7bd45159fde56e1a1f28237c5eb
+DIST gcc-8.4.0-patches-3.tar.bz2 16890 BLAKE2B 29b537faf6fbf5ee43a72ea622090c17a28e19b903807d64302ef9a53c4eddc796c32e4f522ae0b724dda527ee073ba436e8803384d6d73d5e715653f89f59a3 SHA512 3f44e05d271c877eb2183731d4faccfdd66ac392bb8a541256d4d58c9e26bd205a53b9c881cc9c457cece55596cfbd8c6278be9509f3b151bb5e43206ce80188
 DIST gcc-8.4.0.tar.xz 63713440 BLAKE2B e536b7d1da5942a522f4ccce489882dcd5aefb1c76660fc17b0475a1164753979563bec25ed46c4e6c718cb9f64c047f57780e8d5be919657a1653f8221c1c9a SHA512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280
 DIST gcc-9.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110
 DIST gcc-9.3.0-patches-4.tar.bz2 15474 BLAKE2B b06fdfce4402850bb1c6c211ace4c3a07ad2114ffa48eac58d1624124d5d1bddd6d2b4faa18be3291a340272c022bea26dfcaf17929828ceb6474a5211401389 SHA512 54904a4a1c4a784f1a707cbdd9f6f498457e4aa550dc6f3d6eff71ed05a75685e23e6b71c2a614b1dea7e506b9f42fb0109ecfde00ef00373275bbc0409cb7e0
 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
 EBUILD gcc-10.2.0-r3.ebuild 434 BLAKE2B ba1fccc8fa386407cee7f758fa6d0b9b989825f6a796d2d18e90e9fea25f5dbd07ac911e61eb11edc226cc0aebb6b27016d8be008755d7e6a9ec0eb1e35e0169 SHA512 3b24b9f05039720b05ba55e2399f0b6251dbb0cfc15587855ba888620d459cd9f1dc0b49c3df0a49414f0f713c021d800108226a4f88897491c47ff3828d18ff
+EBUILD gcc-10.2.0-r4.ebuild 434 BLAKE2B 36c6583bfbec07d3b1f264e640c5ad9422f6833fa4dd9e382bd22e0177f1485e3aef68290cc1104f9796bd380823538fbc14e76874c3ace2196dc0ed5e18eaa4 SHA512 57eca9be43d772c7f5ca9e8c1729ff33647afcc49cc3a62fc4c5b5dbaa4b87a186734baa9ceb6f7bbeab0a3174159745cf8dd2353d172a0ad34758d2bd7a6fd3
 EBUILD gcc-10.2.1_pre9999.ebuild 807 BLAKE2B 08c2172ac50d043050dcfb3d69c138c51fb8d58f2601c14bcbaa4df5d9e844639f0bd345b14a702a86cebb7c420ca4cd831e0b8a995b036e7fd261963663e331 SHA512 0c05fc611f569a49d95d766048f6a1f3972108f7cbf2d03d5dc9a0f0ad29bf1ce4dd2269edabb0912628c9d5e8e377e9be586dbd07f182ebadbe7721a7cd5108
 EBUILD gcc-11.0.0_pre9999.ebuild 511 BLAKE2B c439da4d9eaf4512ac7ad516a2ce726e08a64e2bd60b2288738f6997855ef873a046e679781a237bbbfbc57b8ea36e1a92d428a06f0dbc3c797716127a6b55ef SHA512 b5f39fdd33f9dca702963492e010f0e397580ab1d0a7fedaa23c2e6da63ecda14db6253a02a4aee30c0151ea9437a2ce2ec1027d01574a076ee267737272b132
 EBUILD gcc-6.5.0-r3.ebuild 436 BLAKE2B 8b219613160b1d152efeebae97d56e1110473c31949b6c09b9f721afc36c765a8a499fe1ab43ec5e115197f4b9ec3f73cd6cff2d7716993a93353b8556bb5115 SHA512 b83c39a6a99971a0bc4f3ab57b5bc8c5477a1da8fb82a6b56a0dec1e0225761dbdd080606e6abf4b06d56a9b39e766ebac8b347ae56c535f7bf2a381212530ba
 EBUILD gcc-7.5.0-r1.ebuild 447 BLAKE2B b7465ed897cd3f2c0716e7fc1fe384dd93de4f29a090948857af9cbb04af1acee54557a2185e08852efb63ece42f72bf0c6289ac63f059d31bf32936bcb3dead SHA512 73b7cd1af8c1a45e0303085b95f8fa25831af50ad9999d7268847c970af9ece183dd68334bb0b57a153c8e4ed4ca3baa93c61a4ee6376bbaa944dfd529dd9bdd
 EBUILD gcc-8.4.0-r1.ebuild 443 BLAKE2B 7263728f3a730bcba73bb779ab11b4951f1171be0a0c0f2dc0efa3299e33cb0880c33d53672d369c2266816aa8f165b0d0295fa66c7fd92779ab80846428640a SHA512 2ea31641f37460d7951767780868c7e4b582531f7e0a0a732f5ce4d981a559b3f0750dd51c8dfc91154da9e4205114353ad883df35b9910d361bccaceaeb5711
+EBUILD gcc-8.4.0-r2.ebuild 452 BLAKE2B a08af9f8f55166a07894145a6d53a4c6988b9a419e95386e28f6875d6a81a6a02db25a051506c981e17c68846056a919697cad6f5ee3461b4f3167777974921d SHA512 1991ba970e5e56eda9a8e1391514de8028ed6741b379375d23ae3e13f267203cdd29ac0aee9f8faf8dc6a42c0291095521257886c77bea64159665f0ebb00c1a
 EBUILD gcc-9.3.0-r1.ebuild 443 BLAKE2B 0f43c582049ee55a5627d2a05e6dec513b4078d57e322fcadcc917056e840db4bd58dab264f068135569c0f06baf75e95d43302e89b2caf4bf4dac420e052872 SHA512 4efda3a2cbf371a688bfecb74369e7215dec1d5e8b72612f13a50644a884e738842f8ea25aa6800931c39bf0571c8f494972f413cc187b967f9b7a533a4237ad
-EBUILD gcc-9.3.0-r2.ebuild 450 BLAKE2B 98c2f2f85c6952ff3178a0f4a06d4fa307dd03e94473c7cf63846d2e17a8564c15ef44294bde0c9ec96cc1177e2a6ad73b23d9dd09a0ff98b96a5591d5d89f55 SHA512 ab8c5fe26c4a858f9e511dbc98b0ff6b140b025c8ff1499951a57422105f8bef22f4cac8c34ff0ee7495d336c1bc2feb7e67411cc1eaf8f7f91f983ae555b8f9
+EBUILD gcc-9.3.0-r2.ebuild 447 BLAKE2B 21486596a97d2b46ac76e3f669927fc6ab936fd1ef7ba90b6eeae67880ea68f9fecb19b6fdf8c1e8f8fbcfd7df7c8a6f7e3c353ec3160bbdbcec48cdcf2406e2 SHA512 edc497faaa3e5793e7a90b2e3561b56dd9f60bd5bf742d36154b374755db45667b42e000d37cb62df792bd1586ed309fe42197bb43b2a48043d654ccfa635e99
 MISC metadata.xml 2704 BLAKE2B 3e64655ebe03af9038fa2087b8d929e05136f833fe8667d2e1452a5f5140a1ffa64e39eb7e8e26859cf390d3a2b32842e41fa492697acd8cdac1336a34bba33e SHA512 dc9ec372f6feb99232ab0599351430440b4ddc71e2bf2be1ca4cf235337acfef5443e3ca44f12438f1b0f654b8eaaae66622728f6bcd8f15d3db78374ab781df
diff --git a/sys-devel/gcc/gcc-10.2.0-r4.ebuild b/sys-devel/gcc/gcc-10.2.0-r4.ebuild
new file mode 100644
index 000000000000..1e1a7574abd6
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.2.0-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="5"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-8.4.0-r2.ebuild b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
new file mode 100644
index 000000000000..576f5446974d
--- /dev/null
+++ b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="3"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
diff --git a/sys-devel/gcc/gcc-9.3.0-r2.ebuild b/sys-devel/gcc/gcc-9.3.0-r2.ebuild
index d5204e8c95a9..775f1c3be30b 100644
--- a/sys-devel/gcc/gcc-9.3.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-9.3.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="4"
 
 inherit toolchain
 
-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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index eb8f22818384..52c441067cb9 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lld-10.0.1.ebuild 1327 BLAKE2B 1c55c1e99e5e8bedbc1e3ab1b8159ee04e9128f7ddecc2fcb1800e12c62c1543cf16f9fc016eada3773c263f7a86c5199ead1f75d28db9126c6df3de6a9f0fba SHA512 9d22766d1b5915fade4ed73e1a5ba1eeb276d1cca640ba13d76502cf58025e03a96c4c162bbdfa328a29bc612d954771249300fe4724614b910b97f5313693c3
 EBUILD lld-11.0.0.ebuild 1396 BLAKE2B f57f7373326fee82fd0816e61ac0c4c45a2efac0cd4261b545c751d023f9986bd36be88e3afda9bee7a8d7b226577e0494fd11236a6683ea9ea2bad7f457efbf SHA512 57c50fd9b83a26dfdfb1732867a74264905241f77d31acf1a82e7b3ef09c4867105ec0ce99dc45b3373bd45285c043858f9befc167c44a8d0f25fa3cd89bce29
 EBUILD lld-11.0.1.9999.ebuild 1367 BLAKE2B 63a086f319f38c76f13fa2b2a9b61e42c42bf86c519f592161ff4a1575145720ddaaf44482caa38fc762ab1580e15baef9ce23a5ce6675e9f6133af204acf243 SHA512 f47feac0acc03f9f2aaa5cff60a5921a0ee2a71d736b40718f2a2c5cf66a94bbb445c4506cc04761b0f8b27f487d8bf9af92c9eef70a484fa952aff4ab802505
 EBUILD lld-11.0.1_rc1.ebuild 1367 BLAKE2B 63a086f319f38c76f13fa2b2a9b61e42c42bf86c519f592161ff4a1575145720ddaaf44482caa38fc762ab1580e15baef9ce23a5ce6675e9f6133af204acf243 SHA512 f47feac0acc03f9f2aaa5cff60a5921a0ee2a71d736b40718f2a2c5cf66a94bbb445c4506cc04761b0f8b27f487d8bf9af92c9eef70a484fa952aff4ab802505
+EBUILD lld-11.0.1_rc2.ebuild 1367 BLAKE2B 63a086f319f38c76f13fa2b2a9b61e42c42bf86c519f592161ff4a1575145720ddaaf44482caa38fc762ab1580e15baef9ce23a5ce6675e9f6133af204acf243 SHA512 f47feac0acc03f9f2aaa5cff60a5921a0ee2a71d736b40718f2a2c5cf66a94bbb445c4506cc04761b0f8b27f487d8bf9af92c9eef70a484fa952aff4ab802505
 EBUILD lld-12.0.0.9999.ebuild 1777 BLAKE2B 69690e21b7c4a63f24b873ae13ab37f57f7b7a4c564be295ed185657508e5ca0fcf108a4f114506cdf793dfb3986f65bedfa3886a0d548827de172217718af01 SHA512 3aa55f77f6c966f6bdce54cade8c957b8ad6a5d3152c6cf1d104c145ea35536dc8ec577c81f476577028a7828eb6401323fe6deb5fcddbac2865f165f81294c3
 EBUILD lld-9.0.1.ebuild 1323 BLAKE2B 042f875208515a2b9c39289239601e9b573aa2d9603f2bd58652612d44ff9e62b5776a2370eac1b6933f38f6dd085d3ba24749509eeb2084416e78dc4b5f8fe2 SHA512 d0a352fa95f0e5c47edce97ed4344555ee56d09b70db50b79f2b0ce50ab41e71aaa427dd4218f7239bfa56a439d04b9e99d4eabaa07f573617d55ac259721b55
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-11.0.1_rc2.ebuild b/sys-devel/lld/lld-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..4b86a2bdffef
--- /dev/null
+++ b/sys-devel/lld/lld-11.0.1_rc2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)"
+
+LLVM_COMPONENTS=( lld )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
+
+src_install() {
+	cmake_src_install
+	# LLD has no shared libraries, so strip it all for the time being
+	rm -r "${ED}"/usr/{include,lib*} || die
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index ed3c1267e52f..46176f156381 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-common-10.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
 EBUILD llvm-common-11.0.0.ebuild 606 BLAKE2B 38a0872487be62c2b5c554dab6e675b9f730de7d41cd703257fceb5a2cde35f8565ff517b44491db27cfa1a3656e3881712ca174aa4065005dc8437cda89a3c7 SHA512 dcd3d8b45d1215402eff9ed81eb24e72910e4dd40cee5cf8a5b5c2603eb650635c9afbfa4a06e2debd574ee39fde5090e2f9036419d4dbdb0c5739f8ca6bd01e
 EBUILD llvm-common-11.0.1.9999.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
 EBUILD llvm-common-11.0.1_rc1.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
+EBUILD llvm-common-11.0.1_rc2.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
 EBUILD llvm-common-12.0.0.9999.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
 EBUILD llvm-common-9.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-11.0.1_rc2.ebuild b/sys-devel/llvm-common/llvm-common-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..4804d9640098
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-11.0.1_rc2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index ed7852cd35f3..ef2a83819ec6 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -9,11 +9,13 @@ DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-10.0.1.ebuild 11900 BLAKE2B 069cd18c06aeb6a52f32736bbfe8bd7f9af7050e16298b5653b1b02c326255c41385ab6047052adc2b4c4efd44ccd61ffd20dde8160f48265e1500280612b018 SHA512 576336d3cef1257bf7ae1577d47fd3dc354b9e9d174ff5c75c055f1c306f110fc42313e235caf008308699a66820d1e67de7da3776d40fec3a9e0337f94d0c1f
 EBUILD llvm-11.0.0.ebuild 12856 BLAKE2B 15e4f40259f637a12a67bff0ed1c76c9e80547304370f48a31c00abe73b74a65d34e63b606e43b91e3bae87ac45c0804128bfc1946899b3f1685f7e6cd6296e4 SHA512 4d0cb037ec5919f3a0a3b56e3c59b7e16a5d0c1284908a709cb08faf2cdbbed9c6fbd3d77e59103938614ec7471293043c6dbe80a842ea03ae5c02538dfac4b5
 EBUILD llvm-11.0.1.9999.ebuild 12575 BLAKE2B 12f9dbad338a4b0cd05c8fcddb5da262802da300aae463b2b2ab9f64f96c4cd0d37d4bc9ea69a9f00f71373d807f67e871456a7a069b1812d045c240674f1249 SHA512 a383cfb2901dcdebb49f5451e462168bd0c1991205d6d52d7cff950168ec7ac20bde2e3cc4cd8cdf8004dabcd8ff4fc7f4bb036409c62046279497aaa3074b5b
 EBUILD llvm-11.0.1_rc1.ebuild 12575 BLAKE2B 12f9dbad338a4b0cd05c8fcddb5da262802da300aae463b2b2ab9f64f96c4cd0d37d4bc9ea69a9f00f71373d807f67e871456a7a069b1812d045c240674f1249 SHA512 a383cfb2901dcdebb49f5451e462168bd0c1991205d6d52d7cff950168ec7ac20bde2e3cc4cd8cdf8004dabcd8ff4fc7f4bb036409c62046279497aaa3074b5b
+EBUILD llvm-11.0.1_rc2.ebuild 12575 BLAKE2B 12f9dbad338a4b0cd05c8fcddb5da262802da300aae463b2b2ab9f64f96c4cd0d37d4bc9ea69a9f00f71373d807f67e871456a7a069b1812d045c240674f1249 SHA512 a383cfb2901dcdebb49f5451e462168bd0c1991205d6d52d7cff950168ec7ac20bde2e3cc4cd8cdf8004dabcd8ff4fc7f4bb036409c62046279497aaa3074b5b
 EBUILD llvm-12.0.0.9999.ebuild 12664 BLAKE2B e1a606a81a25bac625bf7847b779e79a27ccf7558b4e0438304146730609cf9f4150e7f585fa02805cac0d58b6dda7f748751413cd6165895be34d4884fe41c5 SHA512 e71e509e3dab84173da46e18ef19c172141b96b4824a12e46b2f70ea8016cd3c79aad2fec43e3978869cdb3c56307db1d0d1083ee889a86af488ebaef66d6339
 EBUILD llvm-9.0.1.ebuild 8399 BLAKE2B c296c1b0575c295bb14db4d3ac8fac06395e327cf95fda0c7e2263062de7eec6d6ea90cc264ac2b806ee2e6071fdc1c66c496502c2349d44b2364165258b6b7d SHA512 92c550916a048de53623aba4f7c2e32b6e6a35fde794116310f1a265e7e6124bfc8b48f27ae6830415802b5a2ffde222948f40c607d1ae5d96fecbf2d9c5591d
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-11.0.1_rc2.ebuild b/sys-devel/llvm/llvm-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..9c6edd92398f
--- /dev/null
+++ b/sys-devel/llvm/llvm-11.0.1_rc2.ebuild
@@ -0,0 +1,515 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Those are in lib/Targets, without explicit CMakeLists.txt mention
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+# Keep in sync with CMakeLists.txt
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	exegesis? ( dev-libs/libpfm:= )
+	gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	gold? ( sys-libs/binutils-libs )"
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/cmake-3.16
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+
+LLVM_COMPONENTS=( llvm )
+LLVM_MANPAGES=build
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_live_ebuild() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+	# reorder
+	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
+		eqawarn "ALL_LLVM_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
+		eqawarn "Expected: ${all_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# Fix llvm-config for shared linking and sane flags
+	# https://bugs.gentoo.org/show_bug.cgi?id=565358
+	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the live ebuild is up-to-date
+	check_live_ebuild
+
+	llvm.org_src_prepare
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwp
+			llvm-elfabi
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-lib
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-pdbutil
+			llvm-profdata
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-rtdyld
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-undname
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use gold && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 6a8ccaff9d8d..3ecbc59c00e9 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -8,5 +8,5 @@ AUX make-4.2.1-pselect-non-blocking.patch 4476 BLAKE2B da96e19c42a4a98714fa1de17
 DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8
 DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
 EBUILD make-4.2.1-r4.ebuild 1689 BLAKE2B d90f4430b958d6d34f307847d3eac7f7ff6f2012963bbc78c07c0f51d04e85552b9fdd18d58f994275aee3192ccdc37e3db3cac081a8a4e2765c459ffbeab32b SHA512 8fe65ba4f107d4d1ad030567f257233837f961697c64556cd02511a26382ea28975f95aa6ce1f25f75628455000a17a3e3de642f59394038529127c63b8b1e2d
-EBUILD make-4.3.ebuild 1451 BLAKE2B 89bd23b716efd63a8ef599bfe477f635fb588b10f3cef1560d2e3395f832efb4fd2963969ec977d7f31c0ad5b18fefe2866b11cdf85911ad6bb10015ac8f0c5c SHA512 dd0c9fffe1aeb67ff0aecdd67a55ae3b1f40942529e0a393ac603aafca7d36ce236228837899dd9a5605e75585dc9c5e31ac1e4dd5cd1cf70a3540fe9f06820e
+EBUILD make-4.3.ebuild 1450 BLAKE2B 6cf3d02affd1e023d70b33ee6c8fb158b78e84c4e357021ac0654464a06aa60000f17047caae36f70f3a6672a4b7c149cea4f5c740c1e769abe7d7620a4ed54a SHA512 d3c0a0cfbe8c70ef2fd1128700d56c947dc09b8f0c9312000b5be73d77b40b811c496ac8a2227842665bdd0049a1e046d4d891e311574c7d79578a72597ed293
 MISC metadata.xml 327 BLAKE2B c4ff5632d2d92cd0e1c073808261cc162799e186abc0cbf06bec9c3cb18757e325e63dc060e417196faec853dd740701f1bce0436754e8856399e4aee0ef950a SHA512 579ef7fc6e14f725bb29802f350035bc3619e6f06c72e3c496a92c056f15c6baa5f07d7b1aabbf13467629f30137bf2160b9d13aa6fdd65dbd04ee94472d00a1
diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild
index 08f05795abe4..0c5b591e2ec3 100644
--- a/sys-devel/make/make-4.3.ebuild
+++ b/sys-devel/make/make-4.3.ebuild
@@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then
 	SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz"
 else
 	SRC_URI="mirror://gnu//make/${P}.tar.gz"
-	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
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index 2274cbf7f1d3..190d4ce69bba 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -1,6 +1,4 @@
-DIST sparse-0.6.1.tar.xz 287880 BLAKE2B 026e7770460ab576b91e8c401c642e95269ddd7c90c0f855b0246448ca653b95a899b4bf647134c090c06c802757b6415dcc89bc214fb7ff124c2ce3888fccb0 SHA512 2faad9b3263f19f941cd6a5891960d2c7d1066c664d3ef68e722d461785aeed2d4a9539df3556bbd98c022e7ee965b8030c49272ab6003113ba3b36f73c00187
 DIST sparse-0.6.2.tar.xz 340100 BLAKE2B 72463fe93753f2cdced3411d1ccb18cc30dce82c4f6ae6289cf4297c66cee9f52ba96f96cceac1f134b017a7d6691b019c2f22cc801522e7a0fe0c5e0b4c8da4 SHA512 43c16b5cb4141077dd51f93e877e28e1a00e69ced58a9c8f643635b6f87a8044cddfe29a734b4a43282748e12f287b19b4fb3ce8c5e0b13931a3355974dff982
-EBUILD sparse-0.6.1.ebuild 1371 BLAKE2B 1cb48cddc186f3ab6726c5d7d6f4dcd680e44856626abe1cf1df61c4dbaa65f1bb821422533ec37e658be1330605cfb22f72461a7378dd7e561359c5c454f047 SHA512 cd3ac75ad44361a400cc659fe4e6b40da0bd10db5ec2e9cc96811d11002bfede6e345888cf662dac6963b9f7713b7068cefac19aee412cde699250770d9226e5
 EBUILD sparse-0.6.2.ebuild 1439 BLAKE2B e52731b5383e2c828af790b5b30d2ce8206abf203b7f20776988314608eb5315449d31fb888799711f9d66d153e2272fb7f0d4ba54b951c14655fb789e8854e8 SHA512 3c6aedbe41a9d5495245e67dcd570de0f8d8d085d7d1f4b4da897d5d208279b0e496571e04f812bc78e311c782b9eb348e5d648fa5ba753d257dc29b36507a23
 EBUILD sparse-9999.ebuild 1439 BLAKE2B e52731b5383e2c828af790b5b30d2ce8206abf203b7f20776988314608eb5315449d31fb888799711f9d66d153e2272fb7f0d4ba54b951c14655fb789e8854e8 SHA512 3c6aedbe41a9d5495245e67dcd570de0f8d8d085d7d1f4b4da897d5d208279b0e496571e04f812bc78e311c782b9eb348e5d648fa5ba753d257dc29b36507a23
 MISC metadata.xml 636 BLAKE2B 48bac3e5bb329089c8923cfbdd0bd32efa8202c5f43a8179b044c70fdc1fcb73090b0765fe3d2b6e33fd0364f5ca25eec07aabd152dff21948074a2099c5367e SHA512 b46ed66da3644ecf4e2cdb6a0ecd9fd18e99cfb6aea1967acf1119d1f75c4907889a3fbcda76ef2d3c4b1617d718a946e5fb01e75db105d740a98c49430da859
diff --git a/sys-devel/sparse/sparse-0.6.1.ebuild b/sys-devel/sparse/sparse-0.6.1.ebuild
deleted file mode 100644
index d058d2c9ea40..000000000000
--- a/sys-devel/sparse/sparse-0.6.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils llvm multilib toolchain-funcs
-
-DESCRIPTION="C semantic parser"
-HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gtk llvm test xml"
-RESTRICT="!test? ( test )"
-
-LLVM_MAX_SLOT=9
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	llvm? ( sys-devel/llvm:${LLVM_MAX_SLOT}= )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	xml? ( virtual/pkgconfig )"
-
-pkg_setup() {
-	use llvm && llvm_pkg_setup
-}
-
-_emake() {
-	# Makefile does not allow for an easy override of flags.
-	# Collect them here and override default phases.
-	emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		CFLAGS="${CFLAGS}" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		\
-		HAVE_GTK=$(usex gtk) \
-		HAVE_LLVM=$(usex llvm) \
-		HAVE_LIBXML=$(usex xml) \
-		\
-		V=1 \
-		PREFIX="${EPREFIX}/usr" \
-		\
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-
-	dodoc FAQ README
-}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 6a2ed31cc771..04d34c5a399a 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index 73e56c6ed0d8..57fa7e93c2fb 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -2,6 +2,6 @@ DIST ipxe-1.0.0_p20180211-546dd51-bin.tar.xz 1748228 BLAKE2B 5ed2ce71c7dbc41d5cb
 DIST ipxe-1.0.0_p20180211-546dd51.tar.bz2 2954305 BLAKE2B 8232b1afe017ff5d0389534e4efea3209ea0330d66e4d3d429abf81da66639b19488911d85bf2da200ff8cb0d49c5dda438074c4538303335419ea080ef80a16 SHA512 45d7f80f15a1c5ff1daa31b132065d38013a51127795ad81308b468940a455edcb40cde7601475039a7c977d732817203bbc627c642d3d10146a480da603f1dd
 DIST ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz 1839688 BLAKE2B b28772b928690646e1b0cb1c27ef56e2cb1c0637a43c6174dea7c8ca401d8c8819938fa358a0bed5d57b8cf992b8c2060b52e32a970ef813f1cf705fb0805beb SHA512 1e5838b8c530257dc544f6e25f80e6e223480917db393ca3ff8c577f07e60180e18f2eed4e71f7b1965157d6e7001f65e224d3c8b56a98f84739e2504ca38985
 DIST ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 2985776 BLAKE2B 5a85505404978d51f80e30332f6eb0417d6d97eb9b3bc05eec5ad649c446c7d17dc841f8cd34a1b29c31dc6f5cf08baa69191de9c8dd4bcdb098c5d7f13a7824 SHA512 3af0da9058b39966bfd8f9d7dfe518ae7b26e18f58d1a3fa2cba8922ec3c50775b82dd9f23bf51be3ca3f69b705f92bcf80988a1817b30f7ab1826a4b159c5a6
-EBUILD ipxe-1.0.0_p20180211.ebuild 2802 BLAKE2B 9fca4b57d57ff02da7b47ab6d69126ee9ab3a02eb3cb3d4c0dca407916436a797dd730cdfef64d14fa255fa6b6021dad4e1d3547be1e433f41d1535118cb99a8 SHA512 999f589e9a37315a7e785ad6bd7b64ff321da46d153a8cfc7704fb2a017e34c3748d0fe778ad59c276c5662f40bba3e577fcedcfb9ada2bcd3b2b736d98358fc
-EBUILD ipxe-1.0.0_p20190728.ebuild 2800 BLAKE2B fcdfd31fab4641dc67950c0ad5ea4c6f68c0af1baa0269ed4c4b211d0ca38a197f973e93d87e89dcab0227c2809ffb4e0f05912118c8f4a164190a48937ca718 SHA512 99b9c365abc41edc9735fb26a91835f0265a3ec94e16906c76a0ba591208557d860c8f237c49016c47ad05e8c5cc530ddffc7883cb878856913940282a82de57
+EBUILD ipxe-1.0.0_p20180211.ebuild 2802 BLAKE2B 62f4cfbb97b7e249af31f93eece95d2bc792a2d07d9cb6ef28ca37369a82efb0712d3f347ac1cfe1d68efa4ff8ef620671eab07c7a108afaeae0da1870e21c70 SHA512 2f52f6270ab11e2cabcba498956a4713beadf2ddc1a0fa79713872ba848dccca25eb96280226c5e0ac49e9020d37a2ac5e9e016c37f67231aca7bd2f19b28936
+EBUILD ipxe-1.0.0_p20190728.ebuild 2800 BLAKE2B 0013c8b512cc2419e8b53279245ff1f83130d4d737ec7e422591103e88130f6c320f146c24c5528713f4dddd346abf129e66373cc2d5ecf50130ffad8f760c80 SHA512 971c1c69d3aee0f0b6996ec355e42db3e7dd9eb52a2ce2221a09acbb41cc542ae9ca08e4bf187323f245d9ad632cb041d7b7f10ed975543592a71fb7602ea193
 MISC metadata.xml 996 BLAKE2B 41f19340003c0213578fb1b3f7ae6aaff718eb150cdb398b463e695dcc931da45251ab5d70fbdff0277f52ad7a231f93f878d9fa4ce9fe5a338cc3d4e2708124 SHA512 123f401010d157b928390599a3125c9c18ba721757a16ac3fcce4fe30e3ff298ad9a3dcda64b779bf2fe0fcb52c9057e382b7ac618a3ae27b92dd94cf0dde0d7
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
index 34c3700b7860..e896449d6c5e 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
@@ -25,8 +25,8 @@ SOURCE_DEPEND="app-arch/xz-utils
 	dev-lang/perl
 	sys-libs/zlib
 	iso? (
+		app-cdr/cdrtools
 		sys-boot/syslinux
-		virtual/cdrtools
 	)"
 DEPEND="
 	!binary? (
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
index 7216cd520792..a173db1969e0 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
@@ -25,8 +25,8 @@ SOURCE_DEPEND="app-arch/xz-utils
 	dev-lang/perl
 	sys-libs/zlib
 	iso? (
+		app-cdr/cdrtools
 		sys-boot/syslinux
-		virtual/cdrtools
 	)"
 DEPEND="
 	!binary? (
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index abd3d36c5d2b..f5d317c3444f 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index b926daab925a..62bb9873ce0c 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,5 +1,3 @@
-DIST duperemove-0.11.1.tar.gz 115740 BLAKE2B 7804f1c98cdeb349ae12425636575c9b2468613dfe908d8c9f1d9fb74aefb412142002a0fc899b8448ed1b255257569555264b9d9c172899f856a919d02dd1a8 SHA512 3c344b00b8fb58a259840aea977ba2e5123b651bb58ec84177bdfd8337a377361984b85c6325271b7d3e4ea216017fa6fda793136c83e9837a13ec041df326b9
 DIST duperemove-0.11.2.tar.gz 158001 BLAKE2B 743f59319424f7fcd400bc24de056fb79fddcb2600a707446c2f1c13c26cdae2ae24e1a91d9edadef55aaafb01b7ca217defc4c939053981bddaca12fcc230e9 SHA512 d2b24c912a3ae4a5b9730ba1369b6174cc6fe252710dc7dae2971816e931558ea68d664bf4c9497630dd9002a71fccc26848ad848831fa45d7a7715ba65378e5
-EBUILD duperemove-0.11.1.ebuild 621 BLAKE2B 71c3b85e3b46c60a90475364ec149b1e736ffa9216ae12228c57dc1f109109fccc3d3d26c6d7d11266daddf3f99e00e2ec61a7c5b3be81a9e6fcfa8ee8bdfe4f SHA512 e1e67d3fe8e6d0f7e9da7e8e90cf7958d72b23c3149c6b1e395de3873a810dc2c68f712082f75264b4d1e3dbc5392428ab8d5f6d93d0958b4f2c16e167e5fd51
-EBUILD duperemove-0.11.2.ebuild 702 BLAKE2B c6dd8efb70f2e108bb7fb1107e2813a4565ee27a2eb43c68056e454dd353e06684743ae8ae4552bf2cbdc41072b172861a34b118404238023a6110d39853239d SHA512 c615860087ae3a00bf38dae467b1d87333817308fecf33d9cd9060d5a6d87988dff3c7809207f81923dfcd0ba4d6d025a4aa5b112640aeff65412dbade8e4f70
+EBUILD duperemove-0.11.2.ebuild 701 BLAKE2B ed3758942b72ff9eab25d5244f2fa6f2c476f921e1e89da8c2274b2b460e7d88928592d21e27f9d9000647865d4eb1d31156a880542b72422dd5f0da2a64acb9 SHA512 26300436e69b9a46bc0e52bb70fd29cd178a5a7d83b0f86a07a36bfcc40a01995461e2eafce0060c038297793ea92f25e8d0eee1b0a609d722347ac0935be3e9
 MISC metadata.xml 333 BLAKE2B 0fee725be9a70cd4044f405f29806359d9e310aaf38915806ba1486424d7b55af23e052cb42d4e2583d5d11bf1be86b59a74e9c556bff985dad4e6c5ee5843f0 SHA512 686d9f84253b594161fecbe0693e1a88735ee928eb7683317e46317e746cd787790e27691b77f6df4da864aec5fb7ac76436de0dd3805f9707c2536daa3eb122
diff --git a/sys-fs/duperemove/duperemove-0.11.1.ebuild b/sys-fs/duperemove/duperemove-0.11.1.ebuild
deleted file mode 100644
index 2491a42a58ac..000000000000
--- a/sys-fs/duperemove/duperemove-0.11.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Btrfs and xfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz -> ${P/_/.}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P/_/.}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.11.2.ebuild b/sys-fs/duperemove/duperemove-0.11.2.ebuild
index 3e266368e293..62cb077c58ad 100644
--- a/sys-fs/duperemove/duperemove-0.11.2.ebuild
+++ b/sys-fs/duperemove/duperemove-0.11.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest
index 5c705a1e3ef9..82bf70fb5427 100644
--- a/sys-fs/iprutils/Manifest
+++ b/sys-fs/iprutils/Manifest
@@ -7,10 +7,6 @@ AUX iprupdate-r1 197 BLAKE2B 4989e933a4d182583640fbd4977a7a43402de66437355d2b889
 AUX iprutils-2.4.11.1-basename.patch 172 BLAKE2B 8075c38277fe0290b47e1a107ba721d02d9d453e9bdb60197e815b0967cc5db4530754c037dc0873483057f93b3b30de0faa4fdd41906ee3c92b0be6a70ee7b7 SHA512 3c0d027d720970028588a241a2399ed5cd658b69b0d4f6ff1645b0ce3eb58eb1af7e485cb674972f11033261f4d9ec9a0c42f583f319123cbab48ce6481caa7d
 AUX iprutils-2.4.7-tinfo.patch 569 BLAKE2B 8188fe255a04685e1240b6e99c8ae63e1993e9942bd25cd526d40f6f7dab568f27816a22360fad60d10418b4455a764fa1484b71a284276019a260adf64b42f1 SHA512 2d489b2a5107fe16c0cbdbcaeb589249d27b7bf40633d9c830d7384053e0659690d2db974a2447a3383bf5af04cc94d64d0fcadc5b18432f57dbc69e338aa0fc
 AUX iprutils-2.4.8-tinfo.patch 551 BLAKE2B 8638750e930e7fe265e75fead2a9c111f0a7304676c4f48c8789be1cf42a76b5ac4a21e0b9fc3ad5536771ce543541c1f032c64f6f264929e6197ba09f76e31d SHA512 c03595b85e17edee22191c49bf8a3361b0c81a9f4dc50bf6d2393dc2be5a0a7c0c77c61de9d17c2e262d150fb0a896274c89442b4df29742532595448171fd5a
-DIST iprutils-2.4.17.1.tar.gz 524770 BLAKE2B eb3864a431193ce342810449bde2ac6a4e7a9c352611077b70f93fd3b3ca69c47cbaf7a55ef45b38f99135acc27ebba34b7fbeb8d7f704587ce96e0a8e1f29bb SHA512 d9b257a1e86350ef26e6491d5030ac864a244283697a4ca588af7ee21c2518c631a2bcfc9913783f973025d186feab8ed045b1d4674621a08b401823e9c52d3d
 DIST iprutils-2.4.18.1.tar.gz 524809 BLAKE2B c32b01ada70e67748653b8e346cdecae35f3ac240a7eaa8be0ff70590bc68b8be770bffe2f3131cbd6cbbe75812f12524c0817aa02674cd4643e846724be2891 SHA512 42da77c0fde0a2650368b2f0605d63762389ab394f755f4e4144704e155333a2ad8133731244b8383e9a334517aca45f62487229a27a2e90cf22a10c760aab3d
-DIST iprutils-2.4.7.tar.gz 467671 BLAKE2B 8ca3e77f927dcb3cd45b78e1b5e15d7edc67b3fbc8762383e0e9e84ebd42ce74927909aae926762d6bf0378d3b8d8f77cece65bb3ace746f889fbebb7fdcbf43 SHA512 9e6fd37cb72ce1d092b02f1cdfeb9e97962007327f92f4d9dd2a755489dab3a5d51a459d2f256d8453de74935a5cee8f25f71a820d82347ae67aa72a89043a91
-EBUILD iprutils-2.4.17.1.ebuild 1046 BLAKE2B 4cb8cd45fbef28639c260f740296922171da2c33a2c9b40efc52a4b80eab70b7cc4a5666312c02204070076d784605230b2cd16c23bb9fcc3cd4d90f959dd662 SHA512 c99df2b9c485662eaf9603baba25ed8e21405f063c360d9447879fa4747bf5f41ce77477865a60f215d5268426ac1d19df3a42653e5618a46635503ba1dfd009
 EBUILD iprutils-2.4.18.1.ebuild 1122 BLAKE2B c94343844730156c0cbb6d29e691e4dde09621ff1d7dc16d1f82a95ba3d4cd349456b76a3fbe897c993c681087a1e100656a67a0d21fa4c9a236d96692ba01b6 SHA512 ea6eb2bc10b350cdb423176c4762445ca710f147110466037a4514495ab8be27175cf1bd8959b5aa04c5b4fa709cdef8933be1d990344a7913d41b15a675e779
-EBUILD iprutils-2.4.7.ebuild 839 BLAKE2B e0e1b3af3728393f410b111d3e0def80c8b598c04e61778075fa7dd75b380494ecb940c6082fa5f4270c92d62943a3cbe4aea690b370839d117e41c399055b68 SHA512 349a3f06f3e75e39786efa5aced19659c094433a1778ab0c43f870b4b8e536e5ed2441105ecfdd56e5b95fb1f5e8da4642be6cffcac1e00e19fef93f98c8d312
 MISC metadata.xml 338 BLAKE2B f1a657a6c8fc11e853f0530c94e8376b8b424818873d909ed8a54c0bef0e47bea40733eea3e8f8e8340562c58dd29c2d3b072023dce9edb6ba803f2774fe1076 SHA512 6323616f564434719f3466d45a7d0a41969ac75a8e6efb5b0225a915061f9a5e8698aa296633ec54f3708903b39ac2d8fe5275686a2bd76bd1ae8662b8dc7600
diff --git a/sys-fs/iprutils/iprutils-2.4.17.1.ebuild b/sys-fs/iprutils/iprutils-2.4.17.1.ebuild
deleted file mode 100644
index b01907f61432..000000000000
--- a/sys-fs/iprutils/iprutils-2.4.17.1.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 bash-completion-r1 eutils ltprune toolchain-funcs
-
-DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
-SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/iprdd/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="~ppc ~ppc64"
-IUSE="static-libs"
-
-IPRUTILS_DEPEND="
-	>=sys-libs/ncurses-5.4-r5:=
-	>=sys-apps/pciutils-2.1.11-r1
-"
-RDEPEND="
-	${IPRUTILS_DEPEND}
-	virtual/logger
-	virtual/udev
-"
-DEPEND="
-	${IPRUTILS_DEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-		"${FILESDIR}"/${PN}-2.4.8-tinfo.patch
-		"${FILESDIR}"/${PN}-2.4.11.1-basename.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		bashcompdir=$(get_bashcompdir) install
-
-	newinitd "${FILESDIR}"/iprinit-r1 iprinit
-	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate
-	newinitd "${FILESDIR}"/iprdump-r1 iprdump
-
-	prune_libtool_files
-}
diff --git a/sys-fs/iprutils/iprutils-2.4.7.ebuild b/sys-fs/iprutils/iprutils-2.4.7.ebuild
deleted file mode 100644
index 7cacccbe3a5c..000000000000
--- a/sys-fs/iprutils/iprutils-2.4.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils ltprune toolchain-funcs
-
-DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
-SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/iprdd/"
-
-SLOT="0"
-LICENSE="IBM"
-KEYWORDS="ppc ppc64"
-IUSE="static-libs"
-
-DEPEND="
-	>=sys-libs/ncurses-5.4-r5
-	>=sys-apps/pciutils-2.1.11-r1
-	virtual/udev
-"
-RDEPEND="
-	${DEPEND}
-	virtual/logger
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.7-tinfo.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/iprinit-r1 iprinit
-	newinitd "${FILESDIR}"/iprupdate-r1 iprupdate
-	newinitd "${FILESDIR}"/iprdump-r1 iprdump
-
-	prune_libtool_files
-}
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 1ea3a5d0adee..deedaac9d9f5 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -7,5 +7,5 @@ AUX ntfs3g-2017.3.23-full-clusters.patch 2206 BLAKE2B 5e11e3a1f3e51cf46c09c2e830
 DIST ntfs-3g_ntfsprogs-2017.3.23.tgz 1259054 BLAKE2B 4f12a6061ef0c116f26225eb3fb5cb84e469b63710115fbfb54fa3802ea94192afa973a553742818ff6849b72919069ec92aca2d4d6f58d8cabca1b0fefa3abe SHA512 3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef
 DIST ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz 1278315 BLAKE2B d4f84bf744b12fec7faff82bd3d3048282a3cbcde2ca75e5d3a295206585c4cee68e25dff5fb20b034f516a3f2cd95c489105d9df810f8a9378024ef065b67d3 SHA512 8534970ba9f07999c5ff433144ad3a59640fb9a28fb30b37b5d736101e19f9fec1c222152338be382c894f972fce2b2a83680b85a28cf147cb5500b40a0a25cc
 EBUILD ntfs3g-2017.3.23-r3.ebuild 2930 BLAKE2B ea3cc4778fc6fc4af6d8e15c9c8fa7d2bb5ddda8c3d32202512cdfeca746c2d609147703b4f90fdc5875cd1dcf9d9816c86f02a1f3dd950a94c6f781b8271c4e SHA512 0be319c53b19da4c253d7b8b299a383e277b71ecce45e35f0f68adb0e98d0c5bf6cecf0aa3537b89b2734ce4ea67281f817dd238cad857962496c1cb2f7b58c8
-EBUILD ntfs3g-2017.3.23.5.ebuild 2011 BLAKE2B 5ebc1053adbfdadc68914ab207751244db2a4f6432b7cb9f353f93c8ea0ad8c7acd815e4e76c2991f260b57f1742da5934af2bb2178bdcd53dd6232b06810717 SHA512 618a472c48baaf5ad73159fa2ec324b756c669a67ccbc15d5c7bb359cf34187b9a7e468b80b596fb6427ee7bcfa69f4593b9e7e2a98baaba2fe0b6eb69ee08ff
+EBUILD ntfs3g-2017.3.23.5-r1.ebuild 2070 BLAKE2B 3943f547cf3c41d1bb71b68d271e1ad2321d961dff6f9e816382083f0128aff4852f284c45cc377826ccbfd7008d9887b8bae83cee017606b77aea25925c84be SHA512 041d87915b55729b157378c9524c0b5e743fb2707d0744e2123e9b8c752a1852f6b3007966e46d47663971c4b74734d51749ae02057c29ef3f778127d5fb4772
 MISC metadata.xml 1188 BLAKE2B cd693b8b1281d056a5e75baeb04019684a67033607e16479c58830fbf9a19b88ba6e263c5e0637b5501cd5fe2fd000f92e8212354576242fa31c513158b38774 SHA512 6d9aa23202090132c37fe6915aa300597f2c88474065749de36143b8a47090c5bdb2e6449dffbb3843c9b7d30254fdde849b1aa230641910189d00134bd88c85
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23.5.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild
similarity index 94%
rename from sys-fs/ntfs3g/ntfs3g-2017.3.23.5.ebuild
rename to sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild
index 83e5a1f4f9ce..e0ede00ae196 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23.5.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit linux-info udev toolchain-funcs libtool
+inherit linux-info toolchain-funcs
 
 MY_P="ntfs-3g_ntfsprogs-${PV%.*}AR.${PV##*.}"
 
@@ -74,4 +74,6 @@ src_install() {
 	use suid && fperms u+s /usr/bin/ntfs-3g
 	dosym mount.ntfs-3g /sbin/mount.ntfs
 	find "${D}" -name '*.la' -type f -delete || die
+	# https://bugs.gentoo.org/760780
+	keepdir "/usr/$(get_libdir)/ntfs-3g"
 }
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index f753ccef7497..d8a769892472 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,7 +1,3 @@
-AUX squashfs-tools-4.4-fno-common.patch 456 BLAKE2B 6864eea963512705290c84e2c8ec57db59d0b96119469dae57a55c70f999446ca14ac7fbf7260540afd1656e1b50ba7ad174548b3972fba74ed530cfee1e5a7d SHA512 16da63201d5d1584401f3199a0f89d11d5e8d968a4e707215febf5910ec03425a7478d32a0a6e5e6cf7039f92300657d1797a525b38a817601ed0a8e698fb96d
 DIST squashfs-tools-4.4-git.1.tar.gz 241963 BLAKE2B 7a80c353efbbca851b2eb44e742f20b4cf59e91058b53b77c74d879dc18d882e3bb6de8a010a4469c0a53384ccf2968bba4cd1d6f10cfcede70fe07eebbf2409 SHA512 8d8cc3da7cbfc7b94d070021383413f3d1ef1261ba3fd9924dde4453558a8f8f14812c2f5614f87bef719496b0a023897de8d087c32a7344fa2eb9c1624563a0
-DIST squashfs-tools-4.4.tar.gz 241842 BLAKE2B 006e2d340bcf6e20873221fb51fa30e0808c4a4d9e1838ca71c11ddbff3bf472dffe730e9edf07c34f535650e6486a8a80a88f82d6c9ef7a7c19aa22098e9197 SHA512 133ce437fb8c929933d52cff710b61dd9181f6f8be58250b0d6a59a7bb79a2b350f68f456b06a0e17c469409a71272d586802d570248273ddcd5dad088c00308
-EBUILD squashfs-tools-4.4-r1.ebuild 1320 BLAKE2B 519be00eb2fe38a2be2a8722d75cf821cbc431d3af15d1138a279b1689f8e6060b017511314e772c9f6fee30ca7b3a28ef5ecc03f002181f4861565b01268edb SHA512 0b47634b8dc8eb2ea199fed7f1b044e8638d182995083cd8479e349cdc3c19920953d1996f7f32ec45c04904ac78eb3d9cc396a2e4c706eb1f9d4362f1787b6f
-EBUILD squashfs-tools-4.4.ebuild 1720 BLAKE2B 762f8c6f0b1ef784bda8a5f56c49be0410628dfa39402fe15c188d97775dd6c53608e1099004c958a1baf87afb6b82362415143f0756e50d168da671c26fccbb SHA512 dd8e639279641c15fc0a6eefc7690c546a135a6eb66a66f5efec57c02947fe5a871b03159f337e00a974a4d10ea3bf0578e53d556c9027b5092d760c5fc62a7e
-EBUILD squashfs-tools-4.4_p1.ebuild 1317 BLAKE2B 4df71310cf56f751394b61eadf743f7fdf6c82cdf04e065fb99d957d9619803de1cd7123be724821671063a9c09bfc5c444f7f72d52acd08e3b4746a99ce371b SHA512 05eab512c830e43eb2f428a7f4555a53efffe3d94581f041908ccac0fee54c164dc1703f3c95c7127269e8b589bc745ee978bfbf81565f9d3b15b3e640972e4d
-MISC metadata.xml 454 BLAKE2B a4b9cd6ce3e032fdfee261126f4893ed9fb81a0008960774812361fe25a993f77c67353fcbc818aceb0c6c936a52bec3f13d5d9b5aebac00cf36f47cf1d74583 SHA512 b884abe3bfe270a305536f51b9e4c291e2acd5c848b0f1c1a996e208beba57ae29746701478ffbc6b4df2c9dd10b17756b4c077aa895e65a37c9a231401e820f
+EBUILD squashfs-tools-4.4_p1.ebuild 1313 BLAKE2B 589a3a76413933addc8d051678baf19d8ae8e557c0544df7df53d1e872216983610d2a04f52ae71236d1d0305232dcad852c204bdff0bf07a75b8e638e9cf741 SHA512 ccf88d8ca9eef5d96d50b51afd5df5cc34239562e88b4f5c0e119eea8502dfcd25d3271c0ce5bd0d72ba597347461fd170bc145499e9760a6785d66938578907
+MISC metadata.xml 325 BLAKE2B 69746d14350ab40f297e7944dd2ffa3af61c6b7890012856fa7a8c8971246591844a078f3ca79cbc579bbd1d8d5fad5e6c8338766a80d4a2d068219ac303e77d SHA512 452fd4de6f1a2ab284e8dd388c18caaf75bba2c07bbf3eb5d990259d92ed6af0f7a2174a85998214f17a09f087f796dae7550e09ebfaad15c6a8ca514335afe4
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch
deleted file mode 100644
index dfbf42abb34b..000000000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/squashfs-tools/mksquashfs.h
-+++ b/squashfs-tools/mksquashfs.h
-@@ -143,7 +143,7 @@ struct append_file {
- #endif
- 
- extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
--struct cache *bwriter_buffer, *fwriter_buffer;
-+extern struct cache *bwriter_buffer, *fwriter_buffer;
- extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
- 	*to_frag, *locked_fragment, *to_process_frag;
- extern struct append_file **file_mapping;
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 9e444d0bdc16..a017cec98cee 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -5,12 +5,6 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
-	<use>
-		<flag name="xz">
-			Enable support for XZ ("LZMA2") compression using
-			<pkg>app-arch/xz-utils</pkg>
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">squashfs</remote-id>
 	</upstream>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild
deleted file mode 100644
index f330af3c97ac..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="tools to create and extract Squashfs filesystems"
-HOMEPAGE="https://github.com/plougher/squashfs-tools"
-SRC_URI="https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="debug lz4 lzma lzo xattr zstd"
-
-RDEPEND="
-	sys-libs/zlib
-	lz4? ( app-arch/lz4 )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	xattr? ( sys-apps/attr )
-	zstd? ( app-arch/zstd )
-"
-DEPEND=${RDEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4-fno-common.patch
-)
-
-use10() { usex "${1}" 1 0; }
-
-src_configure() {
-	# set up make command line variables in EMAKE_SQUASHFS_CONF
-	EMAKE_SQUASHFS_CONF=(
-		LZMA_XZ_SUPPORT=$(use10 lzma)
-		LZO_SUPPORT=$(use10 lzo)
-		LZ4_SUPPORT=$(use10 lz4)
-		XATTR_SUPPORT=$(use10 xattr)
-		XZ_SUPPORT=$(use10 lzma)
-		ZSTD_SUPPORT=$(use10 zstd)
-	)
-
-	tc-export CC
-	use debug && append-cppflags -DSQUASHFS_TRACE
-}
-
-src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools
-}
-
-src_install() {
-	dobin squashfs-tools/{mksquashfs,unsquashfs}
-	dodoc ACKNOWLEDGEMENTS CHANGES README*
-	dodoc -r RELEASE-READMEs
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
deleted file mode 100644
index 26923c4c78e9..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="tools to create and extract Squashfs filesystems"
-HOMEPAGE="https://github.com/plougher/squashfs-tools"
-SRC_URI="https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="debug lz4 lzma lzo static xattr +xz zstd"
-
-LIB_DEPEND="
-	sys-libs/zlib[static-libs(+)]
-	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
-	lz4? ( app-arch/lz4[static-libs(+)] )
-	lzma? ( app-arch/xz-utils[static-libs(+)] )
-	lzo? ( dev-libs/lzo[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xz? ( app-arch/xz-utils[static-libs(+)] )
-	zstd? ( app-arch/zstd[static-libs(+)] )
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4-fno-common.patch
-)
-
-use10() { usex $1 1 0 ; }
-
-src_configure() {
-	# restore GNU89 inline semantics to
-	# emit function symbols, bug 595290
-	append-cflags -std=gnu89
-
-	# set up make command line variables in EMAKE_SQUASHFS_CONF
-	EMAKE_SQUASHFS_CONF=(
-		LZMA_XZ_SUPPORT=$(use10 lzma)
-		LZO_SUPPORT=$(use10 lzo)
-		LZ4_SUPPORT=$(use10 lz4)
-		XATTR_SUPPORT=$(use10 xattr)
-		XZ_SUPPORT=$(use10 xz)
-		ZSTD_SUPPORT=$(use10 zstd)
-	)
-
-	tc-export CC
-	use debug && append-cppflags -DSQUASHFS_TRACE
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}" -C ${PN}
-}
-
-src_install() {
-	dobin ${PN}/{mksquashfs,unsquashfs}
-	dodoc ACKNOWLEDGEMENTS CHANGES README*
-	dodoc -r RELEASE-READMEs
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
index d5952a4ecb36..9faef4b6fd90 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 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="debug lz4 lzma lzo xattr zstd"
 
 RDEPEND="
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index e5b32c78ca24..93ebef3120b5 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -6,7 +6,7 @@ DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e01287
 DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231
 DIST xfsprogs-5.8.0.tar.xz 1260580 BLAKE2B d4efb81123d46fd7907dd81605922ba283642ead92f6270a3b0d93a0c7321963d5b8b0068a2b6b4cdb236da0653a6432b74056feff77354d2557e899b01f1a62 SHA512 11f2810402ecb83db204346c45ff9f7d643ff2390767794e311a06a10eb97118095e4c377d2b065be50611ec5fc82ac5cbc0a8c7122ee7e9820a2db4e9f177c1
 DIST xfsprogs-5.9.0.tar.xz 1263364 BLAKE2B 0504e06a9b2b664289fec3dbb083508438b4950c623e309f326954b81f2e9ca0e65d9eb0c9fa029c49f6708e7995db2e9cab0bc7f42aa048e7f9feb80fc7ec77 SHA512 76f7da8c57e859326b33bff4ceae9f73af485357252b2b1c09808ebb309af5abbafdceb874b9739a1aa87b8f130e42c5ee143fff117edde20844182e7babd0ce
-EBUILD xfsprogs-5.10.0.ebuild 2257 BLAKE2B d2f631604dad9f4434c062c33735bf652d8e809cd82620cef7c078b4bacd6963bfa543e737a4003f39c2e52c306dbd86071d086525868217f2a41d32c712f20a SHA512 ecbb03877e2fc85678777f0966b170877c6a3e8c8267925c73285b178a9481f67dd11883435e678899f64aee6d8b9a12f045fecf08cdee50ed4065225a5bd169
+EBUILD xfsprogs-5.10.0.ebuild 2311 BLAKE2B 061c3316ec4b7e3b1693a28e87084ac12802a260629c49ceb7ef9a11450ef304ebf0590e68b86f693258b0946a826e76fafffff77db862cc99df141ca0edb52e SHA512 d2ef93edc914eff7a2c88bbcc4a39a15695f47dca4d5d7cb6cce2b7a843fb325560ef958c5afcd655bbb878d246f79b6c5ebe54a90effc9a7e8601a42be24d03
 EBUILD xfsprogs-5.4.0-r1.ebuild 2847 BLAKE2B b81f15ddd470b549433942259ce7c7edb4f102a7903d361fd2ddc151b4d3ba1abcda491425d64d2cb5b50d1c034f4301e4350856a2e7df80f2690f065bc93c0d SHA512 962334a565a0b3686f28ec9c9091e1260df3f842da3f64ffdc3d524e6baed77663c8ee2100964471b44935661d60331e7b4c9688d151bcd2c16ef7208d1b9a54
 EBUILD xfsprogs-5.6.0.ebuild 2603 BLAKE2B bfa5d557473a872df4f5afd89aab9f7484fdd11c7d567dc1474bcfaa880c03eb7c9fb68cfcac81a9a21f1a5d32b7afe09f1af58b1f25e1669206df423fac394f SHA512 0ff4477ac23129c22f9bcec54fb4335dee11e0b759887909a269b6d01d4b27188f68661269b5b3907d1d84de0a8911f1ca1ff84075644e0eb3fb8df44578e73d
 EBUILD xfsprogs-5.7.0.ebuild 2255 BLAKE2B 5b64ed3ac748471d4f7131015707bd6f12efcbdfd139b3da96015861f2cdcee9d1662a5771f306af6106f60c66e80e60c5506454ee7b4cabcd08a5ead4a6de46 SHA512 4f45c3320bb13444ae2b0b1cd2990de0115dbc13c1dbea8894fb780b64016c70238fa3fe097350d7c77c2dfc5d594d052622ddca5f744ab9d38f3595fede8eaf
diff --git a/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild
index 1661c39dc4e8..2086d0f89f61 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild
@@ -88,8 +88,8 @@ src_compile() {
 }
 
 src_install() {
-	emake DIST_ROOT="${ED}" install
-	emake DIST_ROOT="${ED}" install-dev
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
 
 	gen_usr_ldscript -a handle
 }
diff --git a/sys-fs/zerofree/Manifest b/sys-fs/zerofree/Manifest
index 666899a7a4be..2a655268e58a 100644
--- a/sys-fs/zerofree/Manifest
+++ b/sys-fs/zerofree/Manifest
@@ -1,4 +1,4 @@
 AUX zerofree-include-sys_types.patch 284 BLAKE2B 45b375568b6bfc767a65d5d1082f44db4030ae687edb4d528f0000d1fc8dc78c10f98cd6bf57eaa9b9dd2d0ce96aee408ecddc1126ddd59faa737f7dcd236d7d SHA512 0cf3833271195c2f1da591af625928d8207d6bb39702cdc9f8ade0e7e773096e4f55860438863f06639f205283c0cccbaaf8b4d9ee98e3850a5075e38d06a187
 DIST zerofree-1.1.1.tgz 8710 BLAKE2B 76a84de7db60473c8824129a29515212acc74235e2139eb15fe7f41d1801c42c85378734fdf39a668f0a4eb285c55c49ce2281dda9444b2008557897428bc645 SHA512 2d7ee57a877bff2491c48054338a26d624ae75c238ac2b0568a75de88b6621c16cc1e7d65500879825d14d8ba44a5173587a061459072769c165bee47c3f9f1c
-EBUILD zerofree-1.1.1.ebuild 954 BLAKE2B 6201d8c315c1a47d6661165bf0e486306fcc9993fb9604fe34aecfcb3f986273e579b4d07844aee2abca50bfa9e776e72de322901e4f6215cbbac49ab86e407c SHA512 83f746c7ea899b3d07a5a5e9fb56bad5b13911ac1c257e9dc87e481997bb8d02a2a14fb24f245bfe3d34dcd7650096d1ce104043c68b52b29da7575d87b9bd53
+EBUILD zerofree-1.1.1.ebuild 951 BLAKE2B cc287911ed04ac79a4a80916865fc4ce2c297dcc9d6a8540464696b46f0d5a13069301fb28d279c6f4c12f4a54761d64df68102b704ec829b4488dc60928c22f SHA512 c171a99298bd804a4f50d3ff8625052b9e1f4c86f408ae5f34f7e36bd09c9cd7fed1821d84bbe3f851dea02cc3a1ca0665f4ec4dfba624b70571e8e473b005ae
 MISC metadata.xml 433 BLAKE2B aa623f9df641917cb34f2a028d4db98e33b241e89b94ac424045fb053bbe16b124f62329394d30cb6163689f8716a1eef4697115648f06f9834ee41c2914ae26 SHA512 c454915a2972c289341df97d9d8cb9bf26ea2f4c00ba4555a2d14e69e8f48f7bc8fc33c404ad19c175ff7e96900f3cead4dbaf32b0c36981c8a4926212a017e8
diff --git a/sys-fs/zerofree/zerofree-1.1.1.ebuild b/sys-fs/zerofree/zerofree-1.1.1.ebuild
index ffa8a9947d42..0b4c25a38dad 100644
--- a/sys-fs/zerofree/zerofree-1.1.1.ebuild
+++ b/sys-fs/zerofree/zerofree-1.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://frippery.org/uml/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+KEYWORDS="amd64 arm ~arm64 ~mips x86"
 IUSE=""
 
 DEPEND="sys-libs/e2fsprogs-libs"
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 46f5a1ac2c8c..6105784e505e 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,8 +1,9 @@
+AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23
 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
 DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f
 EBUILD zfs-kmod-0.8.5.ebuild 4537 BLAKE2B 4cc63f9a5645b5ea988f9a4ccc3aacb1d0e0091047192210a39273ba35cbf7bdde85c495194e9777c84478de2041ed4b44692bacfc82830c6105264d07c8076a SHA512 9bf1464089fa6b0b1dadf4799174ad87331c9f322b59dd234a01542714eabec8fefdc677cbfe7a7f14af0c0067e58599c7342ef0cfea1517aa913781cb62a322
-EBUILD zfs-kmod-0.8.6.ebuild 4761 BLAKE2B 7eb6f17543425e7216461bb5813a0933bb672dd5479af661cca233968e8543aa72c5b80c8282e3c0a53374abe1900b5f5530e94823cf6fb8a70c4d91bfc863e8 SHA512 4c591a4b524f140a15eddfb75371dfb03040e1d95c4c25f1d1e6f48115b605ea153348252d2a10849f2c4372c694a6c1252f624e5ab8d8346ecc529f482c2bcb
+EBUILD zfs-kmod-0.8.6.ebuild 4636 BLAKE2B b3fb6e9f08bdae9c641e350076c3ca9281428510c696932014a72216b7622176471055a32d629c38941f87b92fffb3f895718f87dba1fe36513542aa68beb551 SHA512 3f7b55b7d9c93222997f5ce4f2d45dba5840799ecdb86e99ec35cff4a5f855230355c79ff3c9b6b7fb47aee2355c73ae38f806a1e5c6c6a49f7df1fdd1e11c51
 EBUILD zfs-kmod-2.0.0.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89
 EBUILD zfs-kmod-9999.ebuild 4317 BLAKE2B f805e2c20a65d928b89496aaff71f548c49594b5f4d7decf776339a173b16f39ea5a7e0bfca78f5b1fc01c08ea3a06fa11317458dc2cc4022bdf459d273d68ed SHA512 4ce6398c6ec3cb2015751b0deb6e8694afa22a6b19b0ca83661eed0e195f7ac06f5fb73eaa52a4d86ad2c039dd300de4d49c8901a51e1d80dd37b3e1b0185319
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch b/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch
new file mode 100644
index 000000000000..2b1ef8582546
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch
@@ -0,0 +1,27 @@
+From 0ce99b43b339226d62362f624d37f80a921eb197 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 18 Dec 2020 11:35:07 -0800
+Subject: [PATCH] copy-builtin: handle missing .gitignore
+
+acfc4944d0d6db114db9f2bb5401251c5bd767b6 broke copy-builtin in
+release tarballs, because those do not contain .gitignore file.
+Adding -f to rm call will make it return 0 even if file does not exist.
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ copy-builtin | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/copy-builtin b/copy-builtin
+index 84f469fef02..6a6eb1f3695 100755
+--- a/copy-builtin
++++ b/copy-builtin
+@@ -36,7 +36,7 @@ rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs"
+ cp --recursive include "$KERNEL_DIR/include/zfs"
+ cp --recursive module "$KERNEL_DIR/fs/zfs"
+ cp zfs_config.h "$KERNEL_DIR/include/zfs/"
+-rm "$KERNEL_DIR/include/zfs/.gitignore"
++rm -f "$KERNEL_DIR/include/zfs/.gitignore"
+ 
+ for MODULE in "${MODULES[@]}"
+ do
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
index cc5f18c90673..9067f3662366 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
@@ -37,6 +37,9 @@ RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
 
+# https://github.com/openzfs/zfs/pull/11371
+PATCHES=( "${FILESDIR}/${PV}-copy-builtin.patch" )
+
 pkg_setup() {
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
@@ -94,10 +97,6 @@ src_prepare() {
 		# Set module revision number
 		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
 	fi
-
-	# undo https://github.com/openzfs/zfs/commit/acfc4944d0d6db114db9f2bb5401251c5bd767b6
-	# we use release tarballs with no gitignore files already
-	sed -i 's:rm "$KERNEL_DIR/include/zfs/.gitignore"::' copy-builtin || die
 }
 
 src_configure() {
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 1cd6a2ad914e..33d05eeeaf01 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index d02f15d3c717..50fe78d82b9a 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -7,10 +7,11 @@ AUX 050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch 2779 BLAKE2B
 AUX 050-lvm-fix-removal-of-pvscan-from-udev-rules.patch 1270 BLAKE2B ac4b93d0ed469ca9d2ba2ad9ca83b1f0efce590758bdd824278e9409fd4706e975d3fa9a10733775cc5b0a3a4665260d8869291de5a1f89c810c01a7cf0889e4 SHA512 7466c66f570c9a097b701a91d2735469187e879d2dec2ff2d10322ad39c86f3a5c70fc778d13b42014ba9754a6d1bea6d37f3ee456cbe4ec075dd676cf09093d
 AUX 050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch 1627 BLAKE2B c45b8efef1612ede5021be1bfe2135586286b4ac8d501ce6cde518eefb699c143fec1ec858e4320ba473feb06e88896ab0f4b2f738c6a5a98c20a161d11f508a SHA512 e070f24f0d0e95a14ee503e0cbc62d87b32ad678c12a8054c1a0c505d9ae833cd37052d51fe8d1a2a608fd06a8894d06ea4da626aadf5e9e4dd39b2ea883aaae
 AUX 050-systemd-remove-obsolete-syslog-parameter.patch 8176 BLAKE2B abf1619f4010cd38d98814f8827d592394a7ed7acc4c19392751adea4a98ce4acfce12bae1c2d264c392c73081ae04a205cfccd3591de651b87301352bbbe68c SHA512 3609ea93b85f79d3451fc810164c1be61def3f8e016a1fc0963088f2a690c56680d0c49bad5f8398af80150bd07bf953de50fe8832a5b88da5c01eead5fdbe7f
+AUX 051-dracut.sh-move-ldconfig.patch 2064 BLAKE2B 91d60d66cc3dd788f97900e4765761b918425abb603ce09b3101ec242222f17e6e7166af7faaa8ad47cff7aa1a9259af90832066ee67f7bee25c400bdfd302cb SHA512 060f968f39bd11822b1154baa7d28a1190ead371f57e43d4a997e8013f39d48e1509908b2fe3859b9315de57dc4ed03b8e4beab1ec743dc56186c9e6a1d9c116
 AUX gentoo-ldconfig-paths.patch 1420 BLAKE2B 3ff093e1d244288585c369f0e3c1bc346abe1ee2ce8ee399098559765fa4e3a96611269de5f4edebe435e5a71fa1bb99eb650fcb221fad188e019837261645f4 SHA512 aa99bb08dbc8e38ee1794b7d77e5e6656afa7f6c67684d1b3fb6368861630ea7c7711d84cc48c2c5cf3b1fd98aa2673f816e4f5ebf651b63a07ded93b00d371a
 DIST dracut-050.tar.xz 333592 BLAKE2B cb0bfa5a8e7547260b8a80a3606eb284182c062926269c85b09e07d26ad177df0eeaa64b17005bff9290611f1c83fc8cd8e2216cfe14b5e66ec7f659d4c2fa7b SHA512 eba046cf1c8013369a398e585e0bff233daa8595d469ce9acc8bbc6a32d55c6a5429d4219db19abbf6001104be05b357f0961f9e66b7f926039a5d3ee7c2b850
 DIST dracut-051.tar.xz 346500 BLAKE2B 38129b6b713b3338bbb2554fffd611f80216969eebac9fca7fb72df2db2036d4fbe66ebd54e646e562e24801e61064e54b62f066bab9e77ca88814100ebdd8ff SHA512 f3533430e479bc91c538e0a198ca97450ec449a7d661d876ecd0ad3e417e22f7e4abf0a384fc676a63a4d3479f25d717c8acdcd1bdec7d0a5714298c5c4ea6b8
 EBUILD dracut-050-r2.ebuild 5301 BLAKE2B a8a38a589a56786b5349d84157e21f1c3ad44f64554f1400362bbe15fa3ef1142c78a5ed9b8b821f3f20ff673d23005eec0d0e0489e81c8fed63d3904ff11d29 SHA512 f0c54b10b514645ad8448c220d64fac2fe2048058c3cdd04e5052ea8f9aa6992e2fa644083c1fdfd80b71167ea572fbc66cb53101b6a875a773be7c88b82b8a6
-EBUILD dracut-051.ebuild 4710 BLAKE2B 7ff2a46054af9dbd440c74b91579fe6839f18791d3d40703e441f6f12af0beac89be4bd71682ebbfff80a6722010ba89f4676b1bf317963a037d73fb58e3d375 SHA512 0643638dc799298fbfb295bcc60a48e67853bc3a192e37055654136632b47b873ef8b0559cd9d0246150ebf350d55c3c867012644aaa8267235b981562169a5d
+EBUILD dracut-051-r1.ebuild 4759 BLAKE2B 55b4d986321be6bfd607dca41d72b865598e325703d85c32451a754e372ec4077b1bbe9962e0abfad21fbbb9d67679d3bc5c1df8228c025d2c9ac1f16f6afb25 SHA512 83b32490fd6812f02bdbd1ab86cea43a827f2eeea0c17316ca256ba185932301e5060981ea7bdaabddef3f15c466232257bce4cdd33cc047dd15901c547afdec
 EBUILD dracut-9999.ebuild 4710 BLAKE2B 7ff2a46054af9dbd440c74b91579fe6839f18791d3d40703e441f6f12af0beac89be4bd71682ebbfff80a6722010ba89f4676b1bf317963a037d73fb58e3d375 SHA512 0643638dc799298fbfb295bcc60a48e67853bc3a192e37055654136632b47b873ef8b0559cd9d0246150ebf350d55c3c867012644aaa8267235b981562169a5d
 MISC metadata.xml 464 BLAKE2B 4d72b4c7b89341be061e590d7e5814268d9dc864e025c50d683d23c5e08e5281726e62a268271dfa67f9fb28d6f7fbd108dfcccebbb82da3c142b62fac2042b6 SHA512 7f1778968983e231b4fb6a9bbafacf19f9ae66b98c44a4df2d032978ad9e630108868fd270659f9770d0bcc1c285da83f6d2e865ac4e3e354881f1763fdfcdaf
diff --git a/sys-kernel/dracut/dracut-051.ebuild b/sys-kernel/dracut/dracut-051-r1.ebuild
similarity index 98%
rename from sys-kernel/dracut/dracut-051.ebuild
rename to sys-kernel/dracut/dracut-051-r1.ebuild
index 69b97ddb7c4d..60a9ba038926 100644
--- a/sys-kernel/dracut/dracut-051.ebuild
+++ b/sys-kernel/dracut/dracut-051-r1.ebuild
@@ -64,6 +64,7 @@ DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.module
 QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 
 PATCHES=(
+	"${FILESDIR}"/051-dracut.sh-move-ldconfig.patch
 	"${FILESDIR}"/gentoo-ldconfig-paths.patch
 )
 
diff --git a/sys-kernel/dracut/files/051-dracut.sh-move-ldconfig.patch b/sys-kernel/dracut/files/051-dracut.sh-move-ldconfig.patch
new file mode 100644
index 000000000000..d6d97f7bb948
--- /dev/null
+++ b/sys-kernel/dracut/files/051-dracut.sh-move-ldconfig.patch
@@ -0,0 +1,60 @@
+From 48258fae9fa58046d7d1a246ea3d821530180643 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Fri, 18 Dec 2020 00:01:32 +0300
+Subject: [PATCH] dracut.sh: Move ldconfig after library workaround
+
+This fixes boot failures when libgcc_s.so.1 is in a non-standard
+directory.
+
+Bug: https://bugs.gentoo.org/760249
+Fixes: de3cb0e3214c (dracut.sh: Move the library workaround after squash)
+---
+ dracut.sh | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index 0f4648397..c6c361acc 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -1724,20 +1724,6 @@ for ((i=0; i < ${#include_src[@]}; i++)); do
+     fi
+ done
+ 
+-if [[ $kernel_only != yes ]]; then
+-    # make sure that library links are correct and up to date
+-    for f in $dracutsysrootdir/etc/ld.so.conf $dracutsysrootdir/etc/ld.so.conf.d/*; do
+-        [[ -f $f ]] && inst_simple "${f#$dracutsysrootdir}"
+-    done
+-    if ! $DRACUT_LDCONFIG -r "$initdir" -f /etc/ld.so.conf; then
+-        if [[ $EUID = 0 ]]; then
+-            derror "ldconfig exited ungracefully"
+-        else
+-            derror "ldconfig might need uid=0 (root) for chroot()"
+-        fi
+-    fi
+-fi
+-
+ if [[ $do_hardlink = yes ]] && command -v hardlink >/dev/null; then
+     dinfo "*** Hardlinking files ***"
+     hardlink "$initdir" 2>&1
+@@ -1920,6 +1906,20 @@ if [[ $kernel_only != yes ]]; then
+     fi
+ fi
+ 
++if [[ $kernel_only != yes ]]; then
++    # make sure that library links are correct and up to date
++    for f in $dracutsysrootdir/etc/ld.so.conf $dracutsysrootdir/etc/ld.so.conf.d/*; do
++        [[ -f $f ]] && inst_simple "${f#$dracutsysrootdir}"
++    done
++    if ! $DRACUT_LDCONFIG -r "$initdir" -f /etc/ld.so.conf; then
++        if [[ $EUID = 0 ]]; then
++            derror "ldconfig exited ungracefully"
++        else
++            derror "ldconfig might need uid=0 (root) for chroot()"
++        fi
++    fi
++fi
++
+ if [[ $do_strip = yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then
+     dinfo "*** Stripping files ***"
+     find "$initdir" -type f \
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index bd5099dcadbc..4d919bf664f5 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,5 +1,7 @@
 DIST gentoo-kernel-5.10.1-1.amd64.xpak 64302849 BLAKE2B 40c86882af5fc908b99e7a8bb360871415d37fd71b893c1facf2dd8bf4571f786c2f8caab05457e4555373c51c4cb5e4a92c35956807467a8bf1c768478a9c81 SHA512 f469d651d65828321510e3f6b790aea6f2b3e092a2d64a77ebc8c661199650022538a70e398baa6a30f22367c23ce183b2940cae1de915b200e5dd8f8984e316
 DIST gentoo-kernel-5.10.1-1.x86.xpak 57273914 BLAKE2B e9e49d62c32c074a7dc77ff88ccef6182337d0e1f8e70c5d6212536e6363291786981af3f3c74ca326b7a44c0072280806aaf2ceb1931db6e6b27156803f1f8f SHA512 bbe20f7b787daf3e2a0cfd42d6058f1341354eb9ef46844854893b412aa80d2993cae4f83cff81deb68b1056b3dc61c1371ed3769a22f6edb2cd124922fd76f6
+DIST gentoo-kernel-5.10.1-r1-1.amd64.xpak 64306313 BLAKE2B abd43839aabf680eb8821b3599f740f37879748c316ca8ece2827c8eddd50b06cd8f468b9a0f208dc289453b3882434e02df211342fa81ecb61d93f6c24edabc SHA512 0a49d9dbc851957ab8b16ac5a51fa859a9aeb9ee02362f3c341a0c4b9e4cd698d5fa7c82cb2707a9cda59fbdcd3a0cb19a2ad24cdc87ec3ca3b13d2aabd14dcb
+DIST gentoo-kernel-5.10.1-r1-1.x86.xpak 57262960 BLAKE2B f0ba93de6051d996995ffc6115ff9e76619fdd71072d9bc7496c026e73c4a9d1171792c5bf162f34e12104831253e81998793e13bb8cbfd1658623ea1fff2cfb SHA512 67392894f23f510dbb44abbe8d5ace33e1a9ec1c5eece79ffc756d39612159687aabaf299d26b69f84575b8ee91a9a1911c60ed8a807d2657814c6ca61aec2a4
 DIST gentoo-kernel-5.4.72-1.amd64.xpak 61507115 BLAKE2B 7d8b21516126c550e06e335b886a02b314b1d6547efcfd788b8e44be3cfd308cac633b0b846bfe56aa093125a2a8afb1893cbcefb023312e121f9e598e53a248 SHA512 9b6446b4b1da1275d044316244c70f941c1ffc0c0128c1a8620921e9eccd9e6224cd19bc4b8e45388f6e41c6f7819647e727857af0a069e9c68b70a7d38d0704
 DIST gentoo-kernel-5.4.72-1.arm64.xpak 56655064 BLAKE2B 3b13004d69a7b74c076849fc872104fd4fe3f7e318ff0484fdbe6eff9d9f3235eed57265f52b5737febee6abbd3674c931a13feb2f38accb1114280ea2afb46f SHA512 5159ffaebae025766aa4742037a1d2fbc4fab220b0feea5da7705eb7b9e1e15e5b7a4c0a53e3032ce07b72e0e733a6a58029eb134d6583a9d9621a435ba07df1
 DIST gentoo-kernel-5.4.72-1.x86.xpak 53373842 BLAKE2B 2ea66aee50688fb5d28ac2295db78f97cd844f7be103f3d4d164a8ffe1e855a045118e24b0b62e213f6bfd93cbb44c79823817d5ae0f8ca286cffaf11b0cafee SHA512 8bc3d4b7cab6e5ca4448418c1c3f81b3f1efa7eabf4896ac18eef1a52f05b8fae3731a955ffadaa309a933843dfca235da58440848b03c5da6bc3537e686018c
@@ -27,6 +29,9 @@ DIST gentoo-kernel-5.4.82-1.x86.xpak 52869397 BLAKE2B 1c3cac750bbc617e354aa5be8f
 DIST gentoo-kernel-5.4.83-1.amd64.xpak 61015400 BLAKE2B 73527460e0c430a23c8221f8a736416ef6c3ff0ab93d017096456e72bd6c2c88e2a631bd18b2f995bc929f918e9b5a59aa033119a534a985ae1e33d39ff48790 SHA512 53dbb9fe6d940bd93eeb35c93bb869931f8f423f6c3997433030bede0b0c11dde478e391ff372ff252771a1bb32207cefbfb478f79715ba2ee3910016087bd87
 DIST gentoo-kernel-5.4.83-1.arm64.xpak 56245318 BLAKE2B 53e8e3e3bae66539622bf56c175fe2055905c8a39eb89ea084d0622fab366c0b0614a209d2063e7b44005d438c00759b2a5aca0147b83e9bc17b2a321f693d14 SHA512 657118b04169d9b2bf32fc11138573e0ecf16b27155b6f299e477b211885805bb6c9beab22a19d2d9f93c9a57f0d21759e6ff9b3747c9c7dd76a39867b04b1bc
 DIST gentoo-kernel-5.4.83-1.x86.xpak 52886754 BLAKE2B 2594b014c703f9f960d180bb6b2973027d238a2232ff8c358faf76a78d8ec8835e423fed19ad8afd30225c11e884a93411636407ca5a034c8abaa32635c21089 SHA512 70776892d7cd38d3bcd4cd797a14fb25f72bf0f29c2abd14a21b2361fac062c037b139588554b47727929ae60d331e6bd6ceec0c2f8e8f830adea4ed92279ba7
+DIST gentoo-kernel-5.4.84-1.amd64.xpak 61045195 BLAKE2B be063044b91a458d85ac78b302eb782988abf12e23aa92d50eb8d535f5200bc8336b146268c6085a9be9b9358d43304014dfa038d67085b665c51222a891d76d SHA512 7256eb2847c49e71bbe3b503cb23bb636f1e65a42bb8193fcc9444960c5b491f75d7a0697655f30ebe08ee0277a88ceaeee334eab370d76f29b5e70f3e93c50c
+DIST gentoo-kernel-5.4.84-1.arm64.xpak 56301810 BLAKE2B 555907552878ea7f048aa1a0bbddc0d5c5e424a746583b3ffb9a8b3d9265589be4e70f9162c9c5b9f0d70be75dc8a105908b88a583d0db90f1ceff4e2c50eb8f SHA512 ce5b1dc5e9c6c3da0d0267e2a8c7cea1fb78e078d1d6ad7105b57400944bff03ac1dd0319eff1d5657d049e99a74230a37cc6b785440ef2acf726b2cbb437ba9
+DIST gentoo-kernel-5.4.84-1.x86.xpak 52904755 BLAKE2B e351f3cbbc3e5983154e98452fbccc92fc294a6bc0052bda9e6639f268a3db28778a449743e6cacca4347ef7624c149e3eb6e2b935c21936acfd42dae2a4feab SHA512 99c913ba5003bce2e6f7b54bfb9f3813ba1026587e2c63d5b38e2f41b6ba734778ead071ed00526828b3f43df3edbaa7a29e8a75a422ebcfb89e842bcb67eed9
 DIST gentoo-kernel-5.9.10-1.amd64.xpak 62950591 BLAKE2B 032e27aaaf9f622ce16b3ee699752215fe7485052bebdafddf2155aed370b6316be07eb009da3e207a9b12f8c7865c70c7466451b205cc4b4f374c731a815fd5 SHA512 7f504e2f15319d60f464a4e45edee9503316a100eec8a6258e27ec7a00a4d2a5cbf9ead4e77ae5342ea05778572fc8ecda94c63b425b99b6ac3a5f183e377bbb
 DIST gentoo-kernel-5.9.10-1.arm64.xpak 60852046 BLAKE2B da0ee409eb47ae9bf570a08640bd060894974f5f09fb348b3d43c525f7d006f982a447ff9b17bc22969de929b05a316ee72668d40a20d8c3b8e2084588898416 SHA512 3ae82b223c97903a9c25abcad4a9f1f9e4ede68caf796833d9aa0c0cb23898c5b62e4023b8d3a00ff91cdd1f1ee8e82d51e9198454bf87ea16fed9c99147e202
 DIST gentoo-kernel-5.9.10-1.x86.xpak 56077741 BLAKE2B 40c1b066b5f91b5b53dd16d90be5d28e2699b900fcbc272e14417d69bef942a91058ebb5d74e0d8dd52263e6147bec1efafed75dc57f8f511f11def4657420e7 SHA512 7c778185d98c83fc0f5431111ef0c0623e54c76cde3e225b4d132bdc515319f6edd063fc2141b0d3d58cc4006ef4561088c5069fa047b04a6961cc53e23e7ef0
@@ -42,12 +47,15 @@ DIST gentoo-kernel-5.9.13-1.x86.xpak 56040088 BLAKE2B 436e6527da0120f6fa1829bdef
 DIST gentoo-kernel-5.9.14-1.amd64.xpak 62989867 BLAKE2B 28519bd6e0117c06d91532cac8cf21e3152ba7cdb8884a6bf4c768d33d3069d400343db9ff35f3b138ad037afc224d3248e824bcfce99b107cddd48eaca59ab5 SHA512 280cd5bcc7a65e648eb8e8bbfd29cc07b9838a1c214ed0244406b659e1824b925322d896498efaa1cf776b6fac2e89c09b2d68ac905b27a622f2c4b4d986ea4a
 DIST gentoo-kernel-5.9.14-1.arm64.xpak 61074437 BLAKE2B 1ebb3992c25477fc4627664639c5440b3daaa22eb50a91d1c0c517e54a44996b9a819fecfa0cd472830f5548c64009b8868de6b9d712c445a803bf674048e918 SHA512 13421595b475e38a938661ea785d3fc030f3d44041f2333c244de7b10e52f7edf46899dcd63a6f6b847caeb1af5d3b21f94a14317dfa5d9d09745101eb02f369
 DIST gentoo-kernel-5.9.14-1.x86.xpak 56038922 BLAKE2B 31b6c90a4ffc609afd84867cbc5ab427ec765e1d8fc50ae1bd86d342dbaa9eb8df164b6e2992b3f7bcc5767b050dd10ddc855544738a399787d52174d273918a SHA512 85ee1968fcfff870a683a9319fb3633108cef43b7d26b43c39a7ac4e516be56afdf42c155c03880b22a173f39c8bebeec8ce2717f842cd53f38689f4f49b80e2
+DIST gentoo-kernel-5.9.15-1.amd64.xpak 62989417 BLAKE2B 5e28fcc6dd43379562671fdd45eb496248c48c7e70d22bbbada6fa80b25f53a7b520ef57567d7938d9e2a03598e099da5b265d187a7a37e0c2b3568ecda697e3 SHA512 80f94b7ce1a9940ab5b7812ec87132226e818c83447f8d915eef6d794150de6b0e96afa97c112bea1f7d8d0c1a0a61715c65590b723d3732996694ec34574e48
+DIST gentoo-kernel-5.9.15-1.x86.xpak 56054842 BLAKE2B f0a398218509f7d6293a82ffead04ea5af9573b8a94cc99d490f7fd0e57eecde8792cd5f8e9780153c09ee8da9c414622e889ab18b9ef5c8a4b3f57018eaa879 SHA512 3979bdab97fa3a088622827f8724c635d649a653dc66895e91bb33482159bc780f8bec546e08df95e633da038d6bef41a67a77b626980b568ea80d352aa32b93
 DIST gentoo-kernel-5.9.8-1.amd64.xpak 63386669 BLAKE2B 6ebe70d1085d0ea33361ab398d076ba5bb3cd21aab1769d8a106978d7b320b993878fd32a59800997a5832483a19b3bce2e396b09ed25c0f34d5786ae9b7f90d SHA512 61f4d150f8fb5cca735e09ca8021ae972d953b0297dc52d9d623d1ee3f3d4a3e5cd7f98d39f785e279891373c9719166a5dad624ea16a9300c7c3fa7b0777aaf
 DIST gentoo-kernel-5.9.8-1.arm64.xpak 61440507 BLAKE2B 4704fa85533e68763346f3b4ccd462473424404c1e8f0302a69300e48ccc265857c2911aa36b11b38a0fc908d5ba681c4d35038f5cee473172b83ab331075cff SHA512 0df3f58142b0015457de82134b4c3535f8826f6108ef8aa32e2097cc5294fab35a76135fd4a4fdaed50e2b52be149833bd3e9137546f5beca90c7861f3c0c579
 DIST gentoo-kernel-5.9.8-1.x86.xpak 56613649 BLAKE2B a43bec4bc59613576749cbb58b6eff8b4e120410ae2dbb3b38b3596eab0a4d5dd56e427d91e4ebe044be9794f36e11dd89174a9ac01678eb4f268813370fd444 SHA512 b1d0a1bae0adc8788d46e19bda9875c49a611da6e4fc786d5a79efc8a5a5bbcb8eafb9f8628029685650235d5ec853d7a40b2ec0dd367c9b2d4436618ce1f2c3
 DIST gentoo-kernel-5.9.9-1.amd64.xpak 62935632 BLAKE2B 75fd3d10a25112a79d1ade40dde1ee525fb6ad1c2437ae094610664778523851a41c897b73360631fed4a364cd516a5c7736f3c775ec093c18b4a1f36676536f SHA512 338b6494309c62d22ac7fafce5d81a3ec78368da8e0276dcad1aac1d7b3abb13a0218eac50912035b39a9bd47cd140110a2e0277ac42cb65e336f5b3e22d2caa
 DIST gentoo-kernel-5.9.9-1.arm64.xpak 60808290 BLAKE2B eb2e7e90416c80bbb75bd94ab8caa32b54d28a7e084d682930a3f331a59f0293175a65b8e2787ae42e3906cd93874a97d9e40c12d0295ad5f8a8bd5003f1e592 SHA512 0fae0efe241a3cee62ca1e492c96da552562516c61a6976ae593a50c4320c424f489b360c282c944a5c491a1e7ed929ab77ce886539e58f4599b5096c8714553
 DIST gentoo-kernel-5.9.9-1.x86.xpak 56074565 BLAKE2B 796c3852f6587c53cbe0ea56c47e20fdcfd1ca6d07ad8bc9268d522cc259ef3346bd7f8fb837e1a7a1d99d189876363d908ce2911e25d97023c3f47d1272ba30 SHA512 51241930d16f82a51072bd34377fd26a4c0110e6063cfcb2fd27322b83607d73724f1539642fc9f5559ce02c2975b1e206583749830fee0f86e015e6a5f6a001
+EBUILD gentoo-kernel-bin-5.10.1-r1.ebuild 1053 BLAKE2B 50cd9de6c8d83b937e773f3c73c7d0820630df285f2ac4505d3cdd901b86d396174195495e885dbffb4f08e1571398d25ab52cf80f686ab0b24f2ab235a5c1ba SHA512 f33f44f7285976f17bb965e5947056dc33a2d798be4d7c1ff3f27a00bb9722e62f24e3627e46a2fe8db669aede6f4356f21c629097af72ddf98e74c7676c0e93
 EBUILD gentoo-kernel-bin-5.10.1.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.4.72-r1.ebuild 1371 BLAKE2B b11c2f146a3f72d590347cdb433c3c998ad4a79de5e4e547914275851382af44107f01f6ebea0ffda0a0651689db7d2b0126ba58ea64da8c7bc4cee7974893ce SHA512 5db1e935269ba1b5bad9cee1a6c42cfe155281e11887522d7a256fd326b8ce89037b61b0df4b6f0570bae6c05b97b817bfb5d4e3a5a8c00b4ebe9c87dafd7fc7
 EBUILD gentoo-kernel-bin-5.4.72.ebuild 1249 BLAKE2B bf16b5cf89aeb4cbf1df81265b67c96f47a1eb5992119755c67b2fe929a2c4495120aa0914f69d14d09db77c30e88daf463f5fe3a41e5d8a6bfaeecf2796d0df SHA512 eec7898c0548d5b76bab2190ec1714d7d53189a582cc1da9bc6255a7f0e948bcc3c8417287a829e68c04b8dc58a48a333bb4f3eef27984330ac271adf79f467c
@@ -67,6 +75,8 @@ EBUILD gentoo-kernel-bin-5.4.82-r1.ebuild 1372 BLAKE2B 1fc07b92338d9da27b11824ca
 EBUILD gentoo-kernel-bin-5.4.82.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
 EBUILD gentoo-kernel-bin-5.4.83-r1.ebuild 1372 BLAKE2B 1fc07b92338d9da27b11824cab32ffb01f1895037ed75b091bc42039bf949b93fc6cd2991fa6fb3c6d44a0d5fc803cca62c2ab7a4d0ccc10405d7cb1bb67bd1f SHA512 692857c6e58157c5b82ec618f9f9df26774e665d87431a2965318cdf42e75b34d61653d9432251a0819690ad814aa554609935a0926c1272bcaa1e23be7d0e05
 EBUILD gentoo-kernel-bin-5.4.83.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
+EBUILD gentoo-kernel-bin-5.4.84-r1.ebuild 1372 BLAKE2B 1fc07b92338d9da27b11824cab32ffb01f1895037ed75b091bc42039bf949b93fc6cd2991fa6fb3c6d44a0d5fc803cca62c2ab7a4d0ccc10405d7cb1bb67bd1f SHA512 692857c6e58157c5b82ec618f9f9df26774e665d87431a2965318cdf42e75b34d61653d9432251a0819690ad814aa554609935a0926c1272bcaa1e23be7d0e05
+EBUILD gentoo-kernel-bin-5.4.84.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
 EBUILD gentoo-kernel-bin-5.9.10-r1.ebuild 1119 BLAKE2B 35eb8258b52a640365502e8c1095d105232a81fc1eabd98c7d870194cd9d92cc1b3e0405e904bedcf21865812d5db6d51d799b48eaa9a89797da4e5e4273c893 SHA512 1e809eaf4e474b6344beded4342c0ed8f07aa99f47035456fda32051301d16f2a6d2b09b998c14b75cdf9cdf067276c6d5e46ea90bc6a8120ff5d591e95d1c9b
 EBUILD gentoo-kernel-bin-5.9.10.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.9.11-r1.ebuild 1119 BLAKE2B 35eb8258b52a640365502e8c1095d105232a81fc1eabd98c7d870194cd9d92cc1b3e0405e904bedcf21865812d5db6d51d799b48eaa9a89797da4e5e4273c893 SHA512 1e809eaf4e474b6344beded4342c0ed8f07aa99f47035456fda32051301d16f2a6d2b09b998c14b75cdf9cdf067276c6d5e46ea90bc6a8120ff5d591e95d1c9b
@@ -77,6 +87,7 @@ EBUILD gentoo-kernel-bin-5.9.13-r1.ebuild 1119 BLAKE2B 35eb8258b52a640365502e8c1
 EBUILD gentoo-kernel-bin-5.9.13.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.9.14-r1.ebuild 1119 BLAKE2B 35eb8258b52a640365502e8c1095d105232a81fc1eabd98c7d870194cd9d92cc1b3e0405e904bedcf21865812d5db6d51d799b48eaa9a89797da4e5e4273c893 SHA512 1e809eaf4e474b6344beded4342c0ed8f07aa99f47035456fda32051301d16f2a6d2b09b998c14b75cdf9cdf067276c6d5e46ea90bc6a8120ff5d591e95d1c9b
 EBUILD gentoo-kernel-bin-5.9.14.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
+EBUILD gentoo-kernel-bin-5.9.15.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.9.8-r1.ebuild 1119 BLAKE2B 35eb8258b52a640365502e8c1095d105232a81fc1eabd98c7d870194cd9d92cc1b3e0405e904bedcf21865812d5db6d51d799b48eaa9a89797da4e5e4273c893 SHA512 1e809eaf4e474b6344beded4342c0ed8f07aa99f47035456fda32051301d16f2a6d2b09b998c14b75cdf9cdf067276c6d5e46ea90bc6a8120ff5d591e95d1c9b
 EBUILD gentoo-kernel-bin-5.9.8.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
 EBUILD gentoo-kernel-bin-5.9.9-r1.ebuild 1119 BLAKE2B 35eb8258b52a640365502e8c1095d105232a81fc1eabd98c7d870194cd9d92cc1b3e0405e904bedcf21865812d5db6d51d799b48eaa9a89797da4e5e4273c893 SHA512 1e809eaf4e474b6344beded4342c0ed8f07aa99f47035456fda32051301d16f2a6d2b09b998c14b75cdf9cdf067276c6d5e46ea90bc6a8120ff5d591e95d1c9b
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.1-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.1-r1.ebuild
new file mode 100644
index 000000000000..c65a1b0dbb8a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-r1-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='*'
+
+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.4.84-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.84-r1.ebuild
new file mode 100644
index 000000000000..2378adc3f352
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.84-r1.ebuild
@@ -0,0 +1,57 @@
+# 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
+	)
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.arm64.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="~arm64"
+
+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.4.84.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.84.ebuild
new file mode 100644
index 000000000000..d6e61fa69369
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.84.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.9.15.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.15.ebuild
new file mode 100644
index 000000000000..68ca59b57351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.15.ebuild
@@ -0,0 +1,46 @@
+# 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='*'
+
+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 857cd82494f2..c59d230bd234 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,5 +1,7 @@
 DIST genpatches-5.10-2.base.tar.xz 4604 BLAKE2B ab25c50b6fa200f303b2e9f6f203730da460feea7b473d8be794c833c180239b0cb59abf115a58c4a6c671c30297cdc3eda86aeeb47451395d39571d45bd9033 SHA512 550c34ae1c8434b06d07108f126d6fa386b065d19439226c375623b5f37aa36aec642f318f82148dde168fd85e154ceaeb35d1b88271e62a20675752f6b33c60
 DIST genpatches-5.10-2.extras.tar.xz 1772 BLAKE2B f4bc68ab7c83508265848d9782ce19046a5870c428a9b2e99c473c7c1e6451bdbe2e22152e5ec81812502547b6282e5286dcc2da591481249d75ba69985300a2 SHA512 ab99eae22f08f5894b5b027440e715558da9fe80542f824a260bce9951dda6059dca705a4b29cf3b5e295726eef9c1942a5d114259702733d7f6f6b68f828020
+DIST genpatches-5.10-3.base.tar.xz 5524 BLAKE2B 3811736bbb95e9f4b9745cc0f02bd1c183bde82e4c10924a72cb1b4a0fdd3703cdc591c2e8fe266c3ffd29ef65258bf57ac314318c01d73dd08a17e449108c60 SHA512 50d8e1c26600657f76a4aefc4cbb7aa7db1b9265db77344769ac33bc988d692d84f4d7d7b9055ed2278c6e8c195902b6561ccfede741c7a77c42cfec9dd3ed56
+DIST genpatches-5.10-3.extras.tar.xz 1772 BLAKE2B a5453e4e9187373c7dc1b2e77a7877a53eaf3c0cfb578b199d93715dae78cb47c72e644e4de50e0837712b8a61ef151b4f6cd61a7d85de306bbe8d5dfdda4af6 SHA512 394220858394f89a1beadaaa1bbc86049f1bfd8e850c72fd7e27d0db23b4600d148a602fb4c68a3399e6a8fef3a7e0d45ae0c946976dce7418f0547841a4d21d
 DIST genpatches-5.4-73.base.tar.xz 2527064 BLAKE2B 6e0b392681d6e5e709a02c1c8f15fe06ef1651f1530506982feec7fd436aa04ea75079eeb5d3a61c91bcbb46c59a232cb8cb67c62fa7b2e8b289591142dd9430 SHA512 db987b95895fc37243e3697f3ef8f33787489e173fefb84ad09a6600898b2b9b285d9113e6f867aab0c3d5b4c65398f4bcbc40a4220f3cf2b355da9def209dae
 DIST genpatches-5.4-73.extras.tar.xz 1772 BLAKE2B 7475a0907f287fef28ee8bf220932528107bbac0d612dc05de6ca8b2dd86ddf37d9acea31ab2977a677f6ea3a19c594737b23e504da405fa811c4d0faf00b94a SHA512 751898547b1f60070f1d8431cd89daff55e33473c8fe68415a15e3b8079ae2d3e44318815ba47a1ce9750feb1cac1812eb8eb7765426b204eb1357993cc68cb0
 DIST genpatches-5.4-78.base.tar.xz 2710752 BLAKE2B caf08c588198fa9a364ec299c9918ef6cc51495df40cc875b0e60c4abd6f3195fcb67581b276cea0ed8150220f8b84c04344acbee71c26598cc1871e6520c1e2 SHA512 fc4bc267a20e8c7f5326893d89e45d064c9ca7372d13657a443432e47a34c4b835de885c8f3d93ee1aced43d5016886b774d55c29d6839921089bacc40a742c3
@@ -18,6 +20,8 @@ DIST genpatches-5.4-84.base.tar.xz 2822596 BLAKE2B c3cc3d6435b084e911d1ce12028fb
 DIST genpatches-5.4-84.extras.tar.xz 1772 BLAKE2B 3951ecd7d506fce8c59b3699a132365c06262fb9b02622123ffd8961fd7b39cd07896f8cb701452fbb5bfdc5d80011ad06c0537957ea0fb8b99cab16743b2e80 SHA512 d3450ca9ed556251e9922ad96356696434ba3d9b4ae9e46c908522803bb48368e167dab77abe8e53767ddcf89ca1516c04334ed1cb182d1bb932325dd1b7b2ae
 DIST genpatches-5.4-85.base.tar.xz 2833404 BLAKE2B 56a8a49c1c61693ea344d26fedbb85c2682a16d55dfda57b5bbc5df65d2311c5d92b2d464c6b951b9ef58b04879038ee134e179c1dc4d692308b2eeb3eeb517d SHA512 fa277427a7e5c3c44a681e08ff1570587173a1471de8425013afde212a9aef6e6d68f8e707f52b21d76672a4cd0e6cfdb33c32b78d02908eaa55264517d3d4c1
 DIST genpatches-5.4-85.extras.tar.xz 1768 BLAKE2B 5a5e25a02014fd06b8742a2e505f9998d766c6c95d1a515f0c5a6f3b433163c97c1b8ec758be9bff0c017c947fe4c9c1210fd5fb9d1d838f8571ccd9178d251b SHA512 9ca5271fda3619765363f8fdc5e837b0c6bd218de7d956795e9ef01e9000c85d85f0b49479b8d20a33227008ecbb268d9353c622b37f81619329f358b2fcdff7
+DIST genpatches-5.4-86.base.tar.xz 2842360 BLAKE2B a5056a63d5c63621f0b728fbe7249b63097006a62892d4f347202327d17c1cd8e5efe5f7f134be2f01e2020e1628fcff37f9639b2fbf84f451c2b814c65c9257 SHA512 509110cf81bdf0e28dbd7affeac89d516059b50e368c4b75b70596c279b972f66cdcec430b577bfc22fa0251f2502c03b01a4dd325901654d921d908b2066f0a
+DIST genpatches-5.4-86.extras.tar.xz 1772 BLAKE2B a5efc07916c932bdb150744f7675d4ab255c62563a2b88798cc3c9b7aaab21a06fe4d94fdd0ee49de48a2f41460fec8610613ea460fd5df5df50578b12d060cf SHA512 39a4effcda32cc194daeb3d9429bd857cbbb803079d40f0968a0741ca3f753f22b27084eaad052d8c9cfb8aba3c01e37b91930e33dae08e2a8e9f74cd7697cbe
 DIST genpatches-5.9-10.base.tar.xz 521384 BLAKE2B ea65c4e0977bc07459297883aabba1589b746de718c054127b1cb5fb2d79702798dccd918e8f5542d439d316d3c6c3ae38514155ff2cd5f61c7916eacfaf5177 SHA512 54836cd45b62fc97c857f85bd96ebcb99d5f5d80b3c80c31e70a48e3aa8e54eca5eae802e9a8780c0eb0a1d166c190f39751512580ab10eb122a887d31ad3a57
 DIST genpatches-5.9-10.extras.tar.xz 1768 BLAKE2B 8177c3e2b8d92785b9ee71a7733432c783977a4c18f2db282c3c5b079219a911f6c302cad0dc3bf14c886bd3765ffdb2808f353ba0ecb89bb01d522f24f54c0b SHA512 462b35b3ff7a142877d11ddf02992a50043ba677f9f10619a308424f3e4df54d45436bc148fc503581c1c707a2a936ee278b18d95c02c6d5cdfec08f94257171
 DIST genpatches-5.9-11.base.tar.xz 580544 BLAKE2B 59989b81c77e174e421b4fd6f570b7b8daf3649c4869eb61808607c98999467c60f9fe0a9f1c798807e9395ee064fd183a3110482536f1061b80349156af1b83 SHA512 5f5570bb06e62220304c235d5cd93c0d7f738bcc978cd1215ba262dd6bc9a0b0d43cf8d51cf36f2f0a66996b79f656463c7a0323e14f8c46899f28b0420155cf
@@ -28,6 +32,8 @@ DIST genpatches-5.9-13.base.tar.xz 638532 BLAKE2B 758f41192c8075719abe2ffb7756d3
 DIST genpatches-5.9-13.extras.tar.xz 1768 BLAKE2B dc4a89f09c4a771f7b6011c3b5bd31dfc7a6254b09c48308eb8d3f13b21996e76b2893660e80a6f4a6116f06b3ba74834d8112d4eacd4b53a88a26ce1330dd52 SHA512 07d75cbbb25dd4d51cf3fbe24fe5c5e6430ffc3422c3335fc6916e18903922b8d22cd6d422c4bb38d233200d59971442b0ee64bdc27ecb257f9acb0124df6d3e
 DIST genpatches-5.9-14.base.tar.xz 656112 BLAKE2B 5793eec0a89629823c027a92758bae2ef2b92cda058b313358f3487a8f51fcebc80a3a12e5c58bc1e8a98b299111fe22d18d5952382c0151e3f1b104d461b879 SHA512 a53e9edeb5d88685de2412adad6de6eda92f002851cc74ca6329bb63f63cde2f9e42272c1b583918586dd7858bd3bb0b8f252cb90e22713f25fbd55f376e1113
 DIST genpatches-5.9-14.extras.tar.xz 1768 BLAKE2B a99628fbec37aabea2644b761ae4eeb81e2999d3cc9352c8d6575646762a74eeff14b3f9765b61baf4074523cab3f3cc693f07d0a4d06bc50ae13baee2fd86d2 SHA512 eaf3cdf93e8545d663408c14ccf13f38a13fe7e5f5582d63af766dca6cf398cc17395a813d71a0b7bb37a43685b70b1afab1d27ef49dbd20d1c62f6aaf9f28d6
+DIST genpatches-5.9-15.base.tar.xz 687008 BLAKE2B 825634d9d632670a57b992ad0d8bda3496629a9e977ae470cd5e25d628b673f0953b4ea8e326404d349bda2bb209c870517c8f6698428a12f788550248213fb6 SHA512 72d81a9d6bb9eb3801702ad7d63226c53e163886c52e2ac0ac8a240965746b256a3a24f9072ab115d1fbee27ed74de9014ca1e6db8780aab2c5ccf4ff8191306
+DIST genpatches-5.9-15.extras.tar.xz 1764 BLAKE2B 38e68dba925dbf3080a2ff51dde9d0b1766991a52cd1e06b50fa3d282a8fd93191db446551f3bba4c50c1e001801743e29edc2cad42a32f613fe46799fe24b76 SHA512 95f1147ca652f2ef0f206239723a47253b0854241adf7603a2f57cf0198e8eda682267782dd777bd0ef412d01ad771857009b08a6b42bff04e3dd27e5193bc3d
 DIST genpatches-5.9-8.base.tar.xz 443192 BLAKE2B 48c79a97fe1201bab87ba601feac1e05ce12f2db155e53e0a543c7994ba8dfcac75b17e315929c0b68b8136913fdf93005690ccb260640ccc31527088beb326b SHA512 c365018bcfe84ff64a8171951fd4f97bb89044633df137926d22bedc738cd17ebe72c26800eaf30171c3495ce2b1bfdc93866112756bdd2207e6e184b5f1fb6f
 DIST genpatches-5.9-8.extras.tar.xz 1768 BLAKE2B 96413f75c606fe4515d0facb8f0ca784702bb5d83591af87fb4bcf2b6c5e135eabcc55e0e84be9ecd3854ec108b8ed93cff11c41e7efba8c45aadefa291cacff SHA512 646efb1f6e0b9252b0220aa5922b0c0d8f093dba8edb7e40e127680c8a471aa49724f9591a3147925d7a4084af8d5e1cc5f78b0e72297072fd15bd13d1c93e40
 DIST genpatches-5.9-9.base.tar.xz 513024 BLAKE2B de77ed5aa32336d44f0a299703ceaf290a6ec00ec8fe80f3ad6cf85d89374bdeb278c0fed143f7d7899e21146bfd6daadafbe2274ed10c3bc9170186015ba772 SHA512 d1c7640fc3510e8d47aa07b13c2876a14f510a30e74d53cbac2d6b564b3258698b833c028ed8e8694b8e4aaa31c899c7ae8023825e57e0b35e136f99e667185d
@@ -53,6 +59,7 @@ DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a5
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
+EBUILD gentoo-kernel-5.10.1-r1.ebuild 2548 BLAKE2B 64eb7d0b498e60220fdca1993066b851558570d200fcee1671885da3ae3313dab7ffef37278712f9d1031b2f0a4ee9a4bdf57496ec4bac8abf848b457ec215ce SHA512 3b91cd3139b558f22442dd9b0efe9312b7ba3c1f0eb8ab2fa016cd0172ba8eff8f512acb590b44396b3546da9698710ef4db9ac2b0280e0c01a3a46795d3118e
 EBUILD gentoo-kernel-5.10.1.ebuild 2548 BLAKE2B 87ec0a16e4aa74cdabcd8c3dfb5751822acf4cbe946b45de3f2223ae8e99bd66c58337572df22315c40289fba2b2a9e4b318980b0ea5e8f9abd715344483f2e2 SHA512 dafd2fe528fc48c4553aeeb03047b7ec1d28b75fcf100b37ec7c81d3293ff76d1d31be689f7c447d8bcb044c116560841243396ed5a4e99a5aaffb03a015ffde
 EBUILD gentoo-kernel-5.4.72.ebuild 4381 BLAKE2B 6480215866f3823c266d9d9ee6ddac4fbe153ce366e6965e2d34f8bfb71da7f175cf1eece19761e1d3380c68f2d582d212a133d6998c702320461adbe0f702da SHA512 fa5ba0795644bfc611e44a5049d05b22c4b88abcbf57df6fe8fa528800b5fd3b66cd8d198500c683a1bc4781007125795261464c49ebd547b8e25a724c6cb7e3
 EBUILD gentoo-kernel-5.4.77-r1.ebuild 2719 BLAKE2B 3a8fca6271d30695909ec44a6bd929a9ab7da6a1b161be9696b3fc9014195dac5bf402fd1c753d22f84503e5514657bca863cc7cfea0bf0a566b1790a0fd0ec3 SHA512 5bec6cc4611461071be98e4184aa632666b63e54329ec4b26e8d38e17744d8c6b2cf83003914f08fc10c86b02e53b8d61f112fe4dec7227405da0a20140a15f4
@@ -64,11 +71,13 @@ EBUILD gentoo-kernel-5.4.80.ebuild 2717 BLAKE2B e34b097d2e908d4b6f8059184ee11205
 EBUILD gentoo-kernel-5.4.81.ebuild 2719 BLAKE2B 7bddd3ad74b8b2169923146f98b00913bd67017dba785bf561c3613448da3c5a30b3adb1dcd72625614ae4f46f7726bc9b7cd6c1f2457a3fa41acc829b32dc7a SHA512 1a58d81ed2717febcf73efe4e656d90c55b609e6ea3da89affb58dcadfac6246845c7c65cb0408c0272620c217225c4e3ebfacc2c67bfe631480ffd56be7dadb
 EBUILD gentoo-kernel-5.4.82.ebuild 2719 BLAKE2B 7bddd3ad74b8b2169923146f98b00913bd67017dba785bf561c3613448da3c5a30b3adb1dcd72625614ae4f46f7726bc9b7cd6c1f2457a3fa41acc829b32dc7a SHA512 1a58d81ed2717febcf73efe4e656d90c55b609e6ea3da89affb58dcadfac6246845c7c65cb0408c0272620c217225c4e3ebfacc2c67bfe631480ffd56be7dadb
 EBUILD gentoo-kernel-5.4.83.ebuild 2719 BLAKE2B 7bddd3ad74b8b2169923146f98b00913bd67017dba785bf561c3613448da3c5a30b3adb1dcd72625614ae4f46f7726bc9b7cd6c1f2457a3fa41acc829b32dc7a SHA512 1a58d81ed2717febcf73efe4e656d90c55b609e6ea3da89affb58dcadfac6246845c7c65cb0408c0272620c217225c4e3ebfacc2c67bfe631480ffd56be7dadb
+EBUILD gentoo-kernel-5.4.84.ebuild 2719 BLAKE2B 7bddd3ad74b8b2169923146f98b00913bd67017dba785bf561c3613448da3c5a30b3adb1dcd72625614ae4f46f7726bc9b7cd6c1f2457a3fa41acc829b32dc7a SHA512 1a58d81ed2717febcf73efe4e656d90c55b609e6ea3da89affb58dcadfac6246845c7c65cb0408c0272620c217225c4e3ebfacc2c67bfe631480ffd56be7dadb
 EBUILD gentoo-kernel-5.9.10.ebuild 2536 BLAKE2B c2bf44e94abbdf5cfcebe040e37881ed321396dbd00df8ca784d72a5514430f16e17db5872f2173b9f34bc527cdcfb984ebcd15dfc588df7bbfa4785bc169c3a SHA512 6503d3b862ebce4036b34d80a42d4ee7c4956677bc60a5aa5f4f6c761edcad670baa2f46851c12a8856eec737f2d5fa92baeaa546d8a57edb6b1ff7107447e1b
 EBUILD gentoo-kernel-5.9.11.ebuild 2536 BLAKE2B c2bf44e94abbdf5cfcebe040e37881ed321396dbd00df8ca784d72a5514430f16e17db5872f2173b9f34bc527cdcfb984ebcd15dfc588df7bbfa4785bc169c3a SHA512 6503d3b862ebce4036b34d80a42d4ee7c4956677bc60a5aa5f4f6c761edcad670baa2f46851c12a8856eec737f2d5fa92baeaa546d8a57edb6b1ff7107447e1b
 EBUILD gentoo-kernel-5.9.12.ebuild 2536 BLAKE2B c2bf44e94abbdf5cfcebe040e37881ed321396dbd00df8ca784d72a5514430f16e17db5872f2173b9f34bc527cdcfb984ebcd15dfc588df7bbfa4785bc169c3a SHA512 6503d3b862ebce4036b34d80a42d4ee7c4956677bc60a5aa5f4f6c761edcad670baa2f46851c12a8856eec737f2d5fa92baeaa546d8a57edb6b1ff7107447e1b
 EBUILD gentoo-kernel-5.9.13.ebuild 2537 BLAKE2B 867583422cf4d652dfe0ff6ff396c61d21082d62a53fb209129179331ca5ce078008118eb49e470d950076df03fe2edd2c95e38e2d85226256b3b65aea821b39 SHA512 f43ec67732f737e1b17ef085bfa0ce3739f92c2aad5e075616f617a9cf3e873d97d18780938e20ce057e76f80b790ed3039f724b3ae6721d4be2df64f6ce7584
 EBUILD gentoo-kernel-5.9.14.ebuild 2537 BLAKE2B 867583422cf4d652dfe0ff6ff396c61d21082d62a53fb209129179331ca5ce078008118eb49e470d950076df03fe2edd2c95e38e2d85226256b3b65aea821b39 SHA512 f43ec67732f737e1b17ef085bfa0ce3739f92c2aad5e075616f617a9cf3e873d97d18780938e20ce057e76f80b790ed3039f724b3ae6721d4be2df64f6ce7584
+EBUILD gentoo-kernel-5.9.15.ebuild 2537 BLAKE2B 867583422cf4d652dfe0ff6ff396c61d21082d62a53fb209129179331ca5ce078008118eb49e470d950076df03fe2edd2c95e38e2d85226256b3b65aea821b39 SHA512 f43ec67732f737e1b17ef085bfa0ce3739f92c2aad5e075616f617a9cf3e873d97d18780938e20ce057e76f80b790ed3039f724b3ae6721d4be2df64f6ce7584
 EBUILD gentoo-kernel-5.9.8-r1.ebuild 2536 BLAKE2B c2bf44e94abbdf5cfcebe040e37881ed321396dbd00df8ca784d72a5514430f16e17db5872f2173b9f34bc527cdcfb984ebcd15dfc588df7bbfa4785bc169c3a SHA512 6503d3b862ebce4036b34d80a42d4ee7c4956677bc60a5aa5f4f6c761edcad670baa2f46851c12a8856eec737f2d5fa92baeaa546d8a57edb6b1ff7107447e1b
 EBUILD gentoo-kernel-5.9.8.ebuild 4314 BLAKE2B 2e86ab3b0627612b0cbd906f70867c66f6bc014a793a70f5c162c67863da3d5a90148bb3f1164f1234127507d39df87400a361ffd065b2800266b65b3a65ca43 SHA512 c32becc02962fa0391cf64a13c6b4c437d2cfe9f4c936923b71f658d86c2fcb50ccffac4e07f7cc9e5871003587d158f7051460f20412f9b225f377de183b7a7
 EBUILD gentoo-kernel-5.9.9.ebuild 2536 BLAKE2B c2bf44e94abbdf5cfcebe040e37881ed321396dbd00df8ca784d72a5514430f16e17db5872f2173b9f34bc527cdcfb984ebcd15dfc588df7bbfa4785bc169c3a SHA512 6503d3b862ebce4036b34d80a42d4ee7c4956677bc60a5aa5f4f6c761edcad670baa2f46851c12a8856eec737f2d5fa92baeaa546d8a57edb6b1ff7107447e1b
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.1-r1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.1-r1.ebuild
new file mode 100644
index 000000000000..8680fe03552f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.1-r1.ebuild
@@ -0,0 +1,87 @@
+# 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##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.0
+CONFIG_HASH=12700e38e8ba0a7be437a4c5804ba0e6417fdc24
+GENTOO_CONFIG_VER=5.9.8-r1
+
+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
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-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 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+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
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local merge_configs=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.84.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.84.ebuild
new file mode 100644
index 000000000000..0c806189a34d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.84.ebuild
@@ -0,0 +1,94 @@
+# 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##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.77-r1
+
+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
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.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 ~arm64 ~ppc64 ~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
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local merge_configs=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.15.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.15.ebuild
new file mode 100644
index 000000000000..84710f3c16d3
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.15.ebuild
@@ -0,0 +1,87 @@
+# 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.9.13
+CONFIG_HASH=b57160e20ddbe02624d2652e6836b0cb73044a4e
+GENTOO_CONFIG_VER=5.9.8-r1
+
+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
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-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 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+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
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local merge_configs=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 7f16bf7f8777..74a5afc402bd 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -52,6 +52,9 @@ DIST genpatches-5.10-1.extras.tar.xz 1768 BLAKE2B e99d5d2137d5752845ba8284a0dd57
 DIST genpatches-5.10-2.base.tar.xz 4604 BLAKE2B ab25c50b6fa200f303b2e9f6f203730da460feea7b473d8be794c833c180239b0cb59abf115a58c4a6c671c30297cdc3eda86aeeb47451395d39571d45bd9033 SHA512 550c34ae1c8434b06d07108f126d6fa386b065d19439226c375623b5f37aa36aec642f318f82148dde168fd85e154ceaeb35d1b88271e62a20675752f6b33c60
 DIST genpatches-5.10-2.experimental.tar.xz 6092 BLAKE2B 395d889688bf4c1391aa1a1fea98808e3471163e547d82cbff6804b847e7d828be0019a66e92a50d83a753749ac1669f0da980abf22155089d7d1fb4da3075d3 SHA512 31af3ec09131df058b9e2a7f8de5f85a7c0e881a2087334a14355549c7e1d85ed0e12200d7090d6aea2b6034112331812fe87ab0574554b4e2af7ec9dcccc7cb
 DIST genpatches-5.10-2.extras.tar.xz 1772 BLAKE2B f4bc68ab7c83508265848d9782ce19046a5870c428a9b2e99c473c7c1e6451bdbe2e22152e5ec81812502547b6282e5286dcc2da591481249d75ba69985300a2 SHA512 ab99eae22f08f5894b5b027440e715558da9fe80542f824a260bce9951dda6059dca705a4b29cf3b5e295726eef9c1942a5d114259702733d7f6f6b68f828020
+DIST genpatches-5.10-3.base.tar.xz 5524 BLAKE2B 3811736bbb95e9f4b9745cc0f02bd1c183bde82e4c10924a72cb1b4a0fdd3703cdc591c2e8fe266c3ffd29ef65258bf57ac314318c01d73dd08a17e449108c60 SHA512 50d8e1c26600657f76a4aefc4cbb7aa7db1b9265db77344769ac33bc988d692d84f4d7d7b9055ed2278c6e8c195902b6561ccfede741c7a77c42cfec9dd3ed56
+DIST genpatches-5.10-3.experimental.tar.xz 6096 BLAKE2B 054eaaf45a25a77cb0a369acfbc0bf0aa14f8d0765b6e70acc6ea73a0709297594eae9e7c0456445a7640e02644318ee54cac3c92c017a950a62ecbf53ea393c SHA512 7313eaf13de80f7f2a0df88d23d0b6991ba2628058cace5807d2dcbf3aabf937233873c4837dd5e5d8e5e5299f6be4dffdbb81a6c2eeb568a5b57375c13e5db7
+DIST genpatches-5.10-3.extras.tar.xz 1772 BLAKE2B a5453e4e9187373c7dc1b2e77a7877a53eaf3c0cfb578b199d93715dae78cb47c72e644e4de50e0837712b8a61ef151b4f6cd61a7d85de306bbe8d5dfdda4af6 SHA512 394220858394f89a1beadaaa1bbc86049f1bfd8e850c72fd7e27d0db23b4600d148a602fb4c68a3399e6a8fef3a7e0d45ae0c946976dce7418f0547841a4d21d
 DIST genpatches-5.4-73.base.tar.xz 2527064 BLAKE2B 6e0b392681d6e5e709a02c1c8f15fe06ef1651f1530506982feec7fd436aa04ea75079eeb5d3a61c91bcbb46c59a232cb8cb67c62fa7b2e8b289591142dd9430 SHA512 db987b95895fc37243e3697f3ef8f33787489e173fefb84ad09a6600898b2b9b285d9113e6f867aab0c3d5b4c65398f4bcbc40a4220f3cf2b355da9def209dae
 DIST genpatches-5.4-73.experimental.tar.xz 6696 BLAKE2B e722d747bcb24b501f3d63c8f6fdade889b620794bdd6fe0931c044147d32f5d9b3fe503fb9afe476cf1e791ca0d1247edb47df3a1d547c99e9a3107a2522139 SHA512 7ae9228a9677f3b7888ff8286b1db8ca5cad14fe829efbcb8da8dfe7e82bdeac95368a0dfb2e7bbf0ea82a2b103f5c2ee3c99826c89eec7e07f3be70bcd51430
 DIST genpatches-5.4-73.extras.tar.xz 1772 BLAKE2B 7475a0907f287fef28ee8bf220932528107bbac0d612dc05de6ca8b2dd86ddf37d9acea31ab2977a677f6ea3a19c594737b23e504da405fa811c4d0faf00b94a SHA512 751898547b1f60070f1d8431cd89daff55e33473c8fe68415a15e3b8079ae2d3e44318815ba47a1ce9750feb1cac1812eb8eb7765426b204eb1357993cc68cb0
@@ -103,6 +106,7 @@ EBUILD gentoo-sources-4.9.246.ebuild 731 BLAKE2B 1b290e2f27d5b166e1ee796cb50f299
 EBUILD gentoo-sources-4.9.247.ebuild 736 BLAKE2B 2ca5c5341e7696ffeb58cac1a48934a2378a33058f1a02f961688195bc0e5db65f56142b3a548ae0c4167b3a491d061efa6bf44a7c4e56d23a77a4028ca6e831 SHA512 d2670e3ad0f6dc7757b262a3cb9c3e862aacc1a48c53562df2ceb39f0885b5fb24a6ba585b087983d8f302e819f1d72a661d38aca8fef2eab407a3f97d8c521e
 EBUILD gentoo-sources-4.9.248.ebuild 736 BLAKE2B 95cf8dce9111e266e6c19fa8edb9e4a86aad02ae2e62b1308eacea7ff352f64e1c2ab584a62333b5010c192f30bc85040fe2f23bc73ac74759211940aad01c9d SHA512 595988b1d52d9cd9d4bf072adc432a1f4de7c1ec30ac14112edfc8f157503e28392810c2732811270f00a326f2c7033d9b8d06f51820272cc48b8ec0bb22d0e2
 EBUILD gentoo-sources-5.10.0.ebuild 749 BLAKE2B 1ea13674ccda13a57fa1dae6e3fa7eb78e56e9bd78b397b00ee5e4efc3f34a20d76bbf4d2cd05a83541b1dd101bbac2a43aabff3675e548f643b132634a2342e SHA512 ee60a4d738abfbc03dcd3b0bc91d09251091455152ffd8cf5247fe08682beaba74ed12e6e959cf79fc5aed1be9917996a9dded1c85f4bdfde43c77c3ac8af6b0
+EBUILD gentoo-sources-5.10.1-r1.ebuild 749 BLAKE2B 394ee0ca99156a520149dae0494ec17573ea7f81809a90138885a3d88810260cb0a4d68b4ad6f1ef261301456a1ff56dba02588608ffecc0b9615c691952ba38 SHA512 179eccdc1b4c76176e1cf68da69e228277dedfef89827c8c699c7b932c4269c10cabae9debe5e2a4716edc82d9eedcf9bc0e4b6d5f0f3fbf4141f62825184a06
 EBUILD gentoo-sources-5.10.1.ebuild 749 BLAKE2B 135c788cd4dd92297638c79d60f79d9117fdd4739cf454d2a89df19b3b88371ed7a98ca3129944c09281cca170d0421c9c774b232def8bab770b9119a20efd25 SHA512 93487ea36c00b07e8a78f0a46419394083b78eea855d5c0441ebdde108a2211753a01dfd47df9725c32edc3cfc6d0300a089bb973b5491402dd971186c38e0f8
 EBUILD gentoo-sources-5.4.72.ebuild 727 BLAKE2B 9a89ee62a4b72cff60cab136237751830f0642d7a65eea3bc9d952da178bc7fa3d9c482b9b1fd53d22b2ee92abe6b38e48e5bedf02ec5f39ec3ea402a7114e36 SHA512 3742724f8d9e9f36111457324c77196acf965067b5e203743a4bf67a317228c51552b0a8a32be7f18d18c85ec051050d7c9ee0e18b7dfee2784c77e9c8ad11d7
 EBUILD gentoo-sources-5.4.80-r1.ebuild 730 BLAKE2B e256abdd2b1ea8a1cd92c5fa419d03f42d42928c283983d1cb96518828d6b8d7c99625cb6f99ba84405c608cdc2feac269b19a47a2e76065ffb8accc8fe0231e SHA512 e4cbd4f8e2dbd41b2b3777deb542b1e8d41bf464cb1d348500ebc57ccada3aeee73f362e2addf62bb615c38c4d5f7fab379621d683a85cc03396240eb8cea56d
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.1-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.1-r1.ebuild
new file mode 100644
index 000000000000..a862c70cea33
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.1-r1.ebuild
@@ -0,0 +1,29 @@
+# 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="3"
+K_NODRYRUN="1"
+
+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/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 7b7e4104b953..67a9d719079b 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -1,5 +1,5 @@
-DIST genpatches-5.10-1.base.tar.xz 3840 BLAKE2B 08ac1f83dc9a1cfc1d4cf0a3a5ab4c9d4686a80348247ec7cd1da6e49db92d6932a1864113f2631d5528a4ba732945b2afe73d03061bd3c532b3d1e4d9571999 SHA512 04356093c4df6a7ee0876b89be5b90f8bc90c920628e5fe69b5787ce82e003be05eaac142310f10f32d0549a6676af846734ae4ac188c2b96c2eca2cb0a6f4b0
-DIST genpatches-5.10-1.extras.tar.xz 1768 BLAKE2B e99d5d2137d5752845ba8284a0dd57620851c3620603e871973af5841b54e9bfdde92ea2408ddedb55355f2c954c80641b06098060043916d2483e10cfb8293a SHA512 0034e5ab57cccb2e969a3b9e1f674614ca853779c552c37be9c5afb0a37112bf8f2c30e1b21832d56320c70c1d622081b60369c6a86fa737a23c3ed953267453
+DIST genpatches-5.10-3.base.tar.xz 5524 BLAKE2B 3811736bbb95e9f4b9745cc0f02bd1c183bde82e4c10924a72cb1b4a0fdd3703cdc591c2e8fe266c3ffd29ef65258bf57ac314318c01d73dd08a17e449108c60 SHA512 50d8e1c26600657f76a4aefc4cbb7aa7db1b9265db77344769ac33bc988d692d84f4d7d7b9055ed2278c6e8c195902b6561ccfede741c7a77c42cfec9dd3ed56
+DIST genpatches-5.10-3.extras.tar.xz 1772 BLAKE2B a5453e4e9187373c7dc1b2e77a7877a53eaf3c0cfb578b199d93715dae78cb47c72e644e4de50e0837712b8a61ef151b4f6cd61a7d85de306bbe8d5dfdda4af6 SHA512 394220858394f89a1beadaaa1bbc86049f1bfd8e850c72fd7e27d0db23b4600d148a602fb4c68a3399e6a8fef3a7e0d45ae0c946976dce7418f0547841a4d21d
 DIST genpatches-5.7-1.base.tar.xz 5168 BLAKE2B 506ed0fe3ecf7891c0fa89467437ec665b91a5d476832f567702d42aa0216b5c738cfed235e990f66244d8dbcd3c71ece1d4b280638be2b62412cb9fc2ae05c0 SHA512 bf14433a31b131bb74c1abb1151d021074015a6ed28c88bcb56430e9502d54b450bed1c066c9cd4870da2f1642cc065f2a5d027cbf389b705cea72ad3ea8e2ab
 DIST genpatches-5.7-1.extras.tar.xz 1764 BLAKE2B d455a21ce5f37b37861747a71d55f16e9983d82ddbfc51e65f6401384b7415dff3afe5491f9ff5344e9b6ab33b760e647e3e4075549211c1a9d7d2249baa4f98 SHA512 0215ce69c03a12e5bdddfcb61ad1ef9cdeb7b2016971d439766bb2420142b9c960fefedb4f85edef73172203961be9fa01c70cb76f72e9b1f4edb299a6a14067
 DIST genpatches-5.8-1.base.tar.xz 4268 BLAKE2B c1c4959758d0bc28213e4fa5c73014bad00144a92d37ed4f576f45d4d578c470c61080d941358d16b426aa17893bd80c88734b65beaa0afd90baf5d78cd078f2 SHA512 534e92071e33fe03049b0f1f3ec7d3e670155a2fa6e93dd1bb8cd5ca0f817549fa9c0b6c5ca06020d7b3733d53204ad79d909d5fbcbc748f218a9f799cc3be6e
@@ -19,7 +19,7 @@ DIST pf-sources-5.9_p4.patch 1978557 BLAKE2B 1863fbf17732dad7e6f96b2ddfb66b424cc
 DIST pf-sources-5.9_p5.patch 2334422 BLAKE2B e90fa94cc371995f36dda11b0d758c157254a4bf7f47ee31af34a83b6a4b6ebb3720d9bfaf752705c5cf3e2fd53cb7df1399654bdf20803c5a1a72e9c731aad8 SHA512 e562acccafa1ca2cd743ad20f5920a61607b27aa1310552e5a3cbf822668886c49ce020fd381d4ce987ec9f77f3c6e861fe83e697acfcbe2d0a5665619614cc8
 DIST pf-sources-5.9_p6.patch 2906787 BLAKE2B 23478dbafee1637661544d0deba45b619acadfc4a368b7f1530358450a0c4112556a779866a31de3b68f1bc1788028d408cc530b40fd1250e30c92f7b85f996a SHA512 eb31a8efbf80c1b22bb491b59b540a1cd3e03b8d20dd97a233b6ab118baa5d4ed7b4f3bd5c02df6ab268f1f38bee08c6219e0d2f88a73da73ee8897c75223b1f
 DIST pf-sources-5.9_p7.patch 3027972 BLAKE2B 9247ea63b30f9d42d79303b73a900d468a71e703333932f7f15ae697cdba52c46358297023e037226c219fad5df912fb5d21e6f4b7190556ca799fa84924480e SHA512 c69e14f59bf98944b3329c65b7e2c271d74a756bc8c890130bf3cc68b4b96d31f1c33c4edb128580fcaefeb6e42dd04b1eb3d7f071b2d58bc764d26322bda8cd
-EBUILD pf-sources-5.10_p1.ebuild 1958 BLAKE2B 45ad93609aef6566468c1365734aa1a42c563a0fcf87135c1f6cdec8af3c637ce3434c69e55f75ccebed12de28250b61bf15d7c2f961c1effc1dc6e03c37cad8 SHA512 b669acb26f1c7a745a99e23107b8b0cc327b3b66044f7934a962281f78bb3cc31bfc0ec3b0ee20f9180d5e9f86822febad923c9337cb552626f194bfa9fb3c9f
+EBUILD pf-sources-5.10_p1-r1.ebuild 2029 BLAKE2B d21e93e02503d79b4e5f1f593f8f5107a148829576f890a02624b43537f2563a168f606c3aab7b8fc824acbe35417499c076e4c1f9915a389c8add9274634224 SHA512 ab05a9b4f6cbeecca779cc656c728f90ee526eb8ead2350c69ec1087d53e959d5207b6578a0a533c3f3fd406f7c62aca5f1d8cea17a168237bf163f13540c84d
 EBUILD pf-sources-5.7_p7.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760e75e66691f61b843024be88ab8c042327b926d79ea49268115413147457083be5a4e7ea8f2c26196dd3a2eda12017 SHA512 c831c884e7fdcb78f89f7611ec2c0fc96b9ae56e6a69615c90940513dc56e9e28ff9803e631e2bb469baa73734d902b5da184c21a7e5db523c187c712e869b63
 EBUILD pf-sources-5.8_p7.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760e75e66691f61b843024be88ab8c042327b926d79ea49268115413147457083be5a4e7ea8f2c26196dd3a2eda12017 SHA512 c831c884e7fdcb78f89f7611ec2c0fc96b9ae56e6a69615c90940513dc56e9e28ff9803e631e2bb469baa73734d902b5da184c21a7e5db523c187c712e869b63
 EBUILD pf-sources-5.9_p1.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760e75e66691f61b843024be88ab8c042327b926d79ea49268115413147457083be5a4e7ea8f2c26196dd3a2eda12017 SHA512 c831c884e7fdcb78f89f7611ec2c0fc96b9ae56e6a69615c90940513dc56e9e28ff9803e631e2bb469baa73734d902b5da184c21a7e5db523c187c712e869b63
diff --git a/sys-kernel/pf-sources/pf-sources-5.10_p1.ebuild b/sys-kernel/pf-sources/pf-sources-5.10_p1-r1.ebuild
similarity index 88%
rename from sys-kernel/pf-sources/pf-sources-5.10_p1.ebuild
rename to sys-kernel/pf-sources/pf-sources-5.10_p1-r1.ebuild
index f2344adc15dc..13b093e8d99d 100644
--- a/sys-kernel/pf-sources/pf-sources-5.10_p1.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-5.10_p1-r1.ebuild
@@ -9,12 +9,8 @@ ETYPE="sources"
 # No 'experimental' USE flag provided, but we still want to use genpatches
 K_EXP_GENPATCHES_NOUSE="1"
 
-# Just get basic genpatches, -pf patch set already includes vanilla-linux
-# updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
+# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
+K_GENPATCHES_VER="3"
 
 # Not supported by the Gentoo security team
 K_SECURITY_UNSUPPORTED="1"
@@ -36,7 +32,7 @@ SRC_URI="${KERNEL_URI}
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-S="${WORKDIR}/linux-${PVR}-pf"
+S="${WORKDIR}/linux-${PV}-pf-${PR}"
 
 PATCHES=( "${DISTDIR}/${P}.patch" )
 
@@ -55,8 +51,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
 	kernel-2_src_prepare
+
+	# Keep consistency when upgrading throughout 5.10 series.
+	sed -e 's/_p1-pf-r1/-pf-r1/g' \
+		-e 's/SUBLEVEL = 1/SUBLEVEL = 0/g' \
+		-i Makefile || die
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 1bdc01370d4c..d99d4cf20f6f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -33,6 +33,8 @@ DIST linux-5.4.82.tar.sign 989 BLAKE2B 30002498f901ffd0b3e320066a27fd6b2658b1685
 DIST linux-5.4.82.tar.xz 109636484 BLAKE2B 1f2c4422de0355728855bb827eb9b6928458f7c7cfaeec801212c24a0e365e4f2b02030efbbddcccb8fa7993d0e8c0db88828c091d6a3c7b5969587c1e04138c SHA512 ec3ebb354a9949e007fd58ec0eb62739e1faab43a08f0f36c2e44c4fc743d6f7ead611e881553a6caebaee3c1c2d6a3d55abb2b8b3f22abaaf327a66fbf9d863
 DIST linux-5.4.83.tar.sign 989 BLAKE2B 0c1c9737b51eb02747146498475436682fec4d0e97c6e90e840682878eff34aeffa6970eac0ce117ce18bb8ca2e15fc1a9b0bfb83e021b710fa10dd713437c32 SHA512 be2564571dc109611e802d5dfe1d69339d375bb01259d46888c18ef03979401d9943721131c10609a8a07f14cfe0b990e558e15c7d89a2eccc71e86d620cf4c0
 DIST linux-5.4.83.tar.xz 109638356 BLAKE2B 0287ca87cc09702a3ce9c83494a3f49712aab4f805cab560fdee29cecb18f9ef132c9f8352793705b371f0faf60fd24f357448a8323ba1c1a2d0ab832b5bac8d SHA512 0b40ffb66fc5b3f35a0c187ffeea0df3dd90644490298fe78ad1fef210f1c72e4b0c33aafc6b1d0959c915a6a0d3ec57ae8a36f8b28486965a8ef158674b1ec3
+DIST linux-5.4.84.tar.sign 989 BLAKE2B 81b7f2ffd2504754c2e79acabb3eef38f764d840408cc736fed3e23f418cc1063ed3d118f68a9f18af6003d64b82067d45eab160242c31ad56f11f284dbbaf20 SHA512 dc26a666c3dba858d0b32ac35b3a6bceb2300a4b33c870b64ec8450b152ced6378ae73e24dea49965ae25b80b5f49ea4fae33761ca7da19bd18e504e3a7ab472
+DIST linux-5.4.84.tar.xz 109631524 BLAKE2B b6cfb1c9b6b635cc3229c8780fa35ab48a6cde757f45b49ae5879cf41b5331cd8ff0913157c4d6efbe072ee4317732db36f74ea6a1333f118076a10b96ba74c8 SHA512 ac077a52ea7e1de51858938e66df61677e5049ef66ded82ed613528bec982a2891756f9474f3f82e8c5ac0dd4e90f691d4c04abffd092fe28bdb1fa7c0957dba
 DIST linux-5.9.10.tar.sign 989 BLAKE2B 28777305ef639cdeb41d76bd5db9212994a2a8d505b394b822f798937af43b946a4098477d1dce132a9caafc4b1009d7f3edac4a79b9eb45d66ff4bdfab69680 SHA512 a68c71883e0972e3cee877156b3dfdd5bc2ac6fee18d9da48c8355d2f19a8c2cf5bca2237f1806bdf0759c330f882331a581fbbf49fa2410f2a42e3cadfa5012
 DIST linux-5.9.10.tar.xz 115545932 BLAKE2B 423d0e2fea39d54c9bbda532dce95f67c2736646b88515e72a3cea97842a25f4b2b4ef0aa2896d623bbc89eb6e8ca14f5b447030f190677601048816ae4a76e1 SHA512 f3f5195508affa84ccac30621c852b0dec42a227e2a3677a31b6fafcffdcf34964bf43cc96b08698faf319a1eead54f26638d7c70c20df31592e1c00ff00ae06
 DIST linux-5.9.11.tar.sign 989 BLAKE2B d8c810fdbf587f70d7665960ed0df082417cde3d9b55b336147b672c2879c80630885162c57adcd437e14d9fc41112fd3f0cd20459822500b7a13c29b4da5e39 SHA512 4046df5a6318a9fd22ce13ca806028a8a97402224c6f8a032d222179d1dd24f80892fe60f51b63c6815370769a3eb7d64985bfa3b076cb61fc082c2de00dba3a
@@ -43,24 +45,28 @@ DIST linux-5.9.13.tar.sign 989 BLAKE2B 662903fd4d1d52edef0d1626e0a892926af100cdc
 DIST linux-5.9.13.tar.xz 115553920 BLAKE2B 6b4e25173a7bb0836af25dc53609f5f9f248dde5963c3667127619d25e1860e6363c31bb2fed905af3dadae5659083f4f3a88051f29fa4195678e39b37171279 SHA512 ec5ca9544775faeb809459f58358b14f06e9d16afff40a017877602efc3117c4a901c8c65bbc3891cf5272a436ac5216d9d5b42c2b92980755ce2f459023eabd
 DIST linux-5.9.14.tar.sign 989 BLAKE2B e6a8d55aeb77ef73af969db44800d893715df0fb775655a2cde1158e8089ff0601eeb91ca30386c9d903c3954ad924142ca00cd299e04e0a721fd95a6140b30d SHA512 be1193c53f641749ee12508c8239af645746638df77f6ac30480248b472623b901d1fffb0058a531fb87e383ee9065d863ba1f3b92295ee205a0cb92817555f3
 DIST linux-5.9.14.tar.xz 115556784 BLAKE2B 559dafc7d4f618ed6b00f0dce74b031c747d4435db5ac976a4b42f3e0c0c22da3ca7b38c77a44341221555adcb5612367b527bca70188c0903efce79fc4773c7 SHA512 719c32e811602cd3a9429c16c1c1e8684751dffd2fb052357376695a2654ec3f771e321e530ed178223dc581f36fbfa9be362941cf6fd74d2853b393ab357552
+DIST linux-5.9.15.tar.sign 989 BLAKE2B 0881539488ebb253b09e63b86e2628cd435d090486b4ac477ee54e4d9b81f5171aecc4fd276ef629a35326bde95eec9d345053ef3951eae6fbdc542076f5a8a5 SHA512 cabf54dcdc2a4b8a8762b8d211921bd2137f38ca525a6efb42f2ae21fd754f095bee93720734d5fe4401c45d3a0f00fed25e826719ad1021835b00d386c75511
+DIST linux-5.9.15.tar.xz 115556416 BLAKE2B 3135a98bff2e55ec418c27286ef7001075975c4df6e2a9840649eeb88f60e82bc5cde5f4c58aae8c941c9510ea4e85f7589087a6e695267f17a3da04d4e91e48 SHA512 8547b0a11996e3af91e0d57e186170620f19b90bd808ece6814ba8aa8e5aafc5810bb86e228dce51f8a1bd88b61b7fb3dd4b79986be57d7d7a1718dcbf6a4851
 DIST linux-5.9.8.tar.sign 987 BLAKE2B bbe7c04acb6b3f61333e96582fc3d64834bb51c79f7f1d1eac455d6b89b62b614e8975adf01d2dda0b3a43813b32abe51f65f111e4ef68a0b4da9b26e22dafc8 SHA512 1e3ba4a90414372790718adabf3d8311cc6cca91601f048c8c7b2efdad6cd7ab9628a906407168df92aa6cfdf6ad93a9d9341a9f31bd8d46d9e808f4c9edf848
 DIST linux-5.9.8.tar.xz 115540828 BLAKE2B 27b8820bbd7ea278b47e1c208efeeb41c890276ae59d33971ab0d8ba0081d45e57c579f9390c5e3019a4f3beebaf17a29a959e1b6cadb9e1824ea4e568f90205 SHA512 063e853ccebe3e9422407dd4ed7f74a6202546761d4eb542035b3d71d0478efba9daa6eaeb1e2452c13d3093dd64729d9fd2df17945319b9535724d95be94a69
 DIST linux-5.9.9.tar.sign 987 BLAKE2B 9a23d3b858f3df31bf00fd5f2d3e318fbda5d794fa97884a6d2cbd26d71d39b4dd99f5b59c9812e4ff74cdc641a83c6f68e09690000958225ec5dde4e3eba852 SHA512 afca72f0efbd938a3822308a725a6b04685dc10694ad44da1d54ac7f9abab083fe5d820ce88bc470c3983b4daf973e39ead03b91d0f0913a179f2e312a253538
 DIST linux-5.9.9.tar.xz 115546864 BLAKE2B 39a9a7438d8399d4e4b863e725b1b5a1ddda0c0b8b02f9fc9a4153f6dbd2ed267aaa6acaac5c0b80c8e3c122c240a82458079fcf83d639047c6372d109b2b4fe SHA512 8d61c3cea48862e394a9d54902f7845f604151ad56f796e2d371a4f5b55560d57179c867ece2328f5dd6dbe4c5452cca0f2f5bb8fb78b3458e3ed61e6bcee303
-EBUILD vanilla-kernel-5.10.1.ebuild 2718 BLAKE2B d666c6e3432c8be7140682117da5340a908b02db3db09eea559893d9d9839a26faa80ad9706d7b6c3a977197f8b946adc3e0f9780ec83a4d497f2b23a824cde5 SHA512 b39bfe48970a9ffcaa65604b31473b9b1029f9840a64be148c6cc4c46895d5ae30dc192c761c7393049cfa2588495e528318d529209f3767134c48db397ea918
+EBUILD vanilla-kernel-5.10.1.ebuild 2778 BLAKE2B 51fdd2b4044aa471bf525334f1dd4b95af7f0c3ca99bdf7146d5e6e72a60c845b3167a7a0899f56f1d43099a97047d03864f68c3851190b309bb18088c1829cc SHA512 0b3b6b670dd450da75491c41cc8d4d501e75c74656c2b12cf310dee247bd7696cfd69360ee8c9ffd5eb7a508d542658ba1428b88de29544ece57562b80658e11
 EBUILD vanilla-kernel-5.4.72.ebuild 4058 BLAKE2B 48fcc3d1a3acc6065ed9fed27e6953d9c4cdd73c15d034bf77baf271aef89455e0d3bab7df8ef69e8fd67036a268fd21f55f67772f2d69dae185329282cebcda SHA512 54a487cbd08a736b880bc8897aaaf44684158d93eb190d7ca95eaebbda8534694842c11239bd829061c7693467735fae325a243c6634da97a193e72ba5f50d7b
 EBUILD vanilla-kernel-5.4.77.ebuild 4546 BLAKE2B 6896f7b9416bf122f46cec386398aa9532718b1254aba2d86ed61858eea9cc210f76aa4b8f58e5eeca816ea04c6ea7c290c22900e2c16d570c26d82d8c82ea7d SHA512 14203cd24e18441563ab9d2311bc0ff436cc983588c74b7443c73fa2b09a68094a23cb0ea70ce0e3b13defe83f35c37a8ee9bfdb9e433e32279d9fd6af01dd51
-EBUILD vanilla-kernel-5.4.78.ebuild 2880 BLAKE2B 6218766f0f62f3decd69c3141427a6a1b583b64e9dde1431cf43ee4f6d69ffac947d3d31557eac3724ea09e3c922cc90775d6a8069dd0a4feb4c6f86c23fe455 SHA512 4854edd0c0098a6b6f097c4a019f344919a43de3eec49dcb9155dac581625f708f86b556a7bb0d9d7c054ad08a8072072c640e72734898f97167a60d8d9e7d7a
-EBUILD vanilla-kernel-5.4.79.ebuild 2880 BLAKE2B 6218766f0f62f3decd69c3141427a6a1b583b64e9dde1431cf43ee4f6d69ffac947d3d31557eac3724ea09e3c922cc90775d6a8069dd0a4feb4c6f86c23fe455 SHA512 4854edd0c0098a6b6f097c4a019f344919a43de3eec49dcb9155dac581625f708f86b556a7bb0d9d7c054ad08a8072072c640e72734898f97167a60d8d9e7d7a
-EBUILD vanilla-kernel-5.4.80.ebuild 2880 BLAKE2B 6218766f0f62f3decd69c3141427a6a1b583b64e9dde1431cf43ee4f6d69ffac947d3d31557eac3724ea09e3c922cc90775d6a8069dd0a4feb4c6f86c23fe455 SHA512 4854edd0c0098a6b6f097c4a019f344919a43de3eec49dcb9155dac581625f708f86b556a7bb0d9d7c054ad08a8072072c640e72734898f97167a60d8d9e7d7a
-EBUILD vanilla-kernel-5.4.81.ebuild 2880 BLAKE2B 6218766f0f62f3decd69c3141427a6a1b583b64e9dde1431cf43ee4f6d69ffac947d3d31557eac3724ea09e3c922cc90775d6a8069dd0a4feb4c6f86c23fe455 SHA512 4854edd0c0098a6b6f097c4a019f344919a43de3eec49dcb9155dac581625f708f86b556a7bb0d9d7c054ad08a8072072c640e72734898f97167a60d8d9e7d7a
-EBUILD vanilla-kernel-5.4.82.ebuild 2880 BLAKE2B 6218766f0f62f3decd69c3141427a6a1b583b64e9dde1431cf43ee4f6d69ffac947d3d31557eac3724ea09e3c922cc90775d6a8069dd0a4feb4c6f86c23fe455 SHA512 4854edd0c0098a6b6f097c4a019f344919a43de3eec49dcb9155dac581625f708f86b556a7bb0d9d7c054ad08a8072072c640e72734898f97167a60d8d9e7d7a
-EBUILD vanilla-kernel-5.4.83.ebuild 2880 BLAKE2B 6218766f0f62f3decd69c3141427a6a1b583b64e9dde1431cf43ee4f6d69ffac947d3d31557eac3724ea09e3c922cc90775d6a8069dd0a4feb4c6f86c23fe455 SHA512 4854edd0c0098a6b6f097c4a019f344919a43de3eec49dcb9155dac581625f708f86b556a7bb0d9d7c054ad08a8072072c640e72734898f97167a60d8d9e7d7a
-EBUILD vanilla-kernel-5.9.10.ebuild 2717 BLAKE2B 7582f39744dd26ae928d605148ab062a0c35ffcfe0828c3d185f0ebbc0d1a27d78bf4e1b4bc96cacfa2b772618ce24e4e56825afa3cc75594b2c0ad6c4c8310a SHA512 fca7cf1007b491269f694c157b57ca35bb5b49849d55d80fecd00082eb21b4427875906b4350a3173ac1bda634d0c0713481e8ebe53e6639f12992bc824bed2c
-EBUILD vanilla-kernel-5.9.11.ebuild 2717 BLAKE2B 7582f39744dd26ae928d605148ab062a0c35ffcfe0828c3d185f0ebbc0d1a27d78bf4e1b4bc96cacfa2b772618ce24e4e56825afa3cc75594b2c0ad6c4c8310a SHA512 fca7cf1007b491269f694c157b57ca35bb5b49849d55d80fecd00082eb21b4427875906b4350a3173ac1bda634d0c0713481e8ebe53e6639f12992bc824bed2c
-EBUILD vanilla-kernel-5.9.12.ebuild 2717 BLAKE2B 7582f39744dd26ae928d605148ab062a0c35ffcfe0828c3d185f0ebbc0d1a27d78bf4e1b4bc96cacfa2b772618ce24e4e56825afa3cc75594b2c0ad6c4c8310a SHA512 fca7cf1007b491269f694c157b57ca35bb5b49849d55d80fecd00082eb21b4427875906b4350a3173ac1bda634d0c0713481e8ebe53e6639f12992bc824bed2c
-EBUILD vanilla-kernel-5.9.13.ebuild 2718 BLAKE2B 2f2bfbfd62843cfe0f8f81594629d24021b0279f1f20719383f50f2b9e57ff3b37d4be300f5c9f4239fc1f125f3d5231b586a799d579b6bb5024b04c4e3c0217 SHA512 6f6825e3a9fc30415dd608f309804c09e0fcad6207d9aed610469297c7b549123bec9b78c168ffc03bbffc4af063a2767acb19fbb56fe19b7209f08577484232
-EBUILD vanilla-kernel-5.9.14.ebuild 2718 BLAKE2B 2f2bfbfd62843cfe0f8f81594629d24021b0279f1f20719383f50f2b9e57ff3b37d4be300f5c9f4239fc1f125f3d5231b586a799d579b6bb5024b04c4e3c0217 SHA512 6f6825e3a9fc30415dd608f309804c09e0fcad6207d9aed610469297c7b549123bec9b78c168ffc03bbffc4af063a2767acb19fbb56fe19b7209f08577484232
+EBUILD vanilla-kernel-5.4.78.ebuild 2940 BLAKE2B f464069e757fa106854e7f6783e1b7e9ff69a08773b406877698d2f09e22e1d245eb384a408bf25811116b58fd25b65f924b17b9f5a997dc62ffd9c7489cf066 SHA512 854f8ad64979a5207182a63b8e1a06dc14bbe4f9c438c60012e26f0bc9320171d08f30603f97cb085c78d6082a05cbfd9f137bfb20ae887e57bcb08623b35856
+EBUILD vanilla-kernel-5.4.79.ebuild 2940 BLAKE2B f464069e757fa106854e7f6783e1b7e9ff69a08773b406877698d2f09e22e1d245eb384a408bf25811116b58fd25b65f924b17b9f5a997dc62ffd9c7489cf066 SHA512 854f8ad64979a5207182a63b8e1a06dc14bbe4f9c438c60012e26f0bc9320171d08f30603f97cb085c78d6082a05cbfd9f137bfb20ae887e57bcb08623b35856
+EBUILD vanilla-kernel-5.4.80.ebuild 2940 BLAKE2B f464069e757fa106854e7f6783e1b7e9ff69a08773b406877698d2f09e22e1d245eb384a408bf25811116b58fd25b65f924b17b9f5a997dc62ffd9c7489cf066 SHA512 854f8ad64979a5207182a63b8e1a06dc14bbe4f9c438c60012e26f0bc9320171d08f30603f97cb085c78d6082a05cbfd9f137bfb20ae887e57bcb08623b35856
+EBUILD vanilla-kernel-5.4.81.ebuild 2940 BLAKE2B f464069e757fa106854e7f6783e1b7e9ff69a08773b406877698d2f09e22e1d245eb384a408bf25811116b58fd25b65f924b17b9f5a997dc62ffd9c7489cf066 SHA512 854f8ad64979a5207182a63b8e1a06dc14bbe4f9c438c60012e26f0bc9320171d08f30603f97cb085c78d6082a05cbfd9f137bfb20ae887e57bcb08623b35856
+EBUILD vanilla-kernel-5.4.82.ebuild 2940 BLAKE2B f464069e757fa106854e7f6783e1b7e9ff69a08773b406877698d2f09e22e1d245eb384a408bf25811116b58fd25b65f924b17b9f5a997dc62ffd9c7489cf066 SHA512 854f8ad64979a5207182a63b8e1a06dc14bbe4f9c438c60012e26f0bc9320171d08f30603f97cb085c78d6082a05cbfd9f137bfb20ae887e57bcb08623b35856
+EBUILD vanilla-kernel-5.4.83.ebuild 2940 BLAKE2B f464069e757fa106854e7f6783e1b7e9ff69a08773b406877698d2f09e22e1d245eb384a408bf25811116b58fd25b65f924b17b9f5a997dc62ffd9c7489cf066 SHA512 854f8ad64979a5207182a63b8e1a06dc14bbe4f9c438c60012e26f0bc9320171d08f30603f97cb085c78d6082a05cbfd9f137bfb20ae887e57bcb08623b35856
+EBUILD vanilla-kernel-5.4.84.ebuild 2940 BLAKE2B f464069e757fa106854e7f6783e1b7e9ff69a08773b406877698d2f09e22e1d245eb384a408bf25811116b58fd25b65f924b17b9f5a997dc62ffd9c7489cf066 SHA512 854f8ad64979a5207182a63b8e1a06dc14bbe4f9c438c60012e26f0bc9320171d08f30603f97cb085c78d6082a05cbfd9f137bfb20ae887e57bcb08623b35856
+EBUILD vanilla-kernel-5.9.10.ebuild 2777 BLAKE2B a81ca055be2d0b433ed4f2aafb3546aa5dac55721877f6019e74ee207728710e75d8d8fd354e8dbfe6e66d6d9bae761f78c58b87756adb39546a75d62949b7ac SHA512 0ece25d5a41af1e8c14bb0ee00209db9617eb3b9ab3e20754e4d5ff51f14c6da35eba5c6334a0e193c6f0c7bffc3b470dcc2f7c44d8e3f9a2407bc63369493b8
+EBUILD vanilla-kernel-5.9.11.ebuild 2777 BLAKE2B a81ca055be2d0b433ed4f2aafb3546aa5dac55721877f6019e74ee207728710e75d8d8fd354e8dbfe6e66d6d9bae761f78c58b87756adb39546a75d62949b7ac SHA512 0ece25d5a41af1e8c14bb0ee00209db9617eb3b9ab3e20754e4d5ff51f14c6da35eba5c6334a0e193c6f0c7bffc3b470dcc2f7c44d8e3f9a2407bc63369493b8
+EBUILD vanilla-kernel-5.9.12.ebuild 2777 BLAKE2B a81ca055be2d0b433ed4f2aafb3546aa5dac55721877f6019e74ee207728710e75d8d8fd354e8dbfe6e66d6d9bae761f78c58b87756adb39546a75d62949b7ac SHA512 0ece25d5a41af1e8c14bb0ee00209db9617eb3b9ab3e20754e4d5ff51f14c6da35eba5c6334a0e193c6f0c7bffc3b470dcc2f7c44d8e3f9a2407bc63369493b8
+EBUILD vanilla-kernel-5.9.13.ebuild 2778 BLAKE2B dfc746af613f51478ed2f23e5482a31f90044f5da5187df5be06ed446e96e52ffde30f9965e42589cc3fda340514fff2742871df921f74b7e707a29ed5de5489 SHA512 dba750c0b0dd17ae38cd1de365bd426dce28a260f2856902c58fd024b2a814e07d0f93a6d5b1bec4128d29c44340ecdf6069510eb7ad8b94a92e44837429a951
+EBUILD vanilla-kernel-5.9.14.ebuild 2778 BLAKE2B dfc746af613f51478ed2f23e5482a31f90044f5da5187df5be06ed446e96e52ffde30f9965e42589cc3fda340514fff2742871df921f74b7e707a29ed5de5489 SHA512 dba750c0b0dd17ae38cd1de365bd426dce28a260f2856902c58fd024b2a814e07d0f93a6d5b1bec4128d29c44340ecdf6069510eb7ad8b94a92e44837429a951
+EBUILD vanilla-kernel-5.9.15.ebuild 2778 BLAKE2B dfc746af613f51478ed2f23e5482a31f90044f5da5187df5be06ed446e96e52ffde30f9965e42589cc3fda340514fff2742871df921f74b7e707a29ed5de5489 SHA512 dba750c0b0dd17ae38cd1de365bd426dce28a260f2856902c58fd024b2a814e07d0f93a6d5b1bec4128d29c44340ecdf6069510eb7ad8b94a92e44837429a951
 EBUILD vanilla-kernel-5.9.8.ebuild 4495 BLAKE2B 2b3738a5ab60473eba2d15dab12ee16cf5b1dd135d7055ab8493b44dc0a39f4ce3be7e1623f808be4e8cf76c3c48085a485c5931896a9a0945467b30d31942d7 SHA512 ab711b5368ea901fe595df6b7fb6c2d4f463eaec4a835db62e862b0c46c0f7e0e09b6c90efb31868bebef17f0b7f9befa0d28dfe1649a2b37aa2bcc90e59ecd0
-EBUILD vanilla-kernel-5.9.9.ebuild 2717 BLAKE2B 7582f39744dd26ae928d605148ab062a0c35ffcfe0828c3d185f0ebbc0d1a27d78bf4e1b4bc96cacfa2b772618ce24e4e56825afa3cc75594b2c0ad6c4c8310a SHA512 fca7cf1007b491269f694c157b57ca35bb5b49849d55d80fecd00082eb21b4427875906b4350a3173ac1bda634d0c0713481e8ebe53e6639f12992bc824bed2c
+EBUILD vanilla-kernel-5.9.9.ebuild 2777 BLAKE2B a81ca055be2d0b433ed4f2aafb3546aa5dac55721877f6019e74ee207728710e75d8d8fd354e8dbfe6e66d6d9bae761f78c58b87756adb39546a75d62949b7ac SHA512 0ece25d5a41af1e8c14bb0ee00209db9617eb3b9ab3e20754e4d5ff51f14c6da35eba5c6334a0e193c6f0c7bffc3b470dcc2f7c44d8e3f9a2407bc63369493b8
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.1.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.1.ebuild
index a2cc8ceb44fc..1e0cd3d60162 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.1.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.1.ebuild
@@ -57,6 +57,7 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
 	else
 		default
 	fi
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.78.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.78.ebuild
index 9c5f2af87fff..7f4ea0861252 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.78.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.78.ebuild
@@ -62,6 +62,7 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
 	else
 		default
 	fi
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.79.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.79.ebuild
index 9c5f2af87fff..7f4ea0861252 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.79.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.79.ebuild
@@ -62,6 +62,7 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
 	else
 		default
 	fi
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.80.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.80.ebuild
index 9c5f2af87fff..7f4ea0861252 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.80.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.80.ebuild
@@ -62,6 +62,7 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
 	else
 		default
 	fi
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.81.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.81.ebuild
index 9c5f2af87fff..7f4ea0861252 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.81.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.81.ebuild
@@ -62,6 +62,7 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
 	else
 		default
 	fi
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.82.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.82.ebuild
index 9c5f2af87fff..7f4ea0861252 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.82.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.82.ebuild
@@ -62,6 +62,7 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
 	else
 		default
 	fi
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.83.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.83.ebuild
index 9c5f2af87fff..7f4ea0861252 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.83.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.83.ebuild
@@ -62,6 +62,7 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
 	else
 		default
 	fi
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.84.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.84.ebuild
new file mode 100644
index 000000000000..7f4ea0861252
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.84.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.77-r1
+
+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
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.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 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+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() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local merge_configs=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.10.ebuild
index 7f2ee941c17e..c13a4a4ee5fa 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.10.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.10.ebuild
@@ -57,6 +57,7 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
 	else
 		default
 	fi
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.11.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.11.ebuild
index 7f2ee941c17e..c13a4a4ee5fa 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.11.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.11.ebuild
@@ -57,6 +57,7 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
 	else
 		default
 	fi
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.12.ebuild
index 7f2ee941c17e..c13a4a4ee5fa 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.12.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.12.ebuild
@@ -57,6 +57,7 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
 	else
 		default
 	fi
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.13.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.13.ebuild
index cd68f818f095..aa4c6eda0dee 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.13.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.13.ebuild
@@ -57,6 +57,7 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
 	else
 		default
 	fi
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.14.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.14.ebuild
index cd68f818f095..aa4c6eda0dee 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.14.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.14.ebuild
@@ -57,6 +57,7 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
 	else
 		default
 	fi
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.15.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.15.ebuild
new file mode 100644
index 000000000000..aa4c6eda0dee
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.15.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.9.13
+CONFIG_HASH=b57160e20ddbe02624d2652e6836b0cb73044a4e
+GENTOO_CONFIG_VER=5.9.8-r1
+
+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
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-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 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local merge_configs=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.9.ebuild
index 7f2ee941c17e..c13a4a4ee5fa 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.9.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.9.ebuild
@@ -57,6 +57,7 @@ src_unpack() {
 		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
 			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
 		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
 	else
 		default
 	fi
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 6e5349ab65ec..7073ccd555b9 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 400130daec47..0148e6f52690 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD compiler-rt-sanitizers-10.0.1.ebuild 4501 BLAKE2B 3a15cc67e7fdbf61e2103ca9e543f936cc6f3221f0f3b7d43788cef7785f5742674ab0325e8c0c5cefe8909cc860a9ff0d42b615c367c1ea736cc745817cd9d0 SHA512 97b6b2b68a6de75e211b5f181d76fcf573f72fef7ff8f49248d03d201c2fec6f7d525c048b5b8b5cdc79c8512948f0ec75d5dbaa286172df929d264956d2c675
 EBUILD compiler-rt-sanitizers-11.0.0.ebuild 4567 BLAKE2B 116a4cec6de2f40d0b819182ed5317f58e5913efb884d2af028e39e23ee021d842cad8ab72f405b9eef0459477c74acc87b000fe1ecf39a41c7e1a579424469b SHA512 04d729e2453a4e40bdc4c4b4a650dc4256ef00cdd3a29b3a90fa0b390e5d691d404c01accff05d4375b2b6987498453255a1a915ddfb34eb4da4c43ed4a4a58d
 EBUILD compiler-rt-sanitizers-11.0.1.9999.ebuild 4491 BLAKE2B fa7e441b014225d4f08b369e839068083f97abfc23cb9923876bbcd22d4fc988a6c87eb7ec128ada251dd6897813a51ad475588a343c954d61fdd11267f04cfe SHA512 7cc1082997453322f4f8e3423d9b44b2b0d1dca1ea1a5b1f40392484605c58a49b6b825248f46f5c0e81ae58e7416475eea51d260d456c8b0a58a8314f2f302b
 EBUILD compiler-rt-sanitizers-11.0.1_rc1.ebuild 4491 BLAKE2B fa7e441b014225d4f08b369e839068083f97abfc23cb9923876bbcd22d4fc988a6c87eb7ec128ada251dd6897813a51ad475588a343c954d61fdd11267f04cfe SHA512 7cc1082997453322f4f8e3423d9b44b2b0d1dca1ea1a5b1f40392484605c58a49b6b825248f46f5c0e81ae58e7416475eea51d260d456c8b0a58a8314f2f302b
+EBUILD compiler-rt-sanitizers-11.0.1_rc2.ebuild 4491 BLAKE2B fa7e441b014225d4f08b369e839068083f97abfc23cb9923876bbcd22d4fc988a6c87eb7ec128ada251dd6897813a51ad475588a343c954d61fdd11267f04cfe SHA512 7cc1082997453322f4f8e3423d9b44b2b0d1dca1ea1a5b1f40392484605c58a49b6b825248f46f5c0e81ae58e7416475eea51d260d456c8b0a58a8314f2f302b
 EBUILD compiler-rt-sanitizers-12.0.0.9999.ebuild 4491 BLAKE2B fa7e441b014225d4f08b369e839068083f97abfc23cb9923876bbcd22d4fc988a6c87eb7ec128ada251dd6897813a51ad475588a343c954d61fdd11267f04cfe SHA512 7cc1082997453322f4f8e3423d9b44b2b0d1dca1ea1a5b1f40392484605c58a49b6b825248f46f5c0e81ae58e7416475eea51d260d456c8b0a58a8314f2f302b
 EBUILD compiler-rt-sanitizers-9.0.1.ebuild 4847 BLAKE2B cc23d456a4c52596858a405bc74c3c5db35c4fe116685cba4982e2753ba01941bd2c166f56e4278c79e02b06229e90a7fba9fce923360dba8bbf516c8a665ae6 SHA512 dc11719f142cfa56c86373e7e6dba88957511218a654c138ab37d3de01a60bd77f8dd4bc90ed634156d0952b350dce1bad08f8a2db1a7d207335596cdd0bd4d6
 MISC metadata.xml 547 BLAKE2B 6f9d8b65c12797fd3d168e9b3948c604265db135bda5493d9f1d8b1d01fd73a79d07e5241afc3a7fa1672827fac23d3d9dc4d7ae42371a0de892a900c8c28269 SHA512 fb73a96b1ffbc7ff2fecfba35c9acd3e54ade0154016ae04423217f5c000eee2b0b821cc626908647551a0aa7b7f462d42d56cde3993ddd52248bc373b117c3e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..1e3a849c675a
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1_rc2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
+# FIXME: libfuzzer does not enable all its necessary dependencies
+REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		!<sys-apps/sandbox-2.13
+		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+		sys-libs/compiler-rt:${SLOT}
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# disable use of SDK for the system itself
+			-DDARWIN_macosx_CACHED_SYSROOT=/
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 3cade7fae36d..017e6fa5d30d 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD compiler-rt-10.0.1.ebuild 2770 BLAKE2B 68ee449ac28f519a2cc0ec03b73aac5c770064f0350b5d1803a861386ac6b295947da9362b26dd6cffd90985f429beaf382ed949fc56da32184c9dab3aaff843 SHA512 2aea27ca4b4ccdc9c295b82c5e19558653945f87aaca03e50158a584044f8b0694f99ceb6c27e9fc5eb4e89cbc7851a4953e5a0a1494a49c46da7079962e3b14
 EBUILD compiler-rt-11.0.0.ebuild 2836 BLAKE2B 675ad6959c74f5d91c85129bb7ec8b3e93445deb4db3b7a4b1e8ce0e93b87081caa96dab4bb06ac67f9a0af318adcddfb17141562e4dde074d942ddaf3e586b1 SHA512 e557ba5f6511817caf5e6bea44835c28fbe6720e62d2ebe3fb22f758678f4054598e0770bdbfc2b3714dc8153fa350b07fba8cc8f42fb98be6cd849a1ea1de6e
 EBUILD compiler-rt-11.0.1.9999.ebuild 2760 BLAKE2B 917e1260aafc22fa4193d4881e52a4c686d5a8673f6958261986b02f3987f159206843e3b62221e2a2af53192f9ef905c9edcf7311befbadb55c9a4b883525f0 SHA512 91498187bf9629e9f58e4b090cfb237c548c4f08b7a284d3a5df29d6803efd9aeb352a4ef6c6ddb23b9bac2f22dd0a06c75ac7039addd1ee920d08fc3a84cfa3
 EBUILD compiler-rt-11.0.1_rc1.ebuild 2760 BLAKE2B 917e1260aafc22fa4193d4881e52a4c686d5a8673f6958261986b02f3987f159206843e3b62221e2a2af53192f9ef905c9edcf7311befbadb55c9a4b883525f0 SHA512 91498187bf9629e9f58e4b090cfb237c548c4f08b7a284d3a5df29d6803efd9aeb352a4ef6c6ddb23b9bac2f22dd0a06c75ac7039addd1ee920d08fc3a84cfa3
+EBUILD compiler-rt-11.0.1_rc2.ebuild 2760 BLAKE2B 917e1260aafc22fa4193d4881e52a4c686d5a8673f6958261986b02f3987f159206843e3b62221e2a2af53192f9ef905c9edcf7311befbadb55c9a4b883525f0 SHA512 91498187bf9629e9f58e4b090cfb237c548c4f08b7a284d3a5df29d6803efd9aeb352a4ef6c6ddb23b9bac2f22dd0a06c75ac7039addd1ee920d08fc3a84cfa3
 EBUILD compiler-rt-12.0.0.9999.ebuild 2760 BLAKE2B 917e1260aafc22fa4193d4881e52a4c686d5a8673f6958261986b02f3987f159206843e3b62221e2a2af53192f9ef905c9edcf7311befbadb55c9a4b883525f0 SHA512 91498187bf9629e9f58e4b090cfb237c548c4f08b7a284d3a5df29d6803efd9aeb352a4ef6c6ddb23b9bac2f22dd0a06c75ac7039addd1ee920d08fc3a84cfa3
 EBUILD compiler-rt-9.0.1.ebuild 2916 BLAKE2B 4725960cfa3ff697f1b17d709c7a9f463aa8aaf2da33592b6c5d129fc4acb51181a4712c1afce01c0b97e441685cc5932524f02cbacb339f5c7c315813e4ec72 SHA512 2b038aeb653043691f046ae2930cac58ada17ece1f7da2699e1e9ce4dbe1903f21366ca82cb3d08605875f0b24fc0a9707bbde2ea6a039c080f0d54268071f0f
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..38a2cbc81fbb
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( compiler-rt )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	local nolib_flags=( -nodefaultlibs -lc )
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+	elif ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# disable use of SDK for the system itself
+			-DDARWIN_macosx_CACHED_SYSROOT=/
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/sys-libs/cygwin-crypt/Manifest b/sys-libs/cygwin-crypt/Manifest
index 409223afac29..0825c52c894f 100644
--- a/sys-libs/cygwin-crypt/Manifest
+++ b/sys-libs/cygwin-crypt/Manifest
@@ -1,3 +1,3 @@
 DIST cygwin-crypt-1.4.tar.bz2 4446 BLAKE2B a0644f036c55fd169a1d708d51fc7d3b1cc0a94fba845319357b4251eb379aa799ed39ba81b2551774c870944b19e6e1053453e1e99b48a93ed5a62272c37e25 SHA512 1ecc4256730f13161a651cfdf71b27c1042e6f56fb859943426c371d4b37b8b2bd6ea768f86e45f7b8cf3478e97ff9578b79e5c37178c8794ff9b87799f2cab3
-EBUILD cygwin-crypt-1.4.ebuild 869 BLAKE2B ffac7bde9e94542ac635d5b60cd4f9268d7516dabbdac58b5646e8dbe7ed20c1c31e05e2ee8f88856271d17fd3caf387f98c5f37ee2a52fbf4c45febdcbc91f2 SHA512 c60bf76fab75226c4266e837d4e4eb5bcb572bad6cefdd49431f3eebebac91f1434ffea5c90843b0bc15b3b7fcc2eeec4fcaaa32c7129e4ed93cc16b4340c3de
+EBUILD cygwin-crypt-1.4.ebuild 854 BLAKE2B 82868e38fc34dc233ecd8b72dad6b24c82c2ac142d15807c4e64c4e48fbe3035b8e7c10341834c585f306395f60ae3d44243b72c4cfac9066884e92105d323cf SHA512 725f80eb0acf1d0a30ff8a0afef0abb67bf21ce32b1f86f9066f42eeb37b2d324373dad87709567454f9c90790df9a5bc7b02103476012ca35f113f64a9d2864
 MISC metadata.xml 517 BLAKE2B 08aee319193ca3b6efbeb61157a841554e9fe9891476ffad4addfc8156cc5f7844201fc7ce2eabca6c0dba72792959b90850bd58df198638c108e980baaa10fb SHA512 3434a72bc3776b411a6fa9cb4948a77c510002e145fb2986552731a1da3fb16152bcca762e72c12de5369a66ba9add93848783364f30e68b0de1cefbd2458e2c
diff --git a/sys-libs/cygwin-crypt/cygwin-crypt-1.4.ebuild b/sys-libs/cygwin-crypt/cygwin-crypt-1.4.ebuild
index 1b97a32993a0..37c9ff3d46f3 100644
--- a/sys-libs/cygwin-crypt/cygwin-crypt-1.4.ebuild
+++ b/sys-libs/cygwin-crypt/cygwin-crypt-1.4.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
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~x64-cygwin ~x86-cygwin"
+KEYWORDS="~x64-cygwin"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 0d8766d83f0f..7c0a7f86c74e 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -2,11 +2,13 @@ AUX libcxx-3.9-cmake-link-flags.patch 1014 BLAKE2B 8e86059e00a5ebcd7a15288828766
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD libcxx-10.0.1.ebuild 5967 BLAKE2B 2e31f12ce656507bae063f3ec199ec485e2cd0e67346b87ba1ab4d57acb4f89d6c1f79d76ca305c470c1160414833ea727f62e9128ed5327dc81b06b27b9e58c SHA512 70ebbeeebdae6f4ee82cbe9d78e6c823535ea38c6cb84411b379962ee6ae93a0c495dab4f051bc5722257211e3d8f3997361dbcf383a6f46edfea1510d6a217b
 EBUILD libcxx-11.0.0.ebuild 6076 BLAKE2B bc3207e38459230228002e9e4cc119235aef014d59889f9dffd0bb8de7942793a7b434f0743bf20d54cfdba1de183cd56c813768b7781b0d71ea7e17525ec8a5 SHA512 56d881963a416846d58eb57598b95fc34a789a84f448d50aff69ef44981ac05edefe4fcf11100245a9ee8751adf6b3291844f70c3a2d14f78e60de7256440478
 EBUILD libcxx-11.0.1.9999.ebuild 6051 BLAKE2B 073787f1a880a85bda48d8f9d8de9140b3e240c554b9fc5a822037d4aed0d47fa6759c9fe01f43a42a37458dfd451ff7676f88c48f3bc8d48c010f1361a2f492 SHA512 807f943e94677bb161b2c479e85ab75fde4747302c6b16e63ab45156571bd50edf0a27a8e5cd765ece20937564f0b24acaa63ce285d21e3a8901530da961bd5a
 EBUILD libcxx-11.0.1_rc1.ebuild 6051 BLAKE2B 073787f1a880a85bda48d8f9d8de9140b3e240c554b9fc5a822037d4aed0d47fa6759c9fe01f43a42a37458dfd451ff7676f88c48f3bc8d48c010f1361a2f492 SHA512 807f943e94677bb161b2c479e85ab75fde4747302c6b16e63ab45156571bd50edf0a27a8e5cd765ece20937564f0b24acaa63ce285d21e3a8901530da961bd5a
+EBUILD libcxx-11.0.1_rc2.ebuild 6051 BLAKE2B 073787f1a880a85bda48d8f9d8de9140b3e240c554b9fc5a822037d4aed0d47fa6759c9fe01f43a42a37458dfd451ff7676f88c48f3bc8d48c010f1361a2f492 SHA512 807f943e94677bb161b2c479e85ab75fde4747302c6b16e63ab45156571bd50edf0a27a8e5cd765ece20937564f0b24acaa63ce285d21e3a8901530da961bd5a
 EBUILD libcxx-12.0.0.9999.ebuild 6051 BLAKE2B 073787f1a880a85bda48d8f9d8de9140b3e240c554b9fc5a822037d4aed0d47fa6759c9fe01f43a42a37458dfd451ff7676f88c48f3bc8d48c010f1361a2f492 SHA512 807f943e94677bb161b2c479e85ab75fde4747302c6b16e63ab45156571bd50edf0a27a8e5cd765ece20937564f0b24acaa63ce285d21e3a8901530da961bd5a
 EBUILD libcxx-9.0.1.ebuild 6398 BLAKE2B 0bf084d925f6633809763077300f2221bd7fd67f2d29b1f4febc436b7ff658c51deb7b614807eb9459f466a120e9f7420cf047a1f5583effd48544bdc51aa344 SHA512 77898701b515982851e2e49436705c9166f9c82c011b967b942f3c4f8d2466692e89883d18b28b1ad886692d37b02234a14a80c965c12fc2675fc40baacceebc
 MISC metadata.xml 731 BLAKE2B a6e96906bc2bff950c1b193b01feeb456b064fa585042566eae77dbe9a207bb08dfd083a3ab5fede2133a80b905a61c6dd541f9196e585c60b5629dd04a06213 SHA512 0a25560aa3eff5355137dadbb9cc48e384d2885b89075a97a8dafc7ac0ebe4ec5fde5b171a3416490264791a734c4405ec8a42dfc98e7e830c30ef0cfef58b6f
diff --git a/sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild b/sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..dd1a1a1f3a2f
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
+REQUIRED_USE="libunwind? ( libcxxabi )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
+# llvm-6 for new lit options
+# clang-3.9.0 installs necessary target symlinks unconditionally
+# which removes the need for MULTILIB_USEDEP
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		>=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+DOCS=( CREDITS.TXT )
+
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+src_prepare() {
+	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
+	# out-of-tree build.
+	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
+
+	llvm.org_src_prepare
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# we want -lgcc_s for unwinder, and for compiler runtime when using
+	# gcc, clang with gcc runtime (or any unknown compiler)
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
+	if use libunwind; then
+		# work-around missing -lunwind upstream
+		extra_libs+=( -lunwind )
+		# if we're using libunwind and clang with compiler-rt, we want
+		# to link to compiler-rt instead of -lgcc_s
+		if tc-is-clang; then
+			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			   ${LDFLAGS} -print-libgcc-file-name)
+			if [[ ${compiler_rt} == *libclang_rt* ]]; then
+				want_gcc_s=OFF
+				want_compiler_rt=ON
+				extra_libs+=( "${compiler_rt}" )
+			fi
+		fi
+	fi
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
+		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
+	)
+
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxx
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	local libdir=$(get_libdir)
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
+
+	# Move it first.
+	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=" libpthread.a libdl.a"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
+}
+
+gen_shared_ldscript() {
+	local libdir=$(get_libdir)
+	# libsupc++ doesn't have a shared version
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
+
+	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
+	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
+}
+
+multilib_src_install() {
+	cmake_src_install
+	gen_shared_ldscript
+	use static-libs && gen_static_ldscript
+}
+
+pkg_postinst() {
+	elog "This package (${PN}) is mainly intended as a replacement for the C++"
+	elog "standard library when using clang."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 20bfde8532ac..9ecf96041edd 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD libcxxabi-10.0.1.ebuild 3238 BLAKE2B e2bd5189a20b8a2a575d1a660d97e7554527f03e4cb3c836b2f1c715bf42ce37250dcf2067639bb59f2c580fd3aa45f4217577ec41a1f4747a7e8397dde519cd SHA512 c6d03f55af65ca576d380497ff172dd3964e31fbc3fe1a8f49ae0b94364d6bf1819505ec5c4b1167744e0f11126cf22b4a8fbba03fff35017cf3963415a675c2
 EBUILD libcxxabi-11.0.0.ebuild 3278 BLAKE2B c0d0f3b89e3e5d9c9f18f18bc0dd05f440988dea5e26a75fa0dd832ca7425dc8b1aee86add1bc2cabb8690957118fe4962d47c934b961aa5921859c783c8ed8e SHA512 8f656a3c866bfdf83fb06e56d3fa1b4c6ac3e99bb8ff2bab66e44e6a820dda362f1174a0f700130bdd25c7c5ecac31ee32c5377700e2abe54618a192b4306fb6
 EBUILD libcxxabi-11.0.1.9999.ebuild 3254 BLAKE2B b955ae412a6407b4f8687ea80d6d28ee0c7ee31d811e11002ce0b817b3f73bce6b8c4ca7f0020b8580c5e43e2fbb8364f3af373f812cf13f74b0334db41814a1 SHA512 7683c68ed72934a9c74e29b37b4a94af73f5607b9dc1857b7d1970c756654acc4176873e4201d11179f18b775306f34ffd082f532808837a118ff3e3a9517f59
 EBUILD libcxxabi-11.0.1_rc1.ebuild 3254 BLAKE2B b955ae412a6407b4f8687ea80d6d28ee0c7ee31d811e11002ce0b817b3f73bce6b8c4ca7f0020b8580c5e43e2fbb8364f3af373f812cf13f74b0334db41814a1 SHA512 7683c68ed72934a9c74e29b37b4a94af73f5607b9dc1857b7d1970c756654acc4176873e4201d11179f18b775306f34ffd082f532808837a118ff3e3a9517f59
+EBUILD libcxxabi-11.0.1_rc2.ebuild 3254 BLAKE2B b955ae412a6407b4f8687ea80d6d28ee0c7ee31d811e11002ce0b817b3f73bce6b8c4ca7f0020b8580c5e43e2fbb8364f3af373f812cf13f74b0334db41814a1 SHA512 7683c68ed72934a9c74e29b37b4a94af73f5607b9dc1857b7d1970c756654acc4176873e4201d11179f18b775306f34ffd082f532808837a118ff3e3a9517f59
 EBUILD libcxxabi-12.0.0.9999.ebuild 3254 BLAKE2B b955ae412a6407b4f8687ea80d6d28ee0c7ee31d811e11002ce0b817b3f73bce6b8c4ca7f0020b8580c5e43e2fbb8364f3af373f812cf13f74b0334db41814a1 SHA512 7683c68ed72934a9c74e29b37b4a94af73f5607b9dc1857b7d1970c756654acc4176873e4201d11179f18b775306f34ffd082f532808837a118ff3e3a9517f59
 EBUILD libcxxabi-9.0.1.ebuild 3390 BLAKE2B 708b1327f629ad4445fde37d53dea7807c433a2e3154f56f3fed4ba9eb698f3bb3e67055820521c58d8a31dc26abf28c293d709f97b4496ab420d788ab532c12 SHA512 18ab388b271756a5eb6dd1650d6a9f05a392b4e2cb48df92359c0e9ac763ecc4672343b4b51184f13c0636fe130e4a5972d8937866d34f1efec4b1addce1f81a
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.1_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..c1992223348b
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.1_rc2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libunwind +static-libs test elibc_musl"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libunwind? (
+		|| (
+			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
+		)
+	)"
+# llvm-6 for new lit options
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+# libcxx is needed uncondtionally for the headers
+LLVM_COMPONENTS=( libcxx{abi,} )
+LLVM_TEST_COMPONENTS=( llvm/cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+		)
+	fi
+	cmake_src_configure
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	# build a local copy of libc++ for testing to avoid circular dep
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r include/.
+}
diff --git a/sys-libs/libkudzu/Manifest b/sys-libs/libkudzu/Manifest
deleted file mode 100644
index 6cb108b5aff7..000000000000
--- a/sys-libs/libkudzu/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX kudzu-1.2.57.1-sbusfix.patch 2217 BLAKE2B 27506402bd81f1a1be3e5213945dd6c6ca814085da9b7becf9cd2845242e17acf8a7936ce843eddc49f6e46590f09c9077d852fb21d15d051d9beeb6d57b4c4b SHA512 5b94734f63e1bb62cbfc349646c6dc4663e6ed2309e554e701943c35649193b14ea779a0c08e531ee931a94afdcc3e15529a8f410c658ea26d26659fe4147c71
-AUX kudzu-1.2.57.1-sparc-keyboard.patch 5389 BLAKE2B b49bd002dcadf6f79ee468fe222f150660908e983e8ffa44cbbc446c8162e3494ecb2b959e11f59e19d56437cc163199e2f4e773cdb8e5e6bc86aa7e6b39606b SHA512 6b89de1ede96e1a523880a33975488957e87cfc31cc0155014bb8152123cafb7ad793edcd9d228b9946bc6005b544e6fb908185f4ff901e623ce200435982708
-DIST kudzu-1.2.57.1.tar.gz 165855 BLAKE2B cd7a71a45a234701dd3e94b7378b37017a03cc78bf5230cc267c273fee4baf5338a5509572f0ba1bb23c8f585ec452c4a7f2d02159326c4133ad6abd80d36c3f SHA512 799e7cea840b7495fc007f4e34adc50fecd2fa7ceda2e2779e39639d0b93b10419bd44a0eb910b2e47024a49a4376330653a6fd96e5560c4828d55e18ab5d641
-EBUILD libkudzu-1.2.57.1.ebuild 1297 BLAKE2B aec0ded22af437e769955d9f974a597a6e2133ded86024e41ee166e3825a92412e1c1252d1e5e4bab0d1a7588f1c3fbd3be520148d02e641a02bdaf3d41554fc SHA512 997eb0825c44048c1faacede1ee7c276ed8b2da9b969d48c9927eae7d77d3965aef9e3f6c5553d55c6b400b160a0720d6ba8a930f4f4bd8cee981b90174cb5f1
-MISC metadata.xml 256 BLAKE2B d02b5b33f7375594b6e77357966b74fd698579fcefce673bde9b7082e2a56a47b1b8824d5aa423ad7271113efc568997c476bc0106d147dbc1a198b201def869 SHA512 b301300f23bb631f440eef04dce17f16cfee618775d38013cfded6b0e8b806d772749578a39c43143104a1716d2cc6eefb3af7f6865d85da5b2cb6f1e78c7c68
diff --git a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch b/sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch
deleted file mode 100644
index 5c186ed631da..000000000000
--- a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/sbus.c
-+++ b/sbus.c
-@@ -162,6 +162,7 @@
- 		    	devClass = CLASS_NETWORK;
- 		} else if (!strcmp(prop, "le")) {
- 			type = "Sun Lance Ethernet";
-+			module = "sunlance";
- 		    	devClass = CLASS_NETWORK;
- 		} else if (!strcmp(prop, "qe")) {
- 			prop = prom_getproperty("channel#", &len);
-@@ -206,9 +207,11 @@
- 		    	devClass = CLASS_SCSI;
- 		} else if (!strcmp(prop, "esp")) {
- 			type = "Sun Enhanced SCSI Processor (ESP)";
-+			module = "esp";
- 		    	devClass = CLASS_SCSI;
- 		} else if (!strcmp(prop, "fas")) {
- 			type = "Sun Swift (ESP)";
-+			module = "esp";
- 		    	devClass = CLASS_SCSI;
- 		} else if (!strcmp(prop, "ptisp")) {
- 			type = "Performance Technologies ISP";
-@@ -232,19 +235,19 @@
- 			while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',')
- 				if (*prop++ == ',') break;
- 		if (!strcmp(prop, "audio")) {
--			type = "AMD7930";
--			module = "amd7930";
-+			type = "Sun|AMD7930";
-+			module = "snd-sun-amd7930";
- 		    	devClass = CLASS_AUDIO;
- 		} else if (!strcmp(prop, "CS4231")) {
- 			if (ebus)
--				type = "CS4231 EB2 DMA (PCI)";
-+				type = "Sun|CS4231 EB2 DMA (PCI)";
- 			else
--				type = "CS4231 APC DMA (SBUS)";
--			module = "cs4231";
-+				type = "Sun|CS4231 APC DMA (SBUS)";
-+			module = "snd-sun-cs4231";
- 		    	devClass = CLASS_AUDIO;
- 		} else if (!strcmp(prop, "DBRIe")) {
--			type = "SS10/SS20 DBRI";
--			module = "dbri";
-+			type = "Sun|SS10/SS20 DBRI";
-+			module = "snd-sun-dbri";
- 		    	devClass = CLASS_AUDIO;
- 		}
- 	    	prop = prom_getproperty("device_type", &len);
-@@ -452,22 +455,6 @@
- 
- struct device *sbusProbe( enum deviceClass probeClass, int probeFlags,
- 		    struct device *devlist) {
--    if (probeClass & CLASS_MOUSE) {
--	int fd;
--	struct sbusDevice *mousedev;
--
--	if ((fd = open("/dev/sunmouse", O_RDONLY)) != -1) {
--	    /* FIXME: Should probably talk to the mouse to see
--	       if the connector is not empty. */
--	    close (fd);
--	    mousedev = sbusNewDevice(NULL);
--	    mousedev->type = CLASS_MOUSE;
--	    mousedev->device = strdup("sunmouse");
--	    mousedev->desc = strdup("Sun Mouse");
--	    mousedev->next = devlist;
--	    devlist = (struct device *)mousedev;
--	}
--    }
-     if (
- 	(probeClass & CLASS_OTHER) ||
- 	(probeClass & CLASS_NETWORK) ||
diff --git a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch b/sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch
deleted file mode 100644
index 5626a357345d..000000000000
--- a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch
+++ /dev/null
@@ -1,195 +0,0 @@
---- a/keyboard.c
-+++ b/keyboard.c
-@@ -21,7 +21,6 @@
- #include "keyboard.h"
- 
- #ifdef __sparc__
--#include <asm/kbio.h>
- #include <asm/openpromio.h>
- #include <asm/types.h>
- #endif
-@@ -96,7 +95,15 @@
-   {0, 0}
- };
- 
--#if !defined(__s390__) && !defined(__s390x__)
-+#if defined(__sparc__)
-+static int termcmp(struct termios *a, struct termios *b) 
-+{
-+        if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag ||
-+            a->c_cflag != b->c_cflag || a->c_lflag != b->c_lflag)
-+                return 1;
-+        return memcmp(a->c_cc, b->c_cc, sizeof(a->c_cc));
-+}
-+#elif !defined(__s390__) && !defined(__s390x__)
- static int termcmp(struct termios *a, struct termios *b)
- {
- 	if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag ||
-@@ -110,150 +117,6 @@
- struct device *keyboardProbe(enum deviceClass probeClass, int probeFlags,
- 			struct device *devlist)
- {
--#ifdef __sparc__
--	int fd;
--	char buf[256];
--	struct keyboardDevice *kbddev;
--	
--	if (probeClass & CLASS_KEYBOARD) {
--		static struct {
--		  int layout0, layout1, layout2;
--		  char *symbols;
--		  int use_iso9995_3;
--		} sunkbd_translate[] = {
--		  { 0, 33, 80, "",      0, },
--		  { 1, 34, 81, "",      0, },
--		  { 2, -1, -1, "fr_BE", 0, },
--		  { 3, -1, -1, "ca",    0, },
--		  { 4, 36, 83, "dk",    1, },
--		  { 5, 37, 84, "de",    1, },
--		  { 6, 38, 85, "it",    1, },
--		  { 7, 39, 86, "nl",    0, },
--		  { 8, 40, 87, "no",    1, },
--		  { 9, 41, 88, "pt",    1, },
--		  { 10, 42, 89, "es",   1, },
--		  { 11, 43, 90, "se",   1, },
--		  { 12, 44, 91, "fr_CH",1, },
--		  { 13, 45, 92, "de_CH",1, },
--		  { 14, 46, 93, "gb",   1, },
--		  { 16, 47, 94, "ko",   0, },
--		  { 17, 48, 95, "tw",   0, },
--		  { 32, 49, 96, "jp",   0, },
--		  { 50, 97, -1, "fr_CA",0, },
--		  { 51, -1, -1, "hu",   0, },
--		  { 52, -1, -1, "pl",   0, },
--		  { 53, -1, -1, "cs",   0, },
--		  { 54, -1, -1, "ru",   0, },
--		  { -1, -1, -1, NULL,   0, }
--		};
--
--		char twelve = 12;
--		int fdstd = 0;
--		char buf[4096];
--
--		for (fd = 0; fd <= 2; fd++) {
--		    sprintf (buf, "/proc/self/fd/%d", fd);
--		    if (readlink (buf, buf, 4096) == 12 &&
--			!strncmp (buf, "/dev/console", 12)) {
--			fdstd = 1;
--			break;
--		    }
--		}
--		if (!fdstd) {
--		    fd = open("/dev/console", O_RDWR);
--		    if (fd < 0) return devlist;
--		}
--		
--		kbddev=keyboardNewDevice(NULL);
--		kbddev->type=CLASS_KEYBOARD;
--		if (devlist)
--			kbddev->next = devlist;
--		devlist = (struct device *) kbddev;
--
--		if (ioctl (fd, TIOCLINUX, &twelve) < 0) {
--			/* Serial console */
--			char desc[64];
--			struct serial_struct si;
--			int line = 0;
--
--			if (ioctl (fd, TIOCGSERIAL, &si) >= 0) {
--			    if (si.line & 1)
--				/* ttyb */
--				line = 1;
--			}
--			if (!fdstd) close(fd);
--			sprintf (desc, "Serial console tty%c", line + 'a');
--			fd = open("/dev/openprom", O_RDONLY);
--			if (fd >= 0) {
--				struct openpromio *op = (struct openpromio *)buf;
--				sprintf (op->oprom_array, "tty%c-mode", line + 'a');
--				op->oprom_size = 4096-128-4;
--				if (ioctl (fd, OPROMGETOPT, op) >= 0 &&
--				    op->oprom_size > 0 && op->oprom_size < 40) {
--					strcat (desc, " ");
--					op->oprom_array [op->oprom_size] = 0;
--					strcat (desc, op->oprom_array);
--				}
--				close (fd);
--			}
--			kbddev->desc=strdup(desc);
--			kbddev->device=strdup("console");
--			return devlist;
--		}
--
--		if (!fdstd) close(fd);
--		fd=open("/dev/kbd", O_RDWR);
--		if (fd < 0) {
--			/* PS/2 keyboard */
--			kbddev->desc=strdup("Generic PS/2 Keyboard");
--		} else {
--			/* Sun keyboard */
--			int kbdtype, kbdlayout, i;
--			char *desc, *desclayout = NULL;
--
--			kbddev->device=strdup("kbd");
--			desc = "Sun Type4 ";
--			if (ioctl(fd, KIOCTYPE, &kbdtype) >= 0)
--				switch (kbdtype) {
--				case 2: desc = "Sun Type2 "; break;
--				case 3: desc = "Sun Type3 "; break;
--				case 4: ioctl(fd, KIOCLAYOUT, &kbdlayout);
--					if (kbdlayout < 33)
--						desc = "Sun Type4 ";
--					else switch (kbdlayout) {
--					case 33: case 47: case 48: case 49:
--					case 80: case 94: case 95: case 96:
--						desc = "Sun Type5 "; break;
--					case 34: case 81:
--						desc = "Sun Type5 Unix "; break;
--					default:
--						desc = "Sun Type5 Euro "; break;
--					}
--					for (i = 0; sunkbd_translate[i].layout0 != -1; i++) {
--						if (sunkbd_translate[i].layout0 == kbdlayout ||
--						    sunkbd_translate[i].layout1 == kbdlayout ||
--						    sunkbd_translate[i].layout2 == kbdlayout)
--						break;
--					}
--					if (sunkbd_translate[i].layout0 != -1 &&
--					    sunkbd_translate[i].symbols[0])
--						desclayout = sunkbd_translate[i].symbols;
--					break;
--				}
--			if (desclayout) {
--				kbddev->desc = malloc(strlen(desc) + strlen(desclayout) + 1 + strlen("Keyboard") + 1);
--				strcpy (kbddev->desc, desc);
--				strcat (kbddev->desc, desclayout);
--				strcat (kbddev->desc, " Keyboard");
--			} else {
--				kbddev->desc = malloc(strlen(desc) + strlen("Keyboard") + 1);
--				strcpy (kbddev->desc, desc);
--				strcat (kbddev->desc, "Keyboard");
--			}
--		}
--		close (fd);
--	}
--#else
- 	int fd;
- 	char twelve = 12;
- 	int fdstd = 0;
-@@ -311,7 +174,7 @@
- 			kbddev->device = strdup("ttySG0");
- 		}
- #endif
--#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__) || defined(__sparc__)
- 		int cfd;
- 		struct termios cmode, mode;
- 
-@@ -397,7 +260,6 @@
- 			kbddev->device=strdup(desc);
- 		}
- 	}
--#endif
- out:
- 	return devlist;
- }
diff --git a/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild b/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
deleted file mode 100644
index e37cf4c2de6a..000000000000
--- a/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info flag-o-matic toolchain-funcs
-
-DESCRIPTION="Red Hat Hardware detection tools"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/kudzu-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 -mips ppc ppc64 sparc x86"
-IUSE="zlib"
-
-DEPEND="
-	dev-libs/popt
-	>=sys-apps/pciutils-2.2.4[zlib?]
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/hwdata-gentoo
-	!sys-apps/kudzu
-"
-
-S=${WORKDIR}/kudzu-${PV}
-
-src_prepare() {
-	sed -i -e 's/-fpic/-fPIC/g' Makefile || die
-
-	epatch \
-		"${FILESDIR}"/kudzu-${PV}-sbusfix.patch \
-		"${FILESDIR}"/kudzu-${PV}-sparc-keyboard.patch
-}
-
-src_configure() {
-	if use zlib; then
-		sed -i -e 's| -lpci| -lz -lpci|g' Makefile || die
-	fi
-	# Fix the modules directory to match Gentoo layout.
-	sed -i -e 's|/etc/modutils/kudzu|/etc/modules.d/kudzu|g' *.* || die
-
-	tc-export CC
-}
-
-src_compile() {
-	emake \
-		$( usex ppc ARCH='ppc' ARCH=$(tc-arch-kernel) ) \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB) \
-		RPM_OPT_FLAGS="${CFLAGS}" \
-		libkudzu.a libkudzu_loader.a
-}
-
-src_install() {
-	insinto /usr/include/kudzu
-	doins *.h
-
-	dolib.a libkudzu.a libkudzu_loader.a
-
-	keepdir /etc/sysconfig
-}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index dc006eb6c59c..66743a4828b3 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD libomp-10.0.1.ebuild 2893 BLAKE2B e91e074bfa0d1584d40d997a1661507f404d6a6e4593e6da2a6825a1f8260ff02c4daebe4b9183d6ea025aa5c3be6986f3f7a920f578ad16d993ea10db272943 SHA512 558940389a55b5ea0e6e4c5b0fb48a8eaad5c00e26c1af90d5619106711b78341a532c59535f01ba5eedf99902af4494838b6edf5a0ade8693524d662d55053a
 EBUILD libomp-11.0.0.ebuild 2900 BLAKE2B 7aeeb7dd0598c9834437176843cd11f43c3e77c73b1638c15ce2d00cfbf44a2af939a5f1a24759c7f8f118ff13e17d26769263eac84ef4b7ea2ce9e560ffd443 SHA512 95d4c487ae19ce18d8f8efb22c71a85c38cbfed7dcdbf7d9a2bae8633ae066cef6dd4a64e8ad80a3684590ffbaf3451577e11ad40b7ab6a10a29cb0f71917c66
 EBUILD libomp-11.0.1.9999.ebuild 2845 BLAKE2B 13c2ef4577d1dcd14f11d5100797a5bc936d9f02c0ca9814c63e4fd8b9e8c274404c8d672ededfd4b304c1c864a33c39d7b1c9f2b1c7c98c70008f809dbb3f19 SHA512 1552854a04dfc15e518a2b8234e64f1d6679638681023d4fd5690ca6577eec4f84b4ab64f3f211c20c9167be354549e2ab96fa2051dc40e66f1689caeea2d58d
 EBUILD libomp-11.0.1_rc1.ebuild 2845 BLAKE2B 13c2ef4577d1dcd14f11d5100797a5bc936d9f02c0ca9814c63e4fd8b9e8c274404c8d672ededfd4b304c1c864a33c39d7b1c9f2b1c7c98c70008f809dbb3f19 SHA512 1552854a04dfc15e518a2b8234e64f1d6679638681023d4fd5690ca6577eec4f84b4ab64f3f211c20c9167be354549e2ab96fa2051dc40e66f1689caeea2d58d
+EBUILD libomp-11.0.1_rc2.ebuild 2845 BLAKE2B 13c2ef4577d1dcd14f11d5100797a5bc936d9f02c0ca9814c63e4fd8b9e8c274404c8d672ededfd4b304c1c864a33c39d7b1c9f2b1c7c98c70008f809dbb3f19 SHA512 1552854a04dfc15e518a2b8234e64f1d6679638681023d4fd5690ca6577eec4f84b4ab64f3f211c20c9167be354549e2ab96fa2051dc40e66f1689caeea2d58d
 EBUILD libomp-12.0.0.9999.ebuild 2858 BLAKE2B 5b23d8c8e540decfa950bd795e0b3ec956307e9bbcd8aa67e9e7e574a0a0990987d8ad0bf2e7543bea128a052212f36bdc25d7d086a85092b1dade3ef1017f22 SHA512 f823e550a414fa30b23c2ac1ef1a53090bb0d547ae4ebbcecf227936e6f46d8dbdf23cc42b87cdbd009e5feddbad17a24b3bec065043a1460812258b74d89e66
 EBUILD libomp-9.0.1.ebuild 3011 BLAKE2B 33ccc441765ab33b61c9739e999039b24437c6f79b89a4db5ee1575b072fd3af609d5c8c583331db81b0b5a24a2a85cc359b4df312330b5732a24c7a8ebe3021 SHA512 404f3df2df27e031b59c4f827b13b2d9ce2b6af4126abdd1d6a233cfe0ec26ede61d01ddf6ca3434b6698ac6407ce8b4a845070b875f92eff4d961280c95ed5a
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-11.0.1_rc2.ebuild b/sys-libs/libomp/libomp-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..f715bdea5353
--- /dev/null
+++ b/sys-libs/libomp/libomp-11.0.1_rc2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib linux-info llvm.org python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="cuda hwloc kernel_linux offload ompt test"
+# CUDA works only with the x86_64 ABI
+REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		virtual/libelf:=[${MULTILIB_USEDEP}]
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	)"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	offload? ( virtual/pkgconfig )
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		>=sys-devel/clang-6
+	)"
+
+LLVM_COMPONENTS=( openmp )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+	use offload && mycmakeargs+=(
+		# this is non-fatal and libomp checks for CUDA conditionally
+		# to ABI, so we can just ignore passing the wrong value
+		# on non-amd64 ABIs
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+	)
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/sys-libs/libvpd/Manifest b/sys-libs/libvpd/Manifest
index 6b47117183b6..38a0fa01ba17 100644
--- a/sys-libs/libvpd/Manifest
+++ b/sys-libs/libvpd/Manifest
@@ -1,6 +1,3 @@
-AUX libvpd-2.2.6-localstatedir.patch 688 BLAKE2B e1674fd78b6b863310a4f6a0c2f0f031a7e5009cf3e392fa373ef4b6a8de950632839cd5111876f1337527471c61bce34dea9c4f33259fad5607d65dd72c0493 SHA512 8ce3f73d5ef84922dfb7574cbf01adc9fd0d2eb34b9e9f56a57aa888944ef66cd4b35286b559dd4d0769a024693622896900adbfec391d316e20b533781dbe49
-DIST libvpd-2.2.6.tar.gz 374262 BLAKE2B b7741948aa62ad6221d28a674f765d085e1446c0bb45d7aa7a5f08599471023b2bb794ad5645c3b70af5806cd48cc87f117f9b4021e0f8c872ca48b748cc1e60 SHA512 17046eeb6ccc5372d465848eff7135cf6e9f876a2d82862e1d01a9f674b691958942e119f846bc3220c1e8f7eb549c5c7867d5d5e896072c733f400d202abc1d
 DIST libvpd-2.2.8.tar.gz 52725 BLAKE2B 76bdc6ddf80236a6848185273c2cac181d44214f0c609d7c5af6fa4d09a7cd816324af35745617ce3daa7268311e2ed754335600df1d4970a324eb327015d051 SHA512 d0b7d1760c6ae54717c538405c651317b7318dec5780961f5386c09b7d245e35a84c2fc47d89c47c3cd2168d73d7186f5819981d52c3ba962514639833dc62aa
-EBUILD libvpd-2.2.6.ebuild 896 BLAKE2B b5b1f44f7baeb76b113abb72bb93ab264264cfcf401ae2feda707f6cbb4443ad9827cdb44fd4100fdbd0bd2511f63033c80b1cc6555dd744820aec6b7c4d2ddd SHA512 68d26a3b3c1c7a9db3f39a8201cf07a4809e5be5424a177aabbddd58dd796e4c759466242099135e94fe8d62e89413524a0f10c55813e76e70c3b76327e79328
 EBUILD libvpd-2.2.8.ebuild 909 BLAKE2B 6b3e715ce6d8c736d205340513b93479f1c8d176e29b2e162f27d448f8d08fe962232050a44eb57c46d9049c4a4cf5af8f533a4061dd2670b6504e579042abd4 SHA512 c1af2a36595cae47c3d803b2ce14e664587aa7348376f03f194d5d89a7c64e86c15e8da0aff50858a8862bf194b8dfaa597b3000fa4940dce91d38ac4c304e08
 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710
diff --git a/sys-libs/libvpd/files/libvpd-2.2.6-localstatedir.patch b/sys-libs/libvpd/files/libvpd-2.2.6-localstatedir.patch
deleted file mode 100644
index 78a44a6351c6..000000000000
--- a/sys-libs/libvpd/files/libvpd-2.2.6-localstatedir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -66,6 +66,6 @@
- 
- install-exec-hook:
- 	mkdir -p $(DESTDIR)/${sysconfdir}/udev/rules.d/
--	mkdir -p $(DESTDIR)/${localstatedir}/lib/lsvpd/
-+	mkdir -p $(DESTDIR)/${localstatedir}/lsvpd/
- 	install -D --mode=644 90-vpdupdate.rules \
-                 ${DESTDIR}/${sysconfdir}/udev/rules.d/90-vpdupdate.rules
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1046,7 +1046,7 @@
- 
- install-exec-hook:
- 	mkdir -p $(DESTDIR)/${sysconfdir}/udev/rules.d/
--	mkdir -p $(DESTDIR)/${localstatedir}/lib/lsvpd/
-+	mkdir -p $(DESTDIR)/${localstatedir}/lsvpd/
- 	install -D --mode=644 90-vpdupdate.rules \
-                 ${DESTDIR}/${sysconfdir}/udev/rules.d/90-vpdupdate.rules
- 
diff --git a/sys-libs/libvpd/libvpd-2.2.6.ebuild b/sys-libs/libvpd/libvpd-2.2.6.ebuild
deleted file mode 100644
index 2a691e27d0c6..000000000000
--- a/sys-libs/libvpd/libvpd-2.2.6.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
-inherit udev
-
-DESCRIPTION="Library implementation for listing vpds"
-HOMEPAGE="https://sourceforge.net/projects/linux-diag/"
-SRC_URI="https://sourceforge.net/projects/linux-diag/files/libvpd/${PV}/libvpd-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="ppc ppc64"
-IUSE="static-libs"
-
-DEPEND="
-	>=dev-db/sqlite-3.7.8
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.6-localstatedir.patch
-)
-
-src_configure() {
-	# sysconfdir is used only to establish where the udev rules file should go
-	# unfortunately it also adds the subdirs on its own so we strip it down to
-	# dirname
-	econf \
-		$(use_enable static-libs static) \
-		--sysconfdir="$( dirname $(get_udevdir) )"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/lsvpd
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 70bd3a16f784..29f8d74b5343 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-libunwind-10.0.1.ebuild 3186 BLAKE2B 11f1a597295754131e37decd729a0583405885910ca915cec77fe0593452164d217f7205ea0ead058c63779b9b0eefb92d2b0118cc764497483a42db0f059ad4 SHA512 eaaff919522f581886c212c319e20056ad2554fb4499e17a3a9d4ea3dc2d12ec2c07ab2c4de300c38103f92f640887845c5368ee0eb8c8cc921454033e5936c4
 EBUILD llvm-libunwind-11.0.0.ebuild 3197 BLAKE2B b2bc45250b64e5db02e14ff2b8b24eca7a63f0b17e32ff11563a8191f399d90b61ad58349cb2d834bc64a95e297e89f60225761f800af72f7e93927dcdfbc395 SHA512 798c6001df7018d840c28da7a1d3063d5d3549c406b550e20120fc1ff9f337a1e88d4140a8b0eb45871e0eb4e3ad5943790490cf32b127525dd890142a7d294e
 EBUILD llvm-libunwind-11.0.1.9999.ebuild 3180 BLAKE2B c28657a17c13d0542029afa1adfc0c93ef7527b27243c75d7e6cd8647b89a612b95876ca53e0c8035e5be6682121f64a1ca182cbecf43703d773ee4d9e278852 SHA512 9c7bb3b843ecb3169c85df3cfd9b821a7c6f9e11b777645fab0a0e5b9365dad974f578c65fe535e222034d13b03df3738dbe07ded84894f293da77fdf14b1738
 EBUILD llvm-libunwind-11.0.1_rc1.ebuild 3180 BLAKE2B c28657a17c13d0542029afa1adfc0c93ef7527b27243c75d7e6cd8647b89a612b95876ca53e0c8035e5be6682121f64a1ca182cbecf43703d773ee4d9e278852 SHA512 9c7bb3b843ecb3169c85df3cfd9b821a7c6f9e11b777645fab0a0e5b9365dad974f578c65fe535e222034d13b03df3738dbe07ded84894f293da77fdf14b1738
+EBUILD llvm-libunwind-11.0.1_rc2.ebuild 3180 BLAKE2B c28657a17c13d0542029afa1adfc0c93ef7527b27243c75d7e6cd8647b89a612b95876ca53e0c8035e5be6682121f64a1ca182cbecf43703d773ee4d9e278852 SHA512 9c7bb3b843ecb3169c85df3cfd9b821a7c6f9e11b777645fab0a0e5b9365dad974f578c65fe535e222034d13b03df3738dbe07ded84894f293da77fdf14b1738
 EBUILD llvm-libunwind-12.0.0.9999.ebuild 3180 BLAKE2B c28657a17c13d0542029afa1adfc0c93ef7527b27243c75d7e6cd8647b89a612b95876ca53e0c8035e5be6682121f64a1ca182cbecf43703d773ee4d9e278852 SHA512 9c7bb3b843ecb3169c85df3cfd9b821a7c6f9e11b777645fab0a0e5b9365dad974f578c65fe535e222034d13b03df3738dbe07ded84894f293da77fdf14b1738
 EBUILD llvm-libunwind-9.0.1.ebuild 3356 BLAKE2B 761c9fcfbd3dc5689521f7423e1bafe4f673d7c6dbd397f6b6e0f4bc168495f3eea513c0550d20a60cf1e4e38200df59583cede7bfaad4c574f249e532fe4bb2 SHA512 82f4e6967d73ae96199a507081cd9cc913a4e4b2b0c45caa0b27d428b68262df76242d318327616bb5112d97ee68fec1061485f94f0137fd73a0fdaad998707b
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.1_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..38385b9304f5
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.1_rc2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://github.com/llvm-mirror/libunwind"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug +static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!sys-libs/libunwind"
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+LLVM_COMPONENTS=( libunwind )
+LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+build_libcxxabi() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
+	local BUILD_DIR=${BUILD_DIR}/libcxxabi
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=
+		-DLIBCXXABI_ENABLE_SHARED=OFF
+		-DLIBCXXABI_ENABLE_STATIC=ONF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	# build local copies of libc++ & libc++abi for testing to avoid
+	# circular deps
+	build_libcxxabi
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# install headers like sys-libs/libunwind
+	doheader "${S}"/include/*.h
+}
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 435e5ce41a26..c66a1e5bc147 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,34 +1,13 @@
 AUX readline-5.0-no_rpath.patch 367 BLAKE2B a39663c6222f604acf0ea0a5b6e4a4c99097257727644d2e8b814377b0f9472a6cdba8ed6edacc61629a39458fb5905bb873474e72dd44ab3e7e78b330f451c5 SHA512 ce4a03fe5b60a1e785f35b6717c5e267a815e8fd1a1d59e527aa88f35709c457c1d7c505c34f63f0d32f8f1633eb66661e05e151e218ae5b74cec1d9ddc4ab92
 AUX readline-6.2-rlfe-tgoto.patch 379 BLAKE2B 363dee5501fa9449eeee0647f1ae65106e28ad06af16c8aefe372a081eb5cd62b01a7cf2109ce5b3fc6577b6056f3a0206e3cc53f22d0a69f4d273930e3e2ab6 SHA512 1d2c3aafc949d92fdf6abbee60a60c80f0327f81694d5d8f3a166f1c24d37346caca3e72c9971106b96b2758a9a01269346954fe20bc381eb9da2e6a2737fc3c
-AUX readline-6.3-fix-long-prompt-vi-search.patch 736 BLAKE2B 1439a22ce82d51dd7cfb4bd1436475dce1d566fb2cc592e8161400e62e2790eff4a21c0634ef99f5da75efb21583514b90d47bb574b97374239fbd7ebb13fde8 SHA512 ad5bb44ba00f6f5e355b95078209e2e51f8d8ba9a924d00ef6aa3286e09c15fe0024efa0817f9e6d86b7aecb73150fcd69d0051a0f7fb37475921478f62ce0e0
-AUX readline-6.3-read-eof.patch 1913 BLAKE2B 85cbba295d21de00af7cfa361d7976aabfb1110d860256224138a1844288f869f5225c296800aba5f637c892a988f834dddf184d06d308ae3da94cccb00ee5c4 SHA512 99728e35d64b466e2bea570412eec719c70841d205a5190c0000bcae55cf3ac2d659ae18e57b4c332525261d83e160054800cd89f4009ce3c76d1c3b4ac27223
 AUX readline-7.0-headers.patch 550 BLAKE2B 82949940cda6d042923b3dde777fbd66643d80f4c2fd984eb11ef7f0fb48776ba8938d1c8be23087b328ce9b3ad0acd668f5bb4f0bda77b4a992119688a37191 SHA512 fec3d20e1581f35609a9d9f9ee1f48df8f9aa781e1a2cdcde2edf7d149624b5770867feb65a7ba142276d95a3133b768f5589e8041049aa0cf30068d0637b938
-AUX readline-7.0-mingw.patch 4464 BLAKE2B 00ca79f7ee128a78d76c3e0adcb8b51f6d3027718cc3a7b2b11660cd4aa9c61b4da15c893c9ad0595becf2c393c0d9e7597b5a772085bfc82974568c30f5b381 SHA512 f416f265c51f4cb05467c29c29abcaabf40ae29d66bb5d3288d35403ccc26903f2a22afef43382e39d7b13ba62732082c60d8f8d10abf7cf7955ee50fc23531b
-AUX readline-7.0-missing-echo-proto.patch 466 BLAKE2B 251660f1321a36231774d5f03fea971a047688918a8f6498e019cadca43314097aee89ef8a96b104a5382ba0baa1037d500143f4d66e881da76d23f9385faaa9 SHA512 a8458bf62c73f79b980f375b98b33a6fbef59dec28386cd5266e4742a9cf70673e567f999d5682e538a2a47388d6f123d8a4fe4cfe34f19c28d4dafd93a9e10a
 AUX readline-8.0-headers.patch 577 BLAKE2B b8fe6cdf51188f68c852d3c9052e7840a0bcb4cd0cd0b25afa82d6fe8697dcb34aa541279010b308427c411a7133c481dd778551069893ad965ce6d3a4a9ff83 SHA512 81695abab2e9fba1b17a4c194b7c72eeb23bbc3ab84cb0716c08388c0ee60adb770ae8efcbbb6a2c7c6adab93dcff12e3a16d0423cf52a0166b38c9efee5c221
-DIST readline-6.3.tar.gz 2468560 BLAKE2B 24488ec141734c050ba985a93423692396f105619bae3ce5b109bc68a4f43862bcf3a6fb8d82fec1145d665cdb408765e179379bb35f008d09c441fa2e5739df SHA512 f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401
-DIST readline-7.0.tar.gz 2910016 BLAKE2B 679b8aa7ce003017b729e6d8d4cb69d0f991578441a3e69005090079e61f6aa48b7ad4d0b1f34b6041528cf33254a1bf3ddb05b60db53a06e443d7922d49d0d4 SHA512 18243189d39bf0d4c8a76cddcce75243c1bae8824c686e9b6ba352667607e5b10c5feb79372a1093c1c388d821841670702e940df12eae94bcebdeed90047870
 DIST readline-8.0.tar.gz 2975937 BLAKE2B 95e08b28cc46582f036379413810ca40c97d4d3bc59a9e03e04e57d531573abfbe955f6f1cb86e39c208bf6c3f4c618cff70a87bec596d0b9120909d6c5a2f69 SHA512 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f
 DIST readline-8.1.tar.gz 2993288 BLAKE2B f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69 SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
-DIST readline63-001 1366 BLAKE2B 82af5be99597719329db3f1d6049e75a5654ccf6597cf557c71ad7ada0ac03be87381a7738931eb78716de65902ae87498f574b84150a69eae9cc308c4bfffdd SHA512 e70f89ca52a4eae7e1cddd70de6a7162252231ee029c89bb3fcb0f6c8c8b46c666be910c8b2eee72e96983ec2f1a23663694dc222f67228d82e8e4684f1504a2
-DIST readline63-002 1297 BLAKE2B 5ace4a81381910ee48dee8cdbb2ca95a1bef2d1f8acca6d39a910c078c86de10a0fc29486939b336110ecb0281b3edb16e4b985f41e7ee161904728f289fff04 SHA512 4e23bd67433577e6e361d10a6c32768ea9e13b10e77493e565b870f56069b673fbcb0b860225f79fa9931845fc91d35c9a82c1385c23f8b757ebfd59f27851f4
-DIST readline63-003 985 BLAKE2B cf2cda505b100d5f820d8bfc99eed6b50e65c92b6a495073352fc7385c6456478594e5c2dc293ce556b66853dff705050fb97982aa25fce452ae53d2cb272cf4 SHA512 6bfb84a5b980091b995e2b96bdf5680f97fe670e6cac1b8606d2d75a1ef922ff5bd4e73f029f7af98a115006b7ab7828146f2cd6986287543d8a29987c91dc12
-DIST readline63-004 1363 BLAKE2B c1aec93f1e23acd51b36068d3aac31b93ffd9c1039be2c45ff4e6479135f153888030c68cf19c5ced950f6fbbb38ee7fa644d5a737f3f8ed511e97bf342940f5 SHA512 6b683e9fe28831885135391b5a23bc580cacf0ffe720951a80f545574eda4eb064fe189801d44329b2eb2d3577db5a90f9e5ad9ed131e7e8a8ae349511632721
-DIST readline63-005 1664 BLAKE2B f98f62be8676aca81b91d919bc4eccfe40c382a8baab0e64b1659b714f0d72424e29b709cc5e226fd73daf67eef264a17e07982d2553ce80f5e5f39fad70610b SHA512 b0332d7f999376788155341319d138a899a2278c338a6faaac89ecf3ed1e2248a07413dd810a76996bf25f211de787182b55f34ab3d7d31eb7519d7a48ebed32
-DIST readline63-006 1982 BLAKE2B ad6d16ff769eb8e367cf961ffe152c04778b046a04e4a62e0ce21d08fa16b0eca3d278dbdc274b082d24fa2ec959ffb62168ea7693b4de94b59a4526b1f0c4a2 SHA512 e9fbfa38d7b03ab2aff2e9e48918b85b4b67a729862ee47d1cc8e0aeb90c3224394a79f68829951e1377cae65742aa5385eae865f75e9c0b2e2abde42889431c
-DIST readline63-007 1428 BLAKE2B 60e64c2dd36457e3992cfbfbbcc261337e515be360a37d71b9de236c62c781f10f0ec37e4e196b4634e5d547edebbf915370091ca42fff873b78cd80cfe3a7f2 SHA512 abee331894846b360203a521d9a66fa02c03214120d5cafbd1cb4d680bd7bbef14321ae845dd67f7b5e8c87322801fd96fc9a5fd0ae026b41d98dc24a8949854
-DIST readline63-008 1452 BLAKE2B 4e41c45be1479fba9f74bf9cedb8d1f6237e650962d5b45ea1a61cc48a8323a0fa60d76f68c011b6e7c73a1078b5ff80f9966e983b994f814d471d0efd9efde6 SHA512 8e30bbca3aa5cea8c2ee511abe0ec8f131608d74fe5ab24d68bcf452267f0f97446ed6e7cd482360876ce6c027280e4f4450cae05eb18f56046240f4c224841c
-DIST readline70-001 1777 BLAKE2B ab217bd9d27f30351397db2b745cb33ac7e0ce18bbc00112bb87570da0f62ee0e8d182395c97e4ecc21af51e7e1e580ba48076de1095c556f0744475e4019821 SHA512 4402186905af8cd42c609d640c2e13b9ad61c7778e5a3fd2c2d9da301f0deab05b04d7836f31527262f44f406517823dbb18cb07f2c73931186c806b494699ec
-DIST readline70-002 2953 BLAKE2B 47d729b1babe904855fe5d4f780a5b2153a743def527479c3cb82759cdee5bb4260be722e1050be680f5c0dd6dec8ca25c4c1ff557415abae6b3fac2bd481f0b SHA512 13d1489578508d4d2c3a1618024198a709dbce74a6bbf0f6d7ec67d2419c55bfec9f0ca9de0ed93f129d21d5c3a94307ccdc49408455bbb301c5e3a772b03185
-DIST readline70-003 1294 BLAKE2B 9473e18b582fba69cea83e3f5b9fa278dd8b0544325439307d2b4053cbeca8d2f008104bee181ae5d9405d702e6d3bcf26379c4d46e269906474c8544367b780 SHA512 eaf962a1480eb3870519017b81ecc5cef171e4c41fcf8c17da61ccbfd0379ed6bca85c17b03e2207ae4d51509f33fd010294c75f4bd0433a52118015d4160385
-DIST readline70-004 1501 BLAKE2B cebce69a21bee3a4d6a908de09f371d65eab6af51a8dc0f58fc915b916957db420252ce07b06703c05d984f62e1e849b6975f5444b2af6ba35ff7c939acf9d99 SHA512 7be41558eab3b88a3657f8589ecfaff0b8ee7f59083d385f50e8704fe830e05a50652a5feda19ff1f3cfd98bff4bb8e25e1637ec4dac8a618db9c8220a3d954e
-DIST readline70-005 1641 BLAKE2B f720508f698b113c6328018f7e6e8775c7c79afc464047405a5c3dae017d611535017dfc2759c11483bb536fab1e9bf72c7a9d3c769b7aea3bd2cee9686bd522 SHA512 eeb27f4f9195cb905d5891f26480d58f59c885dde3457f7a30ff57760ac772e2333ee8aeae979214949f3b52030285b10db013e307ee7311abab677a4427e878
 DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a76571b4a6bcb2ebab090c3a021fa2b621832c11b5995e48a8a26dd6e3a8f5864a8e8b520bfcf85d7c4ab SHA512 a148cda6ac97935d51ede1bbacf847d7d2cba8861cf3941d32e3da2f45f16dcc05b20845b63d4264692520db8329e1236cf2bc4fd8ccbe6e40921bbbdeb2cb1c
 DIST readline80-002 1401 BLAKE2B a2f511272f6d651208469998330059d6bae17bb8b704b64468685bb0368b76df1ca5b1dcd8e5cb0019e80932130c8a92fd1a305679bf79f0b801532a94c4b4ae SHA512 a941d142a59fe592cc45c1cf4d416e2fc0ab543dd6a0496fb8b2ec6f651cedd6fb9e0c105f14880700b69b2d6912653b3f66371e45cbe4adc0cc9554801afd3c
 DIST readline80-003 2158 BLAKE2B d8910aef1b796a59500b255df8db71ad1738dd164fd69827759eade74b6d9806ecd364839cfa904fc2f2d48352342155f670e5ec43aac0693f36820fb7139a4d SHA512 85235fca047b4ac87b846d998fffc67ae67ed365b068fd2743e84f11fd00086f85e622955192e07e3560965e32ff5f6d014e0146cde528fb0d0f7b5b829875ca
 DIST readline80-004 1275 BLAKE2B ac260bab163f17ccc783e0c2a21351b05e9e86ad973383d228d10ec749f265df8588c38946c9da15e987192b50f1bcb81141c2f4e171f65455f58521e864a534 SHA512 301ced2361e7583468f9932038936387a016c20d1c41966658a78c7f7c48c70308bf66b3228de0a3c6fc880427b6a90ee1ac4d2693daed432e5ae970671a7461
-EBUILD readline-6.3_p8-r3.ebuild 4382 BLAKE2B 40f4d50108b38fea8c04c4d21d7f2d0166c903e4094b55a1878c230e8aa2dbe53c482e6ac0bd7173444aabf05e384b322852f06b8959b281c5cda7e561692540 SHA512 756f195d204a9ff3bc942ded6767db0afe8fb4186ffb86b66d8ac77262cc32834a34877a05d6903ae5da399562c596e3eab7641fb950bb7a97bd87261ce534d7
-EBUILD readline-7.0_p5-r1.ebuild 4873 BLAKE2B 3906ef2e23648e451512d7a9b7020b1185f098ca6e6f0d99a8939bc768f73fc90b3db227f861d3816102fe2cb4f950b456004ed333b325dda872a6cf88f148b0 SHA512 9c72e370630bb34d98c65bcdf8a4e9d5b064ac9237c67eda268f41d1ef2c3f0a5b8109b746b987cded1fc6807ac3c025a4b124bfe9910a01f07da5d12b8106a8
 EBUILD readline-8.0_p4.ebuild 4843 BLAKE2B 4466c69c466200c3da9528b4456c69c86d46ace2dd7fb98183e8a42a8e956d0a4a597db0c3658396dea9f0cb57e40dd7926a2ea83e8388c430fb3d145e7635a2 SHA512 0b768071df2aabb2ec3381c13fbb6a0ff30ae9da8471c37f93daf96aa6a2fda652864feddca458e10e28f4d595041575db3da118928251394b623f05d48d6458
 EBUILD readline-8.1.ebuild 4880 BLAKE2B 925b253a42d48e9fb28e8d612c5d4af3d1ea9291f747485896b1105e29e617f6790bc25a1afe6995e3fa00ba0152e02d1cfedb605d76d558b820f9a2cde63759 SHA512 62f2cb6e9594797cc363cde85a43c8c273ee5effb02fc355d5e7f6079884f86bb59d68aa22ccd34317e5e3c53c62ae4bbb8e89e752a72cca6a464534f8e6fcd7
 MISC metadata.xml 472 BLAKE2B 8d3717ac6980105677b10449a1aabca9f9347066f73802241b904101172690bb789b8071f3670dd91ad2af0223c7bc5fb4ed594dc8af3aff20b17bdd681f7630 SHA512 f19a6f0d6aed18903778adc5ad45fdae39c4388e4f09e7cb8a110b798e8cc7ab1739ff813a227ad08ef1166309e1ead57c200b7fe42499a06db97af9f4bce173
diff --git a/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch b/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch
deleted file mode 100644
index 23d785054e75..000000000000
--- a/sys-libs/readline/files/readline-6.3-fix-long-prompt-vi-search.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://lists.gnu.org/archive/html/bug-bash/2014-08/msg00082.html
-
-From 2774192e93991e3d85ccc37c714aa018e442af6d Mon Sep 17 00:00:00 2001
-From: Dylan Cali <calid1984@gmail.com>
-Date: Sat, 23 Aug 2014 02:26:05 -0500
-Subject: [PATCH] fix vi search prompt bug for long prompts
-
----
- display.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/display.c b/display.c
-index 4df1f73..e575b16 100644
---- a/display.c
-+++ b/display.c
-@@ -2259,7 +2259,7 @@ rl_message (va_alist)
-       va_start (args);
-       format = va_arg (args, char *);
- #endif
--      vsnprintf (msg_buf, msg_bufsiz - 1, format, args);
-+      vsnprintf (msg_buf, msg_bufsiz, format, args);
-     }
- #else
-   vsprintf (msg_buf, format, args);
--- 
-1.7.10.4
diff --git a/sys-libs/readline/files/readline-6.3-read-eof.patch b/sys-libs/readline/files/readline-6.3-read-eof.patch
deleted file mode 100644
index f74aad63be1f..000000000000
--- a/sys-libs/readline/files/readline-6.3-read-eof.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2014-12/msg00152.html
-
-*** ../bash-4.3-patched/lib/readline/readline.c	2014-10-01 13:08:28.000000000 -0400
---- lib/readline/readline.c	2014-12-20 22:37:28.000000000 -0500
-***************
-*** 580,592 ****
-  	}
-  
-!       /* EOF typed to a non-blank line is a <NL>.  If we want to change this,
-! 	 to force any existing line to be ignored when read(2) reads EOF,
-! 	 for example, this is the place to change. */
-        if (c == EOF && rl_end)
-! 	c = NEWLINE;
-  
-        /* The character _rl_eof_char typed to blank line, and not as the
-! 	 previous character is interpreted as EOF. */
-!       if (((c == _rl_eof_char && lastc != c) || c == EOF) && !rl_end)
-  	{
-  #if defined (READLINE_CALLBACKS)
---- 587,620 ----
-  	}
-  
-!       /* EOF typed to a non-blank line is ^D the first time, EOF the second
-! 	 time in a row.  This won't return any partial line read from the tty.
-! 	 If we want to change this, to force any existing line to be returned
-! 	 when read(2) reads EOF, for example, this is the place to change. */
-        if (c == EOF && rl_end)
-! 	{
-! 	  if (RL_SIG_RECEIVED ())
-! 	    {
-! 	      RL_CHECK_SIGNALS ();
-! 	      if (rl_signal_event_hook)
-! 		(*rl_signal_event_hook) ();		/* XXX */
-! 	    }
-! 
-! 	  /* XXX - reading two consecutive EOFs returns EOF */
-! 	  if (RL_ISSTATE (RL_STATE_TERMPREPPED))
-! 	    {
-! 	      if (lastc == _rl_eof_char || lastc == EOF)
-! 		rl_end = 0;
-! 	      else
-! 	        c = _rl_eof_char;
-! 	    }
-! 	  else
-! 	    c = NEWLINE;
-! 	}
-  
-        /* The character _rl_eof_char typed to blank line, and not as the
-! 	 previous character is interpreted as EOF.  This doesn't work when
-! 	 READLINE_CALLBACKS is defined, so hitting a series of ^Ds will
-! 	 erase all the chars on the line and then return EOF. */
-!       if (((c == _rl_eof_char && lastc != c) || c == EOF) && rl_end == 0)
-  	{
-  #if defined (READLINE_CALLBACKS)
diff --git a/sys-libs/readline/files/readline-7.0-mingw.patch b/sys-libs/readline/files/readline-7.0-mingw.patch
deleted file mode 100644
index f003038d2c0f..000000000000
--- a/sys-libs/readline/files/readline-7.0-mingw.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- a/colors.c
-+++ b/colors.c
-@@ -37,6 +37,10 @@
- #include "posixstat.h" // stat related macros (S_ISREG, ...)
- #include <fcntl.h> // S_ISUID
- 
-+#ifndef S_ISDIR
-+#define	S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)
-+#endif
-+
- // strlen()
- #if defined (HAVE_STRING_H)
- #  include <string.h>
-@@ -182,12 +186,17 @@ _rl_print_color_indicator (const char *f
-       if (S_ISREG (mode))
-         {
-           colored_filetype = C_FILE;
--
-+#ifdef S_ISUID
-           if ((mode & S_ISUID) != 0 && is_colored (C_SETUID))
-             colored_filetype = C_SETUID;
--          else if ((mode & S_ISGID) != 0 && is_colored (C_SETGID))
-+		else
-+#endif
-+#ifdef S_ISGID
-+          if ((mode & S_ISGID) != 0 && is_colored (C_SETGID))
-             colored_filetype = C_SETGID;
--          else if (is_colored (C_CAP) && 0) //f->has_capability)
-+          else
-+#endif
-+		  if (is_colored (C_CAP) && 0) //f->has_capability)
-             colored_filetype = C_CAP;
-           else if ((mode & S_IXUGO) != 0 && is_colored (C_EXEC))
-             colored_filetype = C_EXEC;
-@@ -211,12 +220,16 @@ _rl_print_color_indicator (const char *f
-             colored_filetype = C_STICKY;
- #endif
-         }
-+#if defined (S_ISLNK)
-       else if (S_ISLNK (mode))
-         colored_filetype = C_LINK;
-+#endif
-       else if (S_ISFIFO (mode))
-         colored_filetype = C_FIFO;
-+#if defined (S_ISSOCK)
-       else if (S_ISSOCK (mode))
-         colored_filetype = C_SOCK;
-+#endif
-       else if (S_ISBLK (mode))
-         colored_filetype = C_BLK;
-       else if (S_ISCHR (mode))
---- a/histfile.c
-+++ b/histfile.c
-@@ -606,12 +606,14 @@ history_truncate_file (fname, lines)
-       history_lines_written_to_file = 0;
-     }
- 
-+#if defined (HAVE_CHOWN)
-   /* Make sure the new filename is owned by the same user as the old.  If one
-      user is running this, it's a no-op.  If the shell is running after sudo
-      with a shared history file, we don't want to leave the history file
-      owned by root. */
-   if (rv == 0 && exists)
-     r = chown (filename, finfo.st_uid, finfo.st_gid);
-+#endif
- 
-   xfree (filename);
-   FREE (tempname);
-@@ -753,12 +755,14 @@ mmap_error:
-       history_lines_written_to_file = 0;
-     }
- 
-+#if defined (HAVE_CHOWN)
-   /* Make sure the new filename is owned by the same user as the old.  If one
-      user is running this, it's a no-op.  If the shell is running after sudo
-      with a shared history file, we don't want to leave the history file
-      owned by root. */
-   if (rv == 0 && exists)
-     mode = chown (histname, finfo.st_uid, finfo.st_gid);
-+#endif
- 
-   FREE (histname);
-   FREE (tempname);
---- a/input.c
-+++ b/input.c
-@@ -71,6 +71,10 @@ extern int errno;
- #include "rlshell.h"
- #include "xmalloc.h"
- 
-+#if defined (__MINGW32__)
-+#include <conio.h>
-+#endif
-+
- /* What kind of non-blocking I/O do we have? */
- #if !defined (O_NDELAY) && defined (O_NONBLOCK)
- #  define O_NDELAY O_NONBLOCK	/* Posix style */
---- a/posixstat.h
-+++ b/posixstat.h
-@@ -78,30 +78,44 @@
- 
- #if defined (S_IFBLK) && !defined (S_ISBLK)
- #define	S_ISBLK(m)	(((m)&S_IFMT) == S_IFBLK)	/* block device */
-+#elif !defined (S_IFBLK)
-+#define S_ISBLK(m) 0
- #endif
- 
- #if defined (S_IFCHR) && !defined (S_ISCHR)
- #define	S_ISCHR(m)	(((m)&S_IFMT) == S_IFCHR)	/* character device */
-+#elif !defined (S_IFCHR)
-+#define S_ISCHR(m) 0
- #endif
- 
- #if defined (S_IFDIR) && !defined (S_ISDIR)
- #define	S_ISDIR(m)	(((m)&S_IFMT) == S_IFDIR)	/* directory */
-+#elif !defined (S_IFDIR)
-+#define S_ISDIR(m) 0
- #endif
- 
- #if defined (S_IFREG) && !defined (S_ISREG)
- #define	S_ISREG(m)	(((m)&S_IFMT) == S_IFREG)	/* file */
-+#elif !defined (S_IFREG)
-+#define S_ISREG(m) 0
- #endif
- 
- #if defined (S_IFIFO) && !defined (S_ISFIFO)
- #define	S_ISFIFO(m)	(((m)&S_IFMT) == S_IFIFO)	/* fifo - named pipe */
-+#elif !defined (S_IFIFO)
-+#define S_ISFIFO(m) 0
- #endif
- 
- #if defined (S_IFLNK) && !defined (S_ISLNK)
- #define	S_ISLNK(m)	(((m)&S_IFMT) == S_IFLNK)	/* symbolic link */
-+#elif !defined (S_IFLNK)
-+#define S_ISLNK(m) 0
- #endif
- 
- #if defined (S_IFSOCK) && !defined (S_ISSOCK)
- #define	S_ISSOCK(m)	(((m)&S_IFMT) == S_IFSOCK)	/* socket */
-+#elif !defined (S_IFSOCK)
-+#define S_ISSOCK(m) 0
- #endif
- 
- /*
-@@ -137,6 +151,8 @@
- /* These are non-standard, but are used in builtins.c$symbolic_umask() */
- #define S_IRUGO		(S_IRUSR | S_IRGRP | S_IROTH)
- #define S_IWUGO		(S_IWUSR | S_IWGRP | S_IWOTH)
-+#if defined(S_IXUSR) && defined(S_IXOTH)
- #define S_IXUGO		(S_IXUSR | S_IXGRP | S_IXOTH)
-+#endif
- 
- #endif /* _POSIXSTAT_H_ */
diff --git a/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch b/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch
deleted file mode 100644
index cad3c8ca2c44..000000000000
--- a/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://lists.gnu.org/archive/html/bug-readline/2016-11/msg00000.html
-
-fix from upstream
-
---- a/readline.h
-+++ b/readline.h
-@@ -413,6 +413,7 @@
- extern void rl_tty_set_default_bindings PARAMS((Keymap));
- extern void rl_tty_unset_default_bindings PARAMS((Keymap));
- 
-+extern int rl_tty_set_echoing PARAMS((int));
- extern int rl_reset_terminal PARAMS((const char *));
- extern void rl_resize_terminal PARAMS((void));
- extern void rl_set_screen_size PARAMS((int, int));
diff --git a/sys-libs/readline/readline-6.3_p8-r3.ebuild b/sys-libs/readline/readline-6.3_p8-r3.ebuild
deleted file mode 100644
index 009f74e037f7..000000000000
--- a/sys-libs/readline/readline-6.3_p8-r3.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal preserve-libs usr-ldscript
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-	"${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch
-	"${FILESDIR}"/${PN}-6.3-read-eof.patch
-)
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-	epatch "${PATCHES[@]}"
-
-	# Force ncurses linking. #71420
-	# Use pkg-config to get the right values. #457558
-	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline # for local readline headers
-}
-
-src_configure() {
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--cache-file="${BUILD_DIR}"/config.cache \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--with-curses \
-		$(use_enable static-libs static)
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-		ECONF_SOURCE=${S}/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
-			ln -sf ../../lib${l}.a lib${l}.a
-		done
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
-
-		if use utils && ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc USAGE
-	dohtml -r doc/.
-	docinto ps
-	dodoc doc/*.ps
-}
-
-pkg_preinst() {
-	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
-}
diff --git a/sys-libs/readline/readline-7.0_p5-r1.ebuild b/sys-libs/readline/readline-7.0_p5-r1.ebuild
deleted file mode 100644
index 00c928489ece..000000000000
--- a/sys-libs/readline/readline-7.0_p5-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib-minimal toolchain-funcs preserve-libs usr-ldscript
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
-
-case ${PV} in
-	*_alpha*|*_beta*|*_rc*)
-		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	;;
-	*)
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-	;;
-esac
-
-LICENSE="GPL-3"
-SLOT="0/7"  # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs +unicode utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-	"${FILESDIR}"/${PN}-7.0-headers.patch
-	"${FILESDIR}"/${PN}-7.0-missing-echo-proto.patch
-	"${FILESDIR}"/${PN}-7.0-mingw.patch
-)
-
-# Needed because we don't want the patches being unpacked
-# (which emits annoying and useless error messages)
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-	default
-
-	# Force ncurses linking. #71420
-	# Use pkg-config to get the right values. #457558
-	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline || die # for local readline headers
-}
-
-src_configure() {
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--cache-file="${BUILD_DIR}"/config.cache
-		--with-curses
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-		ECONF_SOURCE="${S}"/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
-			ln -s ../../lib${l}.a lib${l}.a || die
-		done
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
-
-		if use utils && ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
-	dodoc USAGE
-	docinto ps
-	dodoc doc/*.ps
-}
-pkg_preinst() {
-	# bug #29865
-	# Reappeared in #595324 with paludis so keeping this for now...
-	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6}
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6}
-}
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 3811fd3e173b..bebe8d190e63 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,7 +1,4 @@
-DIST tzcode2020a.tar.gz 257509 BLAKE2B 21335f0b6a3b98ba8203d49d1273c2016bfbef9903c394cda6ca97cc5ec5d1fb1605bb73ba9aa6c73eca3fe115fb2924da37b736bf0a8a0e214eed547100fe70 SHA512 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2
 DIST tzcode2020d.tar.gz 260182 BLAKE2B ddf00c3a87b09de52f9ebb8ce8141ca22c2cec5340a476df041fdbfa5899af4c78cfa63d733e33e63b7efa3f37541eacc0bd4b240bcbcaa8708ee9c13cf582fa SHA512 315ce86574780d89482761298137b2871a21cb4391886abdc9f29c6cc09e8b8f6585f96d3f4dfef8d7b54e24720214f5c77144114ad58cc91aa5bbde350c0f9b
-DIST tzdata2020a.tar.gz 397245 BLAKE2B 2a85a9a9badbf2b74ba2ace3f7fd436cc7752202557785be503c1c8f2f698dfc8cfb412b3f08ebc0bd4a8d0e27293b47eeedf937f713dadb4386dad14322b871 SHA512 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d
 DIST tzdata2020d.tar.gz 401479 BLAKE2B 0136bf157e9a97fba56a02a2a495be19cc9b2008c6106eb9d4f4af13cb24848bd72e7e9c0182ca4643819a95ecfdff8750ff199bb2d1f9a560b4cd6685b41e50 SHA512 362e4569a666b0776614be3f63f1fe3d5ae259055e7051c9875f36023db9c52b0c5a10c19067114443a4cf2bf92475f8a0aebdf79bac836d967527fcdea4e9b6
-EBUILD timezone-data-2020a.ebuild 5200 BLAKE2B 3db29450f1cd759b3cb5cd1c8f45dd8ad4663aad1928c10bd3d81220f650ca76f859e6d220759cffcbde9d36f3e203264ca26793318b69fcb93bbcbabd50387f SHA512 9c2bb39c24a32a282abcaf345ef87f41fcaf8ed878ab6e5a2d814d982c8ffa9bb9b0b8f0081f1a2494e2862a11dc79d6df6e2abda41070cb12743e330c83a505
 EBUILD timezone-data-2020d.ebuild 5400 BLAKE2B 202c859b79dc9ea54084967cdb68d8ad18d6692d8a32223bc73f442be7be6f0bb2280aab5a508203b1b13967c64aa0c0777ac7e9e40c4941c97fc4686916330d SHA512 828f2646fd5c3172cc01a5e990fc50753dfa21d49aea99c8985a35a33c7961a94358da8aa48beb0eeb0c4c697d5267a173b7ff7462f125753e530c7a50abac8d
 MISC metadata.xml 728 BLAKE2B b390f4f3d184c7f424d97a36883c9ab67f56a2445d6ecfe6deca69d42864b1249fa2fec6a48bf693f9b2101c167597e5a435cf13a8797784e8f37ad870bf3daf SHA512 36e2c2fa026441ae4b21d33b9425a7195c4d4d404e8f010e9bf894be3095b0d461079a87126f22c398475652777301aa5dcf151b195502d25b4094420c56c7e4
diff --git a/sys-libs/timezone-data/timezone-data-2020a.ebuild b/sys-libs/timezone-data/timezone-data-2020a.ebuild
deleted file mode 100644
index 04def569f2a5..000000000000
--- a/sys-libs/timezone-data/timezone-data-2020a.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="https://www.iana.org/time-zones"
-SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-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"
-IUSE="nls leaps-timezone elibc_FreeBSD"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
-	default
-
-	# check_web contacts validator.w3.org
-	sed -i -e 's/check_tables check_web/check_tables/g' \
-		Makefile || die "Failed to disable check_web"
-
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-src_configure() {
-	tc-export CC
-
-	append-lfs-flags #471102
-
-	if use elibc_FreeBSD || use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-
-	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
-	LDLIBS=""
-	if use nls ; then
-		# See if an external libintl is available. #154181 #578424
-		local c="${T}/test"
-		echo 'main(){}' > "${c}.c"
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
-			LDLIBS+=" -lintl"
-		fi
-	fi
-}
-
-_emake() {
-	emake \
-		REDO=$(usex leaps-timezone posix_right posix_only) \
-		TZDATA_TEXT= \
-		TOPDIR="${EPREFIX}" \
-		ZICDIR='$(TOPDIR)/usr/bin' \
-		"$@"
-}
-
-src_compile() {
-	_emake \
-		AR="$(tc-getAR)" \
-		cc="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			AR="$(tc-getBUILD_AR)" \
-			cc="$(tc-getBUILD_CC)" \
-			RANLIB="$(tc-getBUILD_RANLIB)" \
-			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_test() {
-	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
-	emake check VALIDATE_ENV=true
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
-	rm -rf "${D}/nukeit" "${ED}/etc" || die
-
-	insinto /usr/share/zoneinfo
-	doins "${S}"/leap-seconds.list
-
-	# Delete man pages installed by man-pages package.
-	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
-	dodoc CONTRIBUTING README NEWS *.html
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}/etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
-		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
-		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
-		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
-		eerror "be using right/xxx for the system timezone as it breaks programs."
-		die "Please fix your timezone setting"
-	fi
-
-	# Trim the symlink by hand to avoid portage's automatic protection checks.
-	rm -f "${EROOT}"/usr/share/zoneinfo/posix
-
-	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
-		elog "Support for accessing posix/ and right/ directly has been dropped to match"
-		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
-		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
-		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
-	fi
-}
-
-configure_tz_data() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime"
-
-	# If it's a symlink, assume the user knows what they're doing and
-	# they're managing it themselves. #511474
-	if [[ -L "${etc_lt}" ]] ; then
-		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
-		return 0
-	fi
-
-	if ! tz=$(get_TIMEZONE) ; then
-		einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
-		return 0
-	fi
-	if [[ "${tz}" == "FOOKABLOIE" ]] ; then
-		elog "You do not have TIMEZONE set in ${src}."
-
-		if [[ ! -e "${etc_lt}" ]] ; then
-			cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
-			elog "Setting ${etc_lt} to Factory."
-		else
-			elog "Skipping auto-update of ${etc_lt}."
-		fi
-		return 0
-	fi
-
-	if [[ ! -e "${EROOT}/usr/share/zoneinfo/${tz}" ]] ; then
-		elog "You have an invalid TIMEZONE setting in ${src}"
-		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
-		tz="Factory"
-	fi
-	einfo "Updating ${etc_lt} with ${EROOT}/usr/share/zoneinfo/${tz}"
-	cp -f "${EROOT}/usr/share/zoneinfo/${tz}" "${etc_lt}"
-}
-
-pkg_config() {
-	configure_tz_data
-}
-
-pkg_postinst() {
-	configure_tz_data
-}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index ba2947640d6c..3c7d1982b315 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index aa44d6ef6fa4..1ea24dbfec50 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -6,6 +6,6 @@ DIST htop-3.0.2.tar.gz 176132 BLAKE2B 9abc28461d346eeac7f9741bc1ba08c898d00be013
 DIST htop-3.0.3.tar.gz 292925 BLAKE2B 7e227188e3954c0cb273b4bc95eaf2e11237daca3d929d4674dcdfc987c4af26e4b08da2b0f184d6d3e06952dee5704e468bf4b7bc03dfa0b6602c058beac495 SHA512 208eff95a0df3ab38f5e3175bb34420c8833ad630c797825a3fb188a1111476a3287aa5f53511c83da90d181afc3e6ea246ea01fbc3227466c5c928a5d70badc
 EBUILD htop-2.2.0.ebuild 1477 BLAKE2B 1a5421e1dae65c14cd719070206158989e73879ef4bc5413254aaf9b04184d35838d12704e134c16414395f491393b8660683e51e40dcc5f7e9fdb7dcd3565e7 SHA512 4acfb07731fc5bb398fb77ebadbb7131768999b4a948f9941cf9db4f3554b623e11d6ad80195a668341c16d5dc095d65b3d16c310c64a36ac85ff69c0b10551b
 EBUILD htop-3.0.1.ebuild 1471 BLAKE2B 61e570d83bfc55421ddeeddf7511f0fc165494c620e9eb80b51a92fff1810247d846aecaf94646f56a0a632622e7bf129e04af2ca2254a85e0274c9bcea4f3c5 SHA512 892925343c1526eaee61f1e21c559e91433dffb23191d45ae95b28cf236b0c93665eb277c39526fd8f4b2fe60346e592f46553c0a2ba1bcefc5760e78dcfaa8d
-EBUILD htop-3.0.2.ebuild 1512 BLAKE2B 0dc8a28aef689f7982bbdb07aa7f281c54dd464fb7ca96f591bffcad8f5869ce98b47754f1f6fd448abd2e30a2dc9b7df5e5bccbb2eee9130f8d020e2c6484a7 SHA512 d6b37c6261d5bf3a39d5aab53a325e6b3d6a7f36d8de03245732b3b256edddcc61a39869187610b031d582d71d15bc7f5a8892539c958865c49fdd8b8f5fb068
+EBUILD htop-3.0.2.ebuild 1511 BLAKE2B a1b6eaf69aabdb450abde79d4b22cc76c7ce1bedec581f6a567495e8102c920f50e86a748c5b1d525d372b9fd1bf239004311e58d84f7f6f645ca3af864e16da SHA512 948286f10b37d29ed2ae9115c8fdbf813399ba30ef301014220019b0329671c6e5bef93b43c9f406497250ec1f7eb091dcb803e3b2b54dae595ec94834e943eb
 EBUILD htop-3.0.3.ebuild 1687 BLAKE2B f5f32ebffb159df027c4b85d3e8f7499b8b1169afa7ede0b1d8af439f8dab8fdca10eea7dfb8ae17029ec168e8518fe0451103b4cc1ead085b879d9337cf0efc SHA512 0d6ab37677a4081b4a76dad83159cbcceba98767b667376fd48da9e506ea2580ddd0fdf6d03eff807a86a3bff82066bb3cb3def555b49b0916e1dd3a80f87b86
 MISC metadata.xml 911 BLAKE2B e92af64c9d4ead9348cecca14425e8778d3d69e63cd45063e76c1a8052610e6155299c01606aa3a3540ec3b432629d074cda74130ad86f1d31bb09957fb51a75 SHA512 686e8459e279182fcba99f65d67491c11ed144149207e2ac952797b6d66f145ef7b2ea19a5116e9e9a70d6a6ad6d4ecbf106c8f3734e45019f7e274311437ece
diff --git a/sys-process/htop/htop-3.0.2.ebuild b/sys-process/htop/htop-3.0.2.ebuild
index 334cec5e4ece..e046b0cceb60 100644
--- a/sys-process/htop/htop-3.0.2.ebuild
+++ b/sys-process/htop/htop-3.0.2.ebuild
@@ -10,7 +10,7 @@ inherit autotools linux-info python-any-r1
 DESCRIPTION="interactive process viewer"
 HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
 SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 9979052b127e..33c3216cc379 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,7 +1,5 @@
-DIST parallel-20200922.tar.bz2 2101918 BLAKE2B 51446bbe0ab34166db2b088dc96b18cfc26027312b16a8a98a6d68bf50ae247ba3b8654689760a53020bb5d8826ea8bd498bf4e6fbd9e26ab0e49dcc2214b68c SHA512 150e067025ba46dcd3f5319524890c383a5ba662999a355a1c44357e2bc57e4d23f0a164684aff12c96798dd637b44c3c8582769f5858a86e30dc66c9c3fca88
 DIST parallel-20201022.tar.bz2 2103301 BLAKE2B fa4b9f02e5de8e876d42c1673ded472131cc45ee081fc774a1040f6b5c260dd783d6b4890d17047badca176dd7d6be1d6466eaad4c5c12bdf30a152c30b88c0f SHA512 5c5131e8b65ca1a100b577347ecbe39b7ab32cbbf709d4eac7a3ef81b423a3b369772712b404d806dfb8b674dfabe91b9a4e94359d7532bee69cdd6203962f78
 DIST parallel-20201122.tar.bz2 2108900 BLAKE2B 97c49d5a17732db25307bf6f2e74451e8364c19e5253e4bb03736234397126f89809447b3cb6b343b315b512c2d2b578e7d2bbe2d5aa3e39f7eaf2cf40df0372 SHA512 58d6d41294418522db2d143ddbbf4d8cc47a3ae8a66f9f36d77396c230098386de9952a3b4d7db9e14470e36834be7d1995c5dda219ae21a72ea959f27d84e64
-EBUILD parallel-20200922.ebuild 641 BLAKE2B 2859b0f6f674b6d5140c041dc5c45f60258b026d6f46289585ea8b35b68f2cd43dfbcdc6982fb04a487ff2fa9efb09bd7afb5b643801b0bf950d426cbfb17357 SHA512 5d9c1bd8ebffea2705f61df62a8ad0ad8d498b1fc73e625734f99aec15306fc26b878d84770f5ee9e472876e41a61827b3e1b0fe43f65fe826e327175f2f5495
 EBUILD parallel-20201022.ebuild 641 BLAKE2B 2859b0f6f674b6d5140c041dc5c45f60258b026d6f46289585ea8b35b68f2cd43dfbcdc6982fb04a487ff2fa9efb09bd7afb5b643801b0bf950d426cbfb17357 SHA512 5d9c1bd8ebffea2705f61df62a8ad0ad8d498b1fc73e625734f99aec15306fc26b878d84770f5ee9e472876e41a61827b3e1b0fe43f65fe826e327175f2f5495
 EBUILD parallel-20201122.ebuild 656 BLAKE2B 77f738e23c46c022e67ba8c7eea3607950930e1c2e9c7041e5d6870232a83e87e56d9e31b73a3a0f144e54405117035d0c58f356f349b16184e93a6644841c19 SHA512 335eacb025371ecb9025f1251a23e6de4fd247a774ad320fd1461e197f086ef52a104b6e5d0f7634f3502308c39e012d4a0a0e56e61246bdfb45b6d7e6c7ad8d
 MISC metadata.xml 1077 BLAKE2B a636be1d6e6e4861e156561d8670e0c07ae27657e2ddf8cac3a6d9dfcb3c637931fe95daf998dc93fac1ab2a31d9ae43e73469a2882124fa8e229f1c7bf55d06 SHA512 5cfcbca8d00c6fd19ef2ad24fe6f23d3e02164b31a330d0ab34a739a8a4152f8d8df31a42c563d0b482a94519bdc4b0d92182b04d6937dd98f06bcee3726493b
diff --git a/sys-process/parallel/parallel-20200922.ebuild b/sys-process/parallel/parallel-20200922.ebuild
deleted file mode 100644
index 6b36d87b1979..000000000000
--- a/sys-process/parallel/parallel-20200922.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"
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-lang/perl:=
-	dev-perl/Devel-Size
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-IO"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index fa12a421c102..242d8a0876da 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/acl/Manifest b/virtual/acl/Manifest
index 96b6c26d2ae1..bfba36882e6f 100644
--- a/virtual/acl/Manifest
+++ b/virtual/acl/Manifest
@@ -1,4 +1,4 @@
 EBUILD acl-0-r1.ebuild 360 BLAKE2B 54e19daca79e6aa87c575455e5dabead9ead4d855ffbae924ab4274cf56bcc03badd64917c3b4bc9101085785f1845e78c479d339c94b6e458874de07dcee9eb SHA512 86eae5a44b5fbb266b0221b475cbe0d3e63d1d0b5e55fe2b60b56f58bc118526a009a81d98cc0d4248b87ff29454dc422ff616226d2d18db8162f8be209e7406
-EBUILD acl-0-r2.ebuild 416 BLAKE2B 4144830da347084afc3942b0568870e57ced5fa95d6973c28a51dd5ffa07243356882c42906cb5081fe9d652b1d6c1d5d56c2cd2bd9f4ac44fbfa1729249af1d SHA512 0733c3cbe067eeb1bb57b2ba64926944ab0991b76c9638edaa16648cffcc80ea63f5fbaae345c79ef775a6923c857c7a42979a92c034287073f1020bb6c5a5f1
-EBUILD acl-0.ebuild 316 BLAKE2B 0f5b8ae38252cf7436dd485e43e7e787e0e23231d4a4b9f137f20c52f5ff44dda0e6b2f6acaee2d065c2e446548f97a87d25ba97dd483b8d758d02f735e8e2a0 SHA512 6a48d04b3f3eb78dc81ef497479841658e3820fbf798099782feb4665cc0936470ee64f6093305d8210fb071ca3b864d8f843862836f23650589eb8c99ddc5cb
+EBUILD acl-0-r2.ebuild 415 BLAKE2B 63a6eacde9587155ff5712fdcb704cd8b8df6d9808890168b1e219e033086d7a8ee028b5279ba506b14e7a6769e7456c8f272311a548eeb2d287a7c1e1555a28 SHA512 695f1ee0b7151d642f99684a75d0bc129292540ca58d79660165a5ea0128619ced3e3a3f8f281c52f205b8cfafe6615dc2d3c53c105cebfdeeb94a9241d483b0
+EBUILD acl-0.ebuild 327 BLAKE2B 296d9ec8cc9a4671f32163a26db166cd554913d4000804eb5f63a9c3922e2301c79a5dbf206f0e1729c5d484df2e428502e817dfbb5027a14369f3e116ff92ea SHA512 3fe015ecdfc28eb2c3a7ce5efe0155eaf952d2bdeec72ea5f8549a80c38ca94af73be22d260abafe10e447db53a6d20a5c3baed92c7ee7eff6dad9adaa72e067
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/virtual/acl/acl-0-r2.ebuild b/virtual/acl/acl-0-r2.ebuild
index c45d2c97c160..1d28dc736888 100644
--- a/virtual/acl/acl-0-r2.ebuild
+++ b/virtual/acl/acl-0-r2.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for acl support (sys/acl.h)"
 SLOT="0"
-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"
 IUSE="static-libs"
 
 RDEPEND="kernel_linux? ( >=sys-apps/acl-2.2.52-r1[static-libs?,${MULTILIB_USEDEP}] )"
diff --git a/virtual/acl/acl-0.ebuild b/virtual/acl/acl-0.ebuild
index 3af85ef40482..76fc7cd652b2 100644
--- a/virtual/acl/acl-0.ebuild
+++ b/virtual/acl/acl-0.ebuild
@@ -5,6 +5,6 @@ EAPI=5
 
 DESCRIPTION="Virtual for acl support (sys/acl.h)"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~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"
 
 RDEPEND="kernel_linux? ( sys-apps/acl )"
diff --git a/virtual/awk/Manifest b/virtual/awk/Manifest
index 2f8564c4aec0..31d705ae8e16 100644
--- a/virtual/awk/Manifest
+++ b/virtual/awk/Manifest
@@ -1,2 +1,2 @@
-EBUILD awk-1.ebuild 473 BLAKE2B 62938a0fffc883bb74ca223dbd4862a85f62146255c09c8d90598b9e6157c7c64d9bcd2ac0f911aead6d91c94f50b67246f662726a43ec7c5b67fa27b6245ea8 SHA512 12e1665eefa09e34efd7eb1f8ee1f0c899e501334bd6283513539eb5f92fa91d0d010c77a09ecbabab0285070d358b8c4e2f5470e8bc6fe4b75468ed89f39310
+EBUILD awk-1.ebuild 585 BLAKE2B 20f7f6ef64ce7c80bfb54ebda3c92ec8bd0bcee73516adb19d04e66d45ac32a508c3feb0905355eb8d48f3ceb5067185fbd973a061b8eb3a54316a2192721e4b SHA512 ddc50df933a842773fe5008e7d3dc91f8d351c8b0c45543a1f936446a899ea094aa2f10d2ffcdffdf8c0d6f0f9e986ef959a27325ea884d0060c68e1e4192f82
 MISC metadata.xml 385 BLAKE2B d0c65503a8aec0e10e4412c3655df206935ea988ffc0f1285965c3bddb6fe84868f80a95b91612a3dcddc22ed6cb2d616d1e9f5fa294e70a3019a375db72763e SHA512 2e19654d5b258ca5e5737a5b59044d870a3b11211f4c4cd5eb92fd2ce1af8ae1082f04128d57efcd879055bfc223a7d32f5ddc3c0b933d9c0a6279aaa90f5833
diff --git a/virtual/awk/awk-1.ebuild b/virtual/awk/awk-1.ebuild
index c405925c8a05..e818b5adb900 100644
--- a/virtual/awk/awk-1.ebuild
+++ b/virtual/awk/awk-1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual for awk implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+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="
 	|| (
diff --git a/virtual/bitcoin-leveldb/Manifest b/virtual/bitcoin-leveldb/Manifest
index 1e7d1f5a2851..8022bb3ac77b 100644
--- a/virtual/bitcoin-leveldb/Manifest
+++ b/virtual/bitcoin-leveldb/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitcoin-leveldb-0-r2.ebuild 440 BLAKE2B 38c29967f23103a257e005bd0b66ee70bdffd3f7e70e017478e8da826b0618ebf8b3f55fa5e305ea1e50724744fcfb3919e1ad6a653aa730d838ac9c0dcf5ff9 SHA512 bcc583d8ccf455013460ffdfb7b4d11259c33eb2e9ac113048902cb32f99b4bb94f61b0f1c08c78f3081ca6efc5b53f53e1be1287eaa3c75a4f8ab512dab2697
+EBUILD bitcoin-leveldb-0-r2.ebuild 443 BLAKE2B b5ff9dc33a6b67cac18219e26ff61750a3e6ded41762a530ece26ba08aca3d29f4fbb5799224c1e1e40eda0f95526b6e9df1e98fc2c93d2bb4d08510bc43aab0 SHA512 40833441423f5f76d9b7f34b4970f6fd78911f582b9c9d05e8e19090cd7c40ea5918aa2c43c5133e4435cb63d19d9b95446b69f09892d235af23070081933b12
 MISC metadata.xml 374 BLAKE2B f68f84220cb3bbe941bb5b153cefd80df5b76d14bfe963f7c0b3c687cc8f402eef1012995d461a8fb08b71433c3b606bba6cc38578cdbcc027554752e1b652bb SHA512 a5eeb34d8bb1faad87f3efa627a396af99de202cd13b8d0c2c6424e5b7e059d31755b2465e981707f49837a1c884349bf749117dd4a0cee66c052e31c0069033
diff --git a/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild b/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild
index f08b522738d7..14ee83d7cbdc 100644
--- a/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild
+++ b/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="Virtual for LevelDB versions known to be compatible with Bitcoin Core 0.9+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	|| (
diff --git a/virtual/cdrtools/Manifest b/virtual/cdrtools/Manifest
deleted file mode 100644
index eeb5a5dd2ef9..000000000000
--- a/virtual/cdrtools/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD cdrtools-0.ebuild 369 BLAKE2B 0e7726f4f8a12c008de4ffb89693323c98c3141c7b5ecf7bda5f1daf8ce54d3a23944c4cd94689ad5f1aeecd52d1893b63880444e941b1bb8343243ba81bcc91 SHA512 1618f9414d2d5c934e894b6b59ee3147ec69e31cc620b51c8dcb85d827ddfa13262f6aa90e1b8cd286745a244d4cee03434216d8a01b9eb0cf538c96c3fadb2a
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/cdrtools/cdrtools-0.ebuild b/virtual/cdrtools/cdrtools-0.ebuild
deleted file mode 100644
index ad0079f86fe9..000000000000
--- a/virtual/cdrtools/cdrtools-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for command-line recorders cdrtools and cdrkit"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="|| ( app-cdr/cdrtools app-cdr/cdrkit )"
diff --git a/virtual/commonlisp/Manifest b/virtual/commonlisp/Manifest
index 149687685987..fbcb17aed33d 100644
--- a/virtual/commonlisp/Manifest
+++ b/virtual/commonlisp/Manifest
@@ -1,2 +1,2 @@
-EBUILD commonlisp-0.ebuild 392 BLAKE2B ca250c64a6c57b3b04c1fb922f9a3cfe0d9caf998da0cca9a2050cd9560e8ea0a9c9c8ca9c1d2898f5cba044c900d711072f854c2e8044b62975b1afe876de8d SHA512 62f9e728228006186c902d933b942643ae6d763b34bf4841f961a99611c9414e89bc28ea27170478a2084dbc3f6781d997c83b50340b335ca3093bbd1e616b97
+EBUILD commonlisp-0.ebuild 403 BLAKE2B c1c87d4269b2af2f3ee23d34300b16a7d555a2c89403a0e330bc4a243e8d1cc558184db50b6b15ff35dec0269f3cf12df44eb8cbda354b86677c5777c8915151 SHA512 21b78de21a3af00f56de8e305a1b170162d096def032880047bd7473c2693af3ff6130386be8e28b039e66ea7ae88ddf2da8e436ffe0eb168e4905d631404af6
 MISC metadata.xml 265 BLAKE2B 27fdce83bed33d20824cd769365bbc39a3b6e21df188fccb88553338641f69993fc31b49e8e223888b15a60e033b5357c3a247a3d0e46aee06fd44cc8bf17800 SHA512 b71868af549ef2209adf095fc735209d471155551e9afbbab4b93babe5281ebed0e9ea80e048616691ad3656cb83db88117e9364d82fa0664328dd874368c47f
diff --git a/virtual/commonlisp/commonlisp-0.ebuild b/virtual/commonlisp/commonlisp-0.ebuild
index a1e70f029bcd..3b172fd1a357 100644
--- a/virtual/commonlisp/commonlisp-0.ebuild
+++ b/virtual/commonlisp/commonlisp-0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for Common Lisp"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 
 RDEPEND="|| ( dev-lisp/sbcl
 	dev-lisp/clisp
diff --git a/virtual/eject/Manifest b/virtual/eject/Manifest
index 15f07656668f..73f562604258 100644
--- a/virtual/eject/Manifest
+++ b/virtual/eject/Manifest
@@ -1,2 +1,2 @@
-EBUILD eject-0-r1.ebuild 337 BLAKE2B 8f672c1d482caf1455cc3ea07b7ae302941c15c04a45c6858c8e6296bdd298aeee5e6b6e36c5bb5e36ca27d542df53903ccaba683484c0182b2da156189e58fc SHA512 42ed19fbe763fe329c4a754881c55ba6c3861b1a7eaa79bb75f8f5ba6756160a208dca3ccd8d23a338662736895ed0a7307eefc9caf79eb35e706c600e251142
+EBUILD eject-0-r1.ebuild 344 BLAKE2B c627f32d01a720f60168fa45faa033b60fbbf3997f4463d29f0525b37559bfd3f13df0c4b1d9030459698e986e53b8ee1335bdb791ad5c0f837cca283ce2a970 SHA512 834bda9751efbb510da1e6409bfd6d6d812e46645f2e44a5c29dd010d5678faf5bc6ae5831db7878bbf8f480343d6748339d1ba9e30d7e9fbfafe1c8a596960e
 MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/virtual/eject/eject-0-r1.ebuild b/virtual/eject/eject-0-r1.ebuild
index df89d60e5518..b5270d3e469b 100644
--- a/virtual/eject/eject-0-r1.ebuild
+++ b/virtual/eject/eject-0-r1.ebuild
@@ -5,6 +5,6 @@ EAPI=6
 
 DESCRIPTION="Virtual for the eject command"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 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"
 
 RDEPEND="|| ( >=sys-apps/util-linux-2.22 sys-block/eject-bsd )"
diff --git a/virtual/fortran/Manifest b/virtual/fortran/Manifest
index 474bc382543e..7ddea06f10e3 100644
--- a/virtual/fortran/Manifest
+++ b/virtual/fortran/Manifest
@@ -1,2 +1,2 @@
-EBUILD fortran-0.ebuild 462 BLAKE2B 37f7a661dd61b213a5724fe996e219b64828e80277a78e947cb4c6f3e2d0903fe054ae8aee3faf038a51adc93bcc734e039cf994e2de75be7a74e6a147cab296 SHA512 5fc25419a8690d1ff34f3235767b7c58a1ebd40b26df6d4b406f03dc3be7a886b70a46649b490d162853585995ca488ce4d3ebcaa28bf86e16cccd417871a9b3
+EBUILD fortran-0.ebuild 469 BLAKE2B a34f46ca845600e5ca86f698b0c3711c0d0380ef755fb89dcbde4cc46344a11225f3b99c6f397e4fbe8a6bd622eeae86519e0f12ae62176f387d35bdba7e519c SHA512 3dd9a710ad7760fd9aac433953187126bf9baa2370403c7a118d3c711c3081c98e4ae3103ab06f1d5bd925fdb54f709e575550253fd28e55c3f052936d969803
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/virtual/fortran/fortran-0.ebuild b/virtual/fortran/fortran-0.ebuild
index 5f4cc123427d..4169dc6bcff7 100644
--- a/virtual/fortran/fortran-0.ebuild
+++ b/virtual/fortran/fortran-0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 DESCRIPTION="Virtual for Fortran Compiler"
 
 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"
+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 ~sparc-solaris"
 IUSE="openmp"
 
 RDEPEND="
diff --git a/virtual/gsasl/Manifest b/virtual/gsasl/Manifest
index d641f3bdf9b2..39b2564718a3 100644
--- a/virtual/gsasl/Manifest
+++ b/virtual/gsasl/Manifest
@@ -1,2 +1,2 @@
-EBUILD gsasl-2.ebuild 326 BLAKE2B 0fad49b35e10d2aa6b1245135fb7a5ba7962b35ea5d60a2d89dd14f8b9c27cd0c36ecaf34ea4290ba34d041c90be3fef18c777d39bf27d50f234e693390cef7a SHA512 f5f2fa2404eec65592bec1393eab982b1f081f7f171aaeded5b58f6c1095221c357b448d928ee89815c28fdf239697b18ad8969c3cc6a66f29137b077b5fd914
+EBUILD gsasl-2.ebuild 348 BLAKE2B 5ba6cd7f040162ef5cb0a48d65515e7a967ea87725b4e474533f79bac723deb532955e51ff4cf746f6c470b5b6fdca192591c41261a7722052077dd5b575069e SHA512 3fee00a7564438b0633689b109648da075479502b4bec1eaa4e7e3e075d6ee33ddd8c69bed29cecafda48e41939172d316bdb8d86aa467f135af20de1441249d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/virtual/gsasl/gsasl-2.ebuild b/virtual/gsasl/gsasl-2.ebuild
index 22bf74a0ab7a..5cf7ce777ec8 100644
--- a/virtual/gsasl/gsasl-2.ebuild
+++ b/virtual/gsasl/gsasl-2.ebuild
@@ -5,6 +5,6 @@ EAPI=5
 
 DESCRIPTION="Virtual for the GNU SASL library"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| ( net-libs/libgsasl net-misc/gsasl )"
diff --git a/virtual/httpd-basic/Manifest b/virtual/httpd-basic/Manifest
index 18b11861b04b..7b0307892fa4 100644
--- a/virtual/httpd-basic/Manifest
+++ b/virtual/httpd-basic/Manifest
@@ -1,2 +1,2 @@
-EBUILD httpd-basic-0-r2.ebuild 512 BLAKE2B a25a7029221ad5f60d51260bbf4190c37411918f28b53e2869b0aa74fa5af80ed9668b448d804841afc59a93a44e393309411c1cdad11b4fe41de0a5fc658983 SHA512 5e6997baa8b45260b538be234d00d27477856477248bee1386e97c57025ccf6db215ddecdd21d190b9b9f0e6a1092d1d90f5cc8645037b94502a724c3066c6f1
+EBUILD httpd-basic-0-r2.ebuild 618 BLAKE2B 9c4b8d1b61dbd956e261761e983f8274ec2374348d7b882c4548376f102719fcdbc160e7995cfaf7b316ddfe0fa4e5a9cb24927347bed0dbdddd305279cf8f5f SHA512 1dc2c58469c2ecd8fb0ef53db0696ac6aebc5b9459fe3f75b12764c298df82508437ce9150e7be9813e2626adc26ff9a34fe597ecc491d396979c7bacba7500a
 MISC metadata.xml 250 BLAKE2B 856ff9793486ce226d86aeb43e3c5a75acf1fdd49936d52cf09e72669d2e956844d9087cf5cb67d4f04353d30be644bfc1daaa70b2ae332651f4bf71ae5c31e8 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282
diff --git a/virtual/httpd-basic/httpd-basic-0-r2.ebuild b/virtual/httpd-basic/httpd-basic-0-r2.ebuild
index 101bc41c2696..3d04c97acb7c 100644
--- a/virtual/httpd-basic/httpd-basic-0-r2.ebuild
+++ b/virtual/httpd-basic/httpd-basic-0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual for static HTML-enabled webservers"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| (
 	www-servers/apache
diff --git a/virtual/httpd-cgi/Manifest b/virtual/httpd-cgi/Manifest
index 822d0f060ae7..d23d4cd7feba 100644
--- a/virtual/httpd-cgi/Manifest
+++ b/virtual/httpd-cgi/Manifest
@@ -1,3 +1,3 @@
-EBUILD httpd-cgi-0-r1.ebuild 546 BLAKE2B 4c444e7a279b15358c9cdd3e31d08f7ede46470b680e14decfa9cfa1f1e36771f95bdd75aa1bfe0d886e156a0fdfa21a0658a6a6a57bc0130af8d58feb242af8 SHA512 3a2bf5a41db298685affe2c501d8949aacab489918f8203f0d6c9cf33ac57908c3d46b1df37039d4c20123a8488cdf75c1676edbf14dfd021e07c8abdd4041fb
-EBUILD httpd-cgi-0-r2.ebuild 568 BLAKE2B 861978ecbd9bf86fc0eb1d236e90d053ac3882198f4af066a26c114884cb8cd924fda5395fe119a82a111b707441f0a5fc8661cc64664389588cedabd9208327 SHA512 0132a3e557ef158d49f5395165838ded147f258f30dfcd43af24b9c274dba11a9dc9a3a3963b262d03b66635d4eb6c106a364553fc72f050c7e2c45228bbe97b
+EBUILD httpd-cgi-0-r1.ebuild 599 BLAKE2B 3cafe31882b0155a886642af5c1ab9a114e6033d37f71c927b1053a4e19bec58b52b8b3c979c6b4f6c0090ced2504477eab350c90735e0a2ed8cf245eac6f830 SHA512 82156fd44d592e8a4acabc9c9ce97756cbd46565b8505445100b1c92ebb9dba834f4390eab92d15d5735a02ca4420c44d338d50ee6afceb264884c784fd51b9b
+EBUILD httpd-cgi-0-r2.ebuild 621 BLAKE2B 95ba538477e63fccfdbebe04e206c93f34c248e6dd143333366e94b8671bf81879d2fd9a05fae354d08267bd2e37c5ddd6c6ee04f1600127a8fe0b73840dc76e SHA512 b8b8659f24dc722f6dc0d0cb5e305b84302ec8478f84673800c055b21defea78fa3a8a9c89ab78ae4375cf7bc192207ed9bbdae90aed70804d4af22e2a69a9bf
 MISC metadata.xml 250 BLAKE2B 856ff9793486ce226d86aeb43e3c5a75acf1fdd49936d52cf09e72669d2e956844d9087cf5cb67d4f04353d30be644bfc1daaa70b2ae332651f4bf71ae5c31e8 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild
index 23cba37b026e..31d70e0582ab 100644
--- a/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild
+++ b/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual for CGI-enabled webservers"
 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 ~m68k-mint ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| (
 	www-servers/apache
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
index f37860e31dfe..69a7d802f3f6 100644
--- a/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
+++ b/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual for CGI-enabled webservers"
 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 ~m68k-mint ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| (
 	www-servers/apache
diff --git a/virtual/httpd-fastcgi/Manifest b/virtual/httpd-fastcgi/Manifest
index 5d25f21f643d..8bc18cb39476 100644
--- a/virtual/httpd-fastcgi/Manifest
+++ b/virtual/httpd-fastcgi/Manifest
@@ -1,2 +1,2 @@
-EBUILD httpd-fastcgi-0-r1.ebuild 392 BLAKE2B 2de70ca489611d77baab15cafcd56d453405bedd2fdc7bd9f49c35d0753c74c2ce2a82d320381fec050020df6f54ce2bc7f3ad25296b29d98658f6df1ce3baf5 SHA512 618d33f4b3092bbee48d6329bcb5d738bbd664d11a3d0507c14d7425ea7f6e82ba118811adce182de4bb321e2c34cdf0b08e07b9c184df1cc472df8ba88b7fbb
+EBUILD httpd-fastcgi-0-r1.ebuild 423 BLAKE2B bfd914120d4fc54869e2423a8bc3445e699c13d081a477676f3e910445877b28290db953f6cd54ba510e32d2872f99a46ec9db8b721a7664f7a697cba074fc5e SHA512 378c60842e8290560d12dd9af3784e94f70cc1902585b7e53c8cd941436bec3625f069fe47096989e822a0c4253f9e016b2167f5310e0924ff65439d6bbf2890
 MISC metadata.xml 250 BLAKE2B 856ff9793486ce226d86aeb43e3c5a75acf1fdd49936d52cf09e72669d2e956844d9087cf5cb67d4f04353d30be644bfc1daaa70b2ae332651f4bf71ae5c31e8 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282
diff --git a/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild b/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
index a7706226154f..b9f6ae59c6bd 100644
--- a/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
+++ b/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual for FastCGI-enabled webservers"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="|| (
 	www-apache/mod_fcgid
diff --git a/virtual/imap-c-client/Manifest b/virtual/imap-c-client/Manifest
index 7aae474d550a..d71e09d02073 100644
--- a/virtual/imap-c-client/Manifest
+++ b/virtual/imap-c-client/Manifest
@@ -1,3 +1,3 @@
-EBUILD imap-c-client-1.ebuild 313 BLAKE2B fb877eec138662cc3880aaf3f4390c3ea21d7401326647c0b69e8010c0d7540b02b40c18a79a7e6e06aa28aa8c99a7b07ec8544045a5c19d6854b9fa3c9fdc84 SHA512 0352b8b3d895af67e4454f39faf6ed34845a8b2e373dfde7b53e37bea990f11f407a3ebbd1ebe490922559405e9b4c28b05e3100948a2f18af039d6c31c663c4
-EBUILD imap-c-client-2.ebuild 349 BLAKE2B 2d39c19ced137a5045727df4a34230100176473e19b851065c988ac17a6aca62cd3c6fb218171ffe4230212026a9af694d98df163bb895c88c7bfbb553f02dad SHA512 c787ef0123747394489fde8e89366507d231a217a9afdd4117add99635b2c3c355cb710303ed62ce2c47848bf71997b172c0dcef17be61c9a1bcd76cb321a7a6
+EBUILD imap-c-client-1.ebuild 319 BLAKE2B d6c3f21c46796729f0873457990be414706202aeba509298c3988c68e15e0f6ba7a92ce64726cc32760112bc67407eb796eebc945e70719f9fff1fcafe3453c2 SHA512 fe15ec8f594c0aaa0c7effcdacaa66c32fecc4712a3600044cf398c62293d426820382e06d00dff1532e9f06f1a5721a49914ece799d9b50736e1e14a87ffc88
+EBUILD imap-c-client-2.ebuild 348 BLAKE2B 349cba2e882d82665c4b53072b08a41f24e0ba243820d0b88badfe601f216e821f24d4a7a1decf1065e16eceae97fafab31cd83925f3c92f84af651c86242c65 SHA512 d0058c252ee29db0f4b73ae6b018bdb1598a01318d80f4821ed8c8d74586d1db8582d5d4258f3dc673b3f3377bff1e2b59aa86a543949b16f36c93557ad8caa0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/imap-c-client/imap-c-client-1.ebuild b/virtual/imap-c-client/imap-c-client-1.ebuild
index 5ae235ff9c39..823dcf507f6b 100644
--- a/virtual/imap-c-client/imap-c-client-1.ebuild
+++ b/virtual/imap-c-client/imap-c-client-1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual for IMAP c-client"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="ssl"
 
 RDEPEND=" || (	net-libs/c-client[ssl=]
diff --git a/virtual/imap-c-client/imap-c-client-2.ebuild b/virtual/imap-c-client/imap-c-client-2.ebuild
index 81f718fb667a..f2194913216a 100644
--- a/virtual/imap-c-client/imap-c-client-2.ebuild
+++ b/virtual/imap-c-client/imap-c-client-2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for IMAP c-client"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="kerberos ssl"
 
 RDEPEND=" || (	net-libs/c-client[kerberos=,ssl=]
diff --git a/virtual/jpeg-compat/Manifest b/virtual/jpeg-compat/Manifest
index 012eff5b148c..74b9303036de 100644
--- a/virtual/jpeg-compat/Manifest
+++ b/virtual/jpeg-compat/Manifest
@@ -1,2 +1,2 @@
-EBUILD jpeg-compat-62.ebuild 391 BLAKE2B 1d03fb2d2d563ae4507b61ef54758e4f57924d93d76793240279efffecbe8017553342c686e040c9059735c541afa376d472ea88d4080d29b7e9e83fd9a81889 SHA512 52e72ea9ed5617f20bda1c0f61bc2085c2324baa6a596ebb7d86f27dabd2dc90c799631a9beda86b4aff3f2886df41a4ee3a2f024ba691868c07573849b3eb70
+EBUILD jpeg-compat-62.ebuild 489 BLAKE2B 5d5dd80e2c119eb4e4dd8ac3a3d159af41419e3aafa4f881eb1b343b41cb88767b3b92166ceb81b46c7b45049146ff0a7d762601ff94db2d02e9b2c0d9c4be65 SHA512 63dd097c7e68ea0bf11b894a007c329b4d0151b2c0e8fb2f7c34e165511577aba4731eff5ea610b14169e706dbfecc9ff9ca47052f685400264799acea4aa41a
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/virtual/jpeg-compat/jpeg-compat-62.ebuild b/virtual/jpeg-compat/jpeg-compat-62.ebuild
index cc4ce8125f6a..cdf7cc4eb374 100644
--- a/virtual/jpeg-compat/jpeg-compat-62.ebuild
+++ b/virtual/jpeg-compat/jpeg-compat-62.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
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="A virtual for the libjpeg.so.62 ABI for binary-only programs"
 SLOT="62"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="
 	|| (
diff --git a/virtual/libcrypt/Manifest b/virtual/libcrypt/Manifest
index 3be894fadd26..bdc27342437f 100644
--- a/virtual/libcrypt/Manifest
+++ b/virtual/libcrypt/Manifest
@@ -1,3 +1,3 @@
-EBUILD libcrypt-1-r1.ebuild 656 BLAKE2B 638c40f6eda05d3413109c2eddc69c36a478181b47a53b71963bebfef2a0a3ed0ee0c78ef489b9a78e559762a7511febfe6c49455cc29e571658d6b963e354d0 SHA512 30e65e31711ec5c504919c6e7cdfa2777f010dfff80414a549aefb276649bf3c39b065e9308bb51c9aedb777c0ab5c7b3659c72b902c08a3ef7000472b7acce6
-EBUILD libcrypt-2.ebuild 680 BLAKE2B bcf0727ba25fb361120283b0c3545d4f55ab5786e7b7929777a289016db861eeaa2926a421631e940fa09cae8c0252e207f3dc96bf22231a09f424251705c17f SHA512 cbd29a4c4c1256fdd8555762748f08d583cb136b37a36b23cae94c8957fe84574c90bb3d13ca4714e0a922005fa150646006af4bd6c5a03a03eab6acce319498
+EBUILD libcrypt-1-r1.ebuild 635 BLAKE2B f520030c2b6ef888b05d6a22773386536a2dcfa4fbf8a3e53b118ae95ef2aa6bbeb245e583621502f83a7c4777344173348bf0ecf96a922c83b5ea11f0310949 SHA512 45ee7982f72829aa48886408b6192ce5650c3cdac6d20aeb672f5393b744bc0ffb4343c785c94ea425ce35c44ffe6e9417aa63375a96eae42ce8c63739242a7b
+EBUILD libcrypt-2.ebuild 659 BLAKE2B fa050e5ab4e2757d8e291fcddc7ca9f7a62aad462574db3eba2d129629a6c78cb78d312c8720faeec38ebc7ec77235b333869dfed28b83b85f43e65687898929 SHA512 fdd3bc507b049b2186a564cc8105db62eacfe1a2b1a149afc1be7916035c8f2807e4bdb64ec2d837d1bb9f09054d51544e71f118cfb39e86861036befee141bf
 MISC metadata.xml 261 BLAKE2B caf1cd4155f618105164d2fe3addfb4a06a504d56d9a387830f3b7f2b85864260b891897f0a2a6c56a83f72e2dcc1c66ecba2cfe25cf0dcaa54167cda74a117c SHA512 fd47d9491bf53a7f5b4232a4996dabba1ce2cc74a3fdfea0a7d831e0d3351a42c5d1187a05c8c69410fe91a80b7c3c3c087e08ab1fc5ba6a925c46a105d96ac9
diff --git a/virtual/libcrypt/libcrypt-1-r1.ebuild b/virtual/libcrypt/libcrypt-1-r1.ebuild
index 26346878635a..c1907388f74b 100644
--- a/virtual/libcrypt/libcrypt-1-r1.ebuild
+++ b/virtual/libcrypt/libcrypt-1-r1.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for libcrypt.so"
 
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-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="+static-libs"
 
 RDEPEND="
diff --git a/virtual/libcrypt/libcrypt-2.ebuild b/virtual/libcrypt/libcrypt-2.ebuild
index 9e060ac3dcd3..31ebd5facd03 100644
--- a/virtual/libcrypt/libcrypt-2.ebuild
+++ b/virtual/libcrypt/libcrypt-2.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for libcrypt.so"
 
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~x86-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="+static-libs"
 
 RDEPEND="
diff --git a/virtual/libgudev/Manifest b/virtual/libgudev/Manifest
index 052d285b657f..207c5c9e55a3 100644
--- a/virtual/libgudev/Manifest
+++ b/virtual/libgudev/Manifest
@@ -1,4 +1,4 @@
 EBUILD libgudev-215-r3.ebuild 749 BLAKE2B bf7a5b972cd9855c0ebc7a24f942bca57ffb477ca9019a872ccbea566f7d379cd9edbdf0a32c44cd9404b09a9f2a65fe5f09f5466f311d750cf3c8803245753b SHA512 8d790619c6a35c1696fc1a17b5f1bbf025b6056a21cd0e07125d4798d58104a02c32ca8beeef2800095030fd68e4adc17d9ac106e6ffc173b735d825f76f3096
-EBUILD libgudev-230.ebuild 391 BLAKE2B 55a7b44926b53856bec912a1a97d564fe4fb9eff3339125be7e75822039d5e9618180deb0c2510519a01f5f21b34ecd3a0891f77470a1e75b075afad4ed3d164 SHA512 54ebd6f777b2cf6327d8e54d9aff4341f59683f85c43f959cb78bca68e0e3b5da34f0921e506a7ff239c7eee3ca0c66f2bffc061a2247fee89571657fd3bb7d6
-EBUILD libgudev-232.ebuild 396 BLAKE2B 6f68172f393b486880151e03f8bf6c13341f397c5e25cd5f96137aa400576689aac0cdc049e0e768f5c1798ddd254b671632051db089a44fb55b81f824da2b53 SHA512 2805f4b5cb20c71d734c4ac20367027c9bc99bcacda73b3f626302e24ce78f2a9ece791689845d4ef6705214477278aab509699640e1eff23db36f840ed7b9dd
+EBUILD libgudev-230.ebuild 389 BLAKE2B e021e167630f92a3079a48340ca6acba8881197bbd0b3752a1b0a1ebb77d5803f082e2d68c5b9848bb7b90e04cc0bf63f32a496122522ddbc304d429e7404a88 SHA512 bb07e38d475c7d27978a460e9750d3793e5d0ba172b7ba64b887fff27f6e2896fec14a1cd6eecb1e3941b8f2cc3d7911739ad7176edc9dcb5e58007f28544857
+EBUILD libgudev-232.ebuild 395 BLAKE2B e435b9e2894583f560666dd921e144188b549d44833baedbaf99bcea0b91532ad5bc9d486cad92bb227715e0e4905beef7a2c32c642f8d9d96dde85f5dd6956c SHA512 78b181ea3f6402e2bf6024817bc6ffd4eba40a18a5fc3970b089c20eaf4681ceff69bb1b09bb5bbad76305e1beaa90e052e68f1563d139e78720f3ea9a691710
 MISC metadata.xml 379 BLAKE2B 5b6f06cda07bf27984ccc9d28751ffffab6debce45c8d883d963334f4295e6fdece7de2175290b4ba807aa417c0e0f3ca4c21f262185968f66c76d3f8ac8d0c8 SHA512 8353b418ec271a0ae9ae0d0a6bad81eb941610a989a5497c940929f14c622bf8199ffbc5061bc723977aa3c01aacf66a37f72311cf1f69082982f27503b17013
diff --git a/virtual/libgudev/libgudev-230.ebuild b/virtual/libgudev/libgudev-230.ebuild
index 0937cc2d8e1a..8e11c3be2dac 100644
--- a/virtual/libgudev/libgudev-230.ebuild
+++ b/virtual/libgudev/libgudev-230.ebuild
@@ -6,7 +6,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libgudev providers"
 SLOT="0/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="introspection static-libs"
 
 RDEPEND="dev-libs/libgudev:0/0[${MULTILIB_USEDEP},introspection?,static-libs?]"
diff --git a/virtual/libgudev/libgudev-232.ebuild b/virtual/libgudev/libgudev-232.ebuild
index 504f832e2756..16d7200f1ac3 100644
--- a/virtual/libgudev/libgudev-232.ebuild
+++ b/virtual/libgudev/libgudev-232.ebuild
@@ -6,7 +6,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libgudev providers"
 SLOT="0/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="introspection static-libs"
 
 RDEPEND=">=dev-libs/libgudev-232:0/0[${MULTILIB_USEDEP},introspection?,static-libs?]"
diff --git a/virtual/libiconv/Manifest b/virtual/libiconv/Manifest
index d6bf2025c3ad..f4808c1f8a5a 100644
--- a/virtual/libiconv/Manifest
+++ b/virtual/libiconv/Manifest
@@ -1,4 +1,4 @@
-EBUILD libiconv-0-r1.ebuild 716 BLAKE2B 121f7e903c0750f6d333dde53e6f25b565877eba87150cdeb02704fc23b0f6bc05528f758d4c6eec488dda77c2aacb182470053453ce0741cd5e5018ee60ca96 SHA512 87acc8cac7ddce774f265e0acf85aea873b43f710619465a5fdfbeb60b31c90c8938fe6cc194b0682ed322397fada0a06413789d78aa32e223278c6d5bafb501
+EBUILD libiconv-0-r1.ebuild 728 BLAKE2B 6e647be62246abbd6525924ebd9a1f0aaa3725d831dc04d649686385dfcc173d77275c72ed43c8471b0d712baa1638644c1bcccc67c49495dcf3bd89c289eab3 SHA512 ac4ba0148cfd704604d134c38b7315a91845a9f045cd238c3ceed0d6f83fd48099a74415235a872c66b0d241333115b7193e90007d03d7c05e5cfce9efa7321a
 EBUILD libiconv-0-r2.ebuild 728 BLAKE2B 6e647be62246abbd6525924ebd9a1f0aaa3725d831dc04d649686385dfcc173d77275c72ed43c8471b0d712baa1638644c1bcccc67c49495dcf3bd89c289eab3 SHA512 ac4ba0148cfd704604d134c38b7315a91845a9f045cd238c3ceed0d6f83fd48099a74415235a872c66b0d241333115b7193e90007d03d7c05e5cfce9efa7321a
-EBUILD libiconv-0.ebuild 628 BLAKE2B acd4607680b231f568f30444a249a84cdf123c24eca1098e08bd0d3d1cade77ac7f6807db62a653fece48b212232d16199d681219412cbc0aaff179db81ad8bc SHA512 1930e9a74047bffb85bd6d41b8d57f36b76d366d30dadb54d80bace4ff67398a5888c4e6f8df687aa1e80983c2d0ac9a381e6df836be10733f45883e8c238950
+EBUILD libiconv-0.ebuild 640 BLAKE2B 69c6c8163829b3ad7eff6bbccfbb1be590366d490ff7eb9238327b060e08fdabaacc88315be1b7fd1c477f33f1504e031d71c89ecb90dd269cbcb2a049bb0c2f SHA512 4ca4a618ea1fee0cad4654478b9552319a49231c02f82a45f4616881fe53ce56dbd7d04955c7ba7a389ce3241c31e5ce85355c5291f6a15a0716ff417991b7c4
 MISC metadata.xml 218 BLAKE2B 82037a8a13bcba2ae00b1c4db95363a5992fdae654412ff76e70f0cdbc6c28c3ad1a3aa9746763e7271c7ff2f30b6103403bde6437ccb45e6897dbe060e205c1 SHA512 5f03bbfedc0f66afc7bc45f1aeeccdfc3c775dd337fb280bb7e80e29f618898ce92a05c66c126e79333e33ce7f422169c5ff1cdeeb30b58475c712e9bdc4e79f
diff --git a/virtual/libiconv/libiconv-0-r1.ebuild b/virtual/libiconv/libiconv-0-r1.ebuild
index 1576b2ea2f98..5aba698f16da 100644
--- a/virtual/libiconv/libiconv-0-r1.ebuild
+++ b/virtual/libiconv/libiconv-0-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for the GNU conversion library"
 SLOT="0"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="elibc_glibc elibc_uclibc elibc_musl elibc_mintlib"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libiconv/libiconv-0.ebuild b/virtual/libiconv/libiconv-0.ebuild
index 55a5b26c72ac..8873c5a49fe6 100644
--- a/virtual/libiconv/libiconv-0.ebuild
+++ b/virtual/libiconv/libiconv-0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual for the GNU conversion library"
 SLOT="0"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="elibc_glibc elibc_uclibc elibc_musl"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libintl/Manifest b/virtual/libintl/Manifest
index 31be3e16e646..b4fc9cab780b 100644
--- a/virtual/libintl/Manifest
+++ b/virtual/libintl/Manifest
@@ -1,4 +1,4 @@
-EBUILD libintl-0-r1.ebuild 704 BLAKE2B 28a550e2d973c858a67b7e38a8572e4783dc9292ce5b04818b89325105c247f50dade8759aa981e191141e727ae59f336a23a99d02228548e305363f9ee79d02 SHA512 5c3bc0882e80554c71361e9ea581e5dc703b006bd941c377d4e0472253e5f995d28cc18afdcc130e1f47e73cfc69968e2970c621c8a481a79061cbfb9636e205
-EBUILD libintl-0-r2.ebuild 722 BLAKE2B 9225bac94670886d1ce05fbf2561354b556b3a8ea6747f385c2187d2be1e77f8f0aaa26bf86066ea6acda87f2ed3cf6b61b3ea482838f6d500052687e7a2055f SHA512 07b149762fd914587b4fefbac5aae5311504b48f2fc2c27a7ded68e52500c1cf7d14d9409b4215eb94493b40604a86acadbab46564c8fd0274be2786ea42907f
-EBUILD libintl-0.ebuild 649 BLAKE2B 21b5924e90859cdf8af6c90090da4efe4c9ae9e05dcfcf5eb2313bd9311041645576310af6b5001f7457cf258c0baf22cf92fa76314f003515a050557df64a9a SHA512 5f8ce35c52aaffb4d765d3b9045bfc31f2e6d50b57a4a5a16be71bf1888f0663d8f7bddc29bae9c3b899acd4b5fd47883cd4ca2c3d3fe7351be315f8eff860da
+EBUILD libintl-0-r1.ebuild 734 BLAKE2B f7bfd3158b29ea7b1b4cb92e36889bfed6ac450fdb648bd061b52e7a0822d458d511ab101beb141280d73f17f32e36f965f28908664b3f54b0ac4ee97b5ac902 SHA512 49fdcc41532af98fa9b17a23903bee029327544aa675b38281e5f1f7950b3648ef9f9d5b512ca97766c8cd950fc14e5f6ddd13d89a65e237f372cb693877087c
+EBUILD libintl-0-r2.ebuild 733 BLAKE2B ad0a241bf7cb2d695bb00e22567d42dd2ae9a13d1346a9936879415e49a8c0cddb316ce8435a90311f76e8f27f64fd040437dc5cc1d6e45bdc7e10bd1953c7e7 SHA512 0bc47b843f9ac01c8a8254e569d63c672a393aea85c1d1e32147ed193035b2d64918463b205cd630e132af182dedf513ae1f5196bd7de8d3d2387711a9032db6
+EBUILD libintl-0.ebuild 679 BLAKE2B b55455bdf9598ee8d402cbec6e848abcd4c4ea37b267465147eaa1c2040b6c8daaeca17b57046185632a53ea75f5f0746ffd6134046816e48b6e2b3c02f6d075 SHA512 a9256d161e13e3df709fb51d5239b38412090514f7d2ed103fd1c404600644fbf089c65e3390746561cf0c247c6580f24cca46cb49eece37b5c15194e83bfd27
 MISC metadata.xml 218 BLAKE2B 82037a8a13bcba2ae00b1c4db95363a5992fdae654412ff76e70f0cdbc6c28c3ad1a3aa9746763e7271c7ff2f30b6103403bde6437ccb45e6897dbe060e205c1 SHA512 5f03bbfedc0f66afc7bc45f1aeeccdfc3c775dd337fb280bb7e80e29f618898ce92a05c66c126e79333e33ce7f422169c5ff1cdeeb30b58475c712e9bdc4e79f
diff --git a/virtual/libintl/libintl-0-r1.ebuild b/virtual/libintl/libintl-0-r1.ebuild
index 9b672be677b4..a7b6780b5999 100644
--- a/virtual/libintl/libintl-0-r1.ebuild
+++ b/virtual/libintl/libintl-0-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for the GNU Internationalization Library"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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 ~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 ~x86-winnt"
 IUSE="elibc_glibc elibc_uclibc"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libintl/libintl-0-r2.ebuild b/virtual/libintl/libintl-0-r2.ebuild
index dd707ced493e..d793b2170452 100644
--- a/virtual/libintl/libintl-0-r2.ebuild
+++ b/virtual/libintl/libintl-0-r2.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for the GNU Internationalization Library"
 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 ~x86-winnt"
 IUSE="elibc_glibc elibc_musl elibc_uclibc"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libintl/libintl-0.ebuild b/virtual/libintl/libintl-0.ebuild
index a048d76089bc..6c38c7a19836 100644
--- a/virtual/libintl/libintl-0.ebuild
+++ b/virtual/libintl/libintl-0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual for the GNU Internationalization Library"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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 ~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 ~x86-winnt"
 IUSE="elibc_glibc elibc_uclibc"
 
 # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libusb/Manifest b/virtual/libusb/Manifest
index 1f394f669af7..07175a6baeba 100644
--- a/virtual/libusb/Manifest
+++ b/virtual/libusb/Manifest
@@ -1,4 +1,4 @@
 EBUILD libusb-0-r2.ebuild 382 BLAKE2B ef63b79fc89b4f2e5b2d7417a7eeced5e53613fbd67058ff51290e5bdfb3ffd094dcc44c3411224e2441aeec378b45d1a2fde3bbb27052053cc1266eddbd307e SHA512 05724d4dd0a1cd5066308cca24b1130dc8509a77fdd47943e3a54e11d1f05099abf0c4833c8dba7744210d5ef38ce7498856e1563c2cb4e21c4737edf057ed77
-EBUILD libusb-1-r1.ebuild 398 BLAKE2B b25809708647dcce8765a13b5bf222be2fc40e1a33e7637e9aac3eb701ffbd706e41a65dd7135baf44c1a2898276fdfb1fc842604c43e573e1d3667a6f2eb319 SHA512 45e0fad6b24b0da1a3d948ce0353689fec65705aff758efcfe8c1bb6c2152d859c37a66797a513f9fc53ddc38fd4c8a7620d5ba8c80afca16d55a53821ec1b8e
-EBUILD libusb-1-r2.ebuild 552 BLAKE2B 6fcc098d9a2afc21e289939ceb19836429aa022c9c2927c59ad09a3239b03c14c7293694c2c8169bebf3f89916fe875fc872cd6e2039efe8010f72e1848d4b38 SHA512 12fbf9c13ea99b28f967f55f9f01bd5858da354eba0d576c29f5bdf27bd548b1ed61a679e027e22e6a968decb58c1cbb083b0586f95668c9c0128e74aa00e570
+EBUILD libusb-1-r1.ebuild 405 BLAKE2B c538b6fba771cba988315757d22ea4550026242d71fc0781299c200ca4b9bb12a6f385f31ca1ede53e5cf2bb19a18b501f4a0c86cf17e51eedd2a2b174277d04 SHA512 d123611d8cc6eb033e63ac6ec7fd18769e9c5ce4d2775a3f4c17688b2a70187ef978d9b940a4b7d7899c3a8d4a889226f090d9f6663671b9cd9362d0fc76d675
+EBUILD libusb-1-r2.ebuild 550 BLAKE2B b98b52bac986f82c62008bea3f2812fca74bd42d2aee77ff8b42892a940aac202ea0a0d6d558614e51d9a19151b10eda5e0af7e4e1ba67d5d433559dee7e9c2d SHA512 9f07bcdd11be03f6df7b0fc708000fa8ef6600332c4fdb9c1494f58dd3d299b03c0b790d5d00b470b1a2bb969d30edd8bd8d9beacfd10c0d74c5bedf2fcbe910
 MISC metadata.xml 258 BLAKE2B a6fcc3580b114ca2b15b760b7e31af88ff854dbfe58715bdf35264771f6aa99f96eadbbb91d005905bf255f26e75d3b0a16ff9c04085c41d7466aaa4b11b90f7 SHA512 e1a07b8724003615826aa66143a03801309fd54fcc2a0f23075c13ca61d4ed35f1d105ea2b447845e2a3d917a84fa81f4f1d1cab6ba3b8d7f7e0ea025387ddf1
diff --git a/virtual/libusb/libusb-1-r1.ebuild b/virtual/libusb/libusb-1-r1.ebuild
index 81127ae91572..1c2e802b8cc9 100644
--- a/virtual/libusb/libusb-1-r1.ebuild
+++ b/virtual/libusb/libusb-1-r1.ebuild
@@ -6,7 +6,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libusb"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 IUSE="udev"
 
 RDEPEND=">=dev-libs/libusb-1.0.9-r2:1[udev(+)?,${MULTILIB_USEDEP}]"
diff --git a/virtual/libusb/libusb-1-r2.ebuild b/virtual/libusb/libusb-1-r2.ebuild
index 469adccdbc75..487a0d2684b6 100644
--- a/virtual/libusb/libusb-1-r2.ebuild
+++ b/virtual/libusb/libusb-1-r2.ebuild
@@ -6,7 +6,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libusb"
 SLOT="1"
-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"
+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"
 IUSE="udev"
 
 # We force a recent libusb so that downstream consumers of virtual/libusb
diff --git a/virtual/logger/Manifest b/virtual/logger/Manifest
index 7465bf854ce0..5207198ebbd5 100644
--- a/virtual/logger/Manifest
+++ b/virtual/logger/Manifest
@@ -1,2 +1,2 @@
-EBUILD logger-0-r1.ebuild 557 BLAKE2B 2c8e0979ae7d2b14d017961fb9e1cba5fd9a3829108d917238a436b9d54d9001f4fb4975b6f4d2ee61ea0aa9e60e7d69916c4ce18d801d93762b9dfd20a01bc2 SHA512 849fb650bbfbc7255521ae500e9ba932b2776095616dc44f40229264ce2905a1686817e98920c6bb71ead8b45a5f33100461d4c9b702a8d10be7d6a9bb3a14f0
+EBUILD logger-0-r1.ebuild 564 BLAKE2B 2ef845a7f623a5b7805558245f0a8db85da4a63e47574118776ff7db6b600c808d433f92e23ffafbc401ac47d8969f4be9d68fa4f3beb2684b5df877ed8038c1 SHA512 545839f61b39282c032d3593024012661d2d86260c6f325019e7128efa4e8e3da2028fe07fc91b81958a0c44e810405837026fafa94df8f82ec4107817e6c312
 MISC metadata.xml 259 BLAKE2B ad9f9c75c778d49d35400d0a02d6f1cbef1f09ed9908b8f2cc621d96eb4399c32655148ca396341321081c94e9f9d93074a7b602532175616489606e912a8f1e SHA512 52ac8ae724178e93c2e9cec0b77c9adf71be556812cd1272f593cb634bb500910d4d48c4386c4047e9d38911ab63eb71f7b4d0869f97176965a81c1b6be30d4b
diff --git a/virtual/logger/logger-0-r1.ebuild b/virtual/logger/logger-0-r1.ebuild
index 4f113de3ea2d..861cf4bd8629 100644
--- a/virtual/logger/logger-0-r1.ebuild
+++ b/virtual/logger/logger-0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for system loggers"
 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"
+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/metalog
diff --git a/virtual/mda/Manifest b/virtual/mda/Manifest
index 78350dad8ffe..04065f65e43e 100644
--- a/virtual/mda/Manifest
+++ b/virtual/mda/Manifest
@@ -1,2 +1,2 @@
-EBUILD mda-0.ebuild 480 BLAKE2B c91058ef7eef1d94bf1319b81b9584c6b25befeb65e264f8207ced5bee799b9c1f8a3755b8fdfbd66914078cbc2cdff4457e140f5a4fdceeb7bf9febf8d4811a SHA512 4da0f1eb7d413a6a5390f9381c51247d24253e343648dfd07dedfa6f14c834a89d48c4a31d21711a85b88f40f7499d275fa3a874574b98c45e068ac25782ecee
+EBUILD mda-0.ebuild 578 BLAKE2B 247490feabde2caa6a724a139d222873178b1b1f37334d15db87e2808c91c204bb3555987c2264608e54d14f6e462210860664b835da9ec59e1c558cfe7d3956 SHA512 6ee45ec01a3c88589c44142e820c1b247ffa923a87077ebe4db2ce941ce87dd28f1787aabca80f8d5298440619bc0702511974f0d79d494391fc6181d9200a4a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/mda/mda-0.ebuild b/virtual/mda/mda-0.ebuild
index f2b008e345da..33438beb6fed 100644
--- a/virtual/mda/mda-0.ebuild
+++ b/virtual/mda/mda-0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual for Message Delivery Agents"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 
 # mail-mta/citadel is from sunrise
 RDEPEND="|| (	mail-filter/procmail
diff --git a/virtual/python-cffi/Manifest b/virtual/python-cffi/Manifest
index 0ffeccf01106..a39ef35f99ec 100644
--- a/virtual/python-cffi/Manifest
+++ b/virtual/python-cffi/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-cffi-1.ebuild 573 BLAKE2B 015001198e1b4f51381aba9e8ad861480bc891156b29ced8b173c84fd8bc24732bbf24810fffb7d65cf2b962c4ab5f7b7a1db00dfc8b9f3dd3089bd566ec3d50 SHA512 23d8eacdd6ee0187d7035bebe3efd0f313d12b87a8eaf8480ab734b32ba3e85c1c6e75fd6af00eb51ed9b68e4c841852cea684ab476c8b823026e567fee71f48
+EBUILD python-cffi-1.ebuild 615 BLAKE2B 5229acaf182b81933c7e5acb5c889dd59e3029d9687ea8c03e15ab8daf7d6132bee53f84460c5c11924fa132eea641b26722ae4465426a9b2a6b9558491d5ce7 SHA512 63efa8a767de5832e3ae5b65bee16dd9b9b0313153ab2fc53d7b6e410ff67252bba040f094ffce97ce7525cf74b56468b86f3d0cc21a75357d1eb9a867730a10
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-cffi/python-cffi-1.ebuild b/virtual/python-cffi/python-cffi-1.ebuild
index 46dd20bde9dc..3fbcc24aa760 100644
--- a/virtual/python-cffi/python-cffi-1.ebuild
+++ b/virtual/python-cffi/python-cffi-1.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
 
 DESCRIPTION="A virtual for the Python cffi package"
 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 ~sparc-solaris ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # built-in in PyPy and PyPy3
diff --git a/virtual/python-greenlet/Manifest b/virtual/python-greenlet/Manifest
index d66c9642f38d..38abee7ba8ab 100644
--- a/virtual/python-greenlet/Manifest
+++ b/virtual/python-greenlet/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-greenlet-1.0-r2.ebuild 463 BLAKE2B 00ba26ac8000fb9ae397335510f497cbcf9d9088b5b197c1bf9c003d6df50d9ca5ddfba140f826976bfecd0cc8b73147020e1680554d1b7ac64a46b348a35224 SHA512 9e69e47a7919b6562999ae084200333df0eef7fa373337edba5799bbf55b65c39648397067a65bfc20408a6bb3b07d84076bdc4824a32065fedcda0c93655800
+EBUILD python-greenlet-1.0-r2.ebuild 474 BLAKE2B daaaa807778472d1da73c4665246719b19aa0be88de122f6debd0e376482e2c259360ff4abf8bf60dd02ac4e87a1321799caac0dce86f32ccbf362dc208f5002 SHA512 6b3fb4c61577d5e9aa612e81c6cc4ce6d4c78dc75a2fef2f21b8fed03183a69f5370979ebf82efff81733266f49cd4fd3832f5c602e415d1d21f2a697b52c4d1
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-greenlet/python-greenlet-1.0-r2.ebuild b/virtual/python-greenlet/python-greenlet-1.0-r2.ebuild
index 988c8b2aaddf..4967a6697c34 100644
--- a/virtual/python-greenlet/python-greenlet-1.0-r2.ebuild
+++ b/virtual/python-greenlet/python-greenlet-1.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
 
 DESCRIPTION="A virtual for Python greenlet module"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/virtual/resolvconf/Manifest b/virtual/resolvconf/Manifest
index 65301bb4eafb..f6041e1e19e4 100644
--- a/virtual/resolvconf/Manifest
+++ b/virtual/resolvconf/Manifest
@@ -1,2 +1,2 @@
-EBUILD resolvconf-1.ebuild 358 BLAKE2B 8d185986fb309e19e1957de3a4c3b1a6ab2f86bc5013f16c91a42ce5b6891bf8e14538dccc30ea97f6bcf4c1e1828929484e3b5526bbb4f9572bccf5b654e3c6 SHA512 bc508de3dfe84d8af09a1a39fd95f87abd53df601db91762f89f709ecd4127b0d76c486bfd719198d6066a0290bef5c3515c051abe9160994efa67b2a2c0b45d
+EBUILD resolvconf-1.ebuild 365 BLAKE2B 8ddd78be7219bc5289dfcec8519042262af0073d5f124768855ffb47ba169f1288347fe6d0851243eac3239852c3ba42fb8e00c1b45a25d23fa0f74fd80db642 SHA512 0057e07deb65d650fe14025a43e534da1f485569dcfb3f9db3dfbe4fcd28ec6f46f8d2a6ee19ac8e924518e133e0009b23416d46be7f2ece9bd116dd504bfe79
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/virtual/resolvconf/resolvconf-1.ebuild b/virtual/resolvconf/resolvconf-1.ebuild
index 5f85ce124727..074d22068c8f 100644
--- a/virtual/resolvconf/resolvconf-1.ebuild
+++ b/virtual/resolvconf/resolvconf-1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual to select between different resolvconf providers"
 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 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/virtual/ruby-ssl/Manifest b/virtual/ruby-ssl/Manifest
index da4759130f04..a609dbc1a334 100644
--- a/virtual/ruby-ssl/Manifest
+++ b/virtual/ruby-ssl/Manifest
@@ -1,2 +1,2 @@
-EBUILD ruby-ssl-11.ebuild 731 BLAKE2B 3a9a7b704de2064ebf4746fb98618173195b892ad00502f4122c932da6693cc0649b705931cf73c759219a576e898fa46e19746b1b33f0d7c87208eceec90c12 SHA512 18f92c9867406a76ce4dfeb52b77b82ec40b1039ca033f0b45f3c4f558ee3cbb7d170fc3b53c987cc87621d619177ff1658558e6f17178e7f514f16118fa4372
+EBUILD ruby-ssl-11.ebuild 751 BLAKE2B 0ea7f3cf96218414ce84a30cc3c559b3a9042dbfc57140d1a00eb2211ed1d077a6a253c0f60d9c192d3aff81e9895f091c7be97bf9fcefc69d314babe2a095b6 SHA512 ea05c0a6ccdde9829627c9eae8e812f268b407e63ec2bb4f4af2b728f012ac05198faf6ac0ab7ad0b017513eb4057e9c6d4eaf9a7c7d0136b03f8e429197c686
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/virtual/ruby-ssl/ruby-ssl-11.ebuild b/virtual/ruby-ssl/ruby-ssl-11.ebuild
index 9536a53ffebd..7852e7d62051 100644
--- a/virtual/ruby-ssl/ruby-ssl-11.ebuild
+++ b/virtual/ruby-ssl/ruby-ssl-11.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for the Ruby OpenSSL bindings"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~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 ~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"
 
 RDEPEND="
 	ruby_targets_ruby25? ( dev-lang/ruby:2.5[ssl] )
diff --git a/virtual/texi2dvi/Manifest b/virtual/texi2dvi/Manifest
index 13dcded1afb1..3d3de1b4d6dd 100644
--- a/virtual/texi2dvi/Manifest
+++ b/virtual/texi2dvi/Manifest
@@ -1,2 +1,2 @@
-EBUILD texi2dvi-0-r2.ebuild 421 BLAKE2B fac25c24e356af7b4521c1d9b6fce82cf2ec856eaee35763a1a6cfd3e563ec72a760c3b9e823741f290376d338025a99f130a377032370060e8813bda62bc3d8 SHA512 df4676e712f41d1cb64a5ed27005d6760a5c2e50e5d340fcf77e5ef271d42a222fb12c57935a5573b94cf82b498cb12ed52f8cefc67393438e4f6924142d4fae
+EBUILD texi2dvi-0-r2.ebuild 451 BLAKE2B 35ce0beb8460c0c3f9898ecaed4aa9ceb69f9cf3dd4e7f5aeabd423831d7da28cef3f5807c5898a10caddcbb330c63651afbf16a54e37e9325feff9f626cb0ee SHA512 e2522e617b371da384d08fb15782a06147c86d1ca10239972f5d927109c09faaf00e90c3b2fce52a969c487d95e017aaf5e3277a26e132fa93a8e49b116cf76a
 MISC metadata.xml 359 BLAKE2B 2ea428cd832710fc7b9cc25393e15a874b726be6a1bbccc284bca872fc2ba2a80c2a72ca587dd43c440d4cd6650e13cd20f1fe7f3c0057fc06e7640811aad719 SHA512 aaec61de8f382de09053c63ffec9c01c4b5c1516edf005693274ce0434b1c104327d2ea57111f9a3a34e169a3e3e14886b44736cb3bf295f6b226da163a5ee90
diff --git a/virtual/texi2dvi/texi2dvi-0-r2.ebuild b/virtual/texi2dvi/texi2dvi-0-r2.ebuild
index 707f7e644037..b6204e6eaf01 100644
--- a/virtual/texi2dvi/texi2dvi-0-r2.ebuild
+++ b/virtual/texi2dvi/texi2dvi-0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual for texi2dvi (and texi2pdf)"
 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 ~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"
 
 RDEPEND="sys-apps/texinfo
 	virtual/latex-base
diff --git a/virtual/ttf-fonts/Manifest b/virtual/ttf-fonts/Manifest
index 534cbec5eaad..c74a18245674 100644
--- a/virtual/ttf-fonts/Manifest
+++ b/virtual/ttf-fonts/Manifest
@@ -1,2 +1,2 @@
-EBUILD ttf-fonts-1-r1.ebuild 595 BLAKE2B 808d09ff5549f6d817f4a991487cbb4a64d1a76242a7e79604cd3440f4180ac90820a63c0bb1b7ca59af21a655889dc911aa75220a53bd3bdc4452d58df18820 SHA512 a60de85bb66844f97eb71ae919bd4b0db0a647ce8367eea5b4c27545ac0cf2aade96538ac02d299229c9bee8a6beb00800f268b038369b15d3cca5796c0f6ba0
+EBUILD ttf-fonts-1-r1.ebuild 606 BLAKE2B 73ba1ff9004ea85bd881860980c88dd7fbab82fad4d70c813a4117784e1286918202c9268ca0bbdfbf694754a0c4d63b2bf15f14b489521895fcdb6feccda3b3 SHA512 33967e1eab33206f687c2c594ab95ba27a029cc5a3245000eef896ac089038fa5dab4c5bcc65d73a7190373fe061c8347d798a6294621cd9cf7fd555b1bcf717
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/virtual/ttf-fonts/ttf-fonts-1-r1.ebuild b/virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
index 6546b22281a6..2cab04f1bead 100644
--- a/virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
+++ b/virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for Serif/Sans/Monospace font packages"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 ~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 ~x86-winnt"
 
 RDEPEND="|| (
 		media-fonts/liberation-fonts
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 515ca1619132..12d33084137b 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 5a2713c9e167..3518eb4bf092 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,5 +1,7 @@
 AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca4595692ac146c2e4cd1c3647e7399d44249059496960ae94490c5b188c986dab64d4b90901bd7fc44203493532a0 SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b
 AUX postupgrade-1.16-en.txt 1519 BLAKE2B 39cf00073c5d12e04dd69126c7671acb5876bcdd592526d6aca475b98f9ed7abcb6d2691cef8642be04d8041fcbdaee0555937f1480f71a82c3f367f2a3d99b6 SHA512 495a2ea3074e96e570ed83e557691786524aea878fa6ee489080245a9bb1669d93e318c3871ce44918225d0e64d09e1e644538627bfb35a4a2a12d27365dc89d
 DIST mediawiki-1.35.0.tar.gz 48039474 BLAKE2B 54d4e5edd4d7531815840d180a92bdaf008e28df3ea9ad26ba27673e4c6f904f5643c0ff333efd5a7e03512b54514c9eb74c5ed1774ef7f4085dbc50dcf42f4d SHA512 0d3d5b464abc2fdea2aa798bdf7fc53d5269852d9ed3f787710528505bbccfed2796b0e2459f5776929f3f0f207a145ae4a8f13e3040322e22d59481a71cfcde
+DIST mediawiki-1.35.1.tar.gz 48046673 BLAKE2B f476547442bf78db3b306165bedcf9878f38f61f6a11b7ce9b30b576b5c14e3b8089d622d4d722801fdb3c0352c7bdec39e0e9c251666b94397dcc9f7433b5c5 SHA512 71afdfeaa52459fc87e135449579b65aac6ed528240050a6fb5073ab19d091584f5fdfec7a8a48f060b1ddba322243d2e00e659f7e964fbeec69f22a271d756d
 EBUILD mediawiki-1.35.0.ebuild 2562 BLAKE2B 10573dc1f8645d56927ac6cd0b89689e0c01612edf8c5ce60bd142bd54cb261c1cc84bf9f83f692fe3db57cdc31247843072a8734d5be4348eb7dc26eea0283a SHA512 bd35f2df7ade0661955877a56a2ac4289a6142e720c55fef739308dad9fb3ea97dbbbf7c28b6059dcf4404b9329f74017de609539f66c12175fda60c6495da58
+EBUILD mediawiki-1.35.1.ebuild 2563 BLAKE2B 9574c4251c593af835aa3bdf6434feb19609b7c4c41ad157b7f1fae72bb40d6f7fea6e81be4ce9c8c6a84963efdb65cd5c90364e85a6c0533c09ccb3bd1d25b6 SHA512 9d0c75d6d53e8650bdf38049dd495b01f60a269adbf0f5b94e684dfa665e06091a08e1d776e78cc25d11bc4e3175a6a1cd058dd1741b808b55b3023a75fd337e
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mediawiki/mediawiki-1.35.1.ebuild b/www-apps/mediawiki/mediawiki-1.35.1.ebuild
new file mode 100644
index 000000000000..6fae7d0e6f17
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.35.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit webapp
+
+MY_BRANCH=$(ver_cut 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc x86"
+IUSE="imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND=">=dev-lang/php-7.3.19[ctype,fileinfo,iconv,json(+),postgres?,session,ssl,unicode,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	mysql? ( dev-lang/php[mysql,mysqli] )
+	sqlite? (
+		dev-db/sqlite[fts3(+)]
+		dev-lang/php[pdo,sqlite]
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_unpack() {
+	default
+
+	# remove lua binaries (bug #631554)
+	rm -fr "${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die "Failed to remove lua binaries"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README.md RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto databases
+	dodoc docs/databases/*
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs || die
+	find . -name Makefile -delete || die
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		echo
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		echo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		echo
+	fi
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 4b257309971a..bbf6a02d18b5 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 532ad9cde8f3..2f9952b4c4d1 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -10,11 +10,11 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-87-patchset-9.tar.xz 6036 BLAKE2B 4dd9aa0e88f11a9104cb13e73607c3b4fcd7e9cb556034472e2fd46158db6e7505b22c098df1c7cab6c7ff06ba6dc45914dcab58a405e0eafffa58d8b0cafbbf SHA512 c036ee20b4906bdb1b3104ecacf30a092ee3662ec10754bf2b168f1b7e1dbf593216e4dc70f8264540fadf91a33b48a8b8040028966dfcc8d8be99807b5f1b99
 DIST chromium-87.0.4280.88.tar.xz 856266548 BLAKE2B 06a29a6c1e8cf71eb2db6e93a009feb8fd0b7ee676ff2c1dd31d2d72c597e5e84d979dbc64b7cb3f80ee0c51196f60a56157a27b679cab7f779baee61cd1928a SHA512 ac3903b598bd69f4ee3065845eac3c85cb5524715b9ce629c9c2bd017f2ebd168b7ee8111bccc2e6b6cfd12ad07add834cb2cd3bf0e27a8a5076bb7842fca897
 DIST chromium-88-patchset-3.tar.xz 8396 BLAKE2B 4c978f1a6efef3f71e3dd6340c392b74bc6a734b49a9ca43343d03903159dafc66159939f9a6c4b55665ddbe7bd97a26d8d86c285ec02cf76cad5f5cc7410570 SHA512 c39afa26f5b0b9930f6f67ce0c42eefd74c09d528b26bc0db57129b150f75ff83c8b1cb97bd9c5d75f288fb4767cc68c9c5ce89231b4a59f8ca02493e4dd281a
-DIST chromium-88.0.4324.41.tar.xz 856996692 BLAKE2B 9272e3374ece9678d7487034ca1953c9062cabd0120e51030815bba7ee1d9bd3a2f8a86f45db49157665aeea5eec75807ee4f59219397d7065620e29f5b33ff3 SHA512 4aa9a4412e08166900c1d91ebd4a8dddfc38945aac9de04dbfcde101c713a0b2be38983c779bc5c4d2c361043fb3b92a0ece57adb5ab1548b08a135c9103dbe5
-DIST chromium-89-patchset-2.tar.xz 7016 BLAKE2B 6512f6d35420a7df1d897b1ca4b157511436a6cb918a433a147cd6e405bd98c112849c65587b3f99b3ce824cdb2d24ade424e2cab898bf9006c141ff6aa72ff1 SHA512 7c6aff43f8f4b36a43012a352d61c4f77ad5eb64ac02b9a2561cf7ec18bacd64e94af94a970b9ba93b416da13a8dee3923634dc48981785c1e0ea9d48427270b
-DIST chromium-89.0.4350.4.tar.xz 884498160 BLAKE2B 7e34647c9df6e8c00c9202329bc861a2b9d036eb74975f21d65c9daab8d25c792bbaa71a2e293a30831598ea035765a0ff87b1a87de73537ebd570d0b4528cd5 SHA512 e6db4cd4bebb438c5c32e140e4afed5a6b8ab99e832c83d7f1a37c9014649bd5a6483223c6d0e3414355fa9af98abccb570bfcd05a1f67e4b77fa2cc67aa12e3
+DIST chromium-88.0.4324.50.tar.xz 857151388 BLAKE2B 0e6cb0ae6f73e7313b57bbf3cca5f18e8a1c06d9dd103a6fa8283401196ccdfcfdd194049cab3477537e4a926290a778699e11a62d55d772814046c3e9390c61 SHA512 18ffa3f42d77b3097d095dbf28581a7ab32f05ed64f6d3fdd1c6efb2a48bf02ea0c6dce2c0a715dc6a100152737fdb7d56b0ec9f3b0e417ae7c33fd259f1ffa9
+DIST chromium-89-patchset-3.tar.xz 5276 BLAKE2B c5001450e876c4be85d1ecfa9219c9d5d59d95d7c7a783470357e4a34fb60a72c20a138d652e3d587fd893e230d8e729ad5887915f1d39fdc940e726cb965341 SHA512 5157265a5d712bbf5a456cc5e0b798ee358d03f571dc91e2bff4b53eab71aae013d40a0140c1adf5aea9d791bbd543883cd5a133a2d3eb971baababb0acd54b7
+DIST chromium-89.0.4356.6.tar.xz 885537076 BLAKE2B 75c8f977b62bb73f5b0c8223561d1bd868270f3fdb01ca86a7e9355d442352fa17d7c7db3d67a20f273b8caeda06a03ce57b1f04017d73d6d4bc195356e39d1b SHA512 f83ce11fd9957a794c6dfdd5e128016f55140936af94daf1b7f09156b04b28d77f924bd9c9f92e062c75aae14d11508cb532deda23732acfa85d987de28cbad3
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-87.0.4280.88.ebuild 28443 BLAKE2B a5b8c7bc5347c6f873a030cca63b422d0a0eddf2d7b1dd954eb0392321ebe5c45dbe27bcbd8278cc04a9325475b31701558e5f1f694bb36ac9779a61a44108f2 SHA512 b4caf7f94af6cc9cd58563132a7272d8f3d588d79e0d21efc512c8d510b4e82c6837b51a39577c436c34c2d8eb5f9187ff22f9471382ed8fd7c2b834c24d8400
-EBUILD chromium-88.0.4324.41.ebuild 28461 BLAKE2B 0864f87e039e5977383c0d01cc5073ea9e3879d6e694517608bf24816b68750c59f3568b5790fd9f3734200feeaf685c55b20eb80c5d71ef9d7d52be407ef199 SHA512 b5ef742bfebc05382a191ee5467ded00b31bf71fb6f6ad8e63389737afdb6f8b19526521ff69813e6b9ae6f26400e6ace798072652fd78284996f698d16cfae1
-EBUILD chromium-89.0.4350.4.ebuild 28456 BLAKE2B 14c5aec61420bfd9abe2ee473b00a3b425ff0b74b9e9f2b49cfacc527d0dafef3ff90af8cf6be4fdf392d466b4ce75bad7030d4237f735912198abf327206c9d SHA512 f3694d03af8193ddeb9af63be07355ee4eb44da2f574be022451c480cfad3ab288d9c91d318e2465f1097dc200fc208445f6cf166c55acb02cbdfa14b5a82a8c
-MISC metadata.xml 1475 BLAKE2B 656bb8ec2a3bab8ceac368327564ab10c872fab191877bd4e0385a7fe6ca82a6fb468016d257498429875a9b377b61844c2e574d13d699bd91302f5f5b928288 SHA512 3b1422398b7055411ca01b4d6c4bcbbf639fbde0eb8cc312d59cae518a500f4bff9ff3df01145f36e7e229396a0ea60d07c1b6e872f25f332ce807d80a8aad2a
+EBUILD chromium-88.0.4324.50.ebuild 28461 BLAKE2B a58fd70b1e7071a34be2871f5b9d981778fffc16ba7e41718994a38a2b31e98783e3982cf36b6a4134fc3ceff5c68d9c2a23480687256fc6fc296d1cd7099ea6 SHA512 357c92c843bd0696ab20d2afe8047d89ff85cfe308eb8f85471c716127da6b3131df3b927e49e608179d6faf0d579ac5eb07886851c5309b8dd7c06e894540a4
+EBUILD chromium-89.0.4356.6.ebuild 28854 BLAKE2B 4773cd611ab3576de749d15908e0bf4841132b4be9dedf96c1399bb709f13ed589b5f519c8961d452015652a34c08855d87f77fe9c60346227c191bf50bb7196 SHA512 c4bb9110a337b93682229dfd347185b3bdf8723a8b7340177c32a1844cfe5e841d15e364c3031ac2201e74f9912449749af15a03fca5e865a3d87f87e29a72e0
+MISC metadata.xml 1596 BLAKE2B e15a05a13e8200be6a946ba0b2631a014b83a66267a9ce956245d28312403b3229ef6a961830bd69535bc4286912fdf8d5f3a6cb0d0f8aff29936ceaf7113e8f SHA512 204d0b04307b2fc2188c64f290c0e3a0a0b14f3ac0f35deaffdaac1b30addd4df1f2eef2eae19a674f07123dc44a6ba4a0b5e2419a898bfaac61579603ceb0ee
diff --git a/www-client/chromium/chromium-88.0.4324.41.ebuild b/www-client/chromium/chromium-88.0.4324.50.ebuild
similarity index 99%
rename from www-client/chromium/chromium-88.0.4324.41.ebuild
rename to www-client/chromium/chromium-88.0.4324.50.ebuild
index e5a4b0caf3e8..75efc1615e4b 100644
--- a/www-client/chromium/chromium-88.0.4324.41.ebuild
+++ b/www-client/chromium/chromium-88.0.4324.50.ebuild
@@ -137,7 +137,7 @@ else
 		dev-libs/libxslt:=
 		>=dev-libs/re2-0.2019.08.01:=
 		>=media-libs/openh264-1.6.0:=
-		system-icu? ( >=dev-libs/icu-67.1:= )
+		system-icu? ( >=dev-libs/icu-68.1:= )
 	"
 	RDEPEND+="${COMMON_DEPEND}"
 	DEPEND+="${COMMON_DEPEND}"
diff --git a/www-client/chromium/chromium-89.0.4350.4.ebuild b/www-client/chromium/chromium-89.0.4356.6.ebuild
similarity index 97%
rename from www-client/chromium/chromium-89.0.4350.4.ebuild
rename to www-client/chromium/chromium-89.0.4356.6.ebuild
index ad25c8766228..9a4725ffc820 100644
--- a/www-client/chromium/chromium-89.0.4350.4.ebuild
+++ b/www-client/chromium/chromium-89.0.4356.6.ebuild
@@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="2"
+PATCHSET="3"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
@@ -22,9 +22,10 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine"
+IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid )
+	screencast? ( wayland )
 "
 
 COMMON_X_DEPEND="
@@ -86,6 +87,7 @@ COMMON_DEPEND="
 		wayland? (
 			dev-libs/wayland:=
 			dev-libs/libffi:=
+			screencast? ( media-video/pipewire:0/0.3 )
 			x11-libs/gtk+:3[wayland,X]
 			x11-libs/libdrm:=
 			x11-libs/libxkbcommon:=
@@ -598,6 +600,7 @@ src_configure() {
 	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
 	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
 	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\""
 
 	# TODO: link_pulseaudio=true for GN.
 
@@ -741,8 +744,7 @@ src_configure() {
 			tools/generate_shim_headers/generate_shim_headers.py || die
 		# Disable CFI: unsupported for GCC, requires clang+lto+lld
 		myconf_gn+=" is_cfi=false"
-		# Disable PGO, because profile data is missing in tarball
-		# (https://groups.google.com/a/chromium.org/g/chromium-packagers/c/2ID9c4j6UkY)
+		# Disable PGO, because profile data is only compatible with >=clang-11
 		myconf_gn+=" chrome_pgo_phase=0"
 	fi
 
@@ -896,4 +898,10 @@ pkg_postinst() {
 		elog "inside Chromium or add --enable-accelerated-video-decode"
 		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
 	fi
+	if use screencast; then
+		elog "Screencast is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
 }
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 4f72ec48b4c9..ede03e582875 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="official">Enable Official build instead of Developer build.</flag>
 		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
 		<flag name="proprietary-codecs">Enable codecs for patent-encumbered audio and video formats.</flag>
+		<flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
 		<flag name="suid">Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels</flag>
 		<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
 		<flag name="system-icu">Use system icu instead of the bundled one</flag>
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 7f2a7e7e431b..ef20180ba0bc 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_89.0.4350.4-1_amd64.deb 78080688 BLAKE2B 24cfb274aea768cc36718a8be07a91c4bb496a3f9218864ab4f3f0c9dcf0d50f8a8e725f5c27ab77c66de01b18c5527cc460c72617e1e766e684f7c871795909 SHA512 ad5daeb4e982173fa40bb405c0f7470d3988288c8adbf22c5dfc282c997d5ebfbf69b3916077c37a141b03abb38f2eee799a79ca8e4f0428413a8976fe53e54e
-EBUILD google-chrome-unstable-89.0.4350.4.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
+DIST google-chrome-unstable_89.0.4356.6-1_amd64.deb 73905528 BLAKE2B da6b11abb8daebbaf138298d870b24c5f1ae42b20322960d99d74c8a58310bb201e80ec5101feb0182d49e88eb66f9c683ecde5e767703de03debb4426f98a53 SHA512 a3c5547d719b4eb82af39fba33b310caaee85669463e260b1619846f86adb293e42e1c7758a9024a0b4ce2280ea4873e46725a0ad143c3ec710b882a54a14105
+EBUILD google-chrome-unstable-89.0.4356.6.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-89.0.4350.4.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-89.0.4356.6.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-89.0.4350.4.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-89.0.4356.6.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 1171da286c70..3b5667dc59dd 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,4 +1,4 @@
 DIST opera-beta_73.0.3856.283_amd64.deb 70931480 BLAKE2B 928db29de19c2b6d83920b8befb61f90a6fa860588ec59d8a0e6b0003cc1e8be4f71e9c53bccf05789063c23dffc11c709aae0b167b808e83cd197187a106860 SHA512 cf39d9b5bebc7d538eff69837a531f24e4134664a1242aa475812cc4e30ccb7441c46ae947a78ca9b62ad64ddb339cd9a53c041fc5625b28222ee4f784ca8a6f
 DIST opera-ffmpeg-codecs-87.0.4280.88.tar.xz 1361732 BLAKE2B 1a4fa468d472bca80e7c7f79d6dd5b4e58ff6566cea546febf3ac56fc9eb89d663d3f11a4a05883f377f7cb73101353dcfc0fba875e9300d2e2d0b749ed3232c SHA512 6f5e8616a0995b51218b5117619eac74419c5631f559ffacf71c51318e407430f1509e84114eb4945353d6a2b95097d3aae5083f73ddab76d55263e185b9c204
-EBUILD opera-beta-73.0.3856.283.ebuild 3268 BLAKE2B 37bfb26e9980aac6e133fafee91dc3248ab69f338e419cdad662aba083fb427453f1350e5c491a754ba2baa9927c097dd8aa715a34b2282bbf819032f3de43ba SHA512 739727c0ccfa881e9229d1e1e0cf92409f47ba870d60cdb71d0554e7bb56f0d5454a5598e85f00f44fd70dffaf1994ac9cd9096bd9b16a4d329c149bc7fc2b01
+EBUILD opera-beta-73.0.3856.283.ebuild 3294 BLAKE2B 194e987314f16b6aed112887b476e3cb4b6c524ba721cab3b2c9b4af44260169cac4a0f1890630760f7f5a0467ce5a9a37ec10ed88ef719de5738495445ea409 SHA512 1f9c8a995eb434a3e3068dd23b1ba09eeeb71be7673ce513f6f0844d1650eb81135fa10eaed827488162b5322d785e8d705281c405d3d9cfe3c4ca4c3ab7b5d4
 MISC metadata.xml 477 BLAKE2B 11beed348273a9ff128136eddd7499da5e0f8353d22659893aa613d24e2a79ee37cfbfc62aa6e0dcd77cff8f5df6015ff0374e01768f34fb0f68492675ba2f8b SHA512 7530db21f8c1b251d8c255a8cf7771f13323defccd76698e577591b676978d25cc3208709571a6e754b3be3b76c2e6e562ae1ebca42f8c5961b25f5771327afe
diff --git a/www-client/opera-beta/opera-beta-73.0.3856.283.ebuild b/www-client/opera-beta/opera-beta-73.0.3856.283.ebuild
index dbad87a40773..12ecad2009a2 100644
--- a/www-client/opera-beta/opera-beta-73.0.3856.283.ebuild
+++ b/www-client/opera-beta/opera-beta-73.0.3856.283.ebuild
@@ -11,7 +11,7 @@ inherit chromium-2 multilib pax-utils unpacker xdg
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
+LICENSE="OPERA-2018"
 SLOT="0"
 
 SRC_URI_BASE=(
@@ -38,6 +38,7 @@ SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
 	)"
 
 IUSE="+proprietary-codecs suid widevine"
+RESTRICT="bindist mirror"
 
 RDEPEND="
 	app-accessibility/at-spi2-atk:2
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index c5d9924de390..fcd7f9fc39ee 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,4 +1,4 @@
 DIST opera-developer_74.0.3904.0_amd64.deb 72559240 BLAKE2B 566cecf54030e461a4af514e92945897444f67afbd87e9388a0a4cb9a2844b86555e254abb10ac6370ddebda095a7ded396a6312098d337838ef50f2ca2c705a SHA512 fb094d5002c413fc448716ab4aacb5d4a1389890f62c700f29bf75de1cf97e15750d3b8dfc670387fd759c4985d7c2128c1e0df9e32109cb2e9b71223cc7ee26
 DIST opera-ffmpeg-codecs-88.0.4324.27.tar.xz 1362668 BLAKE2B 0815049dbf95996a04a072ad1b82664ef594e0ea99aaea5ea9d54448457bb5aa5c6d9cb95d6c84a14ca64a29e0a2e9c6f5315a1988eb577ad02cc7422fe0f886 SHA512 cd1857d302c413a52433839103a3a268a12ab255ad8d6e651e872f7f28b61e1426e3c2854fc9a6acf4430be9fa8fea939de288c800cc3c60696394f77d86146d
-EBUILD opera-developer-74.0.3904.0-r1.ebuild 3268 BLAKE2B e429bd5c2fb1fa1ef643f8fb62e24616e5ed7ceabad6d9093b78886732cb46c132986a62a56dfc9487a7ccb5fb5063f59744cd415af65d263c3cca3054835f5b SHA512 499af7cf3782e8e71d5693c69031358b2284b6230defebe914474bbd8414b24510d332a585936fc172cdb62a39fceb79b778f343cab55a0a1b89182be163a932
+EBUILD opera-developer-74.0.3904.0-r1.ebuild 3294 BLAKE2B fc207bd2fcba8e4fcf623a0ec935fd4b74c4b57bdfd346ce5407e8a414bec0544b64f97cf1294471d0468b443e9ce1ca34756ea082962cf89e60a92504518c57 SHA512 ddb5379fa9ea1e7cc6eb978a850e07e59a76daf2f3d61f0b997f650470b322d2236c5f33f0fc778847e84b34463ce740af4c83ecd9124277424220b9a04db7a3
 MISC metadata.xml 477 BLAKE2B 11beed348273a9ff128136eddd7499da5e0f8353d22659893aa613d24e2a79ee37cfbfc62aa6e0dcd77cff8f5df6015ff0374e01768f34fb0f68492675ba2f8b SHA512 7530db21f8c1b251d8c255a8cf7771f13323defccd76698e577591b676978d25cc3208709571a6e754b3be3b76c2e6e562ae1ebca42f8c5961b25f5771327afe
diff --git a/www-client/opera-developer/opera-developer-74.0.3904.0-r1.ebuild b/www-client/opera-developer/opera-developer-74.0.3904.0-r1.ebuild
index fcc98f28db80..e27ca50578c7 100644
--- a/www-client/opera-developer/opera-developer-74.0.3904.0-r1.ebuild
+++ b/www-client/opera-developer/opera-developer-74.0.3904.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit chromium-2 multilib pax-utils unpacker xdg
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
+LICENSE="OPERA-2018"
 SLOT="0"
 
 SRC_URI_BASE=(
@@ -38,6 +38,7 @@ SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
 	)"
 
 IUSE="+proprietary-codecs suid widevine"
+RESTRICT="bindist mirror"
 
 RDEPEND="
 	app-accessibility/at-spi2-atk:2
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index d4216a6a56da..067e972e816c 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-87.0.4280.88.tar.xz 1361732 BLAKE2B 1a4fa468d472bca80e7c7f79d6dd5b4e58ff6566cea546febf3ac56fc9eb89d663d3f11a4a05883f377f7cb73101353dcfc0fba875e9300d2e2d0b749ed3232c SHA512 6f5e8616a0995b51218b5117619eac74419c5631f559ffacf71c51318e407430f1509e84114eb4945353d6a2b95097d3aae5083f73ddab76d55263e185b9c204
 DIST opera-stable_73.0.3856.284_amd64.deb 70760608 BLAKE2B b0c7ea860e4ee1849e71656aad16288407c80604553277f325b36c22bedc9ca7d88318a597ece606b160854c4ec89b95e4ba3624e41ddf3a4ce628487af6bc43 SHA512 a321f06db3b2fc1ea232344556973dc5c66f34abe75a0a830807416d4c90fa31ad5232e372f4ac031537dba9f7f910894b98fd2260c6e484a5b6fc09e0f65b84
-EBUILD opera-73.0.3856.284-r1.ebuild 3268 BLAKE2B 8ef678bd7bf39b4e33b07ade6acb7046a46c744f5db5e4b2a77f52cc93532055b4815b7643791691813a0e03ebd678803d7dcfdbadf33693450844305954d825 SHA512 deec1e7319d2fda84d1c239439025c24ed707a3553af254a6bd9e28d6169d0da66618c11aef13b2d57d170ae19efa7a5d7920179b912999b6547ebe3b660f6eb
+EBUILD opera-73.0.3856.284-r1.ebuild 3294 BLAKE2B 6272f187b34490dc95eacb3490f0190609daec926e7c798e6e03d0077cd59bcebde31b2a500c279cc789a782d911536acfceeb2f4fbef70729ebb42a6611c3dd SHA512 37be83add1a95153c3531e614d47f015a0e22b7105bf2151f495e72a3acf229f85b7d2dc1a3e8389f689198aebffbb133470841c8096106123291246cde326ac
 MISC metadata.xml 687 BLAKE2B ebfff0bde22208ffea6584bccc5dcbf3b8682cdb10e95b43150d872bef72c6e4325697adbcc659ea3376977a21aba1a90d9f9d71b30bdc1a5d850996116cda55 SHA512 43bd26c1b891583955107a111bf7e8d81619d03dc4cd0c67210909c8f26b3bac9112fc59e31d5c422c7464c8ac699107977c34b57a0f27585786ca1636d704cb
diff --git a/www-client/opera/opera-73.0.3856.284-r1.ebuild b/www-client/opera/opera-73.0.3856.284-r1.ebuild
index 8dd3db974120..dbd88d09681f 100644
--- a/www-client/opera/opera-73.0.3856.284-r1.ebuild
+++ b/www-client/opera/opera-73.0.3856.284-r1.ebuild
@@ -11,7 +11,7 @@ inherit chromium-2 multilib pax-utils unpacker xdg
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
+LICENSE="OPERA-2018"
 SLOT="0"
 
 SRC_URI_BASE=(
@@ -38,6 +38,7 @@ SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
 	)"
 
 IUSE="+proprietary-codecs suid widevine"
+RESTRICT="bindist mirror"
 
 RDEPEND="
 	app-accessibility/at-spi2-atk:2
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 58a910453d2a..5288788f9085 100644
Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 28c1ce896573..2e8559e6a9db 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -3,7 +3,9 @@ AUX urlwatch-2.18-pycodestyle-requirement.patch 766 BLAKE2B d30b074629d0547fcded
 DIST urlwatch-2.17.tar.gz 44178 BLAKE2B 46163b3305a50c3b5165da8f794c252aeb0a3581f16ba04cc1f0d920066accd02f7eba47718012e2ac0071f6bfa31019777a28840179a28a7fe365ae2e8f1d2c SHA512 635bca7e55641dd73447f5ec9ad429539decfaa8a1c19ab073c3bd46acfc518fa6012d855e0c37dd78654da28acf1446f580def611bcb85ae94fe13f567e3613
 DIST urlwatch-2.18.tar.gz 48268 BLAKE2B e595a6ed27637463f14f92ecafd123eb0c7cef7102cc35ebbc3334804f7e09cc5f933aa2d54e24acd74a1419d6a8683a0d5fb2456b35ae0797c3d8a12efc33de SHA512 4b44a78fe7f2be6f507487ad5de57d79aa55ee790b29b97f2a364c0f3b58828fea5eb2b08235c15cafd3839b9261a7f148ebc9bceb5bedd1ff8319f7f039bb23
 DIST urlwatch-2.21.tar.gz 126235 BLAKE2B 9e0f39e51e413355974ce886e019eb86dd07fb9a75c02c5c711ccdbba573c2e6b218cf11b42c714172ad00288ea0219a079fd9b8016d33c29f087537d160e80d SHA512 30d7312c72d839e8ef681a11065f82c2611b650ab1b9b9a33e718bb791712674afb31e4b2e6da97038379fb8cc4ae5bc58b4d0ee6a26c424cba01898b56566b7
+DIST urlwatch-2.22.tar.gz 136306 BLAKE2B e7f10872e5d7f42ec0ac1073783431c4b0e4fcdcf40884a9f7f52aee36705fbdbaaf5f9e671223715040c6f68cc580f531ba753c9326a2b1380d2fb707f66f1c SHA512 f2c1e0d279689d1e5761203ba139614b972c6266c30877262d59759b0ce63342a820a063f001039848427ea4af4325505c636762cdedb3dc60ebd09e859914f4
 EBUILD urlwatch-2.17.ebuild 1650 BLAKE2B 01abaf115bbfb7ae572ae850505fd8b17ceb098f5ad4c11e578ec0ac554f77cb4aa689d8fb278028c6841520eb614983beb693c329cca202697e049b465df968 SHA512 b64a3a26d4a0909b85e2316b3e5d79876cb256d3f1be2ec8b820eca9f52fff2304622dc7d69d75c95e587563362fee18b06b8a15a986543893db63080ae5aab1
 EBUILD urlwatch-2.18-r1.ebuild 1811 BLAKE2B 9a42617e89c5a88cdc081b069de209455b9b382de2652493a7990c2dddf6545b8e9e58da65553c4aa64917e2797ee6f50d1e2b061a5f27e494512139d65d8446 SHA512 654098c0d31c1feffb0edf1970f59ab1cfd9b806fd1478aaebc7bfb96486c21655e1db176496de8bebbf239f4a331c31ae362258a79191ba3987f262d8fc7f3c
 EBUILD urlwatch-2.21.ebuild 2093 BLAKE2B d3f0ac5014147f279749d9ac680016b8e8a5bc7232cb11166a6e468f98ed3e379cac14e388e7036a01c3ebace3b6c8b1c14d6b21ce6a5e48b6d8285290aec852 SHA512 5d39116604c49d375f4be570eab3c8aba72dd2d7c5d6640980fad4f9b6bf9a210bdeddac8e0f70d58d648760ffa8509b8acb352224a20f145953855963e6d38a
+EBUILD urlwatch-2.22.ebuild 2030 BLAKE2B 776005fe2c991c0f714920d1b5c1a96c349f5f0ff2065e03771c5ee8d2235302b20c208b81ed7c58301d8ce015c36efee1f5c719ff0890990a8e2233830f8a9c SHA512 21ce7770a4ab125288a888c970a35c88a8e28bbc0554a9c548838e343113d6760280ba2625f59d508c1e8db40d71665ecab713410bb2469e83e7b7d39fc4d4e6
 MISC metadata.xml 540 BLAKE2B feb952d37175ef6a6ec17ae6ff1751d031cd14e3e8d98d5b6cdf44074c05068a1a6ce88b9447fdc0a8dec18f37f7d07232072ba81dd0ce6401a106e5e508cb92 SHA512 7c79bc952f7be46983f83c1f357f013df14d87f906df3a3e0f8690c32d296945729ebe9f95838d6a3c3c1e85b4fc8dde20b0ef12037d17967119e4cbaf652f2c
diff --git a/www-misc/urlwatch/urlwatch-2.22.ebuild b/www-misc/urlwatch/urlwatch-2.22.ebuild
new file mode 100644
index 000000000000..b80bc0eb8097
--- /dev/null
+++ b/www-misc/urlwatch/urlwatch-2.22.ebuild
@@ -0,0 +1,69 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for monitoring webpages for updates"
+HOMEPAGE="https://thp.io/2008/urlwatch/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/minidb[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_sphinx docs/source dev-python/alabaster
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# Require the pdftotext module
+		"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/pdf-test.pdf-job12]"
+		"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/pdf-test-password.pdf-job13]"
+		# Requires the pytesseract module
+		"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/ocr-test.png-job26]"
+	)
+	pytest -vv ${skipped_tests[@]/#/--deselect } \
+		|| die "Tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version dev-python/chump; then
+			elog "Install 'dev-python/chump' to enable Pushover" \
+				"notifications support"
+		fi
+		if ! has_version dev-python/pushbullet-py; then
+			elog "Install 'dev-python/pushbullet-py' to enable" \
+				"Pushbullet notifications support"
+		fi
+		elog "HTML parsing can be improved by installing one of the following packages"
+		elog "and changing the html2text subfilter parameter:"
+		elog "dev-python/beautifulsoup:4"
+		elog "app-text/html2text"
+		elog "dev-python/html2text"
+		elog "www-client/lynx"
+	fi
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 550fecf44558..67cf4bebf65e 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 3ff351a3d699..c3f75e171493 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
 DIST google-chrome-beta_88.0.4324.50-1_amd64.deb 72794480 BLAKE2B 30c3338d0cca90d78f73d60c9f03d101920b977151ec6ef211a5b4b6118e525ebe31d0900c80649cd63a0df4e48ff5a040c2c8a58c9e5c8628bd3e990d32c845 SHA512 7c75e238b18625ef4161ba7fe126c8b4075951e4c8f62a064df5f4c96253f003b3fb2532e454c39e185091b80ffef27ad377237a78bc7dfe009e9deca93ac813
 DIST google-chrome-stable_87.0.4280.88-1_amd64.deb 72446160 BLAKE2B 308e73cd83f3f760bb5f6cc6dd077f3b6af9c986493bef76b6aba505bc8105746752df26e05e7d557ea45bf1986f61ab0011b85a6613ba05033f4c93764ac42b SHA512 19eea1d1be171cab60ce5135572da9388b4b72e313118478b53f65c0bf2293733809282736b98ef828a208b7426e5191258f8c666cba7510b8bf5c92d0010a47
-DIST google-chrome-unstable_89.0.4350.4-1_amd64.deb 78080688 BLAKE2B 24cfb274aea768cc36718a8be07a91c4bb496a3f9218864ab4f3f0c9dcf0d50f8a8e725f5c27ab77c66de01b18c5527cc460c72617e1e766e684f7c871795909 SHA512 ad5daeb4e982173fa40bb405c0f7470d3988288c8adbf22c5dfc282c997d5ebfbf69b3916077c37a141b03abb38f2eee799a79ca8e4f0428413a8976fe53e54e
+DIST google-chrome-unstable_89.0.4356.6-1_amd64.deb 73905528 BLAKE2B da6b11abb8daebbaf138298d870b24c5f1ae42b20322960d99d74c8a58310bb201e80ec5101feb0182d49e88eb66f9c683ecde5e767703de03debb4426f98a53 SHA512 a3c5547d719b4eb82af39fba33b310caaee85669463e260b1619846f86adb293e42e1c7758a9024a0b4ce2280ea4873e46725a0ad143c3ec710b882a54a14105
 EBUILD chrome-binary-plugins-87.0.4280.88.ebuild 1218 BLAKE2B 1da82c24fa348283d6e1b470b81627cf5b5d6341279de88971d34aadccaa4a59772aeeda01c08e3d15a46dc69f9255fcac7968d1e5cdf087cb72ceb17d5d4003 SHA512 2dd57832e3adfbf3f2aa7bdaeff3392d27fa67cd8098a11a18a4a025087404a19c3208420f9167ec60ad38cb5326b9f17b8020485011424d0e295afd1e44fb95
 EBUILD chrome-binary-plugins-88.0.4324.50_beta.ebuild 1218 BLAKE2B 1da82c24fa348283d6e1b470b81627cf5b5d6341279de88971d34aadccaa4a59772aeeda01c08e3d15a46dc69f9255fcac7968d1e5cdf087cb72ceb17d5d4003 SHA512 2dd57832e3adfbf3f2aa7bdaeff3392d27fa67cd8098a11a18a4a025087404a19c3208420f9167ec60ad38cb5326b9f17b8020485011424d0e295afd1e44fb95
-EBUILD chrome-binary-plugins-89.0.4350.4_alpha.ebuild 1218 BLAKE2B 1da82c24fa348283d6e1b470b81627cf5b5d6341279de88971d34aadccaa4a59772aeeda01c08e3d15a46dc69f9255fcac7968d1e5cdf087cb72ceb17d5d4003 SHA512 2dd57832e3adfbf3f2aa7bdaeff3392d27fa67cd8098a11a18a4a025087404a19c3208420f9167ec60ad38cb5326b9f17b8020485011424d0e295afd1e44fb95
+EBUILD chrome-binary-plugins-89.0.4356.6_alpha.ebuild 1218 BLAKE2B 1da82c24fa348283d6e1b470b81627cf5b5d6341279de88971d34aadccaa4a59772aeeda01c08e3d15a46dc69f9255fcac7968d1e5cdf087cb72ceb17d5d4003 SHA512 2dd57832e3adfbf3f2aa7bdaeff3392d27fa67cd8098a11a18a4a025087404a19c3208420f9167ec60ad38cb5326b9f17b8020485011424d0e295afd1e44fb95
 MISC metadata.xml 262 BLAKE2B 6958ab33a832169dbd6b7077bfeae3f398c5d825430d3d85f7f37d732951fa0585a75d28766111d82e5103fa4078cfb3e3d16b98a4520b268d4fd6b670ce811e SHA512 b440c405c25f905f11aeaab1ee3721846ac26502b1e02656f773a3b3be4bc636e85af6185c043c8e94205a3297476d3d2230d6c519d477b5c7d42268916e1128
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4350.4_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4356.6_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4350.4_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-89.0.4356.6_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 8e7e155a0e2d..53666dff61b9 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 54c0f2356ee5..14ad84749942 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -3,8 +3,12 @@ AUX puma-3.12.5-cve-2020-11077.patch 3490 BLAKE2B 08f103ed5a5cf9878404f04c139476
 AUX puma-4.3.4-cve-2020-11077.patch 3578 BLAKE2B 34ed185950223fe952f29c98aa80211f8b066ec9d89a04ce4900b6fa654521ac4abb3ae4fd6ae9f56c3143649b0d07bb1a1b66691522c1a9d0ee4d574fe9c58b SHA512 1df326102f6efd0b0aec4918ddda8beba467a76fb863cb0f117d9f073cd6adfdc4dbcb5b698cff8a43404794aa0171e5c124bdf9e0b8ab4161475c6ab3bbd95e
 DIST puma-3.12.5.tar.gz 219175 BLAKE2B 55e80fba8fd84004090cb8d30b6fd01652f1beb1d1216c5d41ce46c616677504fa867f9701ed2631f4edc956c9377d72c6fd4a1b61e99fdbb50ea371b170a0c0 SHA512 1e6721844cbabab0cfb8b1707625723061821dae3ee06a3330075f787ae580e6836d9cbe436e63dc4602253ad1da3b56135316c923c03bbbae454d9457a44aec
 DIST puma-4.3.4.tar.gz 241806 BLAKE2B 5450f14112ad45c48794186c7e9f078feed28a4194a917c949f4058b9d3a115273df6d93260de330047fa59730cb3ad45f31eb05e5880569e95a0b2c9de99a42 SHA512 619bf44c17622233b673dbf6c8f34b0463cd32684df81c20f31045d3106a86e110753b4da80e7b51b46fe18d90ee107d9a84a975dc3116840d9a9b5962178873
+DIST puma-4.3.7.tar.gz 242780 BLAKE2B 22a81839bde50c61147712b85fceb90af8f46ada0b60d1901d0918d75cd7a006a3c71a2c525b83846b3719b44419725fcc38ec7bd32c8bb6acc916ec95ca7aae SHA512 90262ddbb4c9ceceb023538f8f3e4542de6d02763e2dd60dc24fb1bbde45817bb5a6472469da8d384ec25d97f9501c8afbe2c8da3fb690965a38da4d342a8f1c
 DIST puma-5.0.4.tar.gz 275942 BLAKE2B 1e607d7ff44ae9b677f6fb41355fe3b660bd880a642e5d3859e177c9327b68c0db729621ef0b3d7a5bb08917249fb7eac688027ceb62f072dabe7ba30086bf79 SHA512 6804ef3bfd4fa3a6695c213e3550244adace91121cb2c45f06fa4c68fb502787c5fdebba41b4754216eab880ca8738ab6f83d0ec9456a86fc6db99a4d4405bd8
+DIST puma-5.1.1.tar.gz 284807 BLAKE2B 59ba17129e55e79aa2f8092d60a5643840bd996b7832d421cb72538fc48b0fb302353bedef56cc9b115bdfb15b33b0f453bfbf759b2e9552a9490a8b0cef3090 SHA512 8653c622c21dca2116219702e801d7aa3272f0771fd5c2d5149927edbd504a9838fb0d442bfc5dc523035a94dad25946738a5dda954fdaa74a9a00c85ed9f86e
 EBUILD puma-3.12.5-r1.ebuild 2159 BLAKE2B 9890e397dd8966c4f1480cc435cca1235a87d317d37fd7879a32b03a8ad8b1ec1a6898f7cf5731c8f80a0014ad8dc7b01bc3c10a46f817269101f641101d12a3 SHA512 f922181874ab1c8cd685f1837d3631682aaacc2c316bffe8918fd35f1c8a2f879d5b199a3a4bb9346017bb5e5faec51135ec47a0f502c300413d6a5c9389631a
 EBUILD puma-4.3.4-r1.ebuild 2176 BLAKE2B 433e221931b2716fdf1bbddf2aa7c2e08c759a63681bb21b34c3a5b8db3618203c4024473fbe98ba88dc7c4f0b63e96444f5305ace3338b14d1dd62140fbbed3 SHA512 91dde6a7c485b46f158f35432e136bb40b5115dace83e9f4446b4cf1c8e24660467b23f5f147bb6c26e699c13405e36205db4871e4afa6a1b1cc1c9180998b9c
+EBUILD puma-4.3.7.ebuild 2177 BLAKE2B 07142bc2d99d35b096b7478fd185eebb3d51cd126ee363a7ce52c1d29a8b372e8702e45728849a9ea47c5d42a74cd3820c338b1b0d8a902a49962847999999fb SHA512 6015493546b3f66692f86ad1767033c3375b5267bc3e3a2be50e0cc355af35090390139d62cc224777d00ac938de54bef39faeee0f6945ab488414173ae4b7e4
 EBUILD puma-5.0.4.ebuild 1904 BLAKE2B 4041272a4dc73f59b34d6d95c2819d70e9c548c2534dbe58cd71c477524f77655a34025cb3d4c3a4b9100fdd6663ec077e382f651d28bb30cd06e184e0c4ab17 SHA512 8868450157cbeaaac662db7949df14735f43deaa1dece0481743240603b4aa6f8393f00d004754abea2c8a8c06c9b15cf9f5f00b25688b06ea8bddcf834416fa
+EBUILD puma-5.1.1.ebuild 1941 BLAKE2B c6ae1d7008d67ef194e38a978562c54443dc13ba198dc05f6f6d292ef6d67fd70001cd5aff6078b087c5b6d6c57a95910d4be15138fceb94f673569617d6029b SHA512 e010d985c6976dd7a001b42ff7651269cded02960ff4f89c379e6a350034462d20b8d51d6841d8dda4deb5fcc7a6ae6d4e4bd08d9bc6fa060b4a77a0e8f4a169
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-4.3.7.ebuild b/www-servers/puma/puma-4.3.7.ebuild
new file mode 100644
index 000000000000..0f9bdaf48757
--- /dev/null
+++ b/www-servers/puma/puma-4.3.7.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
+HOMEPAGE="https://puma.io/"
+SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
+RDEPEND+=" dev-libs/openssl:0"
+
+ruby_add_bdepend "virtual/ruby-ssl
+	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
+
+ruby_add_rdepend "dev-ruby/nio4r:2"
+
+all_ruby_prepare() {
+#	eapply "${FILESDIR}/${P}-cve-2020-11077.patch"
+
+	sed -e '/bundler/ s:^:#:' \
+		-e '/prove/ s:^:#:' \
+		-i test/helper.rb || die
+
+	# Avoid tests failing inconsistently
+	sed -i -e '/phased_restart_via_pumactl/,/^  end/ s:^:#:' test/test_integration_pumactl.rb || die
+	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
+
+	# Loosen timing on flakey test
+	#sed -i -e '390 s/sleep 2/sleep 4/' test/test_integration.rb || die
+
+	# Use correct ruby version
+	sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die
+
+	# Avoid launcher tests since they make assumptions about bundler use
+	rm -f test/test_launcher.rb || die
+
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
+		-e 's/localhost/127.0.0.1/' test/shell/* || die
+	sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/puma_http11 extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/puma_http11
+	cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
+}
+
+each_ruby_test() {
+	einfo "Running test suite"
+	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
+
+	einfo "Running integration tests"
+	pushd test/shell
+	#sh run.sh || die
+	popd
+}
diff --git a/www-servers/puma/puma-5.1.1.ebuild b/www-servers/puma/puma-5.1.1.ebuild
new file mode 100644
index 000000000000..5effca51d3dc
--- /dev/null
+++ b/www-servers/puma/puma-5.1.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
+HOMEPAGE="https://puma.io/"
+SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
+RDEPEND+=" dev-libs/openssl:0"
+
+ruby_add_bdepend "virtual/ruby-ssl
+	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
+
+ruby_add_rdepend "dev-ruby/nio4r:2"
+
+all_ruby_prepare() {
+	sed -e '/bundler/ s:^:#:' \
+		-e '/prove/ s:^:#:' \
+		-e '/stub_const/ s:^:#:' \
+		-i test/helper.rb || die
+
+	# Avoid tests failing inconsistently
+	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
+
+	# Avoid launcher tests since they make assumptions about bundler use
+	rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die
+
+	# Skip integration tests since they make a lot of assumptions about
+	# the environment
+	rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
+
+	# Avoid test that uses unpackaged stub_const
+	sed -i -e '/test_shutdown_with_grace/,/^  end/ s:^:#:' test/test_thread_pool.rb || die
+
+	sed -e 's/git ls-files --/find/' \
+		-e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/puma_http11 extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/puma_http11
+	cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
+}
+
+each_ruby_test() {
+	einfo "Running test suite"
+	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 86560d4832ac..f83f74d65b8c 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
index f96ecaf09b6a..9571c286e060 100644
--- a/x11-apps/fonttosfnt/Manifest
+++ b/x11-apps/fonttosfnt/Manifest
@@ -2,6 +2,6 @@ DIST fonttosfnt-1.1.0.tar.bz2 143545 BLAKE2B fd05a19ffc50306b747bbbc6ea692b6667c
 DIST fonttosfnt-1.2.0.tar.bz2 145904 BLAKE2B b9b25076126dbd412d69f4c9698f937009f620b55a06f8c55b621add2ed6d638e0b91d3e716ed276089986c1a0140e2bf7aadef021c21ac24ac23c3347ee081c SHA512 a360bd8535beaef89afa6c0678a40f7c554e9d631e0fcb80bb1363ab72288e27a5e106521610f61c95b8101f79c7f02492a2068411b5f5b695de780d8a1c1b25
 DIST fonttosfnt-1.2.1.tar.bz2 146512 BLAKE2B 54b92f586248978f56b1b114a1ec02b19f7c871fed0c0f91c2e8064933d990f2b44f0163fa59f04f82b992a40be47e391eeeeae60a490412e361af9f10c445f9 SHA512 3d4ece61e31d4a5ed56923ecc1883e80a9308d2062d37345cb5be081bc2b004aadebf99a989601749a63e03eb641e0522d07773a57bca0b4710ed453e4f20742
 EBUILD fonttosfnt-1.1.0.ebuild 356 BLAKE2B e9d3f967a9627ddc95c971f99db33075a699b03340351821fba43022a81c0825a5831d45d1210c5c51be69ed4c5176ec193db214f50e1875d3f78b2bdbc271a5 SHA512 e43910fc1d262e11e982663ed0ae8284890f0aa3a2b441702b9263619ef575732176154860452cbd009c15330366a4ee877ea16508c2a1d5a02f5fc7dc85db23
-EBUILD fonttosfnt-1.2.0.ebuild 358 BLAKE2B c3f547e0e284a87029fddc207b80a13181074940b647a8fc6ad4108ac55bd2d6043b325b850161b4611a8d6ef477255faef84dc9ae65d0ebb0d3fb296322dc5d SHA512 9de004a4f95fc35e9043c3451eb0367c594a9c3e6b831001e562ba8bab234dad72c8fc319771aae7366eea03f37ad1fdbabc0e76ea5ca1c08f790c52f479271a
+EBUILD fonttosfnt-1.2.0.ebuild 356 BLAKE2B e9d3f967a9627ddc95c971f99db33075a699b03340351821fba43022a81c0825a5831d45d1210c5c51be69ed4c5176ec193db214f50e1875d3f78b2bdbc271a5 SHA512 e43910fc1d262e11e982663ed0ae8284890f0aa3a2b441702b9263619ef575732176154860452cbd009c15330366a4ee877ea16508c2a1d5a02f5fc7dc85db23
 EBUILD fonttosfnt-1.2.1.ebuild 362 BLAKE2B 363996341db75c2778adb14b3aa20b6d4d012d1c337abe37c43e39668d7529973f5efae274b70b668b94ae83e8ef0f96071491cb9b58097858b2bb05a86cece3 SHA512 b7a5ab5a621a374a92da2e0a838c282e2619c07ef3bb1551e856ddee91b9fbb8e2f82ee91a22c044916162a50df2e834b57f46bb4642b2a702cb91e2b95ab005
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild
index c4ed3fc5e68e..fe76754ea072 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 RDEPEND="media-libs/freetype:2
 	x11-libs/libX11
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index cf3560647b7e..8962d212fb0e 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,5 +1,5 @@
 DIST xkbcomp-1.4.3.tar.bz2 245658 BLAKE2B 306e30789bdbf6b5863252aa1f73c96f88c4086989eb5529dbde1e3f1f9e11200f67ad6446dfe912129acc1071074d2addf776a97d9d42a840eb62320ae47cf2 SHA512 827713c0413aecdcad2b61edb7b8c7c7a002e18505b9041f570e2f680907193cb5ff8a5b424695e21110b2d06c145cbf0e397e52347421ee946f06e2a51f135d
 DIST xkbcomp-1.4.4.tar.bz2 251224 BLAKE2B 965a6ad91029ff4934af443a5845386045a66796cfdb6181cd94bfc1e3ee746700b22e5db56d22cc95255d0dca4f5894cf9afd40cc6675308a4425d947c5ed61 SHA512 971eb06277a49083b42154472596f1452fa94cdee28bad345bbcd85b028441bfd975763c20ed92aa69d6605b3fb23d27fee89df91501963b77c863667bae41c4
 EBUILD xkbcomp-1.4.3.ebuild 437 BLAKE2B adbd8305a8a9fe9313df18434435448b9bfc13c2c5f476c72bd1f56a6449999da8d6b606393ec1e52efd7c1303bee726529ad220e5e76bf1ce66ec987b252acd SHA512 7f450334e8d2f02c55767ceb6b83fdfc4dc1c67e2efa3c76dad98ab04c4d0be689a3b95700c23d5ef6eb2b42c8b6faaab6208a3b2765a90fc871d8d66c75c93f
-EBUILD xkbcomp-1.4.4.ebuild 447 BLAKE2B 3e993ba729e821e1c3344409296aca37818140d5beb7ea92f6f820ca05016d262e42e7b7b482a6f445d8d3eb2bf49a8a09d358942613874813229980d478d19e SHA512 8d9d6e4dd3569c99e5662fd30294cd70be0d4ba85cb31859e88096f7aad6bf999d14f22710a02eda71333d95d21e045dea5a49675f0b19447bf4c4a5fbd94dcf
+EBUILD xkbcomp-1.4.4.ebuild 445 BLAKE2B 15173c25a13b750e2c752dc5eab6c19c5f3e70a2aee6850c7edf062c6b674d01f8fdd5cfd4e273fdb349146df16250feebcfd2dd36ff1f44e96e1ded466b1cb1 SHA512 6b09efb1d6821dcfc04b833293f8f4159899399b4f4ac62e491fabb393b8aafcda77a96ca6e4233b1e8d0d4b51f5b23a1c661fbafd8b28938bda8bd1a4d2ebf1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
index b0133ae55bb2..11b612ac19fa 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="XKB keyboard description compiler"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 DEPEND="
 	>=x11-libs/libX11-1.6.9
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
index 82374d55fc30..bc5ac671b53a 100644
--- a/x11-apps/xprop/Manifest
+++ b/x11-apps/xprop/Manifest
@@ -1,5 +1,5 @@
 DIST xprop-1.2.4.tar.bz2 149930 BLAKE2B 93bd20c7c91d6abd9e2fdeca7864b9885ae7248c7ee3ef80a5efa1706bfef2220244b1443764fdbc042f66be8d589b111fd942c732922f05f4143e1c893da183 SHA512 6e770cb89ba87ae057858cc9f0f5498979e78c3ef66ce86361b7c646cc0b70c41a18d76e55ed7225fe715b22b62bc07c56272519a2631b92832e9403ce260da7
 DIST xprop-1.2.5.tar.bz2 151216 BLAKE2B c676a1a733f4f897bc207cd1d7ec1a6022d48d2bb9615072e2ce19c1fec7737a8c9bc0444c97f4972d85a8ec8bc1e990f559a0815eb3656f2378915095c1f85c SHA512 93cfa621fa76ca6e8e780a252c508380b6dc9db39b67bfca16bb9800f0d39110f5d18189409a8577ef79e98bf5eece17f5e23f2218ca72ae8bb04ee7b429d559
 EBUILD xprop-1.2.4.ebuild 397 BLAKE2B 073f70d7e383c02285af7e14d2c71d2d212d6a02f9f0e060822a40132ad93fc27c2119a9fb06d201f5d885fd4585658e21395fbb586280d5806cb23acf0c7039 SHA512 f7f3fa68a0c33093ac27e7e0ca2490ce5fde54c2bc6a2e17931555bdc482c87881795488f90d37efb4e78af06b5e9447786ee91a413bfc56463ba751cb50d104
-EBUILD xprop-1.2.5.ebuild 392 BLAKE2B b05d957f6cc7e44cca9b7ab6c7e22e1c62a5a291b3ffd480805c19fdf1bedbaf415c95904e590b9c421182d33b0fa5fdfb678b17fb4ee13d38b8f4ae06be27be SHA512 bb1389c12b5c4fc58ead930596e4079479d1b3dae32fc16fb2ce056baf920748550aa4567b34b73710f8db9e1d04b9b66203c29f6ac8e3101ef371411d994504
+EBUILD xprop-1.2.5.ebuild 390 BLAKE2B 8b43f48fb08e5d2ea624bf8ac793dfad9bbc6e880d36d122bde1d6cadeffb2d96927251ef2daf92bf8557910b5bf8cd4dc6634051e4e1531c2830ad96c9d9127 SHA512 2b05848dd0a896417cb63f2e2fcd1bc501f468f3df9d4a3ecdaecf350deb9fcdd99fb8fa2fb76e47c140aae9c16853a6201614d2de4ad6d1846105e6c91ceb7f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xprop/xprop-1.2.5.ebuild b/x11-apps/xprop/xprop-1.2.5.ebuild
index 0ede1b0ad721..7c49ddda9e22 100644
--- a/x11-apps/xprop/xprop-1.2.5.ebuild
+++ b/x11-apps/xprop/xprop-1.2.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="property displayer for X"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index fb5f730bad9f..cb8539c65e63 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index c7b2ae046500..90758906d1f0 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -2,5 +2,5 @@ AUX xcb-proto-1.14-python3_9.patch 1615 BLAKE2B 3c2def81fc944619a4848e00b28252cd
 DIST xcb-proto-1.14.1.tar.xz 143588 BLAKE2B 24983ec26632e93ef2d0c854cd41272925b6f3aab2642701232b73bc37d200d794c46f438e4a4102484e6ac9723e78c923b99cc78ada3541f43eaf0ad7ebc863 SHA512 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d
 DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
 EBUILD xcb-proto-1.14-r1.ebuild 1351 BLAKE2B 05306b6d20fb4d0e84ac11087170baab2180482ad5872bb9620f0e9774227b4745d1db532f3fef99840496d5b1a27616a35ab26b1c71f287ed013f075f6c89a6 SHA512 f34ba7f55d7bf8a2a9af286161319148565bb5e4d6e70b84e3e28ee779723840ef2a163055314439137672a922bd00cb6c97bf6b87b10c49e526dfd89b347aae
-EBUILD xcb-proto-1.14.1.ebuild 1293 BLAKE2B d8ea41ff108002300122226260418f8118f3c382bc3f9e6fb9deb7305f1851d0524d1288ceeec8ce60da33c2e44a128b10dda79d8c290aebe743a9de1af962f2 SHA512 37d10c80642839d16f082cdc66bb784b483539be94fc8c9c4895ad6f0cf9169b99b5d8ccf296051925c3516e79b76bae9cfb8844cf9c9b08213b93ff400898fd
+EBUILD xcb-proto-1.14.1.ebuild 1298 BLAKE2B 68317909819aafc53aa3f75842b1683252857dcd454e8a14bdfd6f4107b4535755dbca56d0134f41594adc34718496dbedf8138978f0ba92524ef8ebb6dfb4fa SHA512 69913380f65075aeddda6d262df5ad418fbbb7731319413ea3bf8d2ddbc39c9b32fd36cbb5cfeec172c9b7386f39d7889fb4658671f9403977496431b59a88e3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild b/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
index 226b8bc6da5e..c2c147e8eaee 100644
--- a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="X C-language Bindings protocol headers"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 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 ~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=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index c5583dbed63d..e8827f4cfca9 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -6,7 +6,7 @@ AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.20.10.tar.bz2 6307058 BLAKE2B 13306e5f4f7f2b4531f2af5103337defa1d441bff78f20ea4d564a7d046ee546406812b6836fe94ca9323189382754270989b2ac7ded8950ddb2b15562c6ff21 SHA512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae
 DIST xorg-server-1.20.8.tar.bz2 6309640 BLAKE2B 0dadd3a7afdb768bcd79f99f3670f7efcb919c43ea88870c93df598b080fbbec48f88cfa996fb7bff2363cffe70d42d9b154855691a64ddb26156f1b378512a0 SHA512 ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805
-EBUILD xorg-server-1.20.10.ebuild 5556 BLAKE2B c385a2df5af966ba41692ff238c8c64c873f6c2f057e7856e6542dbbeb363cea924c59e1cffb5da927093e0694f6ec216a4ce64a93efd62c604253f1009999a4 SHA512 1a60f2906e9ae9347c4b617958ce4519d8f37569cca6e584b9e42f921ff740db7e90047a0aaccde13b8e7b5beb9020865dffef9ab10367b382000e11b653f14b
+EBUILD xorg-server-1.20.10.ebuild 5563 BLAKE2B 1abbb095202d9aa26f6b3bc5790b4c82640ddb90b1690c095da1400f1a7f9bd8139809143d09a80af356edf426f763ef21419498e6f3439828ae65d8b63f04b7 SHA512 55ae1a5708751af8a09f3484dab6b2f18cf29d1ea4f93206b5e4f4c95a900e9b79552be2d6b04f72a5727248cd121e47ed1967b214f5a67b583d39f7a9055d20
 EBUILD xorg-server-1.20.8-r1.ebuild 5861 BLAKE2B c74b36075e0912e90f4aa16495cd3e1493b2dd0c5feecf335ef2d34a2195a94db332fa88ad9c2c87298c7cb0e66f20b638e4767ae16d0b311bd24d97cc653d69 SHA512 17e76294b30d77a7dbb8d4c7e3aa1c06e8ebd3e3551ad030c03594f7b635a8be824119f24b51778d2f9854bc1d984b49e08ff74bab1873d60e83459595967b19
-EBUILD xorg-server-9999.ebuild 5560 BLAKE2B 74c8b0f4de73dbd51416d10c6b613b9cb6b1fcae96a0dbc2310a254ab311fe3ac3745b8f20535e9a6786536f77df1ea55dd92a31ce8f65bc4c130e4c22896655 SHA512 23b5b056aead208714911fa6a15f5b65e8a945c071c35ee1a0410e439ebae018dc691e180dc452a1e60d693a7bc9c498f29114f09f6e893681f0012defedc012
+EBUILD xorg-server-9999.ebuild 5567 BLAKE2B 46ae4b1dd92359744cc0457af516971b52c46d8dfe175847fa2c8b1ba34927b08c9bd5dc88684d5cb51a658663263d03512128568c160513ce0179576fbad80f SHA512 19b72d8cb83a21fef3955e117e9b0c0544fec3fd00dd95e477f8c711871bce503d83932149364c083c7028b1f6888ca8263767c09adc274457202cb40efd5abb
 MISC metadata.xml 952 BLAKE2B 48b5bada3b2b3b16ef4806f028b8fe47a4d5cd0d19783ebb585f0389f51df589d3f53c5bff5f5ed883ad61c7e7be0fef94fd5cf11042e23dea5e456faf0a927c SHA512 34955c04ee1488a09997d0d9caf63c9202023d06e0524b74120c5c1def033d9dbc2ce82a5d4c289a6fd98df83e2e09ad54e6a084d164d2416228628df7874198
diff --git a/x11-base/xorg-server/xorg-server-1.20.10.ebuild b/x11-base/xorg-server/xorg-server-1.20.10.ebuild
index bcd42d84a2d4..3aa37500c3f3 100644
--- a/x11-base/xorg-server/xorg-server-1.20.10.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index ed1a5f6c51e6..09eb63d40ba2 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index d9b0cc40bf2f..0e2afb1677f2 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/xf86-video-vesa/Manifest b/x11-drivers/xf86-video-vesa/Manifest
index 0e4aa96cbd25..00daf9457a92 100644
--- a/x11-drivers/xf86-video-vesa/Manifest
+++ b/x11-drivers/xf86-video-vesa/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-video-vesa-2.4.0.tar.bz2 324599 BLAKE2B ddaa7a54d439b1afb1152e15e0d436cade79c51a61e78837a066e3e0c04d4a2ea6b079e68eca917e618aae125ed4eab7734009a337018460e771265b8daef443 SHA512 4af5c0a7fd64eba503980198cf510688dff2f33482ceac446455d97255dcc828613387ac57828eb6dce080cb15a8644a2b2e278bf356705fdeaea873ab07c2de
 DIST xf86-video-vesa-2.5.0.tar.bz2 304322 BLAKE2B aee8b59d769a72fb2890bbadde7fb87e2f527fb58eaf8b2ef515b0a1b7dc591c6afaf1d8692caaaefb741f475ed77bc0ed069be43a752103260bc85314a7a830 SHA512 36fd921f54f33eb25966b5f9ea1e1b3e9009965c012c8b9c676686b472111719921b80cf62dafc746058878253e21f0ef341a2ff2d650df22ca1e35e81716a8b
 EBUILD xf86-video-vesa-2.4.0.ebuild 623 BLAKE2B 203551d95df8ac149816c256d6bffe4c7dea9d3d1be4beef1b962ed20d9a04fc15da50500d2de9eef293cbd2119b98d09cfac2816b3e9d9ea92368be698a1eda SHA512 4945709cce0bc79b8e88a1214cbe6703f0642691539c27cfa2c1efb2f0efbfe70e694faca6435d4cf9b6bfcc0b7ee5bf7be9f94c596263bf4ffe0df8e5f60977
-EBUILD xf86-video-vesa-2.5.0.ebuild 624 BLAKE2B a262dc7ef07605e44992f163a01127ca6a64ed07058e3fecaea42e28cd8c70006f9c1da2b5c6ac887f4ce08313789d6d419b1bc8944e9d1bc884f3ec6b250928 SHA512 43bf1907c5a0e4785d08c159c2609cc2042fc02f8dc28816b86439627394af8ba673e44eac352bc10aef79f856a12356dfe389185c948d412b93a30e4e73316a
+EBUILD xf86-video-vesa-2.5.0.ebuild 623 BLAKE2B ab3420635068980df0be30496073d4b2917f89c67323a25af6356b56de3a0f75e535ccd9fb67518256b465d9706950d3e50d44b74733507084986232e9d98350 SHA512 ba18775c51b0c19c5cf368d11736543cac6cfecf1ea8176446d1cd2d791223ff8e62456b8bdb8535fc8756f92389e39087f6d58cc42af67cc9facf3c6fad3de3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild
index 610d74713018..2f085947bfdd 100644
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.5.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit linux-info xorg-3
 
 DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* ~alpha amd64 ~x86"
+KEYWORDS="-* ~alpha amd64 x86"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 2cb2e699ee5e..0be6ffeac977 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index 543e3c4d8632..934811410585 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -5,5 +5,5 @@ DIST gl2ps-1.4.0.tgz 300339 BLAKE2B bda8742dea6c1b4eb3e3a3492e6f38229feb6480131c
 DIST gl2ps-1.4.2.tgz 301134 BLAKE2B 43c93f93d09dd7a6af0711819647f5f82c0853a80822dbc600b7502f2c86612f5cb2edc31729c67abbab44cc8fec7aa1fa7e13f0d115b0d79c7a7d45fa1a3079 SHA512 46652e1b3825ace61dbd77c4b0bf451e7671c248eb18bbd3369e2fac00056ea4cd5d2578561984313c239e3b02f78b9d9a76d963c935af65a13bc2abfc538620
 EBUILD gl2ps-1.3.9.ebuild 1245 BLAKE2B 4aceedc95a5adb17de36248fff3cb41e4439e2ce3624c396c52667352630fb865fb09b56b13277fcb3e4bf2bcb22f33a9106710b9d702dfe76c29f0c50a9c7e2 SHA512 3a8d32deec6854b23401e3068cd1174c13951c71c918791b4c82a5b81e58e1ceb701474a9c6fbb1856c932aafc6dae5c4bfed6ac9150c89b1c46646dbdfa5d14
 EBUILD gl2ps-1.4.0.ebuild 1240 BLAKE2B f367ea59dae36e5406444df3a8e8160c614ee30e742a7a7e471cade787996ce4fd0aec6bec00267df983e2f2492979e78e71085638db3a3a1c05888834c29a55 SHA512 7e1f233e1f6ec156aa1c7b7cb93f69287b2a2793266aa2b8a6c17fe2c00313336ce73f3e80eb315433e5a68fcabf6a4a615cac06d3ee4bda52449e66544069a8
-EBUILD gl2ps-1.4.2.ebuild 1187 BLAKE2B a68d0bb9f655ded06f531c434613a0680ae38006df01047b086475d35c2ab60266ddf7b7cf035ae3c682cd92a4c7c4d238e4f3ee0bdf48e091d1a7d0f0124caf SHA512 32d758b078cc5191a8fb029eb2175a479f5ed46471c6344a2b1a1def84d1320ee4f3593597701397ed9b004076fabd546c32c5423c0a48becda00284c4ec546a
+EBUILD gl2ps-1.4.2.ebuild 1186 BLAKE2B fc9868f8e94444a59ec8a034afa85c133e75b73a467da0baff8c31574a148fa68c73b4edb7bc5505abc456f3f82a814cd20c3ef578437042f1c3a6d13943685d SHA512 a18c17f774aec3eea5d267fcf584d2e08837de331057649011247b3a7ab70a5893bce270a8f8ac0947fb16312918d3afc724b69523ba56b28fc2746b0bdfa74a
 MISC metadata.xml 722 BLAKE2B 357dece0405ffb4a0714a534246c0f119a6b19d08b0d9867695d178af5e68bdf40b55824d35817c44ae85094f1900368ddf167752bc97c184cde687fca631a84 SHA512 0cd6f7dc51149def7310418cf775980f8287b9e40bde438e03dde020623f19b49648662f12e06233be7686eda4a5b75f79e92730dfdfd1a3ae6da80d6413efc9
diff --git a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
index a327e3eb6720..b1e839398afb 100644
--- a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc png zlib"
 
 RDEPEND="
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index b9d4bb6c0277..f776c42cbd03 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -9,7 +9,7 @@ DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169
 DIST gtk+-3.24.20.tar.xz 22726768 BLAKE2B 75daa850275d55758503fa98055ca4deb9adca172e0f38c39ca4d5e7f8179398ca8753a759b0d3afc1ad1712ac6e3aa2cc1bce29e2a8fff4198a7f2d70002b11 SHA512 bda8eeacf721afcff4565756fe45857cbf8b053494d1d747ca9b97c899e9fe21fddef6871ecd5ec9a7a0f87b0a3ede2f9d6b5e5712de10a845100d82464a4556
 DIST gtk+-3.24.22.tar.xz 21349784 BLAKE2B 03dac82b3928a77beab1b4fcfcb9fdeb5e458fae13f7ff5459c2c65c7acdd6b255e62cbeaace02ec19ab4a41ff3ba2003dc004bcbaa4ee8206986e35fd7d1084 SHA512 ac653438a0a818885f2aa46a131b1ab0038a57b438406724a674313d8bf4325b1d2e87e4e8c77a92d0cfa8f8d6eaac46ba6890830290e9a9e598c978144861a2
 DIST gtk+-3.24.24.tar.xz 21341240 BLAKE2B a48024c008061b7e9c6ce8fe787e6c2f734923f5f17f818d2284afa6ea9ac080a55d358afcd0b73f3a124d57959c7a07a90c479b784fc881a3c9a0b9e354454f SHA512 f4e22d7c78d7c641ac7c3beeb3181000b72b025c65074bab6bd51b9a86ec4f6a2e25f06ad7671a908be421c064f4c26e2185febb424f310a2530561aebde8520
-EBUILD gtk+-2.24.32-r1.ebuild 9957 BLAKE2B 9f5b89755fa452b5b2ca075093f703b1ca0e904de6848a24644a5662bbfe0edd1dad0d1a4732e268d7878a2702b4432a39ed22f33b6c45f44e4fffd0e7dc648f SHA512 e8f2dc31fa4ba63128bad6f2b7130a872344d86562d38675011661baff8cf16c56efe375933b5ef67d33555dca2ea963b54d66827a179132cd56532b77974a89
+EBUILD gtk+-2.24.32-r1.ebuild 9828 BLAKE2B 6b7bc33df43f9a5b55b75d625b512f9972ade356a978f09a895c509f730bb5960a11c3bbab9f50ab55775c789dcb10dd4ae8e1d2deef3be9612dc81b8303bb13 SHA512 02289b1bd7d6b7c21d53046f9a4a76b9844a378f00d84a51d3400831ee13c992fde7ca1883d5a2808e1cfaf3091c7be1d13cad44d3ddc4158de73e5756d20c0e
 EBUILD gtk+-3.24.20.ebuild 7267 BLAKE2B 14118fd199adbe0538854f9052864eadd94c10d42a5ec467c5820ea267d22994b95e0d15317a4549b84d597a9931866fba0777e5fb8f0664aeff15f85975a684 SHA512 032b54fd90d4dfa92fcb970b6a1c11e1767c9723d142b0476aa22362885c1fc32d1cc8cf89d1562dc48cd34539d885656e5b7bda13fe1a89aabf8b93ec77c046
 EBUILD gtk+-3.24.22.ebuild 7267 BLAKE2B 14118fd199adbe0538854f9052864eadd94c10d42a5ec467c5820ea267d22994b95e0d15317a4549b84d597a9931866fba0777e5fb8f0664aeff15f85975a684 SHA512 032b54fd90d4dfa92fcb970b6a1c11e1767c9723d142b0476aa22362885c1fc32d1cc8cf89d1562dc48cd34539d885656e5b7bda13fe1a89aabf8b93ec77c046
 EBUILD gtk+-3.24.24-r1.ebuild 7302 BLAKE2B 7fe5f0bd1cb74fa26ecb1b8aeb84971833d367714352f292b60ceb1588dcd01e706e37f8788f94b08ae0209dabb3ff5502f75a03c1c0634a7240b0d87a9ac5f5 SHA512 9eab7d3c6b96c51ef8adb89f507b6b5566f9a2d547fe948caacb4cbf8df675eb897f2784dbaf4e16a5b6963a510c4c5dbf07f5a4c2c75baf6b96a778a4046a07
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index d409d7878f89..411097212234 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
 GNOME2_EAUTORECONF="yes"
 
-inherit eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx
+inherit flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="https://www.gtk.org/"
@@ -37,35 +36,26 @@ COMMON_DEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
 	!aqua? (
 		>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
 		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
 		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
 	)
 "
-# docbook-4.1.2 and xsl required for man pages
-# docbook-4.3 required for gtk-doc
 DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
 	>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
 	!aqua? ( x11-base/xorg-proto )
 	test? (
-		x11-themes/hicolor-icon-theme
+		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
+		x11-themes/hicolor-icon-theme
+	)
 "
 
 # gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
@@ -73,18 +63,29 @@ DEPEND="${COMMON_DEPEND}
 # in sync.
 RDEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-update-icon-cache-2
-	!<gnome-base/gail-1000
-	!<dev-util/gtk-builder-convert-${PV}
-	!<x11-libs/vte-0.28.2-r201:0
 	>=x11-themes/adwaita-icon-theme-3.14
 	x11-themes/gnome-themes-standard
+	!<dev-util/gtk-builder-convert-${PV}
 "
 # librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
 PDEPEND="
-	x11-themes/gtk-engines-adwaita
 	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	x11-themes/gtk-engines-adwaita
 	vim-syntax? ( app-vim/gtk-syntax )
 "
+# docbook-4.1.2 and xsl required for man pages
+# docbook-4.3 required for gtk-doc
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	virtual/pkgconfig
+	examples? ( x11-libs/gdk-pixbuf )
+"
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
@@ -208,19 +209,19 @@ multilib_src_install() {
 multilib_src_install_all() {
 	# see bug #133241
 	# Also set more default variables in sync with gtk3 and other distributions
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc"
-	echo 'gtk-icon-theme-name = "Adwaita"' >> "${T}/gtkrc"
-	echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc"
-
 	insinto /usr/share/gtk-2.0
-	doins "${T}"/gtkrc
+	newins - gtkrc <<- 'EOF'
+	gtk-fallback-icon-theme = "gnome"
+	gtk-theme-name = "Adwaita"
+	gtk-icon-theme-name = "Adwaita"
+	gtk-cursor-theme-name = "Adwaita"
+	EOF
 
 	einstalldocs
 
 	# dev-util/gtk-builder-convert split off into a separate package, #402905
-	rm "${ED}"usr/bin/gtk-builder-convert || die
-	rm "${ED}"usr/share/man/man1/gtk-builder-convert.* || die
+	rm "${ED}"/usr/bin/gtk-builder-convert || die
+	rm "${ED}"/usr/share/man/man1/gtk-builder-convert.* || die
 
 	readme.gentoo_create_doc
 }
@@ -230,12 +231,12 @@ pkg_preinst() {
 
 	multilib_pkg_preinst() {
 		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+		local cache="/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
 
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		if [[ -e "${EROOT}${cache}" ]]; then
+			cp "${EROOT}${cache}" "${ED}${cache}" || die
 		else
-			touch "${ED}"/${cache} || die
+			touch "${ED}${cache}" || die
 		fi
 	}
 	multilib_parallel_foreach_abi multilib_pkg_preinst
@@ -252,35 +253,35 @@ pkg_postinst() {
 
 	set_gtk2_confdir
 
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
+	if [ -e "${EROOT}/etc/gtk-2.0/gtk.immodules" ]; then
 		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
 		elog "aware location. Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
+		rm -f "${EROOT}/etc/gtk-2.0/gtk.immodules"
 	fi
 
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
+	if [ -e "${EROOT}${GTK2_CONFDIR}/gtk.immodules" ]; then
 		elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
-		elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+		elog "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
 		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
+		rm -f "${EROOT}${GTK2_CONFDIR}/gtk.immodules"
 	fi
 
 	# pixbufs are now handled by x11-libs/gdk-pixbuf
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+	if [ -e "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
+		elog "File ${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
 		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
+		rm -f "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
 	fi
 
 	# two checks needed since we dropped multilib conditional
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+	if [ -e "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
+		elog "File ${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
 		elog "Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
+		rm -f "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders"
 	fi
 
-	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
+	if [ -e "${EROOT}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT}"/usr/lib/gtk-2.0/2.[^1]*
 		elog "to do that you can use qfile from portage-utils:"
 		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
 	fi
@@ -299,7 +300,7 @@ pkg_postrm() {
 
 	if [[ -z ${REPLACED_BY_VERSION} ]]; then
 		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
+			rm -f "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
 		}
 		multilib_foreach_abi multilib_pkg_postrm
 	fi
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index df89cc8f9fd9..709482adaf25 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,5 +1,5 @@
 DIST libX11-1.6.12.tar.bz2 2376498 BLAKE2B a2c6c76d5d4a15073f7837e6a72ecd8b7711dfcec48c54da538a6100a4afa01334a9456376633f1a2365717e03231c6b777c5683e462d10564065dc2437da39a SHA512 79df7d61d9009b0dd3b65f67a62189aa0a43799c01026b3d2d534092596a0b67f246af5e398a89eb1ccc61a27335f81be8262b8a39768a76f62d862cd7415a47
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
 EBUILD libX11-1.6.12.ebuild 746 BLAKE2B 06fcee110e8b9bdf643032fd1a539f60c2590ec133e09369090c69a3565157e426a1a9a1fe08b66f949a9394aee20f23050bd02e96d17edfd4db285adb9be560 SHA512 aec825d556b6729ccdc457badcf469504c9604e0fdcbc8c3d919d3d4e7d6c6738ba992202a769624cfe9fee9798cad9c59c26f262289f950bc81549596a2444d
-EBUILD libX11-1.7.0.ebuild 846 BLAKE2B 7976d8e989c8de2c22b9a630e66dc3d02821af0f33b3febc14e3e1d456be7171b40bcb1a92a51209fc956387d51e5140d75c3ac9f0f56c403285ae2f505a790d SHA512 db968ff9262b0d1346f8b639a50ab3172de9adf7785767a9594e5754a97351cab5ea9f5b7043034217453d1d900e6b7f45dce271314c84ca1ca1fab833a72ecf
+EBUILD libX11-1.7.0.ebuild 851 BLAKE2B 180a5176da58a3988035fafd102f98148611d2fd8faa9a3e56b0eb6a09ea97925c4e306212994f9883522d6d1903174bc33db9f1c01cdc7268cfb0ba9ecbf418 SHA512 03e734b82c415942c565d331f58dd979940f22fa34a19f577fd0dc72c39e41746e23d62bb95475319565e94db3bb80cd4103daeea46fe062ba3387f7b8a653c7
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.7.0.ebuild b/x11-libs/libX11/libX11-1.7.0.ebuild
index 0ee7dd5c23c4..c4dc65a6c87d 100644
--- a/x11-libs/libX11/libX11-1.7.0.ebuild
+++ b/x11-libs/libX11/libX11-1.7.0.ebuild
@@ -9,7 +9,7 @@ inherit toolchain-funcs 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 2c8df18d03ff..4b1bd263175e 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,4 +1,4 @@
 DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
-EBUILD libXau-1.0.9-r1.ebuild 468 BLAKE2B e007b7fced5e21201d55231436593265800b06fffd40343c9f28b4500e825021a905eede77cace257555960b1805e9e4f2376e4acd0ba082b8ebdecf8f5d1683 SHA512 028a0b7150f131b6030959f0a4d11e11222a422d53d406adbb210fbef14422ae84a1d95fd0f309062d0d97dd9973e190a4f52c6f4b142400c0f0fd747b86b0e5
+EBUILD libXau-1.0.9-r1.ebuild 466 BLAKE2B ad42e47fac643d03d37831753d48ae12c099ddc09e4241119fef479c1debaad87f711700dcef872874caab49bf8adb755eaedee5c580874a2034ec0272fb04bc SHA512 2e7106145cd86559e811cfe2f8d48be7c19795d01de869f43bf87da5df580399d2e02898bba2fb5af5040a9009c538acffba57bc7b6f3570f4ea1cacb09d6aa3
 EBUILD libXau-1.0.9.ebuild 474 BLAKE2B 9f7b74e6f5c183b91cf92b892df357407d1898132aa386b72b1c30b2bcca87b2b84b68f4884ec62f3a982dc23a90f478de45d87e5712410fdc1a2740f5732794 SHA512 a92a61c1abf46a69ff83d7ef342742e61005ef6278406a62201a78f3d39f55775a8d14687d99b057124915acf98184e2989f5dbaa6d1a5cb13205d5398e5a2f4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXau/libXau-1.0.9-r1.ebuild b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
index 70ec216d4453..02d46607b6ce 100644
--- a/x11-libs/libXau/libXau-1.0.9-r1.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
@@ -9,6 +9,6 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X authorization library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~x86-winnt"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index fde71af45d22..2cead79a1d4c 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,4 +1,4 @@
 DIST libXtst-1.2.3.tar.bz2 321819 BLAKE2B 92a75d6ea9000fa7736093ce479d275c57a4a5bf849df2d6afae9478a53a07ba395013ba6676c2ea7dcb6a1f34475967ed6508b7c304b887f83ec44a611b8e6c SHA512 6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765
 EBUILD libXtst-1.2.3-r1.ebuild 632 BLAKE2B 33f69bdcdbf010adc1069371f43524f89171d133b1aa8990c3405933aab707ebee6a741fd34ab416bcbeb5dcf443fe688cbf63308fef10228b236f0bbd89d11e SHA512 070db687b4d5f18229bf030bdc2de3c0d1dae482749605a7153d22ddcac0706851c337afcf4af0068ec78e28439eec2e0e7bdc4f08cd43301c42207496b5d613
-EBUILD libXtst-1.2.3-r2.ebuild 632 BLAKE2B 5d3890e8070212d83c1d517d8e2e95a15506b5ca4ca42bc9d59b4636b2aab8245311817b92a86870560a9aa1d4fdd9b1d8f1356a95b117732c791fe389f9131f SHA512 5342be3a2ad54db970bfa0c7a8c74e02dedee6941c8e9d221825aba276dad52bd1e205dd818bafc67bc2b525e7e9978da92f2b39f9b9414399bcb14b6a7b93f1
+EBUILD libXtst-1.2.3-r2.ebuild 630 BLAKE2B 02d7e04ba0111f35b6c2425a2053716354e16cb2d963a8cbe34c51c65f61fd596d3a0ed6b28de6ce60012db2f91a3e7d67bfd36d750b98159f4a65fef29d8521 SHA512 18aab4a650681b29413fe2c54083d8e2f0f757d3df9de37a6c46afffc566065b42f5eab87275eb67379ac74fc25a79fb62966d80f72b7b729d44329e9342bc47
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
index 22ac04ec2c11..8da58e82470f 100644
--- a/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index ba263cf1da67..05100fda5277 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,6 @@
 DIST libdrm-2.4.102.tar.xz 408844 BLAKE2B f3a5ddb96130d175e860984412949713cd30145a3a9e453f666b650ec9b7eedb1c8e230aa7c5769331a330d833fdeba3da28b339150d81c17716a96935267178 SHA512 386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c
 DIST libdrm-2.4.103.tar.xz 412796 BLAKE2B 64904bebb923d79b83fbe1949aa24c697cff2a258f415c4633991f938772980e985df19f44df881d10b14268ea414ff99220c8f003ad09ac1decdc6c85249240 SHA512 15b098b962008271400692b6b15ecb7e22676f8698e0220ad969735ac2315ccc737d19558afb6abda82bae15117e5f306c048184a2369f434b85ecaa670ca885
 EBUILD libdrm-2.4.102.ebuild 1980 BLAKE2B 521ae5ff9a2b781e3fc22f089e4276a0f739bfae842e4379e3f332bdff0f6d0ff0a2bfe52d6346f3f4c6a81586878c2acd574441ca1cc43bab5db46353bde3ce SHA512 37b69924e37465600c6f48455646c3ca8fae6d0563581a0316e534a0671280c989b37fd9bd1b3d64c80f7655d21d68ed5a9b93f684dbdadca1d11deecb16ab64
-EBUILD libdrm-2.4.103.ebuild 1991 BLAKE2B 6f062e8fe0ed107e51d0409600c71225cbf497e8b5ee5bcd20b87c31692466e8acfafbd7792a711930b2d92ccdd11c716328bef72df7fe471d531de770f50c8b SHA512 12f2c1c9f8598a6e429f67617ac48f535b0e16ccad1da6af9394b6a0b3fe30164d80b8da1f8477b56ad68fe2c4f22263b621f05b013c54886103e49642f7463d
-EBUILD libdrm-9999.ebuild 1988 BLAKE2B d8456210498cfd377691e05d37ef8abb1412de0f3fc871f7ffc4cc141a34a95b196ec843ce0939719e3d9fee6d6dffd46de6fdae4b6d1426235d591ff9268022 SHA512 9ed3335d53489a17d895493c948c7ae44ec645c07ea6b8d1271deb62203a02c8b38120d0a717c15de3e8061098a7ad57f5b6f2ee96ebebd06bdf37758975e801
+EBUILD libdrm-2.4.103.ebuild 1989 BLAKE2B 924d608df03f0c416630dd38376e8f29636beaf240937b565e6b75e582d177697587a9d15f61a51906d6e1f1b11dd45696eca9da862adbbd4e4f5ff347022303 SHA512 6aad21656b23cb8f67d75757606f7dc799ba2f3cb96217d3ef4edcc5c6ba2f3df62deb714c917cc1b6d9e767270c0714cb53719282b802ddc1690e0af27dc8cd
+EBUILD libdrm-9999.ebuild 1995 BLAKE2B 48cca4911319a37b520a953c67935dfb49103445b91726876f3391434697aa5526628579b9abfc38c93953f99a08bd8d62136dd1fb9066f670b9576680b9171b SHA512 0f3db3dd331867ad523ba4f783fed48ebc57b48eb9198164573c830ca5cb07d4b1d9f826f7ab526254ecd4a2d9a8f537dec637880bb39197fc96db5ed48b2474
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.103.ebuild b/x11-libs/libdrm/libdrm-2.4.103.ebuild
index d1133a2d10a8..f2bc92f45d50 100644
--- a/x11-libs/libdrm/libdrm-2.4.103.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.103.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 46ea35c8a426..48e056d6a358 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.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 ~riscv ~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/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 868571a8484f..8242fa584084 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,4 +1,4 @@
 AUX libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch 5795 BLAKE2B 0a864b0fbd998fdc6c151b9f9cdb2a31797ac693b4ffa164a6f9a3c0fc1c5430454ec97be4c52ed48489cb08e820a998086fc588cdd2348b16da122bd483b8bc SHA512 e5148c7c310ca395b7e0f3b76ef98d79e50d0ac58935ad6df3c71bfd426166ce736ccfff4970e9523a2418820cd7cb2cba6e8818f23dd5cc21dac69accc1c3f9
 DIST libxcb-1.14.tar.xz 439404 BLAKE2B 63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111 SHA512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6
-EBUILD libxcb-1.14.ebuild 1429 BLAKE2B 7ce718b4c68491e2e4a06e829a37887942bbaa971402c7f01636e0454746b5cfb31fc467cd2f1488dc876ccca45580b1fe521ac00a17cd2c8261e7076e009852 SHA512 15dcf51b95235e55f0456b66ec65fd582725e0363affecda08549d3fc792328631ed6c86b7441336320322b85b869d38f0d91e7dcf54648ff1bc419fe52fad5b
+EBUILD libxcb-1.14.ebuild 1440 BLAKE2B 83ca73659370a10b18b65634a0ca62b4145b9b49f4570aa3efbb3c570f9080d5362f82833306b1befc28c6990770b822c29fc32415aae07e9869e18fa7a1ee6c SHA512 edce93902c23b1a55efa1be452e3e3716b338283176ef1c6572d5d6868ab41707e01d82bf2add11d7238d4216526fb8bc877ffc9fbd915f915ebdedb4155bd36
 MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index 8d656d8009d4..2c7edd1d000c 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.14.ebuild
@@ -22,17 +22,18 @@ SLOT="0/1.12"
 
 RDEPEND="
 	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
+	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+"
 DEPEND="${RDEPEND}
 	>=x11-base/xcb-proto-1.14[${MULTILIB_USEDEP}]
 	elibc_Darwin? ( dev-libs/libpthread-stubs )
 	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-	doc? ( app-doc/doxygen[dot] )
-	dev-libs/libxslt
 "
+# Note: ${PYTHON_USEDEP} needs to go verbatim
 BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep '>=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]')
+	doc? ( app-doc/doxygen[dot] )
+	test? ( dev-libs/libxslt )
 "
 
 PATCHES=(
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 460e3ff6d279..4f6135f5d251 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -3,5 +3,5 @@ DIST libxkbcommon-1.0.1.tar.xz 432692 BLAKE2B 151e9c2260b517e7e646defea8dfa1891a
 DIST libxkbcommon-1.0.3.tar.xz 432944 BLAKE2B 49dcefcc17cbbfe5623728e9852e700a623e07ad7e6df78c8d7c39784948eb230f9e141d8aaa1de94305cb552244fe54d384abbc8e57f5ec5846915b5ae484e3 SHA512 b05a2db0acd6628427baad1967979a161019dec90a078a926d41f4dfeffb84eab63e627803df1a401e42c8e48953d6c434ce08d7206eae21e890890f29b03d3c
 EBUILD libxkbcommon-0.10.0-r1.ebuild 1284 BLAKE2B d43d05a9366fe8a92d62f714a532d5f2b372443971c0a5f496387faecbfd91ab83841372977f4de853e0ac569545c2deab9828f4dccca580ca0539c406bc884c SHA512 fd009357bf396f4f9bdbcc86febef8536a84095a880bdd5d5dc135e59981113db959d909edd6340e5c6908163e939ae032307228f76219d7972b577f209e6224
 EBUILD libxkbcommon-1.0.1-r1.ebuild 1340 BLAKE2B 0904793785573e6738660848fb95c5d03d1f7fbab2aa0f5f173f0bd2c4b5da8605c649ee03cc5efe284450e4d0ea570c02bdc0f9789c9314a7c119cf82d54fdc SHA512 387d5c0a66382d5466aaaacead83ca12e7394881d1c77d7dd56e1faa950fcba5d4eb1cc32c229a8977153cba53fc4264d6b032f37ee0dd262ec2b592cdb5bfd8
-EBUILD libxkbcommon-1.0.3.ebuild 1287 BLAKE2B 520f2c999a24809d8b3e200d3cc4340e5c4ac8605b39bfca636b89fc1213d55a60e3f5912bfb554cb5c06d370d163065c8347f98c1d03a0332821b0d50eb4867 SHA512 de603e0bc9e10cccfd91246fecc783bbf296546eea75e40f45a3e1dd03e56df06d4782db611179b1290bec7b94b164272ccb8cd1dcaa0e72adc35dce4489286c
+EBUILD libxkbcommon-1.0.3.ebuild 1433 BLAKE2B 7a178db150290390c15793b0ad74259c7adfba294d2148651717644c83b5a6e6d16e3b40b863dd61061c787b4ca937320bda7146410168f307a6df5becdffe3b SHA512 25368946a2a71cbfeb4c04bacacc0a997463b3958bed0f0917029c825113027a682b28bf8cd854b4450097059027d3e6dfa83288c7560a1a56b5a1ce3b43dc16
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild
index cadcbf079075..48636d2e35e6 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild
@@ -8,10 +8,12 @@ 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 ~riscv ~s390 ~sparc x86"
 fi
 
-inherit meson multilib-minimal ${GIT_ECLASS}
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson multilib-minimal ${GIT_ECLASS} python-any-r1
 
 DESCRIPTION="keymap handling library for toolkits and window systems"
 HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
@@ -22,7 +24,9 @@ SLOT="0"
 
 BDEPEND="
 	sys-devel/bison
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	test? ( ${PYTHON_DEPS} )
+"
 RDEPEND="
 	X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )
 	dev-libs/libxml2[${MULTILIB_USEDEP}]
@@ -31,6 +35,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
 
+pkg_setup() {
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		-Ddefault_library="$(usex static-libs both shared)"
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index d4526eeb8462..c6c786f0e933 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,4 +1,4 @@
 DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
 EBUILD libxshmfence-1.3-r1.ebuild 386 BLAKE2B bfdf3a185315e38828a9c03b287512b48a4d4ff6eeefb3a7f69569bbe0e62e718054415c4a3367d91f4b5aba07fba8ada6416ff7bc74645cfde1740f13edb4e5 SHA512 a71b58f12e9cd834cb86beb29b7fd02a43ad0de955d25c7be912fe9e90829f0e77e4854b43d1b0eb91795fd1efd5f8fce1fe6d8f9c22d6338d6f7f9de5b8df37
-EBUILD libxshmfence-1.3-r2.ebuild 378 BLAKE2B 69fc856b06210accb5c8cf2d72fde04b18dce5ff5cd3588e075bb4f2f69f6fe365dfc13b15ee4948a639423424475224011e180e3114da432e9c3746ba849cd7 SHA512 9edc720b7887a3d1e7c585571a5fccec3102fd7d72311fef95619365b0e9592d3cd3a4c642ad72a1cf1a57d96f1c1ecc820732af50cd7cabfef8fdc4fa9631aa
+EBUILD libxshmfence-1.3-r2.ebuild 376 BLAKE2B 865c7510f1481e1883276e6eefb1437edd6c95652436fb6e87b2c8e3bf00fcfbe0a66af531f13a4490ea50d776db9b2d29b1597bd1db0e0812bfa44ec83047ee SHA512 3e9b31d929f8156cfdb123d50442046fc998498293f1c155cb39fdf266e4abb6bfeb4bd2a4052c83c02d19a9345ab71867783091e1b21bb7f445164ea7c69f51
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
index 4c3c410a444c..155e3e84881e 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
@@ -8,6 +8,6 @@ inherit xorg-3
 
 DESCRIPTION="Shared memory fences using futexes"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index b86625b89146..5045cf2b0eca 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index fb8471b005b5..64ab71744ec9 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -5,4 +5,4 @@ DIST albert-0.16.1-plugins.tar.gz 534401 BLAKE2B e0713ee446b0c98a44489d8a45d60a1
 DIST albert-0.16.1.tar.gz 68739 BLAKE2B 4794c8aa4d2997ccf4c2d88a36c1e578ac3daa84fdd7dfebfa08941f692815a085ea2140aec9b3944c6ff8e71a4628510f9b28857137e39396be278606812640 SHA512 49dae5722982ba3fd4a25fcf5f398d8fe8d4bf66d15e2783a699174ff7196538c11ec9dde4201174c7fc7ac0852f2491b5b68abc196077305c89e22d8e1387ab
 EBUILD albert-0.14.22.ebuild 1407 BLAKE2B ee85919ed2a532f8498530daa20e748d2aa2327bade782b97d126e221c2211913584f787ebb653e136f70daf1a1911220daa987f73106a8fb3c1835fda543817 SHA512 fc71f4c8e139e1e0dc86fcd60dbba8f911a54eb989ab60957fb1fc9fba7314d5319cff2515c8b0ad246a8cda917a14b9a798e2493161db49f531c78c0892138f
 EBUILD albert-0.16.1.ebuild 1372 BLAKE2B 9283b51acf6d42fa4f19514edaf8b430f8ba157e8652551457fdc036563bcdc11c59a28e865bee8bef56ae73d28e1e211b16f564b5d0cfa23b31e26711d72c36 SHA512 ec4c97675af1e9e9668e91c60f32dbd705640228177f010acb5245a80da321074eb52a5755b4bad8a281feaeafaff275ad9cb511a444f989cec5815021f35392
-MISC metadata.xml 307 BLAKE2B 8113fd9d5c144840eca96ffa19f81d1406343eb5fd60030739bce0a1fe3b469dfbda7066137a3347a4743abbfbbbb08a61712ca2fd681dd6f60e8d7f166336c7 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a
+MISC metadata.xml 454 BLAKE2B 3640b6c158e08d6f93e89aafcd7533da8b0f40a086aa26b2fac8b739f12813cbb73eaab0aac0ea93c43929c40a0e14f9d395357abb5a409a2f140ac3f86ab618 SHA512 2b069b93be5c8c623fb93891818c610282b35bbf15be9b296a167d80ccb570141d8f0844e46abad8f8f860e89bee422dd5fca41a85fbad207843c2d1024a861d
diff --git a/x11-misc/albert/metadata.xml b/x11-misc/albert/metadata.xml
index 57e125768c28..9790aca21da3 100644
--- a/x11-misc/albert/metadata.xml
+++ b/x11-misc/albert/metadata.xml
@@ -2,7 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>kensington@gentoo.org</email>
+		<email>gentoo@retornaz.com</email>
+		<name>Quentin Retornaz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">albertlauncher/albert</remote-id>
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index d3365296f2af..abc7b78a961b 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
-EBUILD compose-tables-1.7.0.ebuild 890 BLAKE2B 9319b020fef2e3a9047bfaedc958f041d4590a857e6ee1f39a3bf6995e5ee2ddb3d08c14756d16b7c3b53ed36ac46f4e42acee9e62744601d673dc2f3d79a1dd SHA512 bc271018303fe1aeadb98010d8be7480de0840e55a0051e2db723316182a46850c4420fb5bf3d1d7f6cc28a7b1c5b67eda1142d2d6bc9d1abaee5595cad258c4
+EBUILD compose-tables-1.7.0.ebuild 895 BLAKE2B 72fe08a0b8a07ef311c2c7e3d00f0efe2922ace618c929428e98e260b0858890b0f3cee81c4064c5383ea7e6beb65acd87b1af9d4c1326878ea36d99cde69c6c SHA512 473b96a045bd9f4ce9c9d504a3241940ae3dd083c820a91692361d3bac7bf36013923aabe817c8e062c928ca7badae706b48e9b1cc8834829db1b1db51005274
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
index 5c5eca7a991f..8d2cd5fa5f97 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}
 S="${WORKDIR}/libX11-${PV}/"
 
 DESCRIPTION="X.Org Compose Key tables from libX11"
-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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 7d6ec3d000fd..2a28358246b7 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -8,5 +8,5 @@ AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29
 DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
 EBUILD x11vnc-0.9.16-r2.ebuild 1942 BLAKE2B 72cb2940aefc086db989a74155fa48fe27a27593ba04c14af7b83a67fd2da64eb2c0354a1565ba9ddfa744b804869f5f3a102a54e87f949b9efa5ca1c01d6e63 SHA512 7d5b4399b806d4059bb5a0aff470671c8b4591febf562c003e57e7ca6c2bc429fa416ef09f6885cc9b764677c38e44041cbf5b4f911a723a98c5a13f5e795103
 EBUILD x11vnc-0.9.16-r3.ebuild 2014 BLAKE2B e85b366cab4ceb65ffc8c7b644b5814da9db6f8070c180526f66f917d291809ea9c4ddfefc921de89ef216cc03e6391df170e3435e3ddce858ebdba7432fc026 SHA512 d79f267e41843d1cf7c40814baddabea3729608d0d2dfc4f28543de459ff559b39a19221f60fcc808992c0cb0bae86126203700bcd8b181e9199bee5f8a5b2c9
-EBUILD x11vnc-0.9.16-r4.ebuild 2049 BLAKE2B 70251f73469627e347c411f9de285bb2691448251deac7029f7e6fa4f682d19ed8c07c17a8b51531a83e4baaeb5a2f93a7f63ec9ff8f83037ff53ef481af1a23 SHA512 0a95a6d066e96fddc25a5024ffdf1ff886d8e936dbac5e3924f15b3aa5921a76d347b7e5f9ffe06ab01fb397b1ae637049d85758e9db4a5c6ae496d4daf8fba2
+EBUILD x11vnc-0.9.16-r4.ebuild 2048 BLAKE2B 1330773fa0e62ac22caebcdaff16a685b9f4361836fa4645fe872254ce32947d398304e2fe90c51f4925820a5f42e6d49d6b07e6b518dac981b49193af2ad7d6 SHA512 7bab10e0c6bf24494b5c787bd294f1b09db7a52c23a61bd894bf279ddc9905d4b33c72d05a5729d9caff61f711283e74ce84ba621f85f2bb14c343c0b4891996
 MISC metadata.xml 922 BLAKE2B 02740589fa0091f604e1fff99ace802d4b179a35afd2c40d4ae25d40d41af0425a6e16cdb5951b4968813478a5066c6a241d49beba811dc296f125ba2aaddd13 SHA512 b46e3d0b379cf9967ec878e57d0a21b677ca869921546224f6f663eca4da8f2d57a97d07dac9da90999454584f6ea1c80748adf12663ff03b286292603aef2c6
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
index 85403ad5c8bb..c92e18665f25 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index b80ddc25db40..f4540d096943 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,6 @@
 DIST xkeyboard-config-2.30.tar.bz2 1689137 BLAKE2B 54ba0a3a82d65f4cf15c45aa500bd8a44865c9ce845d5bc1ae85d3544a384622c580baa119b8882defa9868d8210697153f868a273a38852d938bf318ed09c3b SHA512 2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4
 DIST xkeyboard-config-2.31.tar.bz2 1705328 BLAKE2B a6fe680a8f32f1ca58363faeb0955ae621712f045570f66ce1c211093f0021f60e7fa29076b9dac80ee6c07ef1e4abb738ad64fd01a75ad776e582e2dbcc286e SHA512 f6f260253e1757640cc0591f9efb55ad5d08023a53ec2f0b468465b36bae0aae4f78dc4d6e603c95aa21c9993d9a42bd641edf2017be3183921a0b1c125f4669
 EBUILD xkeyboard-config-2.30.ebuild 1338 BLAKE2B 9cda49f311d777e251148420d651b2254c29e2adbfd82ae6d70489fecfb55ed955d9f98d6bcc93878a0f6a7d7942f863257e24519e97243a4058f4259f55ef9f SHA512 6e0f427d0f7a30afcbb7263e8b3dede847a33f33bca90842c4317b4bb04f967b6586fda0abea90e506b21b2de007eb8ac30167d444b37df6e2a5d691659e0e5d
-EBUILD xkeyboard-config-2.31.ebuild 1348 BLAKE2B defcbc90ee2d7dcf1b414f61289d54b9140efbce8403e85769530814c22ad32675e0dcc8eb640eede410825d6ea2e5c0c670674b8a6c2b30b7344513ee16aaf7 SHA512 111dc7dd9732639dd5ad75ba754a42e29b420d5511ded88f6947c3a29b33d6edb091f108883fcc28f8fa3c5fdcb047998d49405c216784ef3597aae58287fade
+EBUILD xkeyboard-config-2.31.ebuild 1346 BLAKE2B 35bcef6adc8aef0c9f951c7c40adccea362ba6a51dc52577b5880c34e3bad3899e1ec19b90313ada23c114810782b9d01c27581662c701cf4e303157d101deb2 SHA512 5fefaf5f48e9f9bb436cd263fe7191029db195909e2d8b7dae177be5bf76ce9af3553cad60c462ee4362ded3492eff6ea65aabc6ea36fa0b1a55ee1b82951f9c
 EBUILD xkeyboard-config-9999.ebuild 1025 BLAKE2B 40114e9b867de73171361cb9bbfc524d4b9ec67af46f58ec4aa12851ed34f9e6be3851aadb1758ae6dc7b0870eb84c83db77deb0c76ac63cd01e5438dbb0d8fc SHA512 a61f3525effabe287198ca34aa64198e876feadb44188e8a3df47465b3fddfd9cc2d56f2bf080ad19b9e8aceaff1387cff8893e7d46727903c480879fd85106c
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
index a3b43b48b034..700f24a9a820 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.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 ~riscv ~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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 3c1be92c5343..43e041f66edb 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index c4ba260005fc..5e7344117bd7 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -5,5 +5,5 @@ DIST wmbiff-0.4.35.tar.gz 265332 BLAKE2B 049f01dafaf71af614c47379fa1e59593e6d790
 DIST wmbiff-0.4.36.tar.gz 266288 BLAKE2B 7f90ae23ff228ed775c4693beffb3e71930bc594083d75cbe25d9eb992cae3a35bc8d57699da53b034a19486846d05625dee607b0da38519ddfc50faac4cf6da SHA512 b8b14f9676ebd576f9e568bd59638c3000337713c6ef8cf5d7799ed0adea59d1ca1fe0d9c67ceb997814b1e6d26590a0c4052b1f031cee28601d7273bbd3fd23
 EBUILD wmbiff-0.4.28.ebuild 825 BLAKE2B 3e27116ec3256f882303581d48c4911aee3f360e581bb58c5da55244e94edc89a978333cd2654b2d49d2e8e141df6b05a236456c5768bb5fd5f7f0c8156518d6 SHA512 cf73dca2d7798577fed2e223f25e66261915220d198edc90884181c7d71c9b6b909e29aee41a7a9a5e284221048b4dc29b97388bba9e3a117cdad73adf2cf283
 EBUILD wmbiff-0.4.35.ebuild 854 BLAKE2B fb2e3f070a2e668f729e5748330d98876ea7108bf8c20dc91d20b49eaf52e562897879249226bd67b717ed2a659009a896c8e955615255c7d447cb18eeee75c0 SHA512 1d69747b719985f878268f8111edfde765613dd31aa135d2eb8d4569b2237b63a384514183f90c118fe47e23a73319f4fda6bf783145438d9ec1bfcae283af88
-EBUILD wmbiff-0.4.36.ebuild 749 BLAKE2B e6eec09bc83b0d23065c27efe48043d829017ffce44440094ed159ebb864b22e14e63433b7edbc7090b4559fa1d8f9d4aaaaa05125f77d9474e9264c684021bf SHA512 0eef526e14cc7e96a732eb02595790dcc703246d8551aa9049d85ae1b0d286d50a77097f2005b13cbf7ce22c1d03099a7411f9a12e15393eae29bf81a50f0b83
+EBUILD wmbiff-0.4.36.ebuild 748 BLAKE2B df8b921c25613260d469fa9410456e74a7f6fdd677bdd38c37a79074ebebc3b0e19a3b39305b0a39edcb2e9741b33d8ff46b9f703f65ccf3b2bb215c6419e821 SHA512 1893570240517a5f0e9af38ba3a5308fe95036387604323c4d0e3dcaf7edd6fdf5b29a164da7479461b1f8a5f860b71c535b2d8758f66e3c9d59fc47111c3f32
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
index a7c57b290a75..9bc7ddb28d8b 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="crypt"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmbutton/Manifest b/x11-plugins/wmbutton/Manifest
index fe6e217bede2..12b46fcacb1f 100644
--- a/x11-plugins/wmbutton/Manifest
+++ b/x11-plugins/wmbutton/Manifest
@@ -1,5 +1,3 @@
-AUX sample.wmbutton 659 BLAKE2B 35aa7b2ed88b7a04d869ad1b6eb7ba807d25460aa7addb7e323567e09dca592878295488daee59cbf8d0e89c04ec3d440627ddf10774dbba51b3afcecc10219e SHA512 fc828740001b2280f49b916cd1fc803cb1d606d36a7fdeca0aafa9d892d377ed68eebb996efe7bb96eff6f5ea281e4431182e2831605f6167a39cb2be878063f
-AUX wmbutton-0.7.0-Makefile.patch 753 BLAKE2B 5dcf27655194b834f63f5c9dcc25ed3a3ccbe6d61b2f4db88444c168c54f206039b2c2065e45462d054fa376eaa062a6634f267b7629ea226b27681e80ac1b26 SHA512 f62306dfbba48a960a1e198f7c50a4e828405642d852dd543b4cf6ffd2e297266bac71c386d176a35c060dcc6f6c126a4af52a0f83772a4ebed1b55dbe880b8c
 DIST wmbutton-0.7.1.tar.gz 140293 BLAKE2B 55ab4926b833ae4e57e73cbd4e0fdb6177510099a140bd17d1378c31fe4f42a5fa35c1dbe58398412d465ceb99065a3c7a45a496dc3cb71d045edd879bd70f18 SHA512 61e846c2c7edf6375fdf7e86490ef80feab986b24ce83110283b7e336562a670142e326bfda24ddad832c563da0cb4bc2c3d7379e88e647954c6d93a4dcf6068
 EBUILD wmbutton-0.7.1.ebuild 467 BLAKE2B ad97f18003b167381cf3a356830a2eed663022915ef9f72a89e52d0b4f174ac99ded48f13f00d3f4827b0b7422d302494e15f70b26904b25ffb1ac164f31ae32 SHA512 8fb65e5cc1e3efb5b431fbc40f56a3210a15a415d5cd0fbaa5fded87f4f9201fbc27d09528f4c16cfb2e8528df8ad247bb5abade05fdd38e1a90271db9fb08f2
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbutton/files/sample.wmbutton b/x11-plugins/wmbutton/files/sample.wmbutton
deleted file mode 100644
index a4177a24e081..000000000000
--- a/x11-plugins/wmbutton/files/sample.wmbutton
+++ /dev/null
@@ -1,43 +0,0 @@
-# Buttons are numbered as follows 
-# 	Left	1 2 3	Middle	11 12 13	Right	21 22 23
-# 	button	4 5 6	button	14 15 16	button	24 25 26
-#		7 8 9		17 18 19		27 28 29
-#
-
-1	mozilla &
-11	firefox &
-21	opera &
-
-2	evolution &
-12	mozilla -mail &
-22	gftp &
-
-3	xterm -T 'xterm' &
-13	Eterm -T 'Eterm' &
-23	aterm -T 'Aterm' &
-
-4	psi &
-14	gaim &
-24	kadu &
-
-5	gentoo &
-15	xterm -T 'Midnight Commander' -e mc &
-25	xffm &
-
-6	ooffice &
-16	gnumeric &
-26	acroread &
-
-7	xmms &
-17	gmplayer &
-27	audacity &
-
-8	gimp-2.0 &
-18	sodipodi &
-28	kpaint &
-
-9       kghostview &
-19      ggv &
-29      xpdf &
-# The above don't need to be in any particular order.
-# Repeated entries should be ignored
diff --git a/x11-plugins/wmbutton/files/wmbutton-0.7.0-Makefile.patch b/x11-plugins/wmbutton/files/wmbutton-0.7.0-Makefile.patch
deleted file mode 100644
index f9197842b44a..000000000000
--- a/x11-plugins/wmbutton/files/wmbutton-0.7.0-Makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.orig	2014-10-06 15:20:41.300883734 +0200
-+++ Makefile	2014-10-06 15:22:08.936939085 +0200
-@@ -1,6 +1,6 @@
- INCLUDES =-I/usr/include -I/usr/local/include
--LIBINC =-L/usr/X11R6/lib -L/usr/include/lib
- LIBS = -lX11 -lXpm -lXext
-+CC = gcc
- 
- TARGET = wmbutton
- OBJECTS = wmbutton.o wmb_libs.o
-@@ -14,13 +14,11 @@
- INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
- INSTALL_FILE    = $(INSTALL) -p -o root -g root -m 644
- 
--CFLAGS += -Wall -O2
--
- .c.o:
--	gcc -c ${CFLAGS} ${INCLUDES} $< -o $*.o
-+	${CC} -c ${CFLAGS} ${INCLUDES} $< -o $*.o
- 
- ${TARGET}: ${OBJECTS}
--	gcc -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
-+	${CC} ${LDFLAGS} ${OBJECTS} ${LIBS} -o ${TARGET} 
- 
- clean::
- 	for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done 
diff --git a/x11-plugins/wmcoincoin/Manifest b/x11-plugins/wmcoincoin/Manifest
index cb074408478e..a755fb104661 100644
--- a/x11-plugins/wmcoincoin/Manifest
+++ b/x11-plugins/wmcoincoin/Manifest
@@ -1,5 +1,5 @@
 DIST wmcoincoin-2.6.2_p20140602.tar.gz 972358 BLAKE2B a30acaa7b20e88c1d2f4b5329f02321d6a7431bf22379e9d8074b48c1953bcd411b011097546b905f406e21f5de3e9057923109f0e63136cc19d5b5bdfbc47ef SHA512 ddf1b24d9c9021e9cb02817e80f3327074ef7d09ba7d8033d5d0c8b39a25106a1d54d32f211d31a910e2175d98bbda940f309cc137edd1b02b5a656891e89b2c
 DIST wmcoincoin-2.6.3.tar.gz 973973 BLAKE2B 4dcbb79ddb23c47fb891fde56137bb385ccf841eb54ce7a34cf060d4924d859a5a2ac40d504a26e763f1fe075796e09ec6a00a0080d214add2469db6b2f3a4d4 SHA512 daffd94387a03e780250877ae43e5431a7c0710862dd9fab04efc254e02e648215fa9c301bf1ed6d1a9ca5182a2a88d10ea4c385d92752d047492e6e9ad01d2d
 EBUILD wmcoincoin-2.6.2_p20140602.ebuild 978 BLAKE2B 74c122836e1bfcd89fc77117349d48dd88566f143a37c25426c2322362a2d586d3513bcd5559e0a73f58761b1b274eb037b422c37d67a1164deb5b286fe135b9 SHA512 ad01f83b53cd4a2d5dd9da3f8daa8830eb4c2b227ebae3279302c5afcedd56183c07f6ca70ebb0b4938b8d4f90c264c161e5b655f5a237f2133befa3586eafaa
-EBUILD wmcoincoin-2.6.3.ebuild 742 BLAKE2B 2d420d4646b4c3e2e9f45cb57e2beefaa76ca1b743342425bc6b924fb3b2dfa29247b31a1198b33542025a72fd96465937ce784768d93a39b25bc6fad228f000 SHA512 5872e935c0db3a827b56ad2751cde3a3b532cb68359382be62f716f2376e4ef505b188f383b75eda3cdc76b7a1b688969e19218c82ec9fd99f1f949d4e7832e8
+EBUILD wmcoincoin-2.6.3.ebuild 741 BLAKE2B d246c8288b155ca4810bf7fee0359edc622a91b48ae7cbd0d0a8ec4e2a0b5d5616ddcc5fad9e8576552d2f46370c5d9980ba08d2faa4997ad56f0b4856694c15 SHA512 ad734d06e91dbe98eba7534874165c16864c86265986f2614dbc9744b5c4bfc6502572ec18965dd6694f602ebdf639c7bb8039e758151f304144b61bd498b68d
 MISC metadata.xml 641 BLAKE2B 8ceb569e438dfe8de74de91d31c6b858db7dc20508257fa371504352664cd409c0339e356401cf68f8a59a5cae8aee10dba93134ca353d6a63c47405bc07a229 SHA512 e2d77f95ba4774261ec4ec669d18bc5cdc11558e935bfb3d4e759e9755e15e7ef88b9207a7498c44bab9061f01483c36b2c9624648fc05df526dc91f5637bc64
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
index 7ceffa19d445..4d14c5ca8975 100644
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://hules.free.fr/${PN}/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE="nls xinerama"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
index 6123ce3075c3..37825b32072b 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -1,5 +1,3 @@
-AUX wmix-3.4-gcc-10.patch 3584 BLAKE2B 4026aa39e88ea33625e37995607845b710c5150b8a3afc5d6142bf127cd17216a9843a6e5ce1913e5698bd6488ce1d009abfee20e25a9818c770dacbd55031ce SHA512 b79b3bfc92682e49ad2d45d97c21bb1d97d40db42de242049a6567507b9766e37a7f5f438ebe16b09b29ddca18391dfee8bba67888b817f71e1b9ce1da57f2f6
-AUX wmix.1 1969 BLAKE2B 9599e110ef1efcfb1582749cc58355f5d055920f5d1d0834073bd161af65cea300c100a9cd64ef65906842858da0e4539527a0c448616228280f7b283bf2a29a SHA512 3937513506295543cef1a12a0a739f4923e2fe6500436433969351547493b712c891ac41ccf627a325eaf03c8552cbe6cac0cedc3ba3548a26c138f4eec084d6
 DIST wmix-3.5.tar.gz 118052 BLAKE2B 54461c59d46a2ccf7f81aaf422b9e9fadf260001621396543deb996cb346a1dea5d100b38517b79974acc4d429d6a2f4fcde10e88d114e9f6978d1c0bb599d2e SHA512 ca702368cd5db55958e5f25c9703bf6659987534795fe58fd1ade426220f468ae3979e98ed1a00ffa162b094e53e37974d626a6bc48e2f6099c8c6eaa1f3dfd6
 EBUILD wmix-3.5.ebuild 464 BLAKE2B 9b62dfdefe3e991b5f1a22a3a917efea9a4bbd62ce2b70b7f5f892ec3b71367f4ee0da61e78553746f12a861641a8175369b59aec668f23ec50a8227df1281d5 SHA512 b0db10b4390d024a7a4fb222bd0bd3e14c3b13281950b43230279a4e4b06e9d334a4cd95c58ee4ec72b7f9c67199cc00465b04109a089f9588e83cdbdd9f408b
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch b/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch
deleted file mode 100644
index 4e91a1a53d78..000000000000
--- a/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Naur wmix-3.4.orig/include/mixer.h wmix-3.4/include/mixer.h
---- wmix-3.4.orig/include/mixer.h	2018-04-30 14:17:50.000000000 +0200
-+++ wmix-3.4/include/mixer.h	2020-01-29 19:07:14.932404252 +0100
-@@ -55,28 +55,28 @@
-  * - Muting must occur independently of the volume level.
-  */
- 
--void (*mixer_init)(const char *mixer_device,
-+extern void (*mixer_init)(const char *mixer_device,
-                    bool verbose,
-                    const char *exclude[]);
--bool (*mixer_is_changed)(void);
--int (*mixer_get_channel_count)(void);
--int (*mixer_get_channel)(void);
--const char *(*mixer_get_channel_name)(void);
--const char *(*mixer_get_short_name)(void);
--void (*mixer_set_channel)(int channel);
--void (*mixer_set_channel_rel)(int delta_channel);
--float (*mixer_get_volume)(void);
--void (*mixer_set_volume)(float volume);
--void (*mixer_set_volume_rel)(float delta_volume);
--float (*mixer_get_balance)(void);
--void (*mixer_set_balance)(float balance);
--void (*mixer_set_balance_rel)(float delta_balance);
--void (*mixer_toggle_mute)(void);
--void (*mixer_toggle_rec)(void);
--bool (*mixer_is_muted)(void);
--bool (*mixer_is_stereo)(void);
--bool (*mixer_is_rec)(void);
--bool (*mixer_can_rec)(void);
--bool (*is_exclude)(const char *short_name,
-+extern bool (*mixer_is_changed)(void);
-+extern int (*mixer_get_channel_count)(void);
-+extern int (*mixer_get_channel)(void);
-+extern const char *(*mixer_get_channel_name)(void);
-+extern const char *(*mixer_get_short_name)(void);
-+extern void (*mixer_set_channel)(int channel);
-+extern void (*mixer_set_channel_rel)(int delta_channel);
-+extern float (*mixer_get_volume)(void);
-+extern void (*mixer_set_volume)(float volume);
-+extern void (*mixer_set_volume_rel)(float delta_volume);
-+extern float (*mixer_get_balance)(void);
-+extern void (*mixer_set_balance)(float balance);
-+extern void (*mixer_set_balance_rel)(float delta_balance);
-+extern void (*mixer_toggle_mute)(void);
-+extern void (*mixer_toggle_rec)(void);
-+extern bool (*mixer_is_muted)(void);
-+extern bool (*mixer_is_stereo)(void);
-+extern bool (*mixer_is_rec)(void);
-+extern bool (*mixer_can_rec)(void);
-+extern bool (*is_exclude)(const char *short_name,
-                    const char *exclude[]);
--void (*mixer_tick)(void);
-+extern void (*mixer_tick)(void);
-diff -Naur wmix-3.4.orig/wmix.c wmix-3.4/wmix.c
---- wmix-3.4.orig/wmix.c	2019-07-12 18:44:38.000000000 +0200
-+++ wmix-3.4/wmix.c	2020-01-29 19:06:52.685402994 +0100
-@@ -53,6 +53,31 @@
- static int mouse_drag_home_y;
- static int idle_loop;
- 
-+void (*mixer_init)(const char *mixer_device,
-+                   bool verbose,
-+                   const char *exclude[]);
-+bool (*mixer_is_changed)(void);
-+int (*mixer_get_channel_count)(void);
-+int (*mixer_get_channel)(void);
-+const char *(*mixer_get_channel_name)(void);
-+const char *(*mixer_get_short_name)(void);
-+void (*mixer_set_channel)(int channel);
-+void (*mixer_set_channel_rel)(int delta_channel);
-+float (*mixer_get_volume)(void);
-+void (*mixer_set_volume)(float volume);
-+void (*mixer_set_volume_rel)(float delta_volume);
-+float (*mixer_get_balance)(void);
-+void (*mixer_set_balance)(float balance);
-+void (*mixer_set_balance_rel)(float delta_balance);
-+void (*mixer_toggle_mute)(void);
-+void (*mixer_toggle_rec)(void);
-+bool (*mixer_is_muted)(void);
-+bool (*mixer_is_stereo)(void);
-+bool (*mixer_is_rec)(void);
-+bool (*mixer_can_rec)(void);
-+bool (*is_exclude)(const char *short_name,
-+                   const char *exclude[]);
-+void (*mixer_tick)(void);
- /* local stuff */
- static void signal_catch(int sig);
- static void button_press_event(XButtonEvent *event);
diff --git a/x11-plugins/wmix/files/wmix.1 b/x11-plugins/wmix/files/wmix.1
deleted file mode 100644
index afd65224bbe5..000000000000
--- a/x11-plugins/wmix/files/wmix.1
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\"
-.\" This documentation may be distributed under the terms of
-.\" the GNU General Public Licence version 2.
-.\"
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH wmix 1 "Jul 19, 2004" "Michele Noberasco"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-wmix \- Dockapp mixer for OSS or ALSA
-
-
-.SH SYNOPSIS
-.B wmix
-.RI "{ " options " }"
-
-
-.SH DESCRIPTION
-.B wmix
-Dockapp mixer for OSS or ALSA. Allows toggling record source,
-muting individual channels, adjusting volume and balance, all in a
-compact dockapp size, with TV\-like on\-screen\-display for volume levels.
-.LP 
-Supports mousewheel to adjust current channelvolume
-and can be controlled remotely with SIGUSR1 / SIGUSR2 to adjust the volume.
-Keeps a simple configuration file for user\-defined settings.
-
-
-.SH OPTIONS
-.TP 
-.BI "\-d " dsp
-Connect to remote X display.
-.TP 
-.BI "\-f " file
-Use alternate config file (default is \fI~/.wmixrc\fP)
-.TP 
-.BI "\-m " dev
-Use this mixer device (default  is \fI/dev/mixer\fP)
-.TP 
-.BI "\-h"
-Display list of command line options.
-.TP 
-.BI "\-v"
-Use verbose output messages.
-.TP 
-.BI "\-e " name
-Exclude a channel, can be used many times.
-
-
-.SH AUTHORS
-wmix was written by <timecop@japan.co.jp> and <skunk@mit.edu>
-.LP 
-This man page was written by Fredrik Steen <stone@debian.org> for the Debian
-distribution. Updated and fixed by Michele Noberasco <s4t4n@gentoo.org>
-for the Gentoo distribution.
diff --git a/x11-plugins/wmmaiload/Manifest b/x11-plugins/wmmaiload/Manifest
index faa64dfedeef..d17a858c5149 100644
--- a/x11-plugins/wmmaiload/Manifest
+++ b/x11-plugins/wmmaiload/Manifest
@@ -1,5 +1,7 @@
 AUX wmmaiload-2.2.1-checkthread.patch 387 BLAKE2B 2c79203a230b8caa9cb3ff85443380843144318146c61750d4c7b7113df9ae51960541adc3d76cbfed412cf1dc7c91687a224f549cb898bcd0a7cb70926fc2cc SHA512 a2edea4c4c0beecd5fe764bf8a591a8367d76997bd747f0c2b11ed6f268f88d57aae0d0c0a085ab9b48c7eca42fe1d2fe3f5ea3246981d42868fedf2336da7d1
-AUX wmmaiload-2.2.1-gtk.patch 6148 BLAKE2B 082a2f93bde9fe08c227770789e1e1b54286f69506fb8208550c46f92a985f5a73854ffd96fb96d1026bf70a13180e0109fb5a4572e3d07fd8c9280412730efe SHA512 f0766111c10af4a3d658804f8fbf4a628df49947fad3f350e2399ae10ffeaf5083291759172155647e54b101dccc2dd66520483302d20f59557e57933564bcb6
+AUX wmmaiload-2.3.0-fno-common.patch 3189 BLAKE2B ce81f29d6b8fb3c95eaeb1859d86cd45a935e595785c26ee756cdebf8b9f7f340b966020796c6ee96d943b3aea7ff81df48d3c05af6119d31cf6c81d5748a2a9 SHA512 689c196834783f969c58d3a3244eb289c0d0a34b7a9c32f9b374f07325b3077f8e231afa1fe91832d0e99e4cc2a54c6a85cf9839bec65a588288e57df60804d3
+AUX wmmaiload-2.3.0-ssl.patch 1008 BLAKE2B 2d62d5549df7facd43df932365bccb11324c90ec79dc0aedc1fc42bde5474aa82c51ab42420bda06d6ae2282d26c8cc8aaf59597bbdee4fdebcec31b0ba509f3 SHA512 2976bba5207b77c80ceb0d1759a170f03915fe7746f051a07a1862e748e1d9f95b717670c5ef7692de8fa995b1a1bf018a15f1ec8a70165dcbe5dff691c12352
 DIST wmmaiload-2.3.0.tar.bz2 42852 BLAKE2B abee44716ff74e48a480881c3327bc4a4f02600044a587b3322429567a3454f01c733542fbaa42cb074a2da48ecd1c453d19ed42c30efc04e634c44330d729d3 SHA512 c4e63eb2868474e3b76f5f4f401bdd23172f23dfdb0e90712e3eca607494057e067805b83a53490d38b6f7b2c876e2ec8fdb1d95b871d3febeeda35369550de9
 EBUILD wmmaiload-2.3.0-r1.ebuild 1113 BLAKE2B a3cd913239de19f6a5ff5e14fb29eef7604b8b1905aa64032b8b327a73dad27a0c6d08eaac75c01cbd64f3b4f576d1e5694e5318bb9f825a182c1ee3e17ad9b9 SHA512 a72ed432d9bb9a1a74ef9d8871d41a6ce92a5afd44394a9b0c51f51b7ce0f85fcd450bac3858ef93c946b9852577d7dfc831eaf1e0b2e39b4f2305655995570d
+EBUILD wmmaiload-2.3.0-r2.ebuild 1035 BLAKE2B 7f64f7542d12e3238a540055e243ab59af69ac2cc39a7d7b6642a9859a18a5347dfcc86faf4c8dd5e6dcbf7d7d2dc6eacee4249b2e8a5855e990c3769a3db6a5 SHA512 9bcd425fe90dc0cc764427d123608c1055b5a2fb5040452598e0bd616151ef39a316e8e84e92adabf7c21dd3e17257b0c2b5812ea80be795e61fd4932b1c9470
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch
deleted file mode 100644
index 38c8625e51ac..000000000000
--- a/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -ur wmmaiload-2.2.1.orig/wmmaiload/dockapp.c wmmaiload-2.2.1/wmmaiload/dockapp.c
---- wmmaiload-2.2.1.orig/wmmaiload/dockapp.c	2005-07-12 22:39:47.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload/dockapp.c	2008-01-12 11:53:00.000000000 +0200
-@@ -27,6 +27,7 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <stdlib.h>
- 
- #define WINDOWED_SIZE_W 64
- #define WINDOWED_SIZE_H 64
-diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/actions.c wmmaiload-2.2.1/wmmaiload-config/actions.c
---- wmmaiload-2.2.1.orig/wmmaiload-config/actions.c	2005-07-13 22:54:46.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload-config/actions.c	2008-01-12 11:54:15.000000000 +0200
-@@ -3,6 +3,7 @@
-  */
- 
- #include <stdlib.h>
-+#include <string.h>
- #include "defines.h"
- #include "variables.h"
- #include "dialogs.h"
-diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/dialogs.c wmmaiload-2.2.1/wmmaiload-config/dialogs.c
---- wmmaiload-2.2.1.orig/wmmaiload-config/dialogs.c	2005-07-07 21:54:17.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload-config/dialogs.c	2008-01-12 11:47:42.000000000 +0200
-@@ -38,7 +38,6 @@
-                            bouton, TRUE, TRUE, 0);
-         GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
-         gtk_widget_grab_default(GTK_WIDGET(bouton));
--        gtk_widget_draw_default(GTK_WIDGET(bouton));
-         gtk_widget_show(bouton);
- 
-         bouton = gtk_button_new_with_label("No");
-@@ -97,7 +96,6 @@
-                            bouton, TRUE, TRUE, 0);
-         GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
-         gtk_widget_grab_default(GTK_WIDGET(bouton));
--        gtk_widget_draw_default(GTK_WIDGET(bouton));
-         gtk_widget_show(bouton);
- 
-         gtk_container_set_border_width(GTK_CONTAINER
-diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/Init.make wmmaiload-2.2.1/wmmaiload-config/Init.make
---- wmmaiload-2.2.1.orig/wmmaiload-config/Init.make	2005-08-26 21:37:33.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload-config/Init.make	2008-01-12 11:48:12.000000000 +0200
-@@ -35,9 +35,9 @@
- #
- 
- CROSS_COMPILE =
--USER_CPPFLAGS = `gtk-config --cflags`
-+USER_CPPFLAGS = `pkg-config gtk+-2.0 --cflags`
- USER_CFLAGS   =
--USER_LDFLAGS  = `gtk-config --libs` -lX11
-+USER_LDFLAGS  = `pkg-config gtk+-2.0 --libs` -lX11
- 
- 
- #*****************************************************************
-Only in wmmaiload-2.2.1/wmmaiload-config: Init.make.orig
-diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/main.c wmmaiload-2.2.1/wmmaiload-config/main.c
---- wmmaiload-2.2.1.orig/wmmaiload-config/main.c	2005-07-13 22:51:28.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload-config/main.c	2008-01-12 11:54:01.000000000 +0200
-@@ -3,6 +3,8 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <gtk/gtk.h>
- #include "config.h"
- #include "defines.h"
-diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/mainwindow.c wmmaiload-2.2.1/wmmaiload-config/mainwindow.c
---- wmmaiload-2.2.1.orig/wmmaiload-config/mainwindow.c	2005-07-13 22:51:52.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload-config/mainwindow.c	2008-01-12 11:47:42.000000000 +0200
-@@ -10,9 +10,9 @@
- #include "actions.h"
- 
- 
--static GtkWidget *edit;
--static GtkWidget *set;
--static GtkWidget *remove;
-+static GtkWidget *b_edit;
-+static GtkWidget *b_set;
-+static GtkWidget *b_remove;
- 
- static gint list_sel_cb (GtkCList *clist,
-                          gint row,
-@@ -21,9 +21,9 @@
-                          void *data)
- {
-         selected_row = row;
--        gtk_widget_set_sensitive(edit, TRUE);
--        gtk_widget_set_sensitive(set, TRUE);
--        gtk_widget_set_sensitive(remove, TRUE);
-+        gtk_widget_set_sensitive(b_edit, TRUE);
-+        gtk_widget_set_sensitive(b_set, TRUE);
-+        gtk_widget_set_sensitive(b_remove, TRUE);
-         return TRUE;
- }
- 
-@@ -35,9 +35,9 @@
-                     void *data)
- {
-         selected_row = -1;
--        gtk_widget_set_sensitive(edit, FALSE);
--        gtk_widget_set_sensitive(set, FALSE);
--        gtk_widget_set_sensitive(remove, FALSE);
-+        gtk_widget_set_sensitive(b_edit, FALSE);
-+        gtk_widget_set_sensitive(b_set, FALSE);
-+        gtk_widget_set_sensitive(b_remove, FALSE);
-         return TRUE;
- }
- 
-@@ -230,7 +230,7 @@
-         gtk_table_attach_defaults(GTK_TABLE(table), bouton, 0, 1, 0, 1);
-         gtk_widget_set_sensitive(bouton, FALSE);
-         gtk_widget_show(bouton);
--        edit = bouton;
-+        b_edit = bouton;
- 
-         bouton = gtk_button_new_with_label(" Set default ");
-         gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
-@@ -238,7 +238,7 @@
-         gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 0, 1);
-         gtk_widget_set_sensitive(bouton, FALSE);
-         gtk_widget_show(bouton);
--        set = bouton;
-+        b_set = bouton;
- 
-         bouton = gtk_button_new_with_label(" Remove box ");
-         gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
-@@ -246,7 +246,7 @@
-         gtk_table_attach_defaults(GTK_TABLE(table), bouton, 2, 3, 0, 1);
-         gtk_widget_set_sensitive(bouton, FALSE);
-         gtk_widget_show(bouton);
--        remove = bouton;
-+        b_remove = bouton;
- 
-         /*--- Frame 5 ---*/
-         frame = gtk_frame_new(NULL);
-@@ -322,7 +322,6 @@
-         gtk_box_pack_start(GTK_BOX(buttons_hbox), bouton, TRUE, TRUE, 0);
-         GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
-         gtk_widget_grab_default(GTK_WIDGET(bouton));
--        gtk_widget_draw_default(GTK_WIDGET(bouton));
-         gtk_widget_show(bouton);
- 
-         bouton = gtk_button_new_with_label(" Cancel ");
-diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/popedit.c wmmaiload-2.2.1/wmmaiload-config/popedit.c
---- wmmaiload-2.2.1.orig/wmmaiload-config/popedit.c	2005-07-07 21:54:17.000000000 +0300
-+++ wmmaiload-2.2.1/wmmaiload-config/popedit.c	2008-01-12 11:47:42.000000000 +0200
-@@ -68,7 +68,6 @@
-                            bouton, TRUE, TRUE, 0);
-         GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
-         gtk_widget_grab_default(GTK_WIDGET(bouton));
--        gtk_widget_draw_default(GTK_WIDGET(bouton));
-         gtk_widget_show(bouton);
- 
-         bouton = gtk_button_new_with_label("Cancel");
diff --git a/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-fno-common.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-fno-common.patch
new file mode 100644
index 000000000000..f4c0eb9763b6
--- /dev/null
+++ b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-fno-common.patch
@@ -0,0 +1,113 @@
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/main.c wmmaiload-2.3.0/wmmaiload-config/main.c
+--- wmmaiload-2.3.0.orig/wmmaiload-config/main.c	2005-07-13 21:51:28.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload-config/main.c	2020-12-20 22:04:03.170530520 +0100
+@@ -11,6 +11,18 @@
+ #include "mainwindow.h"
+ #include "actions.h"
+ 
++int backlight;
++int update_interval;
++int boxnum;
++int check_delay;
++int switch_authorized;
++int run_once;
++int test_size;
++char *config_file;
++char *light_color;
++char *command;
++char *notif_cmd;
++MailBox *mboxes;
+ 
+ void Usage ()
+ {
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.c wmmaiload-2.3.0/wmmaiload-config/mainwindow.c
+--- wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.c	2009-02-23 03:58:00.000000000 +0100
++++ wmmaiload-2.3.0/wmmaiload-config/mainwindow.c	2020-12-20 22:05:14.978622375 +0100
+@@ -9,6 +9,19 @@
+ #include "mainwindow.h"
+ #include "actions.h"
+ 
++GtkWidget *application;
++GtkWidget *filelist;
++GtkWidget *wid_backlight;
++GtkWidget *wid_blink;
++GtkWidget *wid_interval;
++GtkWidget *wid_checkdelay;
++GtkWidget *wid_color;
++GtkWidget *wid_command;
++GtkWidget *wid_notify;
++GtkWidget *wid_runonce;
++GtkWidget *wid_testsize;
++
++int selected_row;
+ 
+ static GtkWidget *b_edit;
+ static GtkWidget *b_set;
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.h wmmaiload-2.3.0/wmmaiload-config/mainwindow.h
+--- wmmaiload-2.3.0.orig/wmmaiload-config/mainwindow.h	2005-07-07 20:54:17.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload-config/mainwindow.h	2020-12-20 22:05:14.978622375 +0100
+@@ -7,19 +7,19 @@
+ 
+ #include <gtk/gtk.h>
+ 
+-GtkWidget *application;
+-GtkWidget *filelist;
+-GtkWidget *wid_backlight;
+-GtkWidget *wid_blink;
+-GtkWidget *wid_interval;
+-GtkWidget *wid_checkdelay;
+-GtkWidget *wid_color;
+-GtkWidget *wid_command;
+-GtkWidget *wid_notify;
+-GtkWidget *wid_runonce;
+-GtkWidget *wid_testsize;
++extern GtkWidget *application;
++extern GtkWidget *filelist;
++extern GtkWidget *wid_backlight;
++extern GtkWidget *wid_blink;
++extern GtkWidget *wid_interval;
++extern GtkWidget *wid_checkdelay;
++extern GtkWidget *wid_color;
++extern GtkWidget *wid_command;
++extern GtkWidget *wid_notify;
++extern GtkWidget *wid_runonce;
++extern GtkWidget *wid_testsize;
+ 
+-int selected_row;
++extern int selected_row;
+ 
+ gint list_unsel_cb (GtkCList *clist,
+                     gint row,
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload-config/variables.h wmmaiload-2.3.0/wmmaiload-config/variables.h
+--- wmmaiload-2.3.0.orig/wmmaiload-config/variables.h	2005-07-07 20:54:17.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload-config/variables.h	2020-12-20 22:04:03.170530520 +0100
+@@ -7,17 +7,17 @@
+ 
+ #include "defines.h"
+ 
+-int backlight;
+-int update_interval;
+-int boxnum;
+-int check_delay;
+-int switch_authorized;
+-int run_once;
+-int test_size;
+-char *config_file;
+-char *light_color;
+-char *command;
+-char *notif_cmd;
+-MailBox *mboxes;
++extern int backlight;
++extern int update_interval;
++extern int boxnum;
++extern int check_delay;
++extern int switch_authorized;
++extern int run_once;
++extern int test_size;
++extern char *config_file;
++extern char *light_color;
++extern char *command;
++extern char *notif_cmd;
++extern MailBox *mboxes;
+ 
+ #endif
diff --git a/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-ssl.patch b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-ssl.patch
new file mode 100644
index 000000000000..812563486256
--- /dev/null
+++ b/x11-plugins/wmmaiload/files/wmmaiload-2.3.0-ssl.patch
@@ -0,0 +1,24 @@
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload/Init.make wmmaiload-2.3.0/wmmaiload/Init.make
+--- wmmaiload-2.3.0.orig/wmmaiload/Init.make	2005-08-28 21:14:57.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload/Init.make	2020-12-20 22:10:24.487996211 +0100
+@@ -45,7 +45,7 @@
+ # SPECIFIC INFORMATIONS :
+ #
+ 
+-LIB_SSL = $(shell grep -q '^OPTIONS.*HAVE_SSL' ../Config.make && echo '-lssl')
++LIB_SSL = $(shell grep -q '^OPTIONS.*HAVE_SSL' ../Config.make && echo '-lssl -lcrypto')
+ LIB_THREADS = $(shell grep -q '^OPTIONS.*HAVE_THREADS' ../Config.make && echo '-lpthread')
+ 
+ CROSS_COMPILE =
+diff -Naur wmmaiload-2.3.0.orig/wmmaiload/ssl.c wmmaiload-2.3.0/wmmaiload/ssl.c
+--- wmmaiload-2.3.0.orig/wmmaiload/ssl.c	2005-07-30 15:52:55.000000000 +0200
++++ wmmaiload-2.3.0/wmmaiload/ssl.c	2020-12-20 22:10:30.327001632 +0100
+@@ -39,7 +39,7 @@
+ 
+         OpenSSL_add_all_algorithms();
+ 
+-        method = SSLv2_client_method();
++        method = SSLv23_client_method();
+         ctx = SSL_CTX_new(method);
+         return ctx;
+ }
diff --git a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r2.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..79edd2c03eb7
--- /dev/null
+++ b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="dockapp that monitors one or more mailboxes"
+HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
+SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-checkthread.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-ssl.patch
+)
+
+src_configure() {
+	# The ./configure script is not autoconf based, therefore don't use econf:
+	./configure -p /usr || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCPP)" \
+		CFLAGS="${CFLAGS}" \
+		DEBUG_LDFLAGS="" \
+		LDFLAGS="${LDFLAGS}" \
+		DEBUG_CFLAGS=""
+}
+
+src_install() {
+	dobin ${PN}/${PN} ${PN}-config/${PN}-config
+	doman doc/*.1
+	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO doc/sample.${PN}rc
+}
diff --git a/x11-plugins/wmpasman/Manifest b/x11-plugins/wmpasman/Manifest
index 7ba1ba401f5d..d864c99135ba 100644
--- a/x11-plugins/wmpasman/Manifest
+++ b/x11-plugins/wmpasman/Manifest
@@ -1,4 +1,3 @@
-AUX wmpasman-0.8.5.3-list.patch 2751 BLAKE2B de34e3491f74dd8fc3340c85a665e9dfc546bfd8d056ff56542e535bd98c969e01f37a30e2852bf33d2f95accfa39c7c26752ddfd9ab598b4326da9ec4ebf0c9 SHA512 f8b5f33f7b6da03e95f000a8a7b27c1346b10cb3953635974f804e64af9279ecc7fc99eadbc1a0d534f5f434672db18fa4d46fced0498829fe2202b46ab818a1
 DIST wmpasman-2.2.tar.gz 155077 BLAKE2B d7d9bd1c3e34d4f03661babd42ed5abbf42637709fb2f31358b51fda13dcd682e083af683640a7ef75ae0087f2de179136635e9be3979f9a36a067b5b634fcd2 SHA512 2f24e2ef84d6e5cab1c3a51d032ecabbd21b22e81341ee48b1f86fc96f493d42cde42fd20cf5523f0f8462906cab4f22a2238b6c147b61b33e812f98f32c0157
 EBUILD wmpasman-2.2.ebuild 461 BLAKE2B fd0003bc34d852ff261f13ad3eb1ea8f5948f99a3b853b079384536763d6308243d06c55133ab71949ad6addbc3a49e1b4c40ddcd89d95e5ba6a644d9d6324bf SHA512 b96df693cbc613d95bc942034f7b5f34804c9f93c2049f6011b19199e68c68e77d32fcb102c364be8f214ded8a6335db8f771bf466c8b78aff901d3e1756023d
 MISC metadata.xml 603 BLAKE2B 20e83900219fe3124a32af326c94834ffcaa2303a2fcb7d33d30d9943397c88a38b0ed09c6130307ad1a5be45ffbef36d37ccd6f9c28dce8db080f2acfa3ace9 SHA512 5cc8f2cc54d2298a15f330444e0d06f941c74efb88177e4ebb45d36688f22807c65cdf50c9b2f519a78c76336060ea6f815a67013e9df36ef2a2df1a1de0055a
diff --git a/x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch b/x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch
deleted file mode 100644
index 3769d09d30ee..000000000000
--- a/x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
---- wmgeneral.orig/list.c	2016-01-04 13:18:09.361133006 +0100
-+++ wmgeneral/list.c	2016-01-04 13:18:21.789137166 +0100
-@@ -40,7 +40,7 @@
- 
- /* Return a cons cell produced from (head . tail) */
- 
--inline LinkedList* 
-+LinkedList* 
- list_cons(void* head, LinkedList* tail)
- {
-   LinkedList* cell;
-@@ -53,7 +53,7 @@
- 
- /* Return the length of a list, list_length(NULL) returns zero */
- 
--inline int
-+int
- list_length(LinkedList* list)
- {
-   int i = 0;
-@@ -68,7 +68,7 @@
- /* Return the Nth element of LIST, where N count from zero.  If N 
-    larger than the list length, NULL is returned  */
- 
--inline void*
-+void*
- list_nth(int index, LinkedList* list)
- {
-   while(index-- != 0)
-@@ -83,7 +83,7 @@
- 
- /* Remove the element at the head by replacing it by its successor */
- 
--inline void
-+void
- list_remove_head(LinkedList** list)
- {
-   if (!*list) return;  
-@@ -103,7 +103,7 @@
- 
- /* Remove the element with `car' set to ELEMENT */
- /*
--inline void
-+void
- list_remove_elem(LinkedList** list, void* elem)
- {
-   while (*list)
-@@ -114,7 +114,7 @@
-     }
- }*/
- 
--inline LinkedList *
-+LinkedList *
- list_remove_elem(LinkedList* list, void* elem)
- {
-     LinkedList *tmp;
-@@ -134,7 +134,7 @@
- 
- /* Return element that has ELEM as car */
- 
--inline LinkedList*
-+LinkedList*
- list_find(LinkedList* list, void* elem)
- {
-   while(list)
-@@ -148,7 +148,7 @@
- 
- /* Free list (backwards recursive) */
- 
--inline void
-+void
- list_free(LinkedList* list)
- {
-   if(list)
-@@ -160,7 +160,7 @@
- 
- /* Map FUNCTION over all elements in LIST */
- 
--inline void
-+void
- list_mapcar(LinkedList* list, void(*function)(void*))
- {
-   while(list)
-diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
---- wmgeneral.orig/list.h	2016-01-04 13:18:09.361133006 +0100
-+++ wmgeneral/list.h	2016-01-04 13:18:26.007138577 +0100
-@@ -36,20 +36,20 @@
-   struct LinkedList *tail;
- } LinkedList;
- 
--inline LinkedList* list_cons(void* head, LinkedList* tail);
-+LinkedList* list_cons(void* head, LinkedList* tail);
- 
--inline int list_length(LinkedList* list);
-+int list_length(LinkedList* list);
- 
--inline void* list_nth(int index, LinkedList* list);
-+void* list_nth(int index, LinkedList* list);
- 
--inline void list_remove_head(LinkedList** list);
-+void list_remove_head(LinkedList** list);
- 
--inline LinkedList *list_remove_elem(LinkedList* list, void* elem);
-+LinkedList *list_remove_elem(LinkedList* list, void* elem);
- 
--inline void list_mapcar(LinkedList* list, void(*function)(void*));
-+void list_mapcar(LinkedList* list, void(*function)(void*));
- 
--inline LinkedList*list_find(LinkedList* list, void* elem);
-+LinkedList*list_find(LinkedList* list, void* elem);
- 
--inline void list_free(LinkedList* list);
-+void list_free(LinkedList* list);
- 
- #endif
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 4dd98819ce6e..92f51901f645 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 02f961474dec..0b44b91e6b4d 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -3,7 +3,7 @@ DIST xterm-351.tgz 1401009 BLAKE2B df32425affce33deb199710be118e90da7b1975882aaf
 DIST xterm-360.tgz 1431491 BLAKE2B 2afa7f9cb93136ad0bfb29e0862642221b4b1f583caa5890bbdd4c0a2370266f7c7f19419e3bb82f93d854b3c5703ddd30b896dcb5069873458ac3483dbd7073 SHA512 ffca51e21584e4b84b271a555bead45df1759a9e353d776fd7d8736fb001b71cfa14dc85336c01c304b4fc98297523b1a943792da73b453e1810b890671bb607
 DIST xterm-361.tgz 1435017 BLAKE2B 8e413f3d9b8f3aa11fd71ed5692da9b274109bef5e0303470cf3eb81a333a12eb1437a01c023cff2dd0eb14aa19a849f6b00fa0a155c068421c7d070b1c64e35 SHA512 99e2a018729840c3ec8fe81d3cb305af249b641ceb40c2020f3cd4af3be7d88b6174a39fe8aa614d4ba1734af5f858762ffd68c9ee118ec3ef9030469583e852
 EBUILD xterm-337.ebuild 2584 BLAKE2B a767cd2ecb33368a1aee6766ee6d08b3c7b7f4fb37b9b7173b2d276f5385fd5c6d7ceaa29807f63712a437dd551eeafd0f409cfb65d31e5ac3871314875a3e23 SHA512 75470065aa1bfda91bcc84041021244ad2d6210d1761b082913b714e3be122c5f1089f786b6f03a23d9cc13008fe0120415a732146c838199f476d7ebf13b171
-EBUILD xterm-351.ebuild 2627 BLAKE2B 4f4c4a0d0374c40ea8f029194d5525d950c9645bf6b2dcee4d64cae653fb7c7c7cb5619aaac48be2e5938f4fff8ccd289821ffd102eb0ae0ff30a557db8b13cc SHA512 70ab6dce2c2ff855ecb535e39bfe9e70c5276e2affb63c25df5da2d9caf494ea397e607eca8e327cf7262dc26cf381bbf77c65ce21caf759ba66b7a94db3fb7e
-EBUILD xterm-360.ebuild 2635 BLAKE2B 28001fbf343dd204d9b447828c0eb558382d80859cdfbdb9ad1da13e7773d837585d66e93fb429be3c81e812e84164c0b3ea67885f080706bb58e355f9301ccf SHA512 a07dac126924296f66643dae2435ba36dabae4767928c42a2be9ce20cdc77269bf35c047f85ec52228b307d9875e0ecb42dc48fe4938c9ff68c759e24d810821
-EBUILD xterm-361.ebuild 2642 BLAKE2B 416f99c86f0f9870e8da670af21fd831e5a2fbf0b103015a63832f8b8c44e1d55fbc905ef77e4b3233c73be65c520847824515e9a9cbfb570ef47f6bbc9970aa SHA512 ccb8a9b3eecbc409dc71d2fa9901129b03e581ddbd281a1aca9084ae5452d70320d0e8f267c0e9c36fedf4e9cac8657673f551ff43fa3015e7b5886e059d1bb8
+EBUILD xterm-351.ebuild 2626 BLAKE2B 7a93b6c1ed5f1f82fb85e228aa276434757623abfa93bcd27af63ed3aa4895a3750200b4bde4c9032861dc62c462e56316f5af810c63a34091297685c1536799 SHA512 6dd4f5be9ad48a64a6b7aa04c0da48f3b84f79da20a8499b71f68ac819c11543b50b599a2c9d8e9a4d6c8490b83b086847cb2f7c5400976b61082374a30268ad
+EBUILD xterm-360.ebuild 2634 BLAKE2B 65f1b58b2ca30a8a896bab018dca7491562af73e13ef237f19351e456d4a66d3ed16e28b84c010de36da3db4988e2228cd587fc5816315ab9c07c5a26ba9af92 SHA512 0411951a5bb60c492917a29c9185ada8a82bea059aef7a2ba5a513c90497db4ccba1d4fe567d6e6c61133f72635d358d57f7805a6d0703784571e17b9f1a7cca
+EBUILD xterm-361.ebuild 2641 BLAKE2B 27ede55566ab8e0da7e72df953cd59821162861e0cb2f7cba16a3420de82a4ba2ea6e49b5760cfc0f9c33f37811e57b68594c41de41dc02792bffd53309d4b5b SHA512 918d8f73878f3c5b33e8fc82477c2500248a1b265c8286dca22945afe1bdedb1efaa50274182b56e6419cb68ae15a026a03e11be5f25c27d2ae809e9042af662
 MISC metadata.xml 461 BLAKE2B e2342778bf1a9f780a10a9215182a41019c65d1412fbd9d9e215a8660a1fac0e4c7d62842286b46ca659b42fc6c528cdcaa8697c465de652e1c8c0f0ae21c2d8 SHA512 34f61ee876ad6365efb4d9b69208b65b33bb47eeded0a1264ee9d2f9bec2e21ba2dd65852d3d0adf101a506a19d0a519e6612df84fe08b875c334dbb3341c581
diff --git a/x11-terms/xterm/xterm-351.ebuild b/x11-terms/xterm/xterm-351.ebuild
index fa35f79b4ad9..73e871a7a0c9 100644
--- a/x11-terms/xterm/xterm-351.ebuild
+++ b/x11-terms/xterm/xterm-351.ebuild
@@ -95,5 +95,5 @@ src_install() {
 	fperms 0755 /usr/bin/xterm
 
 	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${ED}${DEFAULTS_DIR}"/XTerm-color || die
+	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
 }
diff --git a/x11-terms/xterm/xterm-360.ebuild b/x11-terms/xterm/xterm-360.ebuild
index ace98c8c3afe..eef209681aa6 100644
--- a/x11-terms/xterm/xterm-360.ebuild
+++ b/x11-terms/xterm/xterm-360.ebuild
@@ -95,5 +95,5 @@ src_install() {
 	fperms 0755 /usr/bin/xterm
 
 	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${ED}${DEFAULTS_DIR}"/XTerm-color || die
+	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
 }
diff --git a/x11-terms/xterm/xterm-361.ebuild b/x11-terms/xterm/xterm-361.ebuild
index 4578ed83e77e..9a35b389070c 100644
--- a/x11-terms/xterm/xterm-361.ebuild
+++ b/x11-terms/xterm/xterm-361.ebuild
@@ -95,5 +95,5 @@ src_install() {
 	fperms 0755 /usr/bin/xterm
 
 	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${ED}${DEFAULTS_DIR}"/XTerm-color || die
+	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
 }
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 7f4018b47da3..e4eba78f144e 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index d435024701fc..a6fafc9a6ceb 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,6 +1,6 @@
 DIST adwaita-icon-theme-3.32.0.tar.xz 18540012 BLAKE2B a82ca6758cdbf459ac617d3b3d834e4147c3a3c5e6ca7c705ed2d16e8cf0a1255f5ae999d7e930b9716585b8c498c220f1ab40fec929dde7679efd56f3b18a45 SHA512 9609732cd51c6794d4d86598818bb2a589b0f4b6b795e57f3507dad69b21ef1b2fc2e83e24e937428bbace32fcccf587a5771cbc02c5768206e704f0456a6d1d
 DIST adwaita-icon-theme-3.36.1.tar.xz 17247020 BLAKE2B 51461ff3058f413cacea9b7ec76bedd13e7adc38fa2aa9a80e84718f371463d9cc2b2be80ef10e375bf670658d184680ecadc7f84089e8b5ee09a39bf9fa1924 SHA512 5df33c8592ebd17e05fb36590423177fa3e07345565302a5b7ef58fb7d7a9b2b3a1789907a81f5ca0abc7446f7e83af059ca9d6432e8182d5274394c79a24fb9
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD adwaita-icon-theme-3.32.0.ebuild 1653 BLAKE2B cdb2f6f32ff05764cf1565dd791a542bfcf5feedae2e6c74d302489a4dd1052a23d7ae5bd151eff5c18ce77ac239a3c610e13780221859f0653f2f8aeb7d5afe SHA512 d23d394b6bf1d6897dc9f58cac0cc8bb0113dee3b22a99843065391739936cbf36ee115c15dfcc4bad5b3339e67d35f53b04fdd7ca257162dc2ee8cc103f0a76
-EBUILD adwaita-icon-theme-3.36.1-r1.ebuild 1950 BLAKE2B 3fcbec7efd08927e514de81bec0d7c31403225c0dcba91781c6a246767e1c9cdf13ecbe0cdbe43cec57bae3bdb30ada2a05ca30d72f53fc34b2fd2d27b52dd1b SHA512 613fcbdb359876c36fa58493277cde94f116bb539cf0ca9c9a974fff942ae38bd7526d4bbe7e890c19d2581d8c9ff8d22ccf81514a167284e5d4097bb24c9652
+EBUILD adwaita-icon-theme-3.32.0.ebuild 1600 BLAKE2B 471bca291b413189a55438d73a95e65956462ef8e159ed291928ba2f7166b8a37c5d79eaf2957c7c263651c0412be54f40af16e3160e3edc4008e94edb1f98c8 SHA512 20cbc5ae4ce2a0aba9a42387d866625142d8e589b68a4621a7874e961c4676402ed9c742a2ba24a36e0616b5f169518c3e4f9c78548f9cee81cffef18ca9404f
+EBUILD adwaita-icon-theme-3.36.1-r1.ebuild 1533 BLAKE2B 4a06ede80f585999f5999afd90f62ef36e33a0727658912105e7db84f34abeb932e579a37279286ddfdac6eee8663129576d92664be02e4da6520721fb64eb95 SHA512 5a46ed707bee8f4d55cec6eaa5896f53b5c6ff4d10d111dce6613077fed0e8e626c57256a8f59b4883a7f3af50209ba1543ed611d2f524d68250b0604482811e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
index 51f5ea054495..e6b170a05836 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.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
 
 inherit gnome2
 
@@ -21,17 +21,15 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
-COMMON_DEPEND="
-	>=x11-themes/hicolor-icon-theme-0.10
+DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
+RDEPEND="${DEPEND}
 	gnome-base/librsvg:2
 "
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/gtk+:3
+BDEPEND="
+	gnome-base/librsvg:2
 	sys-devel/gettext
 	virtual/pkgconfig
+	x11-libs/gtk+:3
 "
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-r1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-r1.ebuild
index 42cbbedd2a10..ec449ae6fa1a 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-r1.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-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
 
 inherit gnome2
 
@@ -21,14 +21,15 @@ KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
-RDEPEND="
-	>=x11-themes/hicolor-icon-theme-0.10
+DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
+RDEPEND="${DEPEND}
 	>=gnome-base/librsvg-2.48:2
 "
-DEPEND="${RDEPEND}
-	x11-libs/gtk+:3
+BDEPEND="
+	>=gnome-base/librsvg-2.48:2
 	sys-devel/gettext
 	virtual/pkgconfig
+	x11-libs/gtk+:3
 "
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
@@ -51,13 +52,5 @@ 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/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest
index 50cbf680b610..55d3017c5ad2 100644
--- a/x11-themes/gnome-themes-standard/Manifest
+++ b/x11-themes/gnome-themes-standard/Manifest
@@ -1,4 +1,4 @@
 AUX gnome-themes-standard-3.22.2-exclude-engine.patch 1893 BLAKE2B 416f89fb438ced13d04ed94cb7a8504fd0cf664bd61a8a30e703f8c0e9afb16407c34ed14dcb395f9c9a4d19d3d90c1d73f2a64f2acb3de34b6d9ba6a649afe8 SHA512 9b7f4efdce158485850e12566dce91a7b3494bae8191bcacb581a737dde15bcce9b10af8f28ab920605e86008744ad380312f26fc3d624bada910599501159f9
 DIST gnome-themes-extra-3.28.tar.xz 2953272 BLAKE2B 122ff5f1d95086c5cad6818efa79763ab574b7d6792b846198ac7ed5b521747d4357025ebd0ac6b5ea1161bf1dd3482ac2e867822bf863928b05a8486172ba0d SHA512 bccc446e86b12476b86a0fe2e3354500c8fb3eef62a85c3823d69aaa259e032e1f94e7993bf633397b669c425ef42635b0cf17b376f0b7cf1869bb1d7160ede0
-EBUILD gnome-themes-standard-3.28.ebuild 1035 BLAKE2B b2756f1fe9c5d5630f663d9671f41a7ed2002b7bd423e2b3ab8c46481ccc743cd501399d05d2d5c7c6dae6dbec9103a27de9df6a57f65ee9e0fbca0a7bc09368 SHA512 b92526987613767c5e8bbb56621dacced6f278f792fcd6896dad4538d553c1e1018c7ec76947528fb86fd59eebe95fe50157ecc60b91bf8dfbe32f540e9b833b
+EBUILD gnome-themes-standard-3.28.ebuild 1008 BLAKE2B d26feab73bdf93497156a8d2f1beb5264742a715bdb1eb07c690eb5d4403106acb7ba2645adbb461a01c22046f4fd620ebdf2d65e7182de02a56d2de6d6b736c SHA512 d0b5aaf2c1a4f580766c34d83f0f1e11a4f81eec81cd628943042cdf6332c920c97fbe724b37e88aa3ce96b1da22f89dc088fbef7879f99ce05f03e1cf626eb5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
index 6752de6dbac2..ec1e7159a039 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.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
 GNOME_ORG_MODULE="gnome-themes-extra"
 
 inherit autotools gnome.org xdg
@@ -11,7 +11,6 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 # Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
@@ -19,7 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd6
 RDEPEND="
 	>=gnome-base/gsettings-desktop-schemas-3.4
 "
-DEPEND="
+BDEPEND="
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -36,7 +35,7 @@ src_prepare() {
 }
 
 src_configure() {
-	ECONF_SOURCE="${S}" econf \
+	econf \
 		--disable-static \
 		--disable-gtk2-engine \
 		--disable-gtk3-engine \
diff --git a/x11-themes/gtk-engines-adwaita/Manifest b/x11-themes/gtk-engines-adwaita/Manifest
index d3fa33eb8a13..5c6536ac95f9 100644
--- a/x11-themes/gtk-engines-adwaita/Manifest
+++ b/x11-themes/gtk-engines-adwaita/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-themes-extra-3.28.tar.xz 2953272 BLAKE2B 122ff5f1d95086c5cad6818efa79763ab574b7d6792b846198ac7ed5b521747d4357025ebd0ac6b5ea1161bf1dd3482ac2e867822bf863928b05a8486172ba0d SHA512 bccc446e86b12476b86a0fe2e3354500c8fb3eef62a85c3823d69aaa259e032e1f94e7993bf633397b669c425ef42635b0cf17b376f0b7cf1869bb1d7160ede0
-EBUILD gtk-engines-adwaita-3.28.ebuild 1077 BLAKE2B 920f90dafdce64f9d6c716b4f00d6b1b1a346e2d909ec5af1b9f582f7027b68a8779fd20a5c62c20361e4edb68b280479ac519f7af0711b897e0f710c4dfa44f SHA512 7617471380b4638b7d4a1ee8411686d6bac3566274d857c471f694112baf384865edf111025befad727c2ccdbb4b5b2121fde2d88629410e8d32ad8d014eda11
+EBUILD gtk-engines-adwaita-3.28.ebuild 1046 BLAKE2B 199830836dc938eb2e658b4019360c6af54cbfcbabe156947e92ebe8bb2367d956e129ae0ae1f5337a68a4f7ade5de1fecec8e296c4117142661d9f56affe72f SHA512 bf888eddd0051d8ee24d493e0008b0ff55ac0cc458ad3f4cb1572865b598c15b469934724c1ed260db1c655fdd142d94526c9813b96a4017ce30f754b0c9f3ca
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
index 4c09b1ff5d2a..eb94c0181f60 100644
--- a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
+++ b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.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
 GNOME_ORG_MODULE="gnome-themes-extra"
 
 inherit gnome.org multilib-minimal
@@ -11,16 +11,13 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
-COMMON_DEPEND="
+DEPEND="
 	>=x11-libs/gtk+-2.24.15:2[${MULTILIB_USEDEP}]
 "
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.20.2-r1
-"
-DEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}"
+BDEPEND="
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -40,5 +37,9 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake -C themes/Adwaita/gtk-2.0 DESTDIR="${D}" install-engineLTLIBRARIES
-	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 9547175b0ce6..d4ec45a6d1db 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-diskperf-plugin/Manifest b/xfce-extra/xfce4-diskperf-plugin/Manifest
index 460bdb380090..dc6df049bfbc 100644
--- a/xfce-extra/xfce4-diskperf-plugin/Manifest
+++ b/xfce-extra/xfce4-diskperf-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-diskperf-plugin-2.6.2.tar.bz2 347244 BLAKE2B 82ef114b6ac445627d05ed99b34f128391061e5028192aaaa47e8b87f17cb89842d541585e77da4b6ec319fc50f242fe6d1fcb510048497e2b1184a8e3dfcadb SHA512 e91a888a9936f8a0279a062801d16ebe03159df479413087a01e20c15913df781378e4b4c91ecba94d71afa813c6d3a5367b11c1c6d3d62bf10fea78c4853031
+DIST xfce4-diskperf-plugin-2.6.3.tar.bz2 384330 BLAKE2B c7e9d885f42d7f007570c54bd26c7b85aac1054cdb9a0ca0119267b89387ab731807090bea49f7be05b6bae314efd2a87845c4005cd7cf31aa41f1b2b5ee4519 SHA512 fb7ffeaca14f67bb8a2423529f7040d3e51a0184a552f4636acfb4aec914da5fef95db2c710cad8cb1a3b96ef9abc308ad072b03f6e2ccc49793c0edb73dc116
 EBUILD xfce4-diskperf-plugin-2.6.2.ebuild 799 BLAKE2B e4787b162fa2521e00f64e69e92a270cb6a6e13d5de90f14000b522172400282c8affcc60f30aebe5e4d861ac8347b62d16d9bcd47ff1f1f5595c9c6112860ee SHA512 9457f35ff920871bbb924853722a7944b286b4801cb5dd2d0ef4f59d20844b9e38862df6d9bc4adb86a41f945adc73564fd1881cc3d22fbe96d6aea65e6f5f44
+EBUILD xfce4-diskperf-plugin-2.6.3.ebuild 813 BLAKE2B 62014956520c57f44d19f3e3957a91fbe5498ffc7ff311cd773b203f239f26a36c1bc31188323c3bb4cfb457653560d7b7797e2580189b615be2f69fe21c994b SHA512 155f14310cc10dc79c7939f0ddb8bb1dd9929c3737370724fd2af61a43ed6bdc1c67a2e3918fb211d59b9b0c1987f5c8720ccbf3dd8b0fa203bcc216d8adfad1
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.3.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.3.ebuild
new file mode 100644
index 000000000000..72c2439e8326
--- /dev/null
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A panel plug-in for disk usage and performance statistics"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/xfce4-panel-4.12:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-mailwatch-plugin/Manifest b/xfce-extra/xfce4-mailwatch-plugin/Manifest
index 2901e34915c3..58e760a556e7 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/Manifest
+++ b/xfce-extra/xfce4-mailwatch-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-mailwatch-plugin-1.2.0.tar.bz2 509649 BLAKE2B 7749914cf4e8ca34e27c63033e84718c4bc8d9da11ca9f6487bf9291c145f5b062d6b7b07d03d2eb273d0e88b96946641721f6f24dd19c19db9f923e9b33ff53 SHA512 6f5128b2341ab275427e02b1ef063cb2fdcf4027f5c47cfc0ed26086462eb0e9f7353441ea1b9380b91a892414934203b781445f604d67200786e3dd85183a83
 DIST xfce4-mailwatch-plugin-1.3.0.tar.bz2 551687 BLAKE2B 3ec841c32df059a2be99ad21c706be794d97c493e9ae1c1be5ec9006c45df51a766c8c89ef9f2941f6c411c18bfd5d01e8a510acfc4233cb349e1528346d0617 SHA512 07d4e4cc2f7d299a142d9e9b307c2797892a5febd8451d5291cb9574be0bd5daba677ee893fea3af49b6a8acbfb827ae0125ba11014df37b6c68a2734ecde11b
-EBUILD xfce4-mailwatch-plugin-1.2.0-r6.ebuild 1079 BLAKE2B a1491670b95724aed82f6da36119b7f35b0e516db4417bc70ec874f8809c621e9a0a7394189ebc9a0cb24e93c7b3ebd44f80cab8fe4b84c7eaef64d142077a2d SHA512 0e1391c335a22cfd4abdf54c540ca8360cb91d3cff98100866b75fd570666146968143de84dc1415cefcce687a7a4b4af6b52edbb8e91ce5ce843eee31aafcaa
-EBUILD xfce4-mailwatch-plugin-1.3.0.ebuild 1008 BLAKE2B a5447c59a60bcac1e69eca1808cbb15a68228a479f0d8c9dfa896467fd9bf2290cd560e3afe8dadbeea03483bca33009490e5cd4abb52e64a1100faa34fc010f SHA512 bb8ddcee390b9353bf2440c23abfbefbfa1bcfdafd9bd3edf0ba64935a5547538cef85b1da6bf96c58c7250384091cc481931b8770e57552d04929bcdbb7c113
+EBUILD xfce4-mailwatch-plugin-1.3.0.ebuild 1000 BLAKE2B 921c6cf24fe3fa2ba715d1c3d2339844bc60b41726ff10d1793bd3e066a80e9639bdc690ec7f81a6e8655dcb435194b8cc34fd1a992d62efee77d9589e6a3471 SHA512 4a3b34eb765eceb11d628e3283612818dda7889742fa252e4d896a30fc5e477dd4dda0301cd31dd02959ef82d35f091eb144e321563ff38536d65d5a5a290c24
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r6.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r6.ebuild
deleted file mode 100644
index a7f3091d9aa9..000000000000
--- a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r6.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
-
-inherit gnome2-utils
-
-DESCRIPTION="An mail notification panel plug-in for the Xfce desktop environment"
-HOMEPAGE="https://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 ssl"
-
-RDEPEND=">=dev-libs/glib-2:=
-	>=x11-libs/gtk+-2.18:2=
-	x11-libs/libX11:=
-	<xfce-base/exo-4.15[gtk2(+)]
-	<xfce-base/libxfce4ui-4.15:=[gtk2(+)]
-	>=xfce-base/libxfce4util-4.10:=
-	<xfce-base/xfce4-panel-4.15:=[gtk2(+)]
-	ssl? (
-		dev-libs/libgcrypt:0=
-		>=net-libs/gnutls-2:=
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_enable ssl) $(use_enable ipv6)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.3.0.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.3.0.ebuild
index 5794e9bb91f1..ef3b4db80f3c 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.3.0.ebuild
+++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.3.0.ebuild
@@ -6,12 +6,12 @@ EAPI=7
 inherit xdg-utils
 
 DESCRIPTION="An mail notification panel plug-in for the Xfce desktop environment"
-HOMEPAGE="https://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/"
+HOMEPAGE="https://www.spurint.org/projects/xfce4-mailwatch-plugin/"
 SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 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="ipv6 ssl"
 
 RDEPEND=">=dev-libs/glib-2.42:=
diff --git a/xfce-extra/xfce4-mount-plugin/Manifest b/xfce-extra/xfce4-mount-plugin/Manifest
index 7eccef2b7ef1..1743b68a40d3 100644
--- a/xfce-extra/xfce4-mount-plugin/Manifest
+++ b/xfce-extra/xfce4-mount-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-mount-plugin-1.1.3.tar.bz2 431182 BLAKE2B ba197ae9028b726e3b1e2b7fd68ebaec3e8e247322d916a1579681af9b004418d4738bfff05e7b947d6bcc5a1bd3cd1e0419f2e7421ae8cf7a7aeb3011658132 SHA512 10894069fd98fa0b709a3e743f0d6f9a8e9487b0de8495c3d177731190480f18b11b0179325d2ed47f80eeeaea10144ddce7f9cd60397dfb6a0db602bd4f8124
+DIST xfce4-mount-plugin-1.1.4.tar.bz2 452224 BLAKE2B aad04c6aec4e624aa437f9a22f730e64d0ef2d11a76d98a082075477825767234e92ff6e97ee7821e36e49f97ef4fe86528660b20bfc3dd21d3b7f490e669dca SHA512 aff784688ca9b83acf7bf512b25fb7ad96c7b8a68d21bf466ccfbbbaed5e2d6884ac8222eb4a0db26c1763a932111114c6c2b76de89407553bc484f33ed036a0
 EBUILD xfce4-mount-plugin-1.1.3.ebuild 782 BLAKE2B 019b82e753fa60728bac612bb69129026d4938bebaa99fd57193dccf2c905d8aac476a54d58970e36f1fb1d06797257d2b4dd75764dd26b10c13cf5fa3344b10 SHA512 5118dfa3c3b90019177307a34bc633e2830c09cbe0b8893d23902a81518ad7d8a1e612b84bc99bc4cc68ef14286a8f76de80cbbb7091c2d0f2b1aa626641f36b
+EBUILD xfce4-mount-plugin-1.1.4.ebuild 789 BLAKE2B 974dd811dea262858d7e606f4272f9c31bdd634c3cc084d6c526b2856ea04c1b8cc7c4e5345356e044108fce2961e8af3f0a2bf5c8057aeae0e35c8c08d4d6e7 SHA512 48b1f133a69ed7ca9109cae90ed4ba3c2b6351e4d03c62aef7b3edf7072a87f567827fa97aa7a9ac308d2a105a58fdef9ef658265350ccb11e9148777c10210d
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.4.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.4.ebuild
new file mode 100644
index 000000000000..5dce52b27f20
--- /dev/null
+++ b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="An mount plug-in for the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/xfce4-panel-4.12:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 08bbd7f2e589..071f1dc68a8d 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-screensaver-0.1.10.tar.bz2 665624 BLAKE2B 9af4a821bcbb461462cf620dbd2c064a32b904f0d6887095cd00939f857244d69612e18559c0cf0be93e9044047d0e3dba8c756acc16fe9e3e136a718beb3942 SHA512 a04842697c7a8f84ee937f0371b3d1413163b59d1a54b9adf0b904dd501d6328ab645160567ff79afbe063cc113a488567ec5d8df4d6ed2db354738275c00b2e
 DIST xfce4-screensaver-0.1.11.tar.bz2 699642 BLAKE2B 5fbb5b5c923e82070e429fcf65c8c5b5b9b0d78cba9fd128c84490a6a0927a0620b41af7ffb7356cd13ccfe48f2e1841f90e980c4bfbd15fa8f50e0f1fed7e75 SHA512 f692e31cba00d65887b90857eb4c1075000859f85db7dac7f421cc0d9812c6e8d517fcdfcac7546a6818375f9a7222a2afb80ae7076e62953bc8dcc7af9be174
-EBUILD xfce4-screensaver-0.1.10.ebuild 1668 BLAKE2B e9e364d64eb3d8fb63a1dd6af77a3f2a21a2724a57d8a17ebd64e1d71d02b268b85712d045bcbb72bc539198f4a2ef3f84214014f693a2aa475abed29212623b SHA512 73575cae9e37ad1b9f2c2135952980f5390530e149b6ae017d2001a25d9e13b82883b46d52e448aa915e70d6c19c5787f99af8fd2597bc8a419cb5c8a65fd561
-EBUILD xfce4-screensaver-0.1.11.ebuild 1772 BLAKE2B 5bc2a7272b56f88eadbf6fc3cb996da1d4efd77491a8ed78e2935ffe94399a7c2c7a9033fc680db53c304c7abbc42b3adccf7412e5a264beb96357da8522e524 SHA512 095688246e42f31f25e26dadab48449248fd90d6bd4ae206a5ad440ec8366a505e116ffcb1ec3c6fb62a8d99af14dd0c95d0cb232910b3cc73219e4ae4c03390
+EBUILD xfce4-screensaver-0.1.11.ebuild 1771 BLAKE2B 2eebc7d87e3d6b2927414d6e227b5581ff80ad5b6b2a782e126bdf0e8ce64a0181284f52d36c8b124864d7942985222ec820a248abb215cb9a96e76f71f3e2c6 SHA512 8cdb8ae31e190e3dd55e2211bf4759b21458c239cf5afd6e3145c8612e7507e04e7eb170b38d4d326468dbdea246e9b4a416da20c5a8b1dd14141904e3da7642
 MISC metadata.xml 291 BLAKE2B 533c3c70954a738e8b239f8ab6ce7b45702bf87d7151e8182ae6142cf8a1611c9d24ab4e6e95ad8d71606e802369536a669e313493e3527d6daa8d1e5a61ecdd SHA512 f86de2f82f08b0a0372ec018cdbebbf87e6c0e7e4f4e4c78c1cbeba0a2cc6ef26f17a8f84b85195961af8a690bf3eb2b45bf415be43e3d9a791e296d7f4a74e1
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
deleted file mode 100644
index da385e71b5ca..000000000000
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
-HOMEPAGE="https://git.xfce.org/apps/xfce4-screensaver/about/"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 x86"
-IUSE="elogind +locking opengl pam systemd"
-
-# Xrandr: optional but automagic
-RDEPEND="
-	>=dev-libs/dbus-glib-0.30
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libwnck-3.20:3
-	x11-libs/libICE:=
-	x11-libs/libX11:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXext:=
-	x11-libs/libXxf86vm:=
-	>=x11-libs/libXrandr-1.3:=
-	>=x11-libs/libxklavier-5.2:=
-	>=xfce-base/garcon-0.5.0:=
-	>=xfce-base/libxfce4ui-4.12.1:=
-	>=xfce-base/libxfce4util-4.12.1:=
-	>=xfce-base/xfconf-4.12.1:=
-	elogind? ( sys-auth/elogind )
-	locking? (
-		pam? ( sys-libs/pam )
-	)
-	opengl? ( virtual/opengl )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-apps/dbus
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		# disable docbook for now
-		ac_cv_path_XMLTO=no
-
-		# xscreensaver dirs autodetection doesn't seem to work
-		--with-xscreensaverdir=/usr/share/xscreensaver/config
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
-		--without-console-kit
-
-		$(use_with opengl libgl)
-		$(use_enable locking)
-		$(use_enable pam)
-		$(use_with elogind)
-		$(use_with systemd)
-	)
-
-	if use pam; then
-		myconf+=( --with-pam-auth-type=system )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild
index 82b77ddee943..00be17a32e50 100644
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="elogind +locking opengl pam systemd"
 
 # Xrandr: optional but automagic
diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index 66dacc3a52b3..5a8361204a0f 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,4 +1,6 @@
 AUX xfce4-systemload-plugin-1.2.3-panel-4.15.patch 691 BLAKE2B a4957c90625825b4d7d96bacc9072245be6588ce80df567e91a5b6af8dfd4b9a313114195745e24e376081017070c3db3a6ba5b742e0de870d222739a3848774 SHA512 2b0c5090086588a59011138ece073d4b626e84235e0551a1d147e69271037948affe7eb708af12655f2243a57054a9677b4dfc71561a84f9d36354bb9290ecb5
 DIST xfce4-systemload-plugin-1.2.3.tar.bz2 349074 BLAKE2B 74cdc8f759824222faf5da04fd3189210883db1ad1ed138978e8cb31075a390d17f32ffa4648cace7745faadfc818878601c70b89a8da9d7e7961768a3f9caac SHA512 98985b2250bfff3ae8314f5671ec4438f4c53702cf9e1b76563cdc5d1b4b62174d6cfa559603294c1fc8fbbd5e15a833cc112c75b106a85b1e11788ded4da538
+DIST xfce4-systemload-plugin-1.2.4.tar.bz2 378644 BLAKE2B b50806925f02ce2a792cb72198bdd2cb0124e1d4ce12c91de124c9f4085e5908200a6f0c3b50fffdc1a6a5ae871eef0f04ec9687f43d8e8d5de1372d808a5fad SHA512 1f57ffe861e9906a1744a02b0b50b1dd9e755ea4d0f8b93dba7f42416cd3727834eca60129465fa6f665ac93ec43c3a5272ce9ceae5f4bb17bf180d88e87bddd
 EBUILD xfce4-systemload-plugin-1.2.3.ebuild 831 BLAKE2B 950bebaae05acdfaa3efd1a0968a35fafac3ca3eb8a58ad0ba73919d661f9fca08d6dfcf95981f3a31b0abb606a3861e3eefbd731ce017ccb994a2376d7b1a08 SHA512 74d4427d04f69b2e090f7328c49823d210ca39710e9c2c0dba8f210b248b31f45c7fe09db77622716cf13e6f32f8308293894b78bb3bda8b9f81b5c871c09aa7
+EBUILD xfce4-systemload-plugin-1.2.4.ebuild 769 BLAKE2B 33a99d1407587bac25dedd43d376a89c92418f2df48a0255e0edb5dd3ad26840c90b90cad569a74e699316876d2cfb041feb6a921ae43822f51cf456df7a1a8c SHA512 23e7f3bfcb7b6271f6460b191dd04e87581fe1de46b0a1dd4abf454021a7aec417df53d6ee6ecde68dec26ae9275c2bb8fc74b50cb7580ef91a761107ff3413b
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.4.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.4.ebuild
new file mode 100644
index 000000000000..d84941a73ff4
--- /dev/null
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="System load plug-in for Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="upower"
+
+RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/xfce4-panel-4.12:=
+	upower? ( >=sys-power/upower-0.9.23 )"
+DEPEND=${RDEPEND}
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_configure() {
+	econf $(use_enable upower)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-weather-plugin/Manifest b/xfce-extra/xfce4-weather-plugin/Manifest
index 803db5172c84..a2037c1020f9 100644
--- a/xfce-extra/xfce4-weather-plugin/Manifest
+++ b/xfce-extra/xfce4-weather-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-weather-plugin-0.10.1.tar.bz2 3026945 BLAKE2B 511427d430b696983855687db12ef8877eabc6a0e2518f511e9f90286b08fcf8b52da10bf6ba7b435c069d5018b653c2c7703e8b9ec3f858251ad9c949acb760 SHA512 14fd17da60b0ac76dd0f8e1b7858e8cef57c5168b7467412e1d45ae91e44858c7619cdca2ee59e242d2888038d458faa7580bf02d1cad3371ec80acc9012f569
 DIST xfce4-weather-plugin-0.10.2.tar.bz2 3049859 BLAKE2B 92e406a77f3538cfc9f5b23b7eb749df0593a4eb50eee6b7d589f00d3f30ce64a58557167189f0306a9079f7ff3ad09c8f67a822b63360ee45d35854b8e55704 SHA512 77df6d10772e47fc6b3cf4db2396b8c6ad87b6b3afb59b2a256d4c52c9f69db30039ee8c6d7b3fbabd613815cad284ecdf7b267293de7ebee76faaa583d89a11
-EBUILD xfce4-weather-plugin-0.10.1.ebuild 1062 BLAKE2B 905ab5eba1ee544ebab13c6b3e46c2affed4384c6bdcee79ae3cb4cf5e17f71de54a5034a672549c7d76f8e33af91ed8479c9aa420c05fc1f82129e72933144f SHA512 28b22cfe8f49b401481137828c0e9c9738bbefb450cee48327459ac0746c151b6a39c47a6addf8cbc79dd2ac78ad43c4150b7ca9690700b440bd22e40b2415b6
-EBUILD xfce4-weather-plugin-0.10.2.ebuild 1063 BLAKE2B 50ee8c56eed7d37f4e74c66c50f6d768f3c89aa845cf10b1136a9207db313a4ec5a4366263096ef5591197fad1e40ce97640ed74be33aa0ac37475eb23e91ea0 SHA512 c297e0fc82b55537df633c09f6c8afe1990b93c36358722da6ec331facfc951de3654b133085438ad0c10b58e95f975d3831fd682cdf0baeef9c06c8aa8f080f
+EBUILD xfce4-weather-plugin-0.10.2.ebuild 1062 BLAKE2B 905ab5eba1ee544ebab13c6b3e46c2affed4384c6bdcee79ae3cb4cf5e17f71de54a5034a672549c7d76f8e33af91ed8479c9aa420c05fc1f82129e72933144f SHA512 28b22cfe8f49b401481137828c0e9c9738bbefb450cee48327459ac0746c151b6a39c47a6addf8cbc79dd2ac78ad43c4150b7ca9690700b440bd22e40b2415b6
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.1.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.1.ebuild
deleted file mode 100644
index 8ea4755cbfad..000000000000
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A weather plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="upower"
-
-RDEPEND=">=dev-libs/glib-2.42
-	dev-libs/libxml2
-	>=net-libs/libsoup-2.42[ssl]
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.14:=
-	>=xfce-base/libxfce4util-4.14:=
-	>=xfce-base/xfce4-panel-4.14:=
-	upower? ( >=sys-power/upower-0.9.23 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	# For GEONAMES_USERNAME, read README file and ask ssuominen@!
-	local myconf=(
-		$(use_enable upower)
-		GEONAMES_USERNAME=Gentoo
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.2.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.2.ebuild
index c759054a9f7f..8ea4755cbfad 100644
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.2.ebuild
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="upower"
 
 RDEPEND=">=dev-libs/glib-2.42